From 7b24072546fdcda160ac37f4abc6d6e0bc6c8f81 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, 20 May 2009 21:30:16 -0400
Subject: Responses

---
 doc/todo/tracking_bugs_with_dependencies.mdwn | 32 ++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 8b36f1e59..a3250f178 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -196,21 +196,39 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 > Very belated code review of last version of the patch:
 > 
 > * `is_globlist` is no longer needed
+
+>> Good :)
+
 > * I don't understand why the pagespec match regexp is changed
 >   from having flags `igx` to `ixgs`. Don't see why you
 >   want `.` to match '\n` in it, and don't see any `.` in the regexp 
 >   anyway?
+
+>> Because you have to define all the named pagespecs in the pagespec, you sometimes end up with very long pagespecs.  I found it useful to split them over multiple lines.  That didn't work at one point and I added the 's' to make it work.  I may have further altered the regex since then to make the 's' redundant.  Remove it and see if multi-line pagespecs still work. :)
+
 > * Some changes of `@_` to `%params` in `pagespec_makeperl` do not
 >   make sense to me. I don't see where \%params is defined and populated,
 >   except with `\$params{specFunc}`.
+
+>> I'm not a perl hacker.  This was a mighty battle for me to get going.  There is probably some battlefield carnage from my early struggles learning perl left here.
+>> Part of this is that @_ / @params already existed as a way of passing in extra parameters.  I didn't want to pollute that top level namespace - just at my own parameter (a hash) which contained the data I needed.
+
 > * Seems that the only reason `match_glob` has to check for `~` is
 >   because when a named spec appears in a pagespec, it is translated
 >   to `match_glob("~foo")`. If, instead, `pagespec_makeperl` checked
 >   for named specs, it could convert them into `check_named_spec("foo")`
 >   and avoid that ugliness.
+
+>> Yeah - I wanted to make named specs syntactically different on my first pass.  You are right in that this could be made a fallback - named specs always override pagenames.
+
 > * The changes to `match_link` seem either unecessary, or incomplete.
 >   Shouldn't it check for named specs and call
 >   `check_named_spec_existential`?
+
+>>  An earlier version did.  Then I realised it wasn't actually needed in that case - match_link() already included a loop that was like a type of existential matching.  Each time through the loop it would
+>> call match_glob().  match_glob() in turn will handle the named spec.  I tested this version briefly and it seemed to work.  I remember looking at this again later and wondering if I had mis-understood
+>> some of the logic in match_link(), which might mean there are cases where you would need an explicit call to check_named_spec_existential() - I never checked it properly after having that thought.
+
 > * Generally, the need to modify `match_*` functions so that they
 >   check for and handle named pagespecs seems suboptimal, if
 >   only because there might be others people may want to use named
@@ -221,13 +239,25 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >   that is not a page name at all, and it could be weird
 >   if such a parameter were accidentially interpreted as a named
 >   pagespec. (But, that seems unlikely to happen.)
+
+>> Possibly.  I'm not sure which I prefer between the current solution and that one.  Each have advantages and disadvantages.
+>> It really isn't much code for the match functions to add a call to check_named_spec_existential().
+
 > * I need to check if your trick to avoid infinite recursion
 >   works if there are two named specs that recursively
 >   call one-another. I suspect it does, but will test this
 >   myself..
->  
+
+>> It worked for me. :)
+
 > --[[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.  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]]
+
 ----
 
     diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 6a0cffc41b0cac86d444138b05140f2043c96c80 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, 21 May 2009 00:56:53 -0400
Subject: Comment on potential bug

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

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index a3250f178..464f68363 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -258,6 +258,9 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >> 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 break
+>>> things another way.  Fixing this properly would allow removal of that special case. -- [[Will]]
+
 ----
 
     diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 7188942440a434fcdc5943cb5cc5c15d9a4d65e7 Mon Sep 17 00:00:00 2001
From: "http://jmtd.net/" <http://jmtd.net/@web>
Date: Thu, 21 May 2009 05:15:11 -0400
Subject: non tag pages under the tagbase

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

diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
index 1bd556f50..40b5dd9e9 100644
--- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
+++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
@@ -15,3 +15,5 @@ this is due to the wikilink being equal to a `\[[!tag ...]]`.  What's the
 rationale on this, or what am I doing wrong, and how to achieve what I want?
 
 --[[tschwinge]]
+
+: What you are doing "wrong" is putting non-tag pages (i.e. `/tag/open_issues_gdb.mdwn`) under your tagbase. -- [[Jon]]
-- 
cgit v1.2.3


From af7f2271ba8e35fbc49bd6b18fd9b8cf67ddc60e Mon Sep 17 00:00:00 2001
From: "http://jmtd.net/" <http://jmtd.net/@web>
Date: Thu, 21 May 2009 05:15:55 -0400
Subject: syntax confusion: tried to use ':' to indent.

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

diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
index 40b5dd9e9..5de59fe88 100644
--- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
+++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
@@ -16,4 +16,4 @@ rationale on this, or what am I doing wrong, and how to achieve what I want?
 
 --[[tschwinge]]
 
-: What you are doing "wrong" is putting non-tag pages (i.e. `/tag/open_issues_gdb.mdwn`) under your tagbase. -- [[Jon]]
+> What you are doing "wrong" is putting non-tag pages (i.e. `/tag/open_issues_gdb.mdwn`) under your tagbase. -- [[Jon]]
-- 
cgit v1.2.3


From d2071292f0f56954f01f52c0c8fd02922e9d5c21 Mon Sep 17 00:00:00 2001
From: "http://jmtd.net/" <http://jmtd.net/@web>
Date: Thu, 21 May 2009 05:17:08 -0400
Subject:

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

diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
index 5de59fe88..bdd0c93c7 100644
--- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
+++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
@@ -16,4 +16,4 @@ rationale on this, or what am I doing wrong, and how to achieve what I want?
 
 --[[tschwinge]]
 
-> What you are doing "wrong" is putting non-tag pages (i.e. `/tag/open_issues_gdb.mdwn`) under your tagbase. -- [[Jon]]
+> What you are doing "wrong" is putting non-tag pages (i.e. `/tag/open_issues_gdb.mdwn`) under your tagbase. The rationale for implementing tag as it has been, I think, is one of simplicity and conciseness. -- [[Jon]]
-- 
cgit v1.2.3


From bcf3f9091a945467a7a68b5b828915e65f0ea139 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 12:44:21 -0400
Subject: add test case for multiline pagespec

---
 t/pagespec_match.t | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 4cf6fa1ff..64408f489 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 => 53;
+use Test::More tests => 54;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -20,6 +20,15 @@ ok(! pagespec_match("foo", "* and !foo"));
 ok(! pagespec_match("foo", "foo and !foo"));
 ok(! pagespec_match("foo.png", "* and !*.*"));
 ok(pagespec_match("foo", "(bar or ((meep and foo) or (baz or foo) or beep))"));
+ok(pagespec_match("foo", "(
+	bar
+	or (
+		(meep and foo)
+		or
+		(baz or foo)
+		or beep
+	)
+)"), "multiline complex pagespec");
 ok(! pagespec_match("a/foo", "foo", location => "a/b"), "nonrelative fail");
 ok(! pagespec_match("foo", "./*", location => "a/b"), "relative fail");
 ok(pagespec_match("a/foo", "./*", location => "a/b"), "relative");
-- 
cgit v1.2.3


From f97f102b04e7ae67bd3db5320dd34496309de5fe Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 13:33:46 -0400
Subject: response

---
 doc/todo/tracking_bugs_with_dependencies.mdwn | 83 ++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 8 deletions(-)

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 464f68363..417d5910e 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -206,12 +206,51 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 
 >> Because you have to define all the named pagespecs in the pagespec, you sometimes end up with very long pagespecs.  I found it useful to split them over multiple lines.  That didn't work at one point and I added the 's' to make it work.  I may have further altered the regex since then to make the 's' redundant.  Remove it and see if multi-line pagespecs still work. :)
 
+>>> Well, I can tell you that multi-line pagespecs are supported w/o
+>>> your patch .. I use them all the time. The reason I find your
+>>> use of `/s` unlikely is because without it `\s` already matches
+>>> a newline. Only if you want to treat a newline as non-whitespace
+>>> is `/s` typically necessary. --[[Joey]] 
+
 > * Some changes of `@_` to `%params` in `pagespec_makeperl` do not
 >   make sense to me. I don't see where \%params is defined and populated,
 >   except with `\$params{specFunc}`.
 
->> I'm not a perl hacker.  This was a mighty battle for me to get going.  There is probably some battlefield carnage from my early struggles learning perl left here.
->> Part of this is that @_ / @params already existed as a way of passing in extra parameters.  I didn't want to pollute that top level namespace - just at my own parameter (a hash) which contained the data I needed.
+>> I'm not a perl hacker.  This was a mighty battle for me to get going.
+>> There is probably some battlefield carnage from my early struggles
+>> learning perl left here. Part of this is that @_ / @params already
+>> existed as a way of passing in extra parameters.  I didn't want to
+>> pollute that top level namespace - just at my own parameter (a hash)
+>> which contained the data I needed.
+
+>>> I think I understand how the various `%params`
+>>> (there's not just one) work in your code now, but it's really a mess.
+>>> Explaining it in words would take pages.. It could be fixed by,
+>>> in `pagespec_makeperl` something like:
+>>> 
+>>>	my %specFuncs;
+>>>	push @_, specFuncs => \%specFuncs;
+>>> 
+>>> With that you have the hash locally available for populating
+>>> inside `pagespec_makeperl`, and when the `match_*` functions
+>>> are called the same hash data will be available inside their
+>>> `@_` or `%params`. No need to change how the functions are called
+>>> or do any of the other hacks.
+>>>
+>>> Currently, specFuncs is populated by building up code
+>>> that recursively calls `pagespec_makeperl`, and is then
+>>> evaluated when the pagespec gets evaluated. My suggested
+>>> change to `%params` will break that, but that had to change 
+>>> anyway.
+>>>
+>>> It probably has a security hole, and is certianly inviting
+>>> one, since the pagespec definition is matched by a loose regexp (`.*`)
+>>> and then subject to string interpolation before being evaluated
+>>> inside perl code. I recently changed ikiwiki to never interpolate
+>>> user-supplied strings when translating pagespecs, and that
+>>> needs to happen here too. The obvious way, it seems to me,
+>>> is to not generate perl code, but just directly run perl code that
+>>> populates specFuncs.
 
 > * Seems that the only reason `match_glob` has to check for `~` is
 >   because when a named spec appears in a pagespec, it is translated
@@ -229,6 +268,10 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >> call match_glob().  match_glob() in turn will handle the named spec.  I tested this version briefly and it seemed to work.  I remember looking at this again later and wondering if I had mis-understood
 >> some of the logic in match_link(), which might mean there are cases where you would need an explicit call to check_named_spec_existential() - I never checked it properly after having that thought.
 
+>>> In the common case, `match_link` does not call `match_glob`,
+>>> because the link target it is being asked to check for is a single
+>>> page name, not a glob.
+
 > * Generally, the need to modify `match_*` functions so that they
 >   check for and handle named pagespecs seems suboptimal, if
 >   only because there might be others people may want to use named
@@ -243,6 +286,9 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >> Possibly.  I'm not sure which I prefer between the current solution and that one.  Each have advantages and disadvantages.
 >> It really isn't much code for the match functions to add a call to check_named_spec_existential().
 
+>>> But if a plugin adds its own match function, it has
+>>> to explicitly call that code to support named pagespecs.
+
 > * I need to check if your trick to avoid infinite recursion
 >   works if there are two named specs that recursively
 >   call one-another. I suspect it does, but will test this
@@ -250,17 +296,38 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 
 >> It worked for me. :)
 
+> * I also need to verify if memoizing the named pagespecs has
+>   really guarded against very expensive pagespecs DOSing the wiki..
+
 > --[[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.  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 break
+>>  Firstly, 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,
+>>> then the second definition might be used at a point when
+>>> it shouldn't (but I haven't verified that really happens).
+>>> That could certianly be a show-stopper. --[[Joey]] 
+
+>>  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]] 
+
 ----
 
     diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 49635b0ca563b336a5ffc1d17a4197ee8b437018 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 13:54:02 -0400
Subject: response

---
 doc/bugs/tagged__40____41___matching_wikilinks.mdwn | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
index bdd0c93c7..2b30f247e 100644
--- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
+++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
@@ -1,7 +1,10 @@
 It may be that I'm simply misunderstanding something, but what is the rationale
 for having `tagged()` also match normal wikilinks?
 
-> It simply hasn't been implemented yet -- see the answer in [[todo/tag_pagespec_function]]. Tags and wikilinks share the same underlying implementation, although ab reasonable expectation is that they are kept separate. --Ivan Z.
+> It simply hasn't been implemented yet -- see the answer in
+> [[todo/tag_pagespec_function]]. Tags and wikilinks share the same
+> underlying implementation, although ab reasonable expectation is that
+> they are kept separate. --Ivan Z.
 
 The following situation.  I have `tagbase => 'tag'`.  On some pages, scattered
 over the whole wiki, I use `\[[!tag open_issue_gdb]]` to declare that this page
@@ -16,4 +19,11 @@ rationale on this, or what am I doing wrong, and how to achieve what I want?
 
 --[[tschwinge]]
 
-> What you are doing "wrong" is putting non-tag pages (i.e. `/tag/open_issues_gdb.mdwn`) under your tagbase. The rationale for implementing tag as it has been, I think, is one of simplicity and conciseness. -- [[Jon]]
+> What you are doing "wrong" is putting non-tag pages (i.e.
+> `/tag/open_issues_gdb.mdwn`) under your tagbase. The rationale for
+> implementing tag as it has been, I think, is one of simplicity and
+> conciseness. -- [[Jon]]
+
+>> No, he has no pages under tagbase that aren't tags. This bug
+>> is valid. [[todo/matching_different_kinds_of_links]] is probably
+>> how it will eventually be solved. --[[Joey]] 
-- 
cgit v1.2.3


From 1a677f862c8a5e1e446adcea3f3737de07085c35 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 14:00:55 -0400
Subject: response

---
 doc/bugs/SSI_include_stripped_from_mdwn.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/doc/bugs/SSI_include_stripped_from_mdwn.mdwn b/doc/bugs/SSI_include_stripped_from_mdwn.mdwn
index bd895127a..5519e45c6 100644
--- a/doc/bugs/SSI_include_stripped_from_mdwn.mdwn
+++ b/doc/bugs/SSI_include_stripped_from_mdwn.mdwn
@@ -1,3 +1,21 @@
 If I have a &lt;--#include virtual="foo" --&gt; in some file, it gets stripped, even though other HTML comments don't get stripped. I imagine it's some plugin doing it, or IkiWiki itself, or an IkiWiki dependency, but I haven't found where this is happening. I'm trying to implement a workaround for my sidebars forcing a rebuild of the wiki every day - I use the calendar plugin - when the day changes, by using SSI.
 
 > It is probably the [[plugins/htmlscrubber]] plugin. -- [[Jon]]
+
+> htmlscrubber does strip these, because they look like
+> a html tag to it, not a html comment. (html comments start
+> with `<!--` .. of course, they get stripped too, because
+> they can be used to hide javascript..)
+> 
+> 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]]
+> and put the SSI on there.
+> 
+> Ie, `page.tmpl` has a 
+> div that the sidebar is put into; if you just replace
+> that with the SSI that includes your static sidebar,
+> you should be good to go. --[[Joey]]
+
+[[done]]
-- 
cgit v1.2.3


From fe9183a926f33c29c026be774a5a6d286933bcc4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 14:15:50 -0400
Subject: response

---
 ..._wrap_HTML_container_around_a_set_of_inlined_pages.mdwn | 14 ++++++++++++++
 doc/wikitemplates.mdwn                                     |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/doc/bugs/no_easy_way_to_wrap_HTML_container_around_a_set_of_inlined_pages.mdwn b/doc/bugs/no_easy_way_to_wrap_HTML_container_around_a_set_of_inlined_pages.mdwn
index 85c2d0c6c..1c1cbbb73 100644
--- a/doc/bugs/no_easy_way_to_wrap_HTML_container_around_a_set_of_inlined_pages.mdwn
+++ b/doc/bugs/no_easy_way_to_wrap_HTML_container_around_a_set_of_inlined_pages.mdwn
@@ -7,3 +7,17 @@ with a template definition like
     <div id="foo">\[[!inline ... pages="<TMPL_VAR raw_pages>"]]</div>
 
 It would be much more convenient if the loop over pages happened in the template, allowing me to just stick whatever markup I want around the loop.
+
+> Unfortunatly, I don't think this can be changed at this point,
+> it would probably break a lot of stuff that relies on the current
+> template arrangement, both in ikiwiki's internals and in
+> people's own, customised inline templates. (Also, I have some plans
+> to allow a single inline to use different templates for different
+> sorts of pages, which would rely on the current one template per
+> page approach to work.)
+> 
+> But there is a simple workaround.. the first template in
+> an inline has FIRST set, and the last one has LAST set.
+> So you can use that to emit your div or table top and bottom.
+> 
+> [[done]] --[[Joey]] 
diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index f365cd5aa..6c0480cea 100644
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -36,6 +36,8 @@ located in /usr/share/ikiwiki/templates by default.
   [[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`.
-- 
cgit v1.2.3


From c5ff3c191bccdc9a8816ab8733eb6af0f39a2d0a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 14:27:56 -0400
Subject: fix clone url for davidbrember's repo, and add it to the git repo
 list

---
 doc/git.mdwn                  | 1 +
 doc/todo/comment_by_mail.mdwn | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 8aa7250a7..b218240c7 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -39,6 +39,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git`
 * [[hendry]] `git://webconverger.org/git/ikiwiki`
 * [[jon]] `git://github.com/jmtd/ikiwiki.git`
+* [[davidbremner]] `http://pivot.cs.unb.ca/git/ikipostal.git`
 
 ## branches
 
diff --git a/doc/todo/comment_by_mail.mdwn b/doc/todo/comment_by_mail.mdwn
index 6d3eeb044..bf934176a 100644
--- a/doc/todo/comment_by_mail.mdwn
+++ b/doc/todo/comment_by_mail.mdwn
@@ -22,7 +22,7 @@ mailbox. I would be interested in any ideas people have about security.
     > posts as they come in. --[[Joey]]
   * work in progress can be 
 
-   - [cloned](http://pivot.cs.unb.ca/git/ikiperl.git), or 
+   - [cloned](http://pivot.cs.unb.ca/git/ikipostal.git), or 
    - [browsed](http://pivot.cs.unb.ca/git/?p=ikipostal.git;a=summary)
   
 
-- 
cgit v1.2.3


From 0c04e9363db4c6646a5d2c0220bdc934c9bf0ab3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 14:35:04 -0400
Subject: add Bremner's ikimailbox repo to list

also, modify gitremotes to support wikilinks with alternate
link text
---
 doc/git.mdwn | 3 ++-
 gitremotes   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/git.mdwn b/doc/git.mdwn
index b218240c7..96da2cd85 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -39,7 +39,8 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git`
 * [[hendry]] `git://webconverger.org/git/ikiwiki`
 * [[jon]] `git://github.com/jmtd/ikiwiki.git`
-* [[davidbremner]] `http://pivot.cs.unb.ca/git/ikipostal.git`
+* [[ikipostal|DavidBremner]] `http://pivot.cs.unb.ca/git/ikipostal.git`
+* [[ikimailbox|DavidBremner]] `http://pivot.cs.unb.ca/git/ikimailbox.git`
 
 ## branches
 
diff --git a/gitremotes b/gitremotes
index 7b9484dd1..91bf2fe84 100755
--- a/gitremotes
+++ b/gitremotes
@@ -6,7 +6,7 @@ my $error=0;
 
 open (IN, "doc/git.mdwn") || die "doc/git.mdwn: $!";
 while (<IN>) {
-	if (/^\*\s+\[?\[?(\w+)\]?\]?\s+`([^>]+)`/) {
+	if (/^\*\s+\[?\[?(\w+)(?:\|\w+)?\]?\]?\s+`([^>]+)`/) {
 		# note that the remote name has to be a simple word (\w)
 		# for security/sanity reasons
 		my $remote=$1;
-- 
cgit v1.2.3


From f0577ace82fee328aaf7093e160a7cb31be71e2b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 14:36:25 -0400
Subject: update

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

diff --git a/doc/todo/mbox.mdwn b/doc/todo/mbox.mdwn
index f7744563c..5b5728fee 100644
--- a/doc/todo/mbox.mdwn
+++ b/doc/todo/mbox.mdwn
@@ -17,3 +17,6 @@ I'd like to be able to drop an unmodified RFC2822 email message into ikiwiki, an
 
 > Your gitweb doesn't tell me where I can git pull this from, which I'd
 > like to do ... --[[Joey]]
+
+>> Found it: <http://pivot.cs.unb.ca/git/ikimailbox.git> --[[Joey]]
+
-- 
cgit v1.2.3


From 285ef010c440a4c83093fbf0d2ac922849a873a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 14:51:57 -0400
Subject: add contrib plugin page for the mailbox plugin

---
 doc/plugins/contrib/mailbox.mdwn | 18 ++++++++++++++++++
 doc/todo/mbox.mdwn               |  8 ++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 doc/plugins/contrib/mailbox.mdwn

diff --git a/doc/plugins/contrib/mailbox.mdwn b/doc/plugins/contrib/mailbox.mdwn
new file mode 100644
index 000000000..b7a9f81c7
--- /dev/null
+++ b/doc/plugins/contrib/mailbox.mdwn
@@ -0,0 +1,18 @@
+[[!template id=plugin name=mailbox author="[[DavidBremner]]"]]
+[[!tag type/format]]
+
+The `mailbox` plugin adds support to ikiwiki for 
+rendering mailbox file into a page displaying the mails
+in the mailbox. It supports mbox, maildir, and MH folders,
+does threading, and deals with MIME.
+
+One hitch I noticed was that it is not currently possible to treat a
+maildir or an MH directory as a page (i.e. just call it foo.mh and have it
+transformed to page foo). I'm not sure if this is possible and worthwhile
+to fix. It is certainly workable to use a [[!mailbox ]] directive.
+-- [[DavidBremner]]
+
+This plugin is not in ikiwiki yet, but can be downloaded
+from <http://pivot.cs.unb.ca/git/ikimailbox.git>
+
+
diff --git a/doc/todo/mbox.mdwn b/doc/todo/mbox.mdwn
index 5b5728fee..31e4a9863 100644
--- a/doc/todo/mbox.mdwn
+++ b/doc/todo/mbox.mdwn
@@ -3,7 +3,7 @@ I'd like to be able to drop an unmodified RFC2822 email message into ikiwiki, an
 > We're discussing doing just that (well, whole mailboxes, really) over in
 > [[comment_by_mail]] --[[Joey]]
 >> The 
->> [mailbox](http://pivot.cs.unb.ca/git/?p=ikimailbox.git;a=summary) 
+>> [[plugins/mailbox]]
 >> plugin is roughly feature complete at this point.  It can read mbox, maildir, and
 >> MH folders, does threading, and deals with MIME (now with 
 >> pagespec based sanity checking).  No doubt lots of things could be 
@@ -15,8 +15,4 @@ I'd like to be able to drop an unmodified RFC2822 email message into ikiwiki, an
 >>  It is certainly workable
 >>> to use a \[[!mailbox ]] directive. -- [[DavidBremner]]
 
-> Your gitweb doesn't tell me where I can git pull this from, which I'd
-> like to do ... --[[Joey]]
-
->> Found it: <http://pivot.cs.unb.ca/git/ikimailbox.git> --[[Joey]]
-
+[[done]]
-- 
cgit v1.2.3


From fb955a49456545774e8d434049e76c7231e28194 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 14:59:21 -0400
Subject: add contrib plugin page for postal plugin

---
 doc/plugins/contrib/postal.mdwn | 39 +++++++++++++++++++++++++++++++
 doc/todo/comment_by_mail.mdwn   | 52 +----------------------------------------
 2 files changed, 40 insertions(+), 51 deletions(-)
 create mode 100644 doc/plugins/contrib/postal.mdwn

diff --git a/doc/plugins/contrib/postal.mdwn b/doc/plugins/contrib/postal.mdwn
new file mode 100644
index 000000000..b14c80d3b
--- /dev/null
+++ b/doc/plugins/contrib/postal.mdwn
@@ -0,0 +1,39 @@
+[[!template id=plugin name=postal author="[[DavidBremner]]"]]
+[[!tag type/useful]]
+
+The `postal` plugin allows users to send mail to
+a special address to comment on a page. It uses the [[mailbox]]
+plugin to display their comments in the wiki.
+
+This plugin is not in ikiwiki yet, but can be downloaded
+from <http://pivot.cs.unb.ca/git/ikipostal.git>
+
+Details:
+
+  * Adds a mailto: url to each page matching some pagespec
+    (currently every page gets a comment footer)
+
+  * This mailto url goes to an address identifying the page  (something like
+    user-iki-blog~I\_hate\_markdown@host.fqdn.tld).
+    [more details](http://www.cs.unb.ca/~bremner/blog/posts/encoding)         
+   
+  * on the mail receiving end, these messages are either deleted, or ran through
+    a filter to be turned into blog posts.  As a first step, I have
+[written](http://pivot.cs.unb.ca/git/?p=ikipostal.git;a=blob_plain;f=filters/postal-filer.pl;hb=010357a08e9)
+a filter that decodes the address and writes the message into an appropriate 
+mailbox. I would be interested in any ideas people have about security.
+
+  * the same plugin can check for comments on a particular page next time the wiki 
+    is generated, and add a link. (more or less done)
+    > If the filter just checks in the posts into revision control, the
+    > post-commit hook would handle updating the wiki to include those
+    > posts as they come in. --[[Joey]]
+  * work in progress can be 
+
+   - [cloned](http://pivot.cs.unb.ca/git/ikipostal.git), or 
+   - [browsed](http://pivot.cs.unb.ca/git/?p=ikipostal.git;a=summary)
+  
+The current version of this plugin is now running on my home page. See for example
+[a recent post in my blog](http://www.cs.unb.ca/~bremner/blog/posts/can-i-haz-a-distributed-rss/).  
+Unfortunately although the [[mailbox|todo/mbox]] renderer supports threading, I haven't had 
+a chance to implement comments on comments yet. --[[DavidBremner]]
diff --git a/doc/todo/comment_by_mail.mdwn b/doc/todo/comment_by_mail.mdwn
index bf934176a..87e57417e 100644
--- a/doc/todo/comment_by_mail.mdwn
+++ b/doc/todo/comment_by_mail.mdwn
@@ -1,53 +1,3 @@
 I would like to allow comments on ikiwiki pages without CGI.
-I have in mind something like
 
-  * Use a pagetemplate hook  
-    in a plugin (DONE)
-  * add a mailto: url to each page matching some pagespec
-    (currently every page gets a comment footer)
-  * this mailto url goes to an address identifying the page  (something like
-    user-iki-blog~I\_hate\_markdown@host.fqdn.tld).  (DONE) 
-    [more details](http://www.cs.unb.ca/~bremner/blog/posts/encoding)         
-   
-  * on the mail receiving end, these messages are either deleted, or ran through
-    a filter to be turned into blog posts.  As a first step, I have
-[written](http://pivot.cs.unb.ca/git/?p=ikipostal.git;a=blob_plain;f=filters/postal-filer.pl;hb=010357a08e9)
-a filter that decodes the address and writes the message into an appropriate 
-mailbox. I would be interested in any ideas people have about security.
-
-  * the same plugin can check for comments on a particular page next time the wiki 
-    is generated, and add a link. (more or less done)
-    > If the filter just checks in the posts into revision control, the
-    > post-commit hook would handle updating the wiki to include those
-    > posts as they come in. --[[Joey]]
-  * work in progress can be 
-
-   - [cloned](http://pivot.cs.unb.ca/git/ikipostal.git), or 
-   - [browsed](http://pivot.cs.unb.ca/git/?p=ikipostal.git;a=summary)
-  
-
-Any comments? Write them here or send them to [[DavidBremner]]
-
-> I don't want to derail this with too much blue-skying, but I was thinking
-> earlier that it would be nice if ikiwiki could do something sensible with
-> mailbox files, such as turning them into a (threaded?) blog display.
-> 
-> One reason I was thinking about that was just that it would be nice to 
-> be able to use ikiwiki for mailing list archives. But another reason was
-> that it would be nice to solve the problem described in
-> [[discussion_page_as_blog]]. For that you really want a threaded system,
-> and mailbox file formats already have threading.
-> 
-> If that were done, it would tie into what you're working on in an
-> interesting way, since the incoming mail would only need to be committed to
-> the appropriate mailbox file, with ikiwiki then running to process it.
-> --[[Joey]]
->> It is an interesting idea.  I like that it uses an arbitrary MUA 
->> as a "moderation" interface.  After I killed a debian BTS entry with 
->> clumsy pseudoheader editing I think any 
->> reference info should also be encoded into the address.
-
-The current version of this plugin is now running on my home page. See for example
-[a recent post in my blog](http://www.cs.unb.ca/~bremner/blog/posts/can-i-haz-a-distributed-rss/).  
-Unfortunately although the [[mailbox|todo/mbox]] renderer supports threading, I haven't had 
-a chance to implement comments on comments yet. [[DavidBremner]]
+> [[done]], see [[plugins/contrib/postal]]
-- 
cgit v1.2.3


From 92b769645daa7d747849dc26384142a1f3fd1298 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 15:04:47 -0400
Subject: another bremner repo

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

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 96da2cd85..9e28f1464 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -39,8 +39,9 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git`
 * [[hendry]] `git://webconverger.org/git/ikiwiki`
 * [[jon]] `git://github.com/jmtd/ikiwiki.git`
-* [[ikipostal|DavidBremner]] `http://pivot.cs.unb.ca/git/ikipostal.git`
-* [[ikimailbox|DavidBremner]] `http://pivot.cs.unb.ca/git/ikimailbox.git`
+* [[ikipostal|DavidBremner]] `git://pivot.cs.unb.ca/git/ikipostal.git`
+* [[ikimailbox|DavidBremner]] `git://pivot.cs.unb.ca/git/ikimailbox.git`
+* [[ikiplugins|DavidBremner]] `git://pivot.cs.unb.ca/git/ikiplugins.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 6fb04eaf8daa3ffebb9b5856fa8d222f5c2e9e11 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 15:29:36 -0400
Subject: reword

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

diff --git a/doc/plugins/contrib.mdwn b/doc/plugins/contrib.mdwn
index e22b13f71..a03e6a95d 100644
--- a/doc/plugins/contrib.mdwn
+++ b/doc/plugins/contrib.mdwn
@@ -1,6 +1,5 @@
-Contributed [[plugins]]:
-
-(See [[install]] for installation help.)
+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"
-- 
cgit v1.2.3


From 36dbd21be6384d187c40e6ae97ff7384461e3c7a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 15:37:09 -0400
Subject: update re format directive

---
 doc/todo/syntax_highlighting.mdwn | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index b5d083ba5..87ba77cad 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -1,9 +1,13 @@
 There's been a lot of work on contrib syntax highlighting plugins. One should be
 picked and added to ikiwiki core.
 
-Ideally, it should support both converting whole source files into wiki
+We want to support both converting whole source files into wiki
 pages, as well as doing syntax highlighting as a preprocessor directive 
-(which is either passed the text, or reads it from a file).
+(which is either passed the text, or reads it from a file). But,
+the [[ikiwiki/directive/format]] directive makes this easy enough to 
+do if the plugin only supports whole source files. So, syntax plugins
+do no really need their own preprocessor directive, unless it makes
+things easier for the user.
 
 ## The big list of possibilities
 
@@ -105,24 +109,12 @@ like this:
      	return;
      }
 
-## format directive
+## format directive and comments
 
-Rather than making syntax highlight plugins have to provide a preprocessor
-directive as well as handling whole source files, perhaps a generic format
-directive could be used:
-
-	\[[!format pl """..."""]]
-
-That would run the text through the pl htmlizer, from the syntax hightligh
-plugin. OTOH, if "rst" were given, it would run the text through the rst
-htmlizer. So, more generic, allows mixing different types of markup on one
-page, as well as syntax highlighting. Does require specifying the type of
-format, instead of allowing it to be guessed (which some syntax highlighters
-can do). (This directive is now implemented..)
-
-Hmm, this would also allow comments inside source files to have mdwn
-embedded in them, without making the use of mdwn a special case, or needing
-to postprocess the syntax highlighter output to find comments.
+Hmm, the [[ikiwiki/directive/format]] directive would also allow comments
+inside source files to have mdwn embedded in them, without making the use
+of mdwn a special case, or needing to postprocess the syntax highlighter
+output to find comments.
 
 	/* \[[!format mdwn """
 
@@ -130,4 +122,5 @@ to postprocess the syntax highlighter output to find comments.
 
 	"""]] */
 
-Note that this assumes that directives are expanded in source files.
+Note that this assumes that directives are expanded in source files,
+which has its own set of problems.
-- 
cgit v1.2.3


From 27193a2eeba3aa2f5ed8c0168f828149696b2b7f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 15:50:25 -0400
Subject: support longname for page types in commands and rename

Also, sort the list of page types.
---
 IkiWiki/Plugin/comments.pm | 7 ++++++-
 IkiWiki/Plugin/editpage.pm | 1 +
 IkiWiki/Plugin/rename.pm   | 8 +++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index e618d1a90..0aa4759d8 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -287,10 +287,15 @@ sub editcomment ($$) {
 	else {
 		$type = $config{default_pageext};
 	}
+
+
 	my @page_types;
 	if (exists $IkiWiki::hooks{htmlize}) {
-		@page_types = grep { ! /^_/ } keys %{$IkiWiki::hooks{htmlize}};
+		foreach my $key (grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}}) {
+			push @page_types, [$key, $IkiWiki::hooks{htmlize}{$key}{longname} || $key];
+		}
 	}
+	@page_types=sort @page_types;
 
 	$form->field(name => 'do', type => 'hidden');
 	$form->field(name => 'sid', type => 'hidden', value => $session->id,
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index af42097ba..8effc02d0 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -280,6 +280,7 @@ sub cgi_editpage ($$) {
 					push @page_types, [$key, $hooks{htmlize}{$key}{longname} || $key];
 				}
 			}
+			@page_types=sort @page_types;
 			
 			$form->tmpl_param("page_select", 1);
 			$form->field(name => "page", type => 'select',
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 41af3ca4d..0b6e74705 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -116,14 +116,16 @@ sub rename_form ($$$) {
 		# insert the standard extensions
 		my @page_types;
 		if (exists $IkiWiki::hooks{htmlize}) {
-			@page_types=grep { !/^_/ }
-				keys %{$IkiWiki::hooks{htmlize}};
+			foreach my $key (grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}}) {
+				push @page_types, [$key, $IkiWiki::hooks{htmlize}{$key}{longname} || $key];
+			}
 		}
+		@page_types=sort @page_types;
 	
 		# make sure the current extension is in the list
 		my ($ext) = $pagesources{$page}=~/\.([^.]+)$/;
 		if (! $IkiWiki::hooks{htmlize}{$ext}) {
-			unshift(@page_types, $ext);
+			unshift(@page_types, [$ext, $ext]);
 		}
 	
 		$f->field(name => "type", type => 'select',
-- 
cgit v1.2.3


From 0541c8ee9d866170782ea3321df39d40928999ea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 15:52:20 -0400
Subject: update

---
 doc/todo/syntax_highlighting.mdwn | 48 ++++++++-------------------------------
 1 file changed, 10 insertions(+), 38 deletions(-)

diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index 87ba77cad..f37a36587 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -41,12 +41,6 @@ releases the 5 or 6 language definitions he has running on his web site, it migh
   using a perl module, or a multiple-backend solution that can use a perl
   module as one option. (Or, if there's a great highlighter python module,
   we could use an external plugin..)
-* Currently no single plugin supports both modes of operation (directive
-  and whole source file to page).
-
-  > This is now fixed by the [[ikiwiki/directive/format]] directive for all
-  > whole-source-file plugins, right?
-
 * Nothing seems to support 
   [[wiki-formatted_comments|wiki-formatted_comments_with_syntax_plugin]]
   inside source files. Doing this probably means post-processing the 
@@ -73,41 +67,19 @@ releases the 5 or 6 language definitions he has running on his web site, it migh
 
 * The whole-file plugins all get confused if there is a `foo.c` and a `foo.h`.
   This is trivially fixable now by passing the keepextension option when
-  registering the htmlize hooks, though.
+  registering the htmlize hooks, though. That also should handle the
+  case of source files with names that do not contain an extension (ie,
+  "Makefile") -- in this case you just register the while filename
+  in the htmlize hook.
 * Whole-file plugins register a bunch of htmlize hooks. The wacky thing
   about it is that, when creating a new page, you can then pick "c" or
-  "h" or "pl" etc from the dropdown that normally has "mdwn" etc in it.
-  Is this a bug, or a feature? (Even if a feature, plugins with many
-  extensions make the dropdown unusable.. One way to deal with that is have
-  a config setting that lists what extensions to offer highlighting for.
-  Most people won't need/want the dozens some engines support.)
-* The per page highlighters can't handle creating wiki pages from 
-  "Makefile", or other files without a significant extension.
-  Not clear how to fix this, as ikiwiki is very oriented toward file
-  extensions. The workaround is to use a directive on a wiki page, pulling
-  in the Makefile.
-
-  > I wonder how hard it would be to make a patch whereby a file with
-  > no `.` in the name, and a name that matches a filetype, and where
-  > that filetype was registered `keepextension`, then the file is just
-  > chosen as the appropriate type.  This would allow `Makefile` to
-  > work.
-
-like this:
+  "h" or "pl" etc from the dropdown that normally has "Markdown" etc in it.
+  Is this a bug, or a feature? Even if a feature, plugins with many
+  extensions make the dropdown unusable.. 
 
-    diff --git a/IkiWiki.pm b/IkiWiki.pm
-    index 8d728c9..1bd46a9 100644
-    --- a/IkiWiki.pm
-    +++ b/IkiWiki.pm
-    @@ -618,6 +618,8 @@ sub pagetype ($) {
-     	
-     	if ($page =~ /\.([^.]+)$/) {
-     		return $1 if exists $hooks{htmlize}{$1};
-    +	} elsif ($hooks{htmlize}{$page}{keepextension}) {
-    +		return $page;
-     	}
-     	return;
-     }
+  Perhaps the thing to do here is to use the new `longname` parameter to
+  the format hook, to give them all names that will group together at or
+  near the end of the list. Ie: "Syntax: perl", "Syntax: C", etc.
 
 ## format directive and comments
 
-- 
cgit v1.2.3


From e7bad274894fec38e03f99f54aa73586729e6798 Mon Sep 17 00:00:00 2001
From: bremner <bremner@web>
Date: Thu, 21 May 2009 15:54:55 -0400
Subject: update postal plugin page to reflect the fact I implement Joey's
 suggestion about checking new posts in to VCS

---
 doc/plugins/contrib/postal.mdwn | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/doc/plugins/contrib/postal.mdwn b/doc/plugins/contrib/postal.mdwn
index b14c80d3b..b2f875393 100644
--- a/doc/plugins/contrib/postal.mdwn
+++ b/doc/plugins/contrib/postal.mdwn
@@ -18,21 +18,17 @@ Details:
     [more details](http://www.cs.unb.ca/~bremner/blog/posts/encoding)         
    
   * on the mail receiving end, these messages are either deleted, or ran through
-    a filter to be turned into blog posts.  As a first step, I have
-[written](http://pivot.cs.unb.ca/git/?p=ikipostal.git;a=blob_plain;f=filters/postal-filer.pl;hb=010357a08e9)
-a filter that decodes the address and writes the message into an appropriate 
-mailbox. I would be interested in any ideas people have about security.
-
-  * the same plugin can check for comments on a particular page next time the wiki 
-    is generated, and add a link. (more or less done)
-    > If the filter just checks in the posts into revision control, the
-    > post-commit hook would handle updating the wiki to include those
-    > posts as they come in. --[[Joey]]
+    a filter to be turned into blog posts.   I have
+[written](http://pivot.cs.unb.ca/git/?p=ikipostal.git;a=blob_plain;f=filters/postal-accept.pl;hb=HEAD)
+  a filter that decodes the address and writes the message into an appropriate 
+mailbox. The changes are then checked into version control; typically a hook then updates the html version of the wiki.
   * work in progress can be 
 
    - [cloned](http://pivot.cs.unb.ca/git/ikipostal.git), or 
    - [browsed](http://pivot.cs.unb.ca/git/?p=ikipostal.git;a=summary)
   
+ * I would be interested in any ideas people have about security.
+
 The current version of this plugin is now running on my home page. See for example
 [a recent post in my blog](http://www.cs.unb.ca/~bremner/blog/posts/can-i-haz-a-distributed-rss/).  
 Unfortunately although the [[mailbox|todo/mbox]] renderer supports threading, I haven't had 
-- 
cgit v1.2.3


From aefbe930bba9a611f9c72a3170002f90cfc3e1dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 15:56:19 -0400
Subject: note

---
 .../automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
index 8bc75420d..64bc21ee0 100644
--- a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
+++ b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
@@ -51,6 +51,7 @@ I hit a wall the following example (the last commit in the above repo).
     </div>
 
 >>> I don't know what is going wrong for you... source-highlight, Markdown or something else.
+>>>> It's a well-known bug in old versions of markdown. --[[Joey]] 
 >>> I do find it interesting the way the sourcecode `div` and the list get interleaved.  That
 >>> just looks like a Markdown thing though.
 >>> In any case, I've updated the patch below to include most of your changes.  -- [[Will]]
-- 
cgit v1.2.3


From 3a1ff1d0dc4b09d211e075b653c5a3767d05b74e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 16:06:05 -0400
Subject: link

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

diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index f37a36587..576d456f3 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -30,7 +30,7 @@ things easier for the user.
 * [[users/jasonblevins]]'s code plugin uses src-highlight, and supports both
   while file and directive use.
 
-* [hlsimple](http://pivot.cs.unb.ca/git/?p=ikiplugins.git;a=blob_plain;f=IkiWiki/Plugin/hlsimple.pm;hb=HEAD) is a wrapper for the the perl module Syntax::Highlight::Engine::Simple.  This is pure perl, pretty simple, uses css. It ought to be pretty fast (according to the author, and just because it is not external).
+* [hlsimple](http://pivot.cs.unb.ca/git/?p=ikiplugins.git;a=blob_plain;f=IkiWiki/Plugin/hlsimple.pm;hb=HEAD) is a wrapper for the the perl module [[!cpan Syntax::Highlight::Engine::Simple]].  This is pure perl, pretty simple, uses css. It ought to be pretty fast (according to the author, and just because it is not external).
 On the other hand, there are not many predefined languages yet.  Defining language syntaxes is about as much 
 work as source-highlight, but in perl.  I plan to package the base module for debian. Perhaps after the author 
 releases the 5 or 6 language definitions he has running on his web site, it might be suitable for inclusion in ikiwiki. [[DavidBremner]]
-- 
cgit v1.2.3


From 3a949d1a04c85276b0b8691d77c8ca72efd3acbe Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 16:30:55 -0400
Subject: updates

---
 doc/todo/syntax_highlighting.mdwn | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index 576d456f3..29e868d16 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -14,7 +14,7 @@ things easier for the user.
 * [[plugins/contrib/highlightcode]] uses [[!cpan Syntax::Highlight::Engine::Kate]],
   operates on whole source files only, has a few bugs (see
   [here](http://u32.net/Highlight_Code_Plugin/), and needs to be updated to
-  support [[bugs/multiple_pages_with_same_name]].
+  support [[bugs/multiple_pages_with_same_name]]. (Currently a 404 :-( )
 * [[!cpan IkiWiki-Plugin-syntax]] only operates as a directive.
   Interestingly, it supports multiple highlighting backends, including Kate
   and Vim.
@@ -35,12 +35,18 @@ On the other hand, there are not many predefined languages yet.  Defining langua
 work as source-highlight, but in perl.  I plan to package the base module for debian. Perhaps after the author 
 releases the 5 or 6 language definitions he has running on his web site, it might be suitable for inclusion in ikiwiki. [[DavidBremner]]
 
-## General problems
+## General problems / requirements
 
 * Using non-perl syntax highlighting backends is slow. I'd prefer either
   using a perl module, or a multiple-backend solution that can use a perl
   module as one option. (Or, if there's a great highlighter python module,
   we could use an external plugin..)
+* Engines that already support a wide variety of file types are of
+  course preferred. If the engine doesn't support a particular type
+  of file, it could fall back to doing something simple like
+  adding line numbers. (IkiWiki-Plugin-syntax does this.)
+* Emitting html that uses CSS to control the display is preferred,
+  since it allows for easy user customization.
 * Nothing seems to support 
   [[wiki-formatted_comments|wiki-formatted_comments_with_syntax_plugin]]
   inside source files. Doing this probably means post-processing the 
-- 
cgit v1.2.3


From 93254bf2f65d19584d11d7c453224e0ff73c0861 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 16:37:48 -0400
Subject: update

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

diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index 29e868d16..f50784e29 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -73,7 +73,8 @@ releases the 5 or 6 language definitions he has running on his web site, it migh
 
 * The whole-file plugins all get confused if there is a `foo.c` and a `foo.h`.
   This is trivially fixable now by passing the keepextension option when
-  registering the htmlize hooks, though. That also should handle the
+  registering the htmlize hooks, though. There's also a noextension option
+  that should handle the
   case of source files with names that do not contain an extension (ie,
   "Makefile") -- in this case you just register the while filename
   in the htmlize hook.
-- 
cgit v1.2.3


From d00484b40ca5c36d01d51b67e18b2ae259f19ac7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 17:14:39 -0400
Subject: remove fortranwiki, not using ikiwiki at this time

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

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 989f05dfc..fdae9c047 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -38,7 +38,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 [Fortran Wiki](http://fortranwiki.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/)
-- 
cgit v1.2.3


From 3adacbac47386b235074cdf39824af6758a1b282 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 17:23:42 -0400
Subject: update

---
 doc/todo/syntax_highlighting.mdwn | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index f50784e29..f269aeb7c 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -21,13 +21,13 @@ things easier for the user.
 * [[plugins/contrib/syntax]] only operates as a directive
   ([[not_on_source_code_files|automatic_use_of_syntax_plugin_on_source_code_files]]),
   and uses [[!cpan Text::VimColor]].
-* [[plugins/contrib/sourcehighlight]] uses src-highlight, and operates on
+* [[plugins/contrib/sourcehighlight]] uses source-highlight, and operates on
   whole source files only. Needs to be updated to
   support [[bugs/multiple_pages_with_same_name]].
 * [[sourcecode|todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion]]
-  also uses src-highlight, and operates on whole source files.
+  also uses source-highlight, and operates on whole source files.
   Updated to work with the fix for [[bugs/multiple_pages_with_same_name]].  Untested with files with no extension, e.g. `Makefile`.
-* [[users/jasonblevins]]'s code plugin uses src-highlight, and supports both
+* [[users/jasonblevins]]'s code plugin uses source-highlight, and supports both
   while file and directive use.
 
 * [hlsimple](http://pivot.cs.unb.ca/git/?p=ikiplugins.git;a=blob_plain;f=IkiWiki/Plugin/hlsimple.pm;hb=HEAD) is a wrapper for the the perl module [[!cpan Syntax::Highlight::Engine::Simple]].  This is pure perl, pretty simple, uses css. It ought to be pretty fast (according to the author, and just because it is not external).
@@ -37,16 +37,28 @@ releases the 5 or 6 language definitions he has running on his web site, it migh
 
 ## General problems / requirements
 
-* Using non-perl syntax highlighting backends is slow. I'd prefer either
-  using a perl module, or a multiple-backend solution that can use a perl
-  module as one option. (Or, if there's a great highlighter python module,
-  we could use an external plugin..)
+* Using non-perl syntax highlighting backends is slower. All things equal,
+  I'd prefer either using a perl module, or a multiple-backend solution that
+  can use a perl module as one option. (Or, if there's a great highlighter
+  python module, we could use an external plugin..)
+
+  Of course, some perl modules are also rather slow.. Kate, for example
+  can only process about 33 lines of C code, or 14 lines of
+  debian/changelog per second. That's **30 times slower than markdown**!
+
+  By comparison, source-highlight can do about 5000 lines of C code per
+  second... And launching the program 100 times on an empty file takes about
+  5 seconds.
+
 * Engines that already support a wide variety of file types are of
   course preferred. If the engine doesn't support a particular type
   of file, it could fall back to doing something simple like
   adding line numbers. (IkiWiki-Plugin-syntax does this.)
+* XHTML output.
 * Emitting html that uses CSS to control the display is preferred,
-  since it allows for easy user customization.
+  since it allows for easy user customization. (Engine::Simple does
+  this; Kate can be configured to do it; source-highlight can be 
+  made to do it via the switches `--css /dev/null --no-doc`)
 * Nothing seems to support 
   [[wiki-formatted_comments|wiki-formatted_comments_with_syntax_plugin]]
   inside source files. Doing this probably means post-processing the 
-- 
cgit v1.2.3


From ebe7fbae1889cd7ac4ef375bb8903f2b628c9606 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 21 May 2009 17:37:52 -0400
Subject: source-highlight C++ library

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

diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index f269aeb7c..2bbaeedfa 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -48,7 +48,9 @@ releases the 5 or 6 language definitions he has running on his web site, it migh
 
   By comparison, source-highlight can do about 5000 lines of C code per
   second... And launching the program 100 times on an empty file takes about
-  5 seconds.
+  5 seconds, which isn't bad. And, it has a C++ library, which it
+  seems likely perl bindings could be written for, to eliminate 
+  even that overhead.
 
 * Engines that already support a wide variety of file types are of
   course preferred. If the engine doesn't support a particular type
-- 
cgit v1.2.3


From 9108d76289d9cf8775d1b284d1b97f442c58070d Mon Sep 17 00:00:00 2001
From: bremner <bremner@web>
Date: Thu, 21 May 2009 18:21:31 -0400
Subject: note that highlight should be slightly easier to call from perl than
 source-highlight

---
 doc/todo/syntax_highlighting.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index 2bbaeedfa..81ba19bc8 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -51,6 +51,11 @@ releases the 5 or 6 language definitions he has running on his web site, it migh
   5 seconds, which isn't bad. And, it has a C++ library, which it
   seems likely perl bindings could be written for, to eliminate 
   even that overhead.
+  > [highlight](http://www.andre-simon.de) has similar features to source-highlight, and swig bindings
+  > that should make it trivial in principle to call from perl.  I like highlight a bit better because 
+  > it has a pass-through feature that I find very useful.  My memory is unfortunately a bit fuzzy as to how
+  > well the swig bindings work. [[DavidBremner]]
+
 
 * Engines that already support a wide variety of file types are of
   course preferred. If the engine doesn't support a particular type
-- 
cgit v1.2.3


From e17694193b1ac8af351122ebe4f8693120fc83f3 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, 21 May 2009 21:10:55 -0400
Subject: treatise on dependencies

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

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 417d5910e..ac57965ef 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -310,6 +310,10 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>> it shouldn't (but I haven't verified that really happens).
 >>> That could certianly be a show-stopper. --[[Joey]] 
 
+>>>> Even if that works, this is a good argument for having a syntactic difference between named pagespecs and normal pages.
+>>>> If you're joining two pagespecs with 'or', you don't want a named pagespec in the first part overriding a page name in the
+>>>> second part.  Oh, and I assume 'or' has the right operator precedence that "a and b or c" is "(a and b) or c", and not "a and (b or c)" -- [[Will]]
+
 >>  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.
@@ -328,6 +332,63 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>> 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.
+
+>>>>> For another example, imagine I added a `match_word()` function.  It matches any page that contains the given word.  As with a backlink,
+>>>>> it is now possible to change the set of pages referred to by a pagespec without changing any of the pages currently referred to by the
+>>>>> pagespec.  If I have an inline of all pages that include the word "abracadabra", then it would have to depend upon all pages to detect
+>>>>> any new uses of that word.
+
+>>>>> 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.
+
+>>>>> 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.
+
+>>>>> 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]]
+
 ----
 
     diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 173decd15eb64cba31aa544cb1d7b995484d7c4b 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, 21 May 2009 21:22:09 -0400
Subject: remove bad example

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

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index ac57965ef..8eedc49e0 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -344,11 +344,6 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>>> 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.
 
->>>>> For another example, imagine I added a `match_word()` function.  It matches any page that contains the given word.  As with a backlink,
->>>>> it is now possible to change the set of pages referred to by a pagespec without changing any of the pages currently referred to by the
->>>>> pagespec.  If I have an inline of all pages that include the word "abracadabra", then it would have to depend upon all pages to detect
->>>>> any new uses of that word.
-
 >>>>> 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
-- 
cgit v1.2.3


From 1fcb97e13188d85a6df6635d3b42812ca46e145b 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, 21 May 2009 23:33:16 -0400
Subject: responses

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

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 8eedc49e0..8268e4026 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -252,6 +252,11 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>> is to not generate perl code, but just directly run perl code that
 >>> populates specFuncs.
 
+>>>> I don't think this is as bad as you make out, but your addition of the
+>>>> data array will break with the recursion my patch adds in pagespec_makeperl.
+>>>> To fix that I'll need to pass a reference to that array into pagespec_makeperl.
+>>>> I think I can then do the same thing to $params{specFuncs}.  -- [[Will]]
+
 > * Seems that the only reason `match_glob` has to check for `~` is
 >   because when a named spec appears in a pagespec, it is translated
 >   to `match_glob("~foo")`. If, instead, `pagespec_makeperl` checked
@@ -314,6 +319,8 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>> If you're joining two pagespecs with 'or', you don't want a named pagespec in the first part overriding a page name in the
 >>>> second part.  Oh, and I assume 'or' has the right operator precedence that "a and b or c" is "(a and b) or c", and not "a and (b or c)" -- [[Will]]
 
+>>>>> Looks like its bracketed in the code anyway... -- [[Will]]
+
 >>  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.
@@ -369,8 +376,8 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>>> 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.
+>>>>> 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
-- 
cgit v1.2.3


From 9b5bf6ff85d7e738317aa87b68581082d9542394 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, 22 May 2009 00:43:45 -0400
Subject: response

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

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 8268e4026..84b2448a6 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -277,6 +277,19 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>> because the link target it is being asked to check for is a single
 >>> page name, not a glob.
 
+>>>> A named pagespec should fall into the glob case.  These two pagespecs should be the same:
+
+    link(a*)
+
+>>>> and
+
+    define(aStar, a*) and link(aStar)
+
+>>>> In the first case, we want the pagespec to match any page that links to a page matching the glob.
+>>>> In the second case, we want the pagespec to match any page that links to a page matching the named spec.
+>>>> match_link() was already doing existential part.  The patches to this code were simply to remove the `lc()`
+>>>> call from the named pagespec name.  Can that `lc` be removed entirely? -- [[Will]]
+
 > * Generally, the need to modify `match_*` functions so that they
 >   check for and handle named pagespecs seems suboptimal, if
 >   only because there might be others people may want to use named
-- 
cgit v1.2.3


From 47cff6eda61701a6142b40b93991fd9a84f065c4 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, 22 May 2009 02:04:33 -0400
Subject: Update patch

---
 doc/todo/tracking_bugs_with_dependencies.mdwn | 203 +++++++++++++-------------
 1 file changed, 100 insertions(+), 103 deletions(-)

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 84b2448a6..04d5f2ba0 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -404,113 +404,107 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>>> 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]]
+
 ----
 
     diff --git a/IkiWiki.pm b/IkiWiki.pm
-    index 4e4da11..8b3cdfe 100644
+    index 061a1c6..1e78a63 100644
     --- a/IkiWiki.pm
     +++ b/IkiWiki.pm
-    @@ -1550,7 +1550,16 @@ sub globlist_to_pagespec ($) {
-     
-     sub is_globlist ($) {
-     	my $s=shift;
-    -	return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
-    +	return ! ($s =~ /
-    +			(^\s*
-    +				[^\s(]+		# single item
-    +					(\(			# possibly with parens after it
-    +						([^)]*	# with stuff inside those parens
-    +						(\([^)]*\))*)*	# maybe even nested parens
-    +					\))?\s*$
-    +			) |
-    +				(\s and \s) | (\s or \s)	# or we find 'and' or 'or' somewhere
-    +			/xs);
-     }
-     
-     sub safequote ($) {
-    @@ -1631,7 +1640,7 @@ sub pagespec_merge ($$) {
+    @@ -1774,8 +1774,12 @@ sub pagespec_merge ($$) {
      	return "($a) or ($b)";
      }
      
     -sub pagespec_translate ($) {
-    +sub pagespec_makeperl ($) {
+    +# is perl really so dumb it requires a forward declaration for recursive calls?
+    +sub pagespec_translate ($$);
+    +
+    +sub pagespec_translate ($$) {
      	my $spec=shift;
+    +	my $specFuncsRef=shift;
      
-     	# Support for old-style GlobLists.
-    @@ -1650,12 +1659,14 @@ sub pagespec_translate ($) {
+     	# Convert spec to perl code.
+     	my $code="";
+    @@ -1789,7 +1793,9 @@ sub pagespec_translate ($) {
      		|
      			\)		# )
      		|
     -			\w+\([^\)]*\)	# command(params)
-    +			define\(\s*~\w+\s*,((\([^()]*\)) | ([^()]+))+\)	# define(~specName, spec) - spec can contain parens 1 deep
+    +			define\(\s*~\w+\s*,((\([^()]*\)) | ([^()]+))+\) # define(~specName, spec) - spec can contain parens 1 deep
     +		|
-    +			\w+\([^()]*\)	# command(params) - params cannot contain parens
+    +			\w+\([^())]*\)	# command(params) - params cannot contain parens
      		|
      			[^\s()]+	# any other text
      		)
-     		\s*		# ignore whitespace
-    -	}igx) {
-    +	}igxs) {
-     		my $word=$1;
-     		if (lc $word eq 'and') {
-     			$code.=' &&';
-    @@ -1666,16 +1677,23 @@ sub pagespec_translate ($) {
+    @@ -1805,10 +1811,19 @@ sub pagespec_translate ($) {
      		elsif ($word eq "(" || $word eq ")" || $word eq "!") {
      			$code.=' '.$word;
      		}
     -		elsif ($word =~ /^(\w+)\((.*)\)$/) {
-    +		elsif ($word =~ /^define\(\s*~(\w+)\s*,(.*)\)$/s) {
-    +			$code .= " (\$params{specFuncs}->{$1}=";	# (exists \$params{specFuncs}) && 
-    +			$code .= "memoize(";
-    +			$code .= &pagespec_makeperl($2);
-    +			$code .= ")";
-    +			$code .= ") ";
+    +		elsif ($word =~ /^define\(\s*(~\w+)\s*,(.*)\)$/s) {
+    +			my $name = $1;
+    +			my $subSpec = $2;
+    +			my $newSpecFunc = pagespec_translate($subSpec, $specFuncsRef);
+    +			return if $@ || ! defined $newSpecFunc;
+    +			$specFuncsRef->{$name} = $newSpecFunc;
+    +			push @data, qq{Created named pagespec "$name"};
+    +			$code.="IkiWiki::SuccessReason->new(\$data[$#data])";
     +		}
     +		elsif ($word =~ /^(\w+)\((.*)\)$/s) {
      			if (exists $IkiWiki::PageSpec::{"match_$1"}) {
-    -				$code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";
-    +				$code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \%params)";
+     				push @data, $2;
+    -				$code.="IkiWiki::PageSpec::match_$1(\$page, \$data[$#data], \@_)";
+    +				$code.="IkiWiki::PageSpec::match_$1(\$page, \$data[$#data], \@_, specFuncs => \$specFuncsRef)";
      			}
      			else {
-     				$code.=' 0';
-     			}
+     				push @data, qq{unknown function in pagespec "$word"};
+    @@ -1817,7 +1832,7 @@ sub pagespec_translate ($) {
      		}
      		else {
-    -			$code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \@_)";
-    +			$code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \%params)";
+     			push @data, $word;
+    -			$code.=" IkiWiki::PageSpec::match_glob(\$page, \$data[$#data], \@_)";
+    +			$code.=" IkiWiki::PageSpec::match_glob(\$page, \$data[$#data], \@_, specFuncs => \$specFuncsRef)";
      		}
      	}
      
-    @@ -1683,8 +1701,18 @@ sub pagespec_translate ($) {
-     		$code=0;
+    @@ -1826,7 +1841,7 @@ sub pagespec_translate ($) {
      	}
      
-    +	return 'sub { my $page=shift; my %params = @_; '.$code.' }';
-    +}
-    +
-    +sub pagespec_translate ($) {
-    +	my $spec=shift;
-    +
-    +	my $code = pagespec_makeperl($spec);
-    +
-    +	# print STDERR "Spec '$spec' generated code '$code'\n";
-    +
      	no warnings;
     -	return eval 'sub { my $page=shift; '.$code.' }';
-    +	return eval $code;
+    +	return eval 'memoize (sub { my $page=shift; '.$code.' })';
      }
      
      sub pagespec_match ($$;@) {
-    @@ -1699,7 +1727,7 @@ sub pagespec_match ($$;@) {
+    @@ -1839,7 +1854,7 @@ sub pagespec_match ($$;@) {
+     		unshift @params, 'location';
+     	}
      
-     	my $sub=pagespec_translate($spec);
-     	return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
-    -	return $sub->($page, @params);
-    +	return $sub->($page, @params, specFuncs => {});
-     }
+    -	my $sub=pagespec_translate($spec);
+    +	my $sub=pagespec_translate($spec, +{});
+     	return IkiWiki::ErrorReason->new("syntax error in pagespec \"$spec\"")
+     		if $@ || ! defined $sub;
+     	return $sub->($page, @params);
+    @@ -1850,7 +1865,7 @@ sub pagespec_match_list ($$;@) {
+     	my $spec=shift;
+     	my @params=@_;
      
+    -	my $sub=pagespec_translate($spec);
+    +	my $sub=pagespec_translate($spec, +{});
+     	error "syntax error in pagespec \"$spec\""
+     		if $@ || ! defined $sub;
+     	
+    @@ -1872,7 +1887,7 @@ sub pagespec_match_list ($$;@) {
      sub pagespec_valid ($) {
-    @@ -1748,11 +1776,78 @@ sub new {
+     	my $spec=shift;
+     
+    -	my $sub=pagespec_translate($spec);
+    +	my $sub=pagespec_translate($spec, +{});
+     	return ! $@;
+     }
+     
+    @@ -1919,6 +1934,68 @@ sub new {
      
      package IkiWiki::PageSpec;
      
@@ -518,15 +512,14 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
     +	my $page=shift;
     +	my $specName=shift;
     +	my %params=@_;
-    +	
-    +	error("Unable to find specFuncs in params to check_named_spec()!") unless exists $params{specFuncs};
+    +
+    +	return IkiWiki::ErrorReason->new("Unable to find specFuncs in params to check_named_spec()!")
+    +		unless exists $params{specFuncs};
     +
     +	my $specFuncsRef=$params{specFuncs};
-    +	
-    +	return IkiWiki::FailReason->new("Named page spec '$specName' is not valid")
+    +
+    +	return IkiWiki::ErrorReason->new("Named page spec '$specName' is not valid")
     +		unless (substr($specName, 0, 1) eq '~');
-    +	
-    +	$specName = substr($specName, 1);
     +
     +	if (exists $specFuncsRef->{$specName}) {
     +		# remove the named spec from the spec refs
@@ -537,7 +530,7 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
     +		$specFuncsRef->{$specName} = $sub;
     +		return $result;
     +	} else {
-    +		return IkiWiki::FailReason->new("Page spec '$specName' does not exist");
+    +		return IkiWiki::ErrorReason->new("Page spec '$specName' does not exist");
     +	}
     +}
     +
@@ -546,14 +539,14 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
     +	my $specName=shift;
     +	my $funcref=shift;
     +	my %params=@_;
-    +	
-    +	error("Unable to find specFuncs in params to check_named_spec_existential()!") unless exists $params{specFuncs};
+    +
+    +	return IkiWiki::ErrorReason->new("Unable to find specFuncs in params to check_named_spec_existential()!")
+    +			unless exists $params{specFuncs};
     +	my $specFuncsRef=$params{specFuncs};
     +	
-    +	return IkiWiki::FailReason->new("Named page spec '$specName' is not valid")
+    +	return IkiWiki::ErrorReason->new("Named page spec '$specName' is not valid")
     +		unless (substr($specName, 0, 1) eq '~');
-    +	$specName = substr($specName, 1);
-    +	
+    +
     +	if (exists $specFuncsRef->{$specName}) {
     +		# remove the named spec from the spec refs
     +		# when we recurse to avoid infinite recursion
@@ -565,7 +558,7 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
     +				my $tempResult = $funcref->($page, $nextpage, %params);
     +				if ($tempResult) {
     +					$specFuncsRef->{$specName} = $sub;
-    +					return $tempResult;
+    +					return IkiWiki::SuccessReason->new("Existential check of '$specName' matches because $tempResult");
     +				}
     +			}
     +		}
@@ -573,12 +566,14 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
     +		$specFuncsRef->{$specName} = $sub;
     +		return IkiWiki::FailReason->new("No page in spec '$specName' was successfully matched");
     +	} else {
-    +		return IkiWiki::FailReason->new("Named page spec '$specName' does not exist");
+    +		return IkiWiki::ErrorReason->new("Named page spec '$specName' does not exist");
     +	}
     +}
     +
-     sub match_glob ($$;@) {
-     	my $page=shift;
+     sub derel ($$) {
+     	my $path=shift;
+     	my $from=shift;
+    @@ -1937,6 +2014,10 @@ sub match_glob ($$;@) {
      	my $glob=shift;
      	my %params=@_;
      	
@@ -586,30 +581,31 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
     +		return check_named_spec($page, $glob, %params);
     +	}
     +
-     	my $from=exists $params{location} ? $params{location} : '';
-     	
-     	# relative matching
-    @@ -1782,11 +1877,12 @@ sub match_internal ($$;@) {
+     	$glob=derel($glob, $params{location});
+     
+     	my $regexp=IkiWiki::glob2re($glob);
+    @@ -1959,8 +2040,9 @@ sub match_internal ($$;@) {
      
      sub match_link ($$;@) {
      	my $page=shift;
     -	my $link=lc(shift);
-    +	my $fulllink=shift;
+    +	my $fullLink=shift;
      	my %params=@_;
-    +	my $link=lc($fulllink);
+    +	my $link=lc($fullLink);
      
+     	$link=derel($link, $params{location});
      	my $from=exists $params{location} ? $params{location} : '';
-    -
-    +	
-     	# relative matching
-     	if ($link =~ m!^\.! && defined $from) {
-     		$from=~s#/?[^/]+$##;
-    @@ -1804,19 +1900,32 @@ sub match_link ($$;@) {
+    @@ -1975,25 +2057,37 @@ sub match_link ($$;@) {
      		}
      		else {
      			return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
     -				if match_glob($p, $link, %params);
-    +				if match_glob($p, $fulllink, %params);
+    +				if match_glob($p, $fullLink, %params);
+     			$p=~s/^\///;
+     			$link=~s/^\///;
+     			return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
+    -				if match_glob($p, $link, %params);
+    +				if match_glob($p, $fullLink, %params);
      		}
      	}
      	return IkiWiki::FailReason->new("$page does not link to $link");
@@ -631,23 +627,24 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
      sub match_created_before ($$;@) {
      	my $page=shift;
      	my $testpage=shift;
-    +	my @params=@_;
+     	my %params=@_;
+    -	
     +
     +	if (substr($testpage, 0, 1) eq '~') {
-    +		return check_named_spec_existential($page, $testpage, \&match_created_before, @params);
+    +		return check_named_spec_existential($page, $testpage, \&match_created_before, %params);
     +	}
+    +
+     	$testpage=derel($testpage, $params{location});
      
      	if (exists $IkiWiki::pagectime{$testpage}) {
-     		if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
-    @@ -1834,6 +1943,11 @@ sub match_created_before ($$;@) {
-     sub match_created_after ($$;@) {
-     	my $page=shift;
+    @@ -2014,6 +2108,10 @@ sub match_created_after ($$;@) {
      	my $testpage=shift;
-    +	my @params=@_;
-    +
+     	my %params=@_;
+     	
     +	if (substr($testpage, 0, 1) eq '~') {
-    +		return check_named_spec_existential($page, $testpage, \&match_created_after, @params);
+    +		return check_named_spec_existential($page, $testpage, \&match_created_after, %params);
     +	}
+    +
+     	$testpage=derel($testpage, $params{location});
      
      	if (exists $IkiWiki::pagectime{$testpage}) {
-     		if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {
-- 
cgit v1.2.3


From 5b2945cc921b222b07415ebea0c0d699f2a9dace 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, 22 May 2009 02:30:58 -0400
Subject: response

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

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 04d5f2ba0..707790a75 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -307,6 +307,9 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>> But if a plugin adds its own match function, it has
 >>> to explicitly call that code to support named pagespecs.
 
+>>>> Yes, and it can do that in just three lines of code.  But if we automatically check for named pagespecs all the time we
+>>>> potentially break any matching function that doesn't accept pages, or wants to use multiple arguments.
+
 > * I need to check if your trick to avoid infinite recursion
 >   works if there are two named specs that recursively
 >   call one-another. I suspect it does, but will test this
@@ -433,7 +436,7 @@ Patch updated to use closures rather than inline generated code for named pagesp
     -			\w+\([^\)]*\)	# command(params)
     +			define\(\s*~\w+\s*,((\([^()]*\)) | ([^()]+))+\) # define(~specName, spec) - spec can contain parens 1 deep
     +		|
-    +			\w+\([^())]*\)	# command(params) - params cannot contain parens
+    +			\w+\([^()]*\)	# command(params) - params cannot contain parens
      		|
      			[^\s()]+	# any other text
      		)
-- 
cgit v1.2.3


From 83826b39cfefd2588da09ca427d48f11a92ea8c0 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, 22 May 2009 02:36:11 -0400
Subject: response

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

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 707790a75..6e55e46af 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -331,6 +331,8 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>> it shouldn't (but I haven't verified that really happens).
 >>> That could certianly be a show-stopper. --[[Joey]] 
 
+>>>> I think this can happen in the new closure based code.  I don't think this could happen in the old code.  -- [[Will]]
+
 >>>> Even if that works, this is a good argument for having a syntactic difference between named pagespecs and normal pages.
 >>>> If you're joining two pagespecs with 'or', you don't want a named pagespec in the first part overriding a page name in the
 >>>> second part.  Oh, and I assume 'or' has the right operator precedence that "a and b or c" is "(a and b) or c", and not "a and (b or c)" -- [[Will]]
-- 
cgit v1.2.3


From a8318303d88de40fb10f3d831cbfc4c2a807436f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 13:00:50 -0400
Subject: fix

---
 ikiwiki-transition | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 7e99c878e..17a347c20 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -184,7 +184,7 @@ sub moveprefs {
 }
 
 sub deduplinks {
-	setstatdir(shift);
+	setstatedir(shift);
 	IkiWiki::loadindex();
 	foreach my $page (keys %links) {
 		my %l;
-- 
cgit v1.2.3


From c2e2da6ee2834d6ab68d06048588cdf3a27d3691 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 13:09:11 -0400
Subject: ikiwiki-transition: deduplinks was broken and threw away all metadata
 stored by plugins in the index. Fix this bug.

---
 debian/NEWS                 | 11 ++++++++++-
 debian/changelog            |  2 ++
 doc/ikiwiki-transition.mdwn |  2 +-
 ikiwiki-transition          |  6 ++++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 7daa350d9..c3574bdb6 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,6 +1,15 @@
+ikiwiki (3.13) UNRELEASED; urgency=low
+
+  The `ikiwiki-transition deduplinks` command introduced in the
+  last release was buggy. If you followed the NEWS file instructions
+  and ran it, you should run `ikiwiki -setup` to rebuild your wiki
+  to fix the problem.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 13:04:02 -0400
+
 ikiwiki (3.12) unstable; urgency=low
 
-  You may want to run `ikiwiki-transition deduplinks /path/to/srcdir`
+  You may want to run `ikiwiki-transition deduplinks your.setup`
   after upgrading to this version of ikiwiki. This command will
   optimise your wiki's saved state, removing duplicate information
   that can slow ikiwiki down.
diff --git a/debian/changelog b/debian/changelog
index c0a4afbc8..f25cab5bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (3.13) UNRELEASED; urgency=low
     interpolation on user-supplied data when translating pagespecs.
   * ikiwiki-transition: Allow setup files to be passed to all subcommands
     that need a srcdir.
+  * ikiwiki-transition: deduplinks was broken and threw away all
+    metadata stored by plugins in the index. Fix this bug.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 06 May 2009 20:45:44 -0400
 
diff --git a/doc/ikiwiki-transition.mdwn b/doc/ikiwiki-transition.mdwn
index 6177f5a46..3d81d659f 100644
--- a/doc/ikiwiki-transition.mdwn
+++ b/doc/ikiwiki-transition.mdwn
@@ -61,7 +61,7 @@ If this is not done explicitly, a user's plaintext password will be
 automatically converted to a hash when a user logs in for the first time
 after upgrade to ikiwiki 2.48.
 
-# deduplinks your.setup|srcdir
+# deduplinks your.setup
 
 In the past, bugs in ikiwiki have allowed duplicate link information
 to be stored in its indexdb. This mode removes such duplicate information,
diff --git a/ikiwiki-transition b/ikiwiki-transition
index 17a347c20..398b1a3c8 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -184,7 +184,9 @@ sub moveprefs {
 }
 
 sub deduplinks {
-	setstatedir(shift);
+	loadsetup(shift);
+	IkiWiki::loadplugins();
+	IkiWiki::checkconfig();
 	IkiWiki::loadindex();
 	foreach my $page (keys %links) {
 		my %l;
@@ -237,7 +239,7 @@ sub usage {
 	print STDERR "\tmoveprefs setupfile\n";
 	print STDERR "\thashpassword setupfile|srcdir\n";
 	print STDERR "\tindexdb setupfile|srcdir\n";
-	print STDERR "\tdeduplinks setupfile|srcdir\n";
+	print STDERR "\tdeduplinks setupfile\n";
 	exit 1;
 }
 
-- 
cgit v1.2.3


From e92c6722ddd559060514097ac1790c9edc2ee996 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 13:27:23 -0400
Subject: stop using perl -T here

See bug #411786. Perl's random corruption of the taint flag is even effecting
the untainting of source filenames now (which AFAICS, is a proper untaint
and always worked before..), and that makes using ikiwiki in perl taint
mode not work at all.
---
 t/basewiki_brokenlinks.t | 2 +-
 t/permalink.t            | 2 +-
 t/syntax.t               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
index ac04f800f..479c71a93 100755
--- a/t/basewiki_brokenlinks.t
+++ b/t/basewiki_brokenlinks.t
@@ -8,7 +8,7 @@ ok(! system("make -s ikiwiki.out"));
 ok(! system("make extra_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null"));
 
 foreach my $plugin ("", "listdirectives") {
-	ok(! system("LC_ALL=C perl -T -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 ".
diff --git a/t/permalink.t b/t/permalink.t
index 9b44cd72e..c326e8d27 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("LC_ALL=C perl -T -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("LC_ALL=C 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"));
 # 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/t/syntax.t b/t/syntax.t
index d09d17f7f..05d955f33 100755
--- a/t/syntax.t
+++ b/t/syntax.t
@@ -12,7 +12,7 @@ push @libs, 'IkiWiki/Plugin/skeleton.pm.example';
 plan(tests => (@progs + @libs));
 
 foreach my $file (@progs) {
-        ok(system("perl -T -c $file >/dev/null 2>&1") eq 0, $file);
+        ok(system("perl -c $file >/dev/null 2>&1") eq 0, $file);
 }
 foreach my $file (@libs) {
         ok(system("perl -c $file >/dev/null 2>&1") eq 0, $file);
-- 
cgit v1.2.3


From 3bbbe4b9df2c77fe55a017c79d1d0d6a96692400 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 13:30:03 -0400
Subject: response

---
 doc/bugs/Insecure_dependency_in_mkdir.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/doc/bugs/Insecure_dependency_in_mkdir.mdwn b/doc/bugs/Insecure_dependency_in_mkdir.mdwn
index 5410ebbfd..46011a7e8 100644
--- a/doc/bugs/Insecure_dependency_in_mkdir.mdwn
+++ b/doc/bugs/Insecure_dependency_in_mkdir.mdwn
@@ -151,3 +151,10 @@ dubious
 >>>>>> You can check it out for yourself by pulling my fork of this, at github or my local repo.
 >>>>>> github will probably be faster for you: git://github.com/kjikaqawej/ikiwiki-simon.git --[[simonraven]]
 
+>>>>>>> I don't know what I'm supposed to see in your github tree.. it
+>>>>>>> looks identical to an old snapshot of ikiwiki's regular git repo?
+>>>>>>> If you want to put up the .deb you're using, I could examine that.
+>>>>>>>
+>>>>>>> I was in fact able to reproduce the insecure dependency in mkdir
+>>>>>>> message -- but only if I run 'perl -T ikiwiki'.
+>>>>>>> --[[Joey]] 
-- 
cgit v1.2.3


From 6e6e37b4fc682a7df79d383cb01437738831cd1b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 13:35:47 -0400
Subject: remove wikilink to ikiwiki/directive/shortcut

This is a broken link if ikiwiki is configured w/o
the listdirectives plugin. Since the value of the
link to the directive docs is fairly low (there are
a bunch of examples of it right on the page
you put it on), it seems simplest to just remove the link.
---
 doc/shortcuts.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index c352f2452..14cd5ff2b 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -60,7 +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"]]
 
-To add a new shortcut, use the [[`shortcut`|ikiwiki/directive/shortcut]]
+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
-- 
cgit v1.2.3


From 7825960d310977d1ae6fd9ab31d76b611c0f91e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 13:45:38 -0400
Subject: remove -T from ikiwiki.in, add back if NOTAINT=0

---
 ikiwiki.in | 2 +-
 pm_filter  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ikiwiki.in b/ikiwiki.in
index c79a2bfef..4e9b812f8 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -T
+#!/usr/bin/perl
 $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
 delete @ENV{qw{IFS CDPATH ENV BASH_ENV}};
 
diff --git a/pm_filter b/pm_filter
index 4984f32d9..1e51f9dd3 100755
--- a/pm_filter
+++ b/pm_filter
@@ -25,8 +25,8 @@ elsif (/^use lib/) {
 		$_="use lib '$libdir';\n";
 	}
 }
-elsif ($. == 1 && ($ENV{NOTAINT} || ! exists $ENV{NOTAINT}) && m{^(#!.*perl.*?) -T$}) {
-	$_=qq{$1\n};
+elsif ($. == 1 && ($ENV{NOTAINT}=0) && m{^(#!.*perl.*?)$}) {
+	$_=qq{$1 -T\n};
 }
 elsif (/^\$ENV{PATH}="(.*)";/) {
 	$_="\$ENV{PATH}=\"$1:$prefix/bin\";\n";
-- 
cgit v1.2.3


From 8f6cdf3ae07536fdf1a197297b91677a1345eebc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 14:17:26 -0400
Subject: listdirectives: Avoid listing _comment directives and generally
 assume any directive starting with _ is likewise internal.

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

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index d2cebca34..bd73f1a04 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -45,7 +45,7 @@ sub checkconfig () {
 sub needsbuild (@) {
 	my $needsbuild=shift;
 
-	@fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
+	@fulllist = grep { ! /^_/ } sort keys %{$IkiWiki::hooks{preprocess}};
 	@shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
 	$pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);
 
diff --git a/debian/NEWS b/debian/NEWS
index c3574bdb6..75b6d0471 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,4 +1,4 @@
-ikiwiki (3.13) UNRELEASED; urgency=low
+ikiwiki (3.13) unstable; urgency=low
 
   The `ikiwiki-transition deduplinks` command introduced in the
   last release was buggy. If you followed the NEWS file instructions
diff --git a/debian/changelog b/debian/changelog
index f25cab5bb..71445ea71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.13) UNRELEASED; urgency=low
+ikiwiki (3.13) unstable; urgency=low
 
   * ikiwiki-transition: If passed a nonexistant srcdir, or one not
     containing .ikiwiki, abort with an error rather than creating it.
@@ -13,8 +13,10 @@ ikiwiki (3.13) UNRELEASED; urgency=low
     that need a srcdir.
   * ikiwiki-transition: deduplinks was broken and threw away all
     metadata stored by plugins in the index. Fix this bug.
+  * listdirectives: Avoid listing _comment directives and generally
+    assume any directive starting with _ is likewise internal.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 06 May 2009 20:45:44 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 14:10:56 -0400
 
 ikiwiki (3.12) unstable; urgency=low
 
-- 
cgit v1.2.3


From cd0b2331229a193c1821106af02100a00e15477c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 14:30:58 -0400
Subject: add news item for ikiwiki 3.13

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

diff --git a/doc/news/version_3.13.mdwn b/doc/news/version_3.13.mdwn
new file mode 100644
index 000000000..0c8f7ab8b
--- /dev/null
+++ b/doc/news/version_3.13.mdwn
@@ -0,0 +1,24 @@
+News for ikiwiki 3.13:
+
+   The `ikiwiki-transition deduplinks` command introduced in the
+   last release was buggy. If you followed the NEWS file instructions
+   and ran it, you should run `ikiwiki -setup` to rebuild your wiki
+   to fix the problem.
+
+ikiwiki 3.13 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * ikiwiki-transition: If passed a nonexistant srcdir, or one not
+     containing .ikiwiki, abort with an error rather than creating it.
+   * Allow underlaydir to be overridden without messing up inclusion
+     of other underlays via add\_underlay.
+   * More friendly display of markdown, textile in edit form selector
+     (jmtd)
+   * Allow curly braces to be used in pagespecs, and avoid a whole class
+     of potential security problems, by avoiding performing any string
+     interpolation on user-supplied data when translating pagespecs.
+   * ikiwiki-transition: Allow setup files to be passed to all subcommands
+     that need a srcdir.
+   * ikiwiki-transition: deduplinks was broken and threw away all
+     metadata stored by plugins in the index. Fix this bug.
+   * listdirectives: Avoid listing \_comment directives and generally
+     assume any directive starting with \_ is likewise internal."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From e8b9cce4b302dabe0a425e27819fdb00c92aeaec Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 14:33:22 -0400
Subject: update as command syntax has changed

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

diff --git a/doc/news/version_3.12.mdwn b/doc/news/version_3.12.mdwn
index 722316233..1e1862bb0 100644
--- a/doc/news/version_3.12.mdwn
+++ b/doc/news/version_3.12.mdwn
@@ -1,4 +1,4 @@
-You may want to run `ikiwiki-transition deduplinks /path/to/srcdir`
+You may want to run `ikiwiki-transition deduplinks my.setup`
 after upgrading to this version of ikiwiki. This command will
 optimise your wiki's saved state, removing duplicate information
 that can slow ikiwiki down.
-- 
cgit v1.2.3


From fcc3b945d6dfb00a93863d39da56e91544ae799d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 14:43:31 -0400
Subject: document internal here (was already documented in plugins/aggregate)

---
 doc/ikiwiki/directive/aggregate.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/ikiwiki/directive/aggregate.mdwn b/doc/ikiwiki/directive/aggregate.mdwn
index 70174f440..ddfcd40b7 100644
--- a/doc/ikiwiki/directive/aggregate.mdwn
+++ b/doc/ikiwiki/directive/aggregate.mdwn
@@ -19,6 +19,11 @@ more aggregated feeds. For example:
 
 	\[[!inline pages="internal(example/*)"]]
 
+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.
+
 ## usage
 
 Here are descriptions of all the supported parameters to the `aggregate`
-- 
cgit v1.2.3


From 6ae08d3272355d21591d83a87d4e89c016eb5dc8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 15:24:42 -0400
Subject: add

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

diff --git a/doc/bugs/aggregate_global_feed_names.mdwn b/doc/bugs/aggregate_global_feed_names.mdwn
new file mode 100644
index 000000000..27127ce27
--- /dev/null
+++ b/doc/bugs/aggregate_global_feed_names.mdwn
@@ -0,0 +1,13 @@
+[[plugins/aggregate]] takes a name parameter that specifies a global name
+for a feed. This causes some problems:
+
+* If a site has multiple pages that aggregate, and they use the same
+  name, one will win and get the global name, the other will claim it's
+  working, but it's really showing what the other aggregated.
+* If an aggregate directive is moved from page A to page B, and the wiki
+  refreshed, aggregate does not realize the feed moved, and so it will
+  keep aggregated pages under `A/feed_name/*`. To work around this bug,
+  you have to delete A, refresh (maybe with --aggregate?), and then add B.
+
+Need to find a way to not make the name be global. Perhaps it needs to
+include the name of the page that contains the directive?
-- 
cgit v1.2.3


From 4008106c66869b8285680e90c501a91debb1652b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 18:08:50 -0400
Subject: response

---
 doc/todo/tracking_bugs_with_dependencies.mdwn | 55 ++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 6e55e46af..b63c73916 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -257,6 +257,9 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>> To fix that I'll need to pass a reference to that array into pagespec_makeperl.
 >>>> I think I can then do the same thing to $params{specFuncs}.  -- [[Will]]
 
+>>>>> You're right -- I did not think the recursive case through.
+>>>>> --[[Joey]] 
+
 > * Seems that the only reason `match_glob` has to check for `~` is
 >   because when a named spec appears in a pagespec, it is translated
 >   to `match_glob("~foo")`. If, instead, `pagespec_makeperl` checked
@@ -283,13 +286,18 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 
 >>>> and
 
-    define(aStar, a*) and link(aStar)
+    define(aStar, a*) and link(~aStar)
 
 >>>> In the first case, we want the pagespec to match any page that links to a page matching the glob.
 >>>> In the second case, we want the pagespec to match any page that links to a page matching the named spec.
 >>>> match_link() was already doing existential part.  The patches to this code were simply to remove the `lc()`
 >>>> call from the named pagespec name.  Can that `lc` be removed entirely? -- [[Will]]
 
+>>>>> I think we could get rid of it. `bestlink` will lc it itself
+>>>>> if the uppercase version does not exist; `match_glob` matches
+>>>>> insensitively.
+>>>>> --[[Joey]] 
+
 > * Generally, the need to modify `match_*` functions so that they
 >   check for and handle named pagespecs seems suboptimal, if
 >   only because there might be others people may want to use named
@@ -310,6 +318,25 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>> Yes, and it can do that in just three lines of code.  But if we automatically check for named pagespecs all the time we
 >>>> potentially break any matching function that doesn't accept pages, or wants to use multiple arguments.
 
+>>>>> 3 lines of code, plus the functions called become part of the API,
+>>>>> don't forget about that..
+>>>>>
+>>>>> Yes, I think that is the tradeoff, the question is whether to export
+>>>>> the additional complexity needed for that flexability.
+>>>>>
+>>>>> I'd be suprised if multiple argument pagespecs become necessary..
+>>>>> with the exception of this patch there has been no need for them yet.
+>>>>>
+>>>>> There are lots of pagespecs that take data other than pages,
+>>>>> indeed, that's really the common case. So far, none of them 
+>>>>> seem likely to take data that starts with a `~`. Perhaps
+>>>>> the thing to do would be to check if `~foo` is a known,
+>>>>> named pagespec, and if not, just pass it through unchanged.
+>>>>> Then there's little room for ambiguity, and this also allows
+>>>>> pagespecs like `glob(~foo*)` to match the literal page `~foo`.
+>>>>> (It will make pagespec_merge even harder tho.. see below.)
+>>>>> --[[Joey]] 
+
 > * I need to check if your trick to avoid infinite recursion
 >   works if there are two named specs that recursively
 >   call one-another. I suspect it does, but will test this
@@ -339,6 +366,13 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 
 >>>>> Looks like its bracketed in the code anyway... -- [[Will]]
 
+>>>> Perhaps the thing to do is to have a `clear_defines()`
+>>>> function, then merging `A` and `B` yields `(A) or (clear_defines() and (B))`
+>>>> That would deal with both the cases where `A` and `B` differently
+>>>> define `~foo` as well as with the case where `A` defines `~foo` while
+>>>> `B` uses it to refer to a literal page.
+>>>> --[[Joey]]
+
 >>  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.
@@ -385,11 +419,25 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>>> 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 
+>>>>>> 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.
+>>>>>> --[[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
@@ -411,6 +459,11 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 
 Patch updated to use closures rather than inline generated code for named pagespecs.  Also includes some new use of ErrorReason where appropriate. -- [[Will]]
 
+> * Perl really doesn't need forward declarations, honest!
+> * I have doubts about memoizing the anonymous sub created by
+>   `pagespec_translate`.
+> * Think where you wrote `+{}` you can just write `{}`
+
 ----
 
     diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 6c8dd33b7886641407d4036105c7a12c7e8e1dc0 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, 22 May 2009 21:14:16 -0400
Subject: Response

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

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index b63c73916..3a761731b 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -337,6 +337,14 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>>> (It will make pagespec_merge even harder tho.. see below.)
 >>>>> --[[Joey]] 
 
+>>>>>> I've already used multi-argument pagespec match functions in
+>>>>>> my data plugin.  It is used for having different types of links.  If
+>>>>>> you want to have multiple types of links, then the match function
+>>>>>> for them needs to take both the link name and the link type.
+>>>>>> I'm trying to think of a way we could have both - automatically
+>>>>>> handle the existential case unless the function indicates somehow
+>>>>>> that it'll do it itself.  Any ideas?  -- [[Will]]
+
 > * I need to check if your trick to avoid infinite recursion
 >   works if there are two named specs that recursively
 >   call one-another. I suspect it does, but will test this
@@ -373,6 +381,33 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 >>>> `B` uses it to refer to a literal page.
 >>>> --[[Joey]]
 
+>>>>> I don't think this will work with the new patch, and I don't think it was needed with the old one.
+>>>>> Under the old patch, pagespec_makeperl() generated a string of unevaluated, self-contained, perl
+>>>>> code.  When a new named pagespec was defined, a recursive call was made to get the perl code
+>>>>> for the pagespec, and then that code was used to add something like `$params{specFuncs}->{name} = sub {recursive code} and `
+>>>>> to the result of the calling function.  This means that at pagespec testing time, when this code is executed, the
+>>>>> specFuncs hash is built up as the pagespec is checked.  In the case of the 'or' used above, later redefinitions of
+>>>>> a named pagespec would have redefined the specFunc at the right time.  It should have just worked.  However...
+
+>>>>> Since my original patch, you started using closures for security reasons (and I can see the case for that).  Unfortunately this
+>>>>> means that the generated perl code is no longer self-contained - it needs to be evaluated in the same closure it was generated
+>>>>> so that it has access to the data array.  To make this work with the recursive call I had two options: a) make the data array a
+>>>>> reference that I pass around through the pagespec_makeperl() functions and have available when the code is finally evaluated
+>>>>> in pagespec_translate(), or b) make sure that each pagespec is evaluated in its correct closure and a perl function is returned, not a
+>>>>> string containing unevaluated perl code.
+
+>>>>> I went with option b).  I did it in such a way that the hash of specfuncs is built up at translation time, not at execution time.  This
+>>>>> means that with the new code you can call specfuncs that get defined out of order:
+
+    ~test and define(~test, blah)
+
+>>>>> but it also means that using a simple 'or' to join two pagespecs wont work.  If you do something like this:
+
+    ~test and define(~test, foo) and define(~test, baz)
+
+>>>>> 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]]
+
 >>  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.
@@ -460,10 +495,18 @@ account all comments above (which doesn't mean it is above reproach :) ).  --[[W
 Patch updated to use closures rather than inline generated code for named pagespecs.  Also includes some new use of ErrorReason where appropriate. -- [[Will]]
 
 > * Perl really doesn't need forward declarations, honest!
+
+>> It complained (warning, not error) when I didn't use the forward declaration. :(
+
 > * I have doubts about memoizing the anonymous sub created by
 >   `pagespec_translate`.
+
+>> This is there explicitly to make sure that runtime is polynomial and not exponential.
+
 > * Think where you wrote `+{}` you can just write `{}`
 
+>> Possibly :) -- [[Will]]
+
 ----
 
     diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 8ae260015fa6ecd5aa39a84898f42837935c9953 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 22:57:03 -0400
Subject: 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)
---
 IkiWiki/Plugin/highlight.pm                        | 118 +++++++++++++++++++++
 debian/changelog                                   |  10 ++
 debian/control                                     |   2 +-
 doc/plugins/highlight.mdwn                         |  72 +++++++++++++
 doc/style.css                                      |  18 ++++
 ..._use_of_syntax_plugin_on_source_code_files.mdwn |   3 +
 doc/todo/syntax_highlighting.mdwn                  |  28 ++---
 doc/todo/syntax_highlighting/discussion.mdwn       |   2 +
 ...wiki-formatted_comments_with_syntax_plugin.mdwn |   5 +
 9 files changed, 240 insertions(+), 18 deletions(-)
 create mode 100644 IkiWiki/Plugin/highlight.pm
 create mode 100644 doc/plugins/highlight.mdwn

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
new file mode 100644
index 000000000..f43f18628
--- /dev/null
+++ b/IkiWiki/Plugin/highlight.pm
@@ -0,0 +1,118 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::highlight;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+use highlight;
+
+# locations of highlight's files
+my $filetypes="/etc/highlight/filetypes.conf";
+my $langdefdir="/usr/share/highlight/langDefs";
+
+sub import {
+	hook(type => "getsetup", id => "highlight",  call => \&getsetup);
+	hook(type => "checkconfig", id => "highlight", call => \&checkconfig);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1, # format plugin
+		},
+		tohighlight => {
+			type => "string",
+			example => ".c, .h, .cpp, .pl, .py, Makefile:make",
+			description => "source files to syntax highlight",
+			safe => 1,
+			rebuild => 1,
+		},
+}
+
+sub checkconfig () {
+	if (exists $config{tohighlight}) {
+		foreach my $file (split /, /, $config{tohighlight}) {
+			my @opts = $file=~s/^\.// ?
+				(keepextension => 1) :
+				(noextension => 1);
+			my $ext = $file=~s/:(.*)// ? $1 : $file;
+		
+			my $langfile=ext2langfile($ext);
+			if (! defined $langfile) {
+				error(sprintf(gettext(
+					"tohighlight contains unknown file type '%s'"),
+					$ext));
+			}
+	
+			hook(
+				type => "htmlize",
+				id => $file,
+				call => sub {
+					my %params=@_;
+				       	highlight($langfile, $params{content});
+				},
+				longname => sprintf(gettext("Source code: %s"), $file),
+				@opts,
+			);
+		}
+	}
+}
+
+my %ext2lang;
+my $filetypes_read=0;
+
+# Parse highlight's config file to get extension => language mappings.
+sub read_filetypes () {
+	open (IN, $filetypes);
+	while (<IN>) {
+		chomp;
+		if (/^\$ext\((.*)\)=(.*)$/) {
+			$ext2lang{$_}=$1 foreach $1, split ' ', $2;
+		}
+	}
+	close IN;
+	$filetypes_read=1;
+}
+
+sub langfile ($) {
+	return "$langdefdir/$_[0].lang";
+}
+
+# Given a filename extension, determines the language definition to
+# use to highlight it.
+sub ext2langfile ($) {
+	my $ext=shift;
+
+	read_filetypes() unless $filetypes_read;
+	if (exists $ext2lang{$ext}) {
+		return langfile($ext2lang{$ext});
+	}
+	# If a language only has one common extension, it will not
+	# be listed in filetypes, so check the langfile.
+	elsif (-e langfile($ext)) {
+		return langfile($ext);
+	}
+	else {
+		return undef;
+	}
+}
+
+# Interface to the highlight C library.
+sub highlight ($$) {
+	my $langfile=shift;
+	my $input=shift;
+
+	my $gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML);
+	$gen->setFragmentCode(1); # generate html fragment
+	$gen->setHTMLEnclosePreTag(1); # include stylish <pre>
+	$gen->initLanguage($langfile);
+	$gen->initTheme("/dev/null"); # theme is not needed because CSS is not emitted
+	$gen->setEncoding("utf-8");
+
+	my $output=$gen->generateString($input);
+	highlightc::CodeGenerator_deleteInstance($gen);
+	return $output;
+}
+
+1
diff --git a/debian/changelog b/debian/changelog
index 71445ea71..db3e32cda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ikiwiki (3.14) UNRELEASED; urgency=low
+
+  * 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)
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 22:03:12 -0400
+
 ikiwiki (3.13) unstable; urgency=low
 
   * ikiwiki-transition: If passed a nonexistant srcdir, or one not
diff --git a/debian/control b/debian/control
index 57c5f917a..233de8f7c 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-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,
-  libsort-naturally-perl, libtext-textile-perl
+  libsort-naturally-perl, libtext-textile-perl, libhighlight-perl
 Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
diff --git a/doc/plugins/highlight.mdwn b/doc/plugins/highlight.mdwn
new file mode 100644
index 000000000..07e888f36
--- /dev/null
+++ b/doc/plugins/highlight.mdwn
@@ -0,0 +1,72 @@
+[[!template id=plugin name=highlight author="[[Joey]]"]]
+[[!tag type/format]]
+
+This plugin allows ikiwiki to syntax highlight source files, using
+a fast syntax highlighter that supports over a hundred programming
+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.
+
+## configuration
+
+Nothing will be highlighted by default.
+To enable syntax highlighting, use the `tohighlight` setting in your
+setup file to control which files should be syntax highlighted.
+Here is a typical setting for it, enabling highlighting for files
+with the extensions .c, etc, and also for any files named "Makefile".
+
+	tohighlight => .c, .h, .cpp, .pl, .py, Makefile:make",
+
+It knows what language to use for most filename extensions (see
+`/etc/highlight/filetypes.conf` for a partial list), but if you want to
+bind an unusual filename extension, or any file without an extension
+(such as a Makefile), to a language, you can do so by appending a colon
+and the name of the language, as illustrated for Makefiles above.
+
+## embedding highlighted code
+
+To embed highlighted code on a page, you can use the
+[[ikiwiki/directive/format]] directive.
+
+For example:
+
+	\[[!format c """
+	void main () {
+		printf("hello, world!");
+	}
+	"""]]
+
+You can do this for any of the extensions/filenames enabled in
+`tohighlight`.
+
+## colors
+
+The colors etc used for the syntax highlighting are entirely configurable
+by CSS. See ikiwiki's [[style.css]] for the defaults.
+
+## limitations
+
+With this plugin enabled, source files become full-fledged ikiwiki pages,
+which means they can include [[WikiLinks|ikiwiki/wikilink]] and
+[[directives|ikiwiki/directive]] like any other page can, and are also
+affected by the [[smiley]] plugin, if it is enabled. This can be
+annoying if your code accidentially contains things that look like those.
+
+On the other hand, this also allows your syntax highlighed
+source code to contain markdown formatted comments and hyperlinks
+to other code files, like this:
+
+	/* \[[!format mdwn """
+		This comment will be formatted as *markdown*!
+
+		See [[bar.h]].
+	""]] */
+
+## security
+
+This lets anyone who can edit a page in your wiki also edit
+source code files that are in your wiki. Use appropriate caution.
diff --git a/doc/style.css b/doc/style.css
index 74d968ddf..e6512aed8 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -389,3 +389,21 @@ span.color {
 	border: 1px solid #aaa;
 	padding: 3px;
 }
+
+/* Used by the highlight plugin. */
+
+pre.hl { color:#000000; background-color:#ffffff; }
+.hl.num { color:#2928ff; }
+.hl.esc { color:#ff00ff; }
+.hl.str { color:#ff0000; }
+.hl.dstr { color:#818100; }
+.hl.slc { color:#838183; font-style:italic; }
+.hl.com { color:#838183; font-style:italic; }
+.hl.dir { color:#008200; }
+.hl.sym { color:#000000; }
+.hl.line { color:#555555; }
+.hl.mark { background-color:#ffffbb; }
+.hl.kwa { color:#000000; font-weight:bold; }
+.hl.kwb { color:#830000; }
+.hl.kwc { color:#000000; font-weight:bold; }
+.hl.kwd { color:#010181; }
diff --git a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files.mdwn b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files.mdwn
index cd5ff34de..71b4b88f0 100644
--- a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files.mdwn
+++ b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files.mdwn
@@ -12,3 +12,6 @@ this would allow the use of ikiwiki for [[!wikipedia literate programming]].
 * I have started something along these lines see [[plugins/contrib/sourcehighlight]].  For some reason I started with source-highlight [[DavidBremner]]
 
 * I wonder if this is similar to what you want: <http://iki.u32.net/setup/Highlight_Code_Plugin/>
+
+> The new [[plugins/highlight]] plugin is in ikiwiki core and supports
+> source code files natively. [[done]] --[[Joey]] 
diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index 81ba19bc8..01aa7b576 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -28,13 +28,17 @@ things easier for the user.
   also uses source-highlight, and operates on whole source files.
   Updated to work with the fix for [[bugs/multiple_pages_with_same_name]].  Untested with files with no extension, e.g. `Makefile`.
 * [[users/jasonblevins]]'s code plugin uses source-highlight, and supports both
-  while file and directive use.
+  whole file and directive use.
 
 * [hlsimple](http://pivot.cs.unb.ca/git/?p=ikiplugins.git;a=blob_plain;f=IkiWiki/Plugin/hlsimple.pm;hb=HEAD) is a wrapper for the the perl module [[!cpan Syntax::Highlight::Engine::Simple]].  This is pure perl, pretty simple, uses css. It ought to be pretty fast (according to the author, and just because it is not external).
 On the other hand, there are not many predefined languages yet.  Defining language syntaxes is about as much 
 work as source-highlight, but in perl.  I plan to package the base module for debian. Perhaps after the author 
 releases the 5 or 6 language definitions he has running on his web site, it might be suitable for inclusion in ikiwiki. [[DavidBremner]]
 
+* [[plugins/highlight]] uses [highlight](http://www.andre-simon.de) via
+  its swig bindings. It supports whole files only. It uses either
+  keepextension or noextension, as appropriate for the type of file.
+
 ## General problems / requirements
 
 * Using non-perl syntax highlighting backends is slower. All things equal,
@@ -56,7 +60,6 @@ releases the 5 or 6 language definitions he has running on his web site, it migh
   > it has a pass-through feature that I find very useful.  My memory is unfortunately a bit fuzzy as to how
   > well the swig bindings work. [[DavidBremner]]
 
-
 * Engines that already support a wide variety of file types are of
   course preferred. If the engine doesn't support a particular type
   of file, it could fall back to doing something simple like
@@ -105,20 +108,11 @@ releases the 5 or 6 language definitions he has running on his web site, it migh
 
   Perhaps the thing to do here is to use the new `longname` parameter to
   the format hook, to give them all names that will group together at or
-  near the end of the list. Ie: "Syntax: perl", "Syntax: C", etc.
-
-## format directive and comments
-
-Hmm, the [[ikiwiki/directive/format]] directive would also allow comments
-inside source files to have mdwn embedded in them, without making the use
-of mdwn a special case, or needing to postprocess the syntax highlighter
-output to find comments.
-
-	/* \[[!format mdwn """
-
-	This is a comment in my C file. You can use mdwn in here.
+  near the end of the list. Ie: "Syntax: perl", "Source code: c", etc.
 
-	"""]] */
+---
 
-Note that this assumes that directives are expanded in source files,
-which has its own set of problems.
+I'm calling this [[done]] since I added the [[plugins/highlight]]
+plugin. There are some unresolved issues touched on here,
+but they either have the own other bug reports, or are documented
+as semi-features in the docs to the plugin. --[[Joey]] 
diff --git a/doc/todo/syntax_highlighting/discussion.mdwn b/doc/todo/syntax_highlighting/discussion.mdwn
index 7a4095c65..27cb7084b 100644
--- a/doc/todo/syntax_highlighting/discussion.mdwn
+++ b/doc/todo/syntax_highlighting/discussion.mdwn
@@ -24,3 +24,5 @@ repository?  --[[JasonBlevins]]
 >> [[sourcecode|todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion]]
 >> plugin only adds the file extensions listed in the config.  This shouldn't cause
 >> massive drop-down menu pollution.  -- [[Will]]
+
+>>> That seems to be the way to go! --[[Joey]] 
diff --git a/doc/todo/wiki-formatted_comments_with_syntax_plugin.mdwn b/doc/todo/wiki-formatted_comments_with_syntax_plugin.mdwn
index a5244c9ef..7a4a295d4 100644
--- a/doc/todo/wiki-formatted_comments_with_syntax_plugin.mdwn
+++ b/doc/todo/wiki-formatted_comments_with_syntax_plugin.mdwn
@@ -2,3 +2,8 @@
 wiki syntax within the comments of code pretty-printed with the
 [[plugins/contrib/syntax]] plugin.  This would allow the use of links and
 formatting in comments.
+
+> You can do this using the [[plugins/highlight]] plugin, but you have
+> to explicitly put a format directive in the comment to do it. Thus,
+> I'm leaving this open for now.. ideally, comments would be detected,
+> and formatted as markdown. --[[Joey]] 
-- 
cgit v1.2.3


From 21d6aded47d306fb44a60c1a8ad9331933cac855 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 May 2009 23:05:58 -0400
Subject: formatting

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

diff --git a/doc/plugins/highlight.mdwn b/doc/plugins/highlight.mdwn
index 07e888f36..0cab8717b 100644
--- a/doc/plugins/highlight.mdwn
+++ b/doc/plugins/highlight.mdwn
@@ -63,7 +63,7 @@ to other code files, like this:
 	/* \[[!format mdwn """
 		This comment will be formatted as *markdown*!
 
-		See [[bar.h]].
+		See \[[bar.h]].
 	""]] */
 
 ## security
-- 
cgit v1.2.3


From cdd1b58b386da575f3c73ab94ae72e5e66be797b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 May 2009 00:09:14 -0400
Subject: remove commas in tohighlight list

---
 IkiWiki/Plugin/highlight.pm | 4 ++--
 doc/plugins/highlight.mdwn  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index f43f18628..117ab5898 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -23,7 +23,7 @@ sub getsetup () {
 		},
 		tohighlight => {
 			type => "string",
-			example => ".c, .h, .cpp, .pl, .py, Makefile:make",
+			example => ".c .h .cpp .pl .py Makefile:make",
 			description => "source files to syntax highlight",
 			safe => 1,
 			rebuild => 1,
@@ -32,7 +32,7 @@ sub getsetup () {
 
 sub checkconfig () {
 	if (exists $config{tohighlight}) {
-		foreach my $file (split /, /, $config{tohighlight}) {
+		foreach my $file (split ' ', $config{tohighlight}) {
 			my @opts = $file=~s/^\.// ?
 				(keepextension => 1) :
 				(noextension => 1);
diff --git a/doc/plugins/highlight.mdwn b/doc/plugins/highlight.mdwn
index 0cab8717b..5172af759 100644
--- a/doc/plugins/highlight.mdwn
+++ b/doc/plugins/highlight.mdwn
@@ -19,7 +19,7 @@ setup file to control which files should be syntax highlighted.
 Here is a typical setting for it, enabling highlighting for files
 with the extensions .c, etc, and also for any files named "Makefile".
 
-	tohighlight => .c, .h, .cpp, .pl, .py, Makefile:make",
+	tohighlight => ".c .h .cpp .pl .py Makefile:make",
 
 It knows what language to use for most filename extensions (see
 `/etc/highlight/filetypes.conf` for a partial list), but if you want to
-- 
cgit v1.2.3


From 47298b01c1921deff7e056406245a90f8371bd59 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 May 2009 05:17:26 -0400
Subject: allow format to use any language supported by highlight

format: Provide a htmlizefallback hook that other plugins can use to
handle formats that are not suitable for general-purpose htmlize hooks.

highlight: Use the hook to allow formatting of any language/extension,
without it needing to be enabled for standalone source files.

highlight: If the highlight perl binding is not available, fallback
safely to a passthrough mode.
---
 IkiWiki/Plugin/format.pm          | 28 +++++++++++-----
 IkiWiki/Plugin/highlight.pm       | 21 +++++++++++-
 debian/changelog                  |  3 ++
 doc/plugins/highlight.mdwn        | 67 ++++++++++++++++++++-------------------
 doc/todo/syntax_highlighting.mdwn |  6 ++--
 5 files changed, 82 insertions(+), 43 deletions(-)

diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index bbe3aa9fe..1513cbed7 100644
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -10,21 +10,33 @@ sub import {
 }
 
 sub preprocess (@) {
-	my $format=$_[0];
-	shift; shift;
-	my $text=$_[0];
-	shift; shift;
 	my %params=@_;
+	my $format=shift;
+	shift;
+	my $text=IkiWiki::preprocess($params{page}, $params{destpage}, shift);
+	shift;
 
 	if (! defined $format || ! defined $text) {
 		error(gettext("must specify format and text"));
 	}
-	elsif (! exists $IkiWiki::hooks{htmlize}{$format}) {
-		error(sprintf(gettext("unsupported page format %s"), $format));
+	elsif (exists $IkiWiki::hooks{htmlize}{$format}) {
+		return IkiWiki::htmlize($params{page}, $params{destpage},
+		                        $format, $text);
 	}
+	else {
+		# Other plugins can register htmlizefallback
+		# hooks to add support for page types
+		# not suitable for htmlize. Try them until
+		# one succeeds.
+		my $ret;
+		IkiWiki::run_hooks(htmlizefallback => sub {
+			$ret=shift->($format, $text)
+				unless defined $ret;
+		});
+		return $ret if defined $ret;
 
-	return IkiWiki::htmlize($params{page}, $params{destpage}, $format,
-		IkiWiki::preprocess($params{page}, $params{destpage}, $text));
+		error(sprintf(gettext("unsupported page format %s"), $format));
+	}
 }
 
 1
diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 117ab5898..f116c41dd 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -4,7 +4,6 @@ package IkiWiki::Plugin::highlight;
 use warnings;
 use strict;
 use IkiWiki 3.00;
-use highlight;
 
 # locations of highlight's files
 my $filetypes="/etc/highlight/filetypes.conf";
@@ -13,6 +12,9 @@ my $langdefdir="/usr/share/highlight/langDefs";
 sub import {
 	hook(type => "getsetup", id => "highlight",  call => \&getsetup);
 	hook(type => "checkconfig", id => "highlight", call => \&checkconfig);
+	# this hook is used by the format plugin
+	hook(type => "htmlizefallback", id => "highlight", call =>
+		\&htmlizefallback);
 }
 
 sub getsetup () {
@@ -59,6 +61,17 @@ sub checkconfig () {
 	}
 }
 
+sub htmlizefallback {
+	my $format=lc shift;
+	my $langfile=ext2langfile($format);
+
+	if (! defined $langfile) {
+		return;
+	}
+
+	return highlight($langfile, shift);
+}
+
 my %ext2lang;
 my $filetypes_read=0;
 
@@ -103,6 +116,12 @@ sub highlight ($$) {
 	my $langfile=shift;
 	my $input=shift;
 
+	eval q{use highlight};
+	if ($@) {
+		print STDERR gettext("warning: highlight perl module not available; falling back to pass through");
+		return $input;
+	}
+
 	my $gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML);
 	$gen->setFragmentCode(1); # generate html fragment
 	$gen->setHTMLEnclosePreTag(1); # include stylish <pre>
diff --git a/debian/changelog b/debian/changelog
index db3e32cda..8088fa705 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ ikiwiki (3.14) UNRELEASED; urgency=low
   * 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.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 22:03:12 -0400
 
diff --git a/doc/plugins/highlight.mdwn b/doc/plugins/highlight.mdwn
index 5172af759..44ced80f7 100644
--- a/doc/plugins/highlight.mdwn
+++ b/doc/plugins/highlight.mdwn
@@ -1,7 +1,7 @@
 [[!template id=plugin name=highlight author="[[Joey]]"]]
 [[!tag type/format]]
 
-This plugin allows ikiwiki to syntax highlight source files, using
+This plugin allows ikiwiki to syntax highlight source code, using
 a fast syntax highlighter that supports over a hundred programming
 languages and file formats.
 
@@ -11,26 +11,10 @@ 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.
 
-## configuration
-
-Nothing will be highlighted by default.
-To enable syntax highlighting, use the `tohighlight` setting in your
-setup file to control which files should be syntax highlighted.
-Here is a typical setting for it, enabling highlighting for files
-with the extensions .c, etc, and also for any files named "Makefile".
-
-	tohighlight => ".c .h .cpp .pl .py Makefile:make",
-
-It knows what language to use for most filename extensions (see
-`/etc/highlight/filetypes.conf` for a partial list), but if you want to
-bind an unusual filename extension, or any file without an extension
-(such as a Makefile), to a language, you can do so by appending a colon
-and the name of the language, as illustrated for Makefiles above.
-
 ## embedding highlighted code
 
 To embed highlighted code on a page, you can use the
-[[ikiwiki/directive/format]] directive.
+[[format]] plugin.
 
 For example:
 
@@ -40,21 +24,36 @@ For example:
 	}
 	"""]]
 
-You can do this for any of the extensions/filenames enabled in
-`tohighlight`.
+	\[[!format diff """
+	-bar
+	+foo
+	"""]]
 
-## colors
+You can do this for any extension or language name supported by
+the [highlight library](http://www.andre-simon.de/) -- basically anything
+you can think of should work.
 
-The colors etc used for the syntax highlighting are entirely configurable
-by CSS. See ikiwiki's [[style.css]] for the defaults.
+## highlighting entire source files
 
-## limitations
+To enable syntax highlighting of entire standalone source files, use the
+`tohighlight` setting in your setup file to control which files should be
+syntax highlighted. Here is a typical setting for it, enabling highlighting
+for files with the extensions .c, etc, and also for any files named
+"Makefile".
 
-With this plugin enabled, source files become full-fledged ikiwiki pages,
-which means they can include [[WikiLinks|ikiwiki/wikilink]] and
-[[directives|ikiwiki/directive]] like any other page can, and are also
-affected by the [[smiley]] plugin, if it is enabled. This can be
-annoying if your code accidentially contains things that look like those.
+	tohighlight => ".c .h .cpp .pl .py Makefile:make",
+
+It knows what language to use for most filename extensions (see
+`/etc/highlight/filetypes.conf` for a partial list), but if you want to
+bind an unusual filename extension, or any file without an extension
+(such as a Makefile), to a language, you can do so by appending a colon
+and the name of the language, as illustrated for Makefiles above.
+
+With the plugin configured this way, source files become full-fledged
+wiki pages, which means they can include [[WikiLinks|ikiwiki/wikilink]]
+and [[directives|ikiwiki/directive]] like any other page can, and are also
+affected by the [[smiley]] plugin, if it is enabled. This can be annoying
+if your code accidentially contains things that look like those.
 
 On the other hand, this also allows your syntax highlighed
 source code to contain markdown formatted comments and hyperlinks
@@ -66,7 +65,11 @@ to other code files, like this:
 		See \[[bar.h]].
 	""]] */
 
-## security
+Finally, bear in mind that this lets anyone who can edit a page in your
+wiki also edit source code files that are in your wiki. Use appropriate
+caution.
+
+## colors
 
-This lets anyone who can edit a page in your wiki also edit
-source code files that are in your wiki. Use appropriate caution.
+The colors etc used for the syntax highlighting are entirely configurable
+by CSS. See ikiwiki's [[style.css]] for the defaults.
diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index 01aa7b576..3d122829b 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -36,8 +36,10 @@ work as source-highlight, but in perl.  I plan to package the base module for de
 releases the 5 or 6 language definitions he has running on his web site, it might be suitable for inclusion in ikiwiki. [[DavidBremner]]
 
 * [[plugins/highlight]] uses [highlight](http://www.andre-simon.de) via
-  its swig bindings. It supports whole files only. It uses either
-  keepextension or noextension, as appropriate for the type of file.
+  its swig bindings. It optionally supports whole files, but also
+  integrates with the format directive to allow formatting of *any* of
+  highlight's supported formats. (For whole files, it uses either
+  keepextension or noextension, as appropriate for the type of file.)
 
 ## General problems / requirements
 
-- 
cgit v1.2.3


From a9970df0bfd3d982def2747b4576cea54b211b0f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 May 2009 05:21:19 -0400
Subject: mention highlight

---
 doc/ikiwiki/directive/format.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/ikiwiki/directive/format.mdwn b/doc/ikiwiki/directive/format.mdwn
index 94cf1b04f..23830e9cd 100644
--- a/doc/ikiwiki/directive/format.mdwn
+++ b/doc/ikiwiki/directive/format.mdwn
@@ -18,4 +18,12 @@ some other format:
 		4
 	"""]]
 
+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 """
+	print "hello, world\n";
+	"""]]
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From 8ba98ad1dcbffe32150745c98d72512a6fa6149e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 May 2009 05:33:08 -0400
Subject: update

---
 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 f116c41dd..90e7053d9 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -26,7 +26,7 @@ sub getsetup () {
 		tohighlight => {
 			type => "string",
 			example => ".c .h .cpp .pl .py Makefile:make",
-			description => "source files to syntax highlight",
+			description => "types of source files to syntax highlight",
 			safe => 1,
 			rebuild => 1,
 		},
-- 
cgit v1.2.3


From 39e5e250006421535c13b97e9ca28600c8447877 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 May 2009 18:39:49 -0400
Subject: cache highlighters to optimise

Setting up a new highlighter object is slightly expensive since it
reads and parses the langfile each time. So cache them.

This also speeds up ext2langfile by avoiding it needing to check for the
existence of a language file in some cases.
---
 IkiWiki/Plugin/highlight.pm | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 90e7053d9..4c02f6c23 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -74,6 +74,7 @@ sub htmlizefallback {
 
 my %ext2lang;
 my $filetypes_read=0;
+my %highlighters;
 
 # Parse highlight's config file to get extension => language mappings.
 sub read_filetypes () {
@@ -88,23 +89,23 @@ sub read_filetypes () {
 	$filetypes_read=1;
 }
 
-sub langfile ($) {
-	return "$langdefdir/$_[0].lang";
-}
 
 # Given a filename extension, determines the language definition to
 # use to highlight it.
 sub ext2langfile ($) {
 	my $ext=shift;
 
+	my $langfile="$langdefdir/$ext.lang";
+	return $langfile if exists $highlighters{$langfile};
+
 	read_filetypes() unless $filetypes_read;
 	if (exists $ext2lang{$ext}) {
-		return langfile($ext2lang{$ext});
+		return "$langdefdir/$ext2lang{$ext}.lang";
 	}
 	# If a language only has one common extension, it will not
 	# be listed in filetypes, so check the langfile.
-	elsif (-e langfile($ext)) {
-		return langfile($ext);
+	elsif (-e $langfile) {
+		return $langfile;
 	}
 	else {
 		return undef;
@@ -122,16 +123,21 @@ sub highlight ($$) {
 		return $input;
 	}
 
-	my $gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML);
-	$gen->setFragmentCode(1); # generate html fragment
-	$gen->setHTMLEnclosePreTag(1); # include stylish <pre>
-	$gen->initLanguage($langfile);
-	$gen->initTheme("/dev/null"); # theme is not needed because CSS is not emitted
-	$gen->setEncoding("utf-8");
+	my $gen;
+	if (! exists $highlighters{$langfile}) {
+		$gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML);
+		$gen->setFragmentCode(1); # generate html fragment
+		$gen->setHTMLEnclosePreTag(1); # include stylish <pre>
+		$gen->initLanguage($langfile);
+		$gen->initTheme("/dev/null"); # theme is not needed because CSS is not emitted
+		$gen->setEncoding("utf-8");
+		$highlighters{$langfile}=$gen;
+	}
+	else {		
+		$gen=$highlighters{$langfile};
+	}
 
-	my $output=$gen->generateString($input);
-	highlightc::CodeGenerator_deleteInstance($gen);
-	return $output;
+	return $gen->generateString($input);
 }
 
 1
-- 
cgit v1.2.3


From 5c4d806f0146e9fc9ccc7f82cf9e70c8bb0b50eb Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Mon, 25 May 2009 10:13:19 -0400
Subject: New wish.

---
 doc/todo/section-numbering.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/todo/section-numbering.mdwn

diff --git a/doc/todo/section-numbering.mdwn b/doc/todo/section-numbering.mdwn
new file mode 100644
index 000000000..6f8c44a4c
--- /dev/null
+++ b/doc/todo/section-numbering.mdwn
@@ -0,0 +1,5 @@
+[[!tag wishlist]]
+
+Optional automatic section numbering would help reading: otherwise, a reader (like me) gets lost in the structure of a long page.
+
+I guess it is implementable with complex CSS... but one has first to compose this CSS in any case. So, this wish still has a todo status.
-- 
cgit v1.2.3


From 65c95d2508b01636559faa76acf36b458823f460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Moral?= <victor@taquiones.net>
Date: Mon, 25 May 2009 09:33:08 +0200
Subject: updated spanish translation

---
 po/bg.po       | 75 +++++++++++++++++++++++++++-------------------
 po/cs.po       | 75 +++++++++++++++++++++++++++-------------------
 po/da.po       | 75 +++++++++++++++++++++++++++-------------------
 po/de.po       | 75 +++++++++++++++++++++++++++-------------------
 po/es.po       | 95 ++++++++++++++++++++++++++++++++--------------------------
 po/fr.po       | 75 +++++++++++++++++++++++++++-------------------
 po/gu.po       | 75 +++++++++++++++++++++++++++-------------------
 po/ikiwiki.pot | 75 +++++++++++++++++++++++++++-------------------
 po/pl.po       | 75 +++++++++++++++++++++++++++-------------------
 po/sv.po       | 75 +++++++++++++++++++++++++++-------------------
 po/vi.po       | 75 +++++++++++++++++++++++++++-------------------
 11 files changed, 502 insertions(+), 343 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 65f8bdf2c..306278343 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-05-06 12:58-0400\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\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:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr "Грешка"
 
@@ -203,7 +203,7 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Няма „счупени” връзки!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
@@ -216,55 +216,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr ""
 
@@ -294,14 +294,14 @@ msgstr "премахване на старата страница „%s”"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
@@ -377,6 +377,21 @@ msgstr "приставката „linkmap”: грешка при изпълне
 msgid "prog not a valid graphviz program"
 msgstr ""
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:62
 #, fuzzy
 msgid "Image::Magick is not installed"
@@ -726,24 +741,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "обновяване на страницата „%s”"
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”"
@@ -1044,31 +1059,31 @@ msgstr "обновяване на уики..."
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1194
+#: ../IkiWiki.pm:1201
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
diff --git a/po/cs.po b/po/cs.po
index aa6e0c928..95c316d01 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-05-06 12:58-0400\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\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:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr "Chyba"
 
@@ -200,7 +200,7 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Žádné porušené odkazy!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
@@ -213,55 +213,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr ""
 
@@ -291,14 +291,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:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
@@ -373,6 +373,21 @@ msgstr "nepodařilo se spustit graphviz"
 msgid "prog not a valid graphviz program"
 msgstr "program není platným programem graphviz"
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:62
 #, fuzzy
 msgid "Image::Magick is not installed"
@@ -715,24 +730,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "zpracovávám %s"
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizace %s (%s) uživatelem %s"
@@ -1026,29 +1041,29 @@ msgstr "znovu vytvářím wiki..."
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 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:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1194
+#: ../IkiWiki.pm:1201
 #, 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:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "nemohu číst %s: %s"
diff --git a/po/da.po b/po/da.po
index 4dfa998ca..34d298bbf 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-06 12:58-0400\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\n"
 "PO-Revision-Date: 2009-04-26 23:34+0100\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:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr "Fejl"
 
@@ -206,7 +206,7 @@ msgstr "%s fra %s"
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Ikke-understøttet sideformat %s"
@@ -219,55 +219,55 @@ msgstr "kommentar skal have indhold"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr "dårligt sidenavn"
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommenterer på %s"
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, 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:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "kommentarer på side '%s' er lukket"
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr "kommentar gemt for moderering"
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "Your comment will be posted after moderator review"
 msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn"
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr "Tilføjede en kommentar"
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Tilføjede en kommentar: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr "du er ikke logget på som en administrator"
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr "Kommentarmoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr "kommentarkoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr "Kommentarer"
 
@@ -297,14 +297,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:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr "redigerer %s"
@@ -375,6 +375,21 @@ msgstr "graphviz-kørsel mislykkedes"
 msgid "prog not a valid graphviz program"
 msgstr "prog er ikke et gyldigt graphviz-program"
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:62
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick ikke installeret"
@@ -712,24 +727,24 @@ msgstr "%s eksisterer allerede på disken"
 msgid "rename %s"
 msgstr "omdøb %s"
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr "Omdøb også UnderSider og vedhæftninger"
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 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:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr "Vælg vedhæftningen som skal omdøbes."
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr "omdøb %s til %s"
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "opdatering til omdøbning af %s til %s"
@@ -1026,30 +1041,30 @@ msgstr "genopbygger wiki..."
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 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:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, 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:1194
+#: ../IkiWiki.pm:1201
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, 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 73105ed6e..8ee9cdb93 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.06\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-06 12:58-0400\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\n"
 "PO-Revision-Date: 2009-03-02 15:39+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -55,7 +55,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr "Fehler"
 
@@ -202,7 +202,7 @@ msgstr "%s von %s"
 msgid "There are no broken links!"
 msgstr "Es gibt keine ungültigen Links!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "nicht unterstütztes Seitenformat %s"
@@ -215,58 +215,58 @@ msgstr "Kommentare dürfen nicht leer sein."
 msgid "Anonymous"
 msgstr "Anonymer Benutzer"
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr "fehlerhafter Seitenname"
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommentiere %s"
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 "Die Seite »%s« existiert nicht, deshalb können Sie sie nicht kommentieren."
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 "Es können keine weiteren Kommentare für die Seite »%s« abgegeben werden."
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr "Kommentar wurde gespeichert und erwartet Freischaltung."
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 "Ihr Kommentar wird freigegeben, nachdem ein Moderator ihn überprüft hat."
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr "Kommentar hinzugefügt."
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Kommentar hinzugefügt: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr "Sie sind nicht als Administrator angemeldet"
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr "Kommentarmoderation"
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr "Kommentarmoderation"
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr "Kommentare"
 
@@ -296,14 +296,14 @@ msgstr "entferne alte Vorschau %s"
 msgid "%s is not an editable page"
 msgstr "Die Seite %s kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/editpage.pm:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr "erstelle %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr "bearbeite %s"
@@ -376,6 +376,21 @@ msgstr "graphviz konnte nicht ausgeführt werden"
 msgid "prog not a valid graphviz program"
 msgstr "prog ist kein gültiges graphviz-Programm"
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:62
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick ist nicht installiert"
@@ -720,24 +735,24 @@ msgstr "%s existiert bereits auf der Festplatte"
 msgid "rename %s"
 msgstr "benenne %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr "Auch Unterseiten und Anhänge umbenennen"
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 msgid "Only one attachment can be renamed at a time."
 msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden."
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr "Bitte wählen Sie den umzubenennenden Anhang aus."
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr "Benenne %s in %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "Aktualisierung für Umbenennung von %s in %s"
@@ -1035,32 +1050,32 @@ msgstr "erzeuge Wiki neu..."
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki..."
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 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:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, 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:1194
+#: ../IkiWiki.pm:1201
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kann %s nicht lesen: %s"
diff --git a/po/es.po b/po/es.po
index 91a08feaf..c029c914e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-06 12:58-0400\n"
-"PO-Revision-Date: 2009-04-27 09:32+0200\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\n"
+"PO-Revision-Date: 2009-05-25 09:30+0200\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,8 +34,7 @@ msgstr ""
 
 #: ../IkiWiki/CGI.pm:149
 msgid "login failed, perhaps you need to turn on cookies?"
-msgstr ""
-"registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
+msgstr "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
 
 #: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
 msgid "Your login session has expired."
@@ -61,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:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr "Error"
 
@@ -71,8 +70,7 @@ msgstr "Contenido añadido activado vía web."
 
 #: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
-msgstr ""
-"¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !"
+msgstr "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !"
 
 #: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
@@ -209,7 +207,7 @@ msgstr "%s desde la página %s"
 msgid "There are no broken links!"
 msgstr "¡ No hay enlaces rotos !"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "formato de página %s no soportado"
@@ -222,55 +220,55 @@ msgstr "Un comentario debe tener algún contenido"
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr "nombre de página erróneo"
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, perl-format
 msgid "commenting on %s"
 msgstr "creando comentarios en la página %s"
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, 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:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "los comentarios para la página '%s' están cerrados"
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr "comentario guardado a la espera de aprobación"
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 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:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr "Añadir un comentario"
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Comentario añadido: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr "No está registrado como un administrador"
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr "Aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr "aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -300,14 +298,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:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr "creando página %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
@@ -361,8 +359,7 @@ msgstr ""
 
 #: ../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"
+msgstr "Error en el análisis del URL, no puedo determinar el nombre del dominio"
 
 #: ../IkiWiki/Plugin/goto.pm:49
 msgid "missing page"
@@ -381,6 +378,20 @@ msgstr "no he podido ejecutar el programa graphviz "
 msgid "prog not a valid graphviz program"
 msgstr "prog no es un programa graphviz válido "
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' "
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr "Código fuente: %s"
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid "warning: highlight perl module not available; falling back to pass through"
+msgstr "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada para continuar el proceso. "
+
 #: ../IkiWiki/Plugin/img.pm:62
 msgid "Image::Magick is not installed"
 msgstr "El complemento Image::Magick no ha sido instalado"
@@ -459,8 +470,7 @@ msgstr "La página %s está bloqueada y no puede modificarse"
 
 #: ../IkiWiki/Plugin/mdwn.pm:44
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
-msgstr ""
-"el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown"
+msgstr "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown"
 
 #: ../IkiWiki/Plugin/mdwn.pm:67
 #, perl-format
@@ -725,24 +735,24 @@ msgstr "%s ya existe en el disco"
 msgid "rename %s"
 msgstr "cambiando de nombre %s"
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr "También cambia de nombre las subpáginas y los adjuntos"
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 msgid "Only one attachment can be renamed at a time."
 msgstr "Únicamente un adjunto puede ser renombrado a la vez."
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr "Por favor, seleccione el adjunto al que cambiar el nombre."
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr "%s cambia de nombre a %s"
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "actualizado el cambio de nombre de %s a %s"
@@ -882,8 +892,7 @@ msgid "plugins"
 msgstr "complementos"
 
 #: ../IkiWiki/Plugin/websetup.pm:395
-msgid ""
-"The configuration changes shown below require a wiki rebuild to take effect."
+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."
@@ -1001,8 +1010,7 @@ msgstr "el programa %s no parece ser ejecutable"
 
 #: ../IkiWiki/Wrapper.pm:20
 msgid "cannot create a wrapper that uses a setup file"
-msgstr ""
-"no puedo crear un programa envoltorio que utiliza un archivo de configuración"
+msgstr "no puedo crear un programa envoltorio que utiliza un archivo de configuración"
 
 #: ../IkiWiki/Wrapper.pm:24
 msgid "wrapper filename not specified"
@@ -1044,33 +1052,33 @@ msgstr "reconstruyendo el wiki.."
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 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:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, 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:1194
+#: ../IkiWiki.pm:1201
 #, 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:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
@@ -1096,3 +1104,4 @@ msgstr ""
 #: ../auto.setup:23
 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 065a01f2b..9e930dd71 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.04\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-06 12:58-0400\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\n"
 "PO-Revision-Date: 2009-03-15 16:10+0100\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:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr "Erreur"
 
@@ -204,7 +204,7 @@ msgstr "%s sur %s"
 msgid "There are no broken links!"
 msgstr "Aucun lien cassé !"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Format de page non reconnu %s"
@@ -217,55 +217,55 @@ msgstr "Un commentaire doit avoir un contenu."
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr "Nom de page incorrect"
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, perl-format
 msgid "commenting on %s"
 msgstr "Faire un commentaire sur %s"
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, 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:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "Le commentaire pour la page '%s' est terminé."
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr "Le commentaire a été enregistré en attente de modération"
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "Your comment will be posted after moderator review"
 msgstr "Votre commentaire sera publié après que le modérateur l'ait vérifié"
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr "Commentaire ajouté"
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Commentaire ajouté : %s"
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr "Vous n'êtes pas authentifié comme administrateur"
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr "Modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr "modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr "Commentaires"
 
@@ -295,14 +295,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:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr "Création de %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr "Édition de %s"
@@ -373,6 +373,21 @@ msgstr "Échec du lancement de graphviz"
 msgid "prog not a valid graphviz program"
 msgstr "Ce programme n'est pas un programme graphviz valable"
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:62
 msgid "Image::Magick is not installed"
 msgstr "Image::Magick n'est pas installé"
@@ -715,24 +730,24 @@ msgstr "%s existe déjà sur le disque"
 msgid "rename %s"
 msgstr "%s renommé"
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr "« SubPages » et attachements renommés."
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 msgid "Only one attachment can be renamed at a time."
 msgstr "Une seule pièce jointe peut être renommée à la fois"
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr "Veuillez sélectionner la pièce jointe à renommer"
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr "Renomme %s en %s"
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "mise à jour, suite au changement de %s en %s"
@@ -1033,30 +1048,30 @@ msgstr "Reconstruction du wiki..."
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 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:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, 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:1194
+#: ../IkiWiki.pm:1201
 #, 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:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "Lecture impossible de %s : %s"
diff --git a/po/gu.po b/po/gu.po
index e33287228..f852af0f5 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-05-06 12:58-0400\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\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:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -201,7 +201,7 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "અહીં કોઇ તૂટેલ કડી નથી!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
@@ -214,55 +214,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr ""
 
@@ -292,14 +292,14 @@ msgstr "જુનાં પાનાં દૂર કરે છે %s"
 msgid "%s is not an editable page"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/editpage.pm:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
@@ -374,6 +374,21 @@ msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ"
 msgid "prog not a valid graphviz program"
 msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી"
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:62
 #, fuzzy
 msgid "Image::Magick is not installed"
@@ -716,24 +731,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "રેન્ડર કરે છે %s"
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "%s નો સુધારો %s નાં %s વડે"
@@ -1026,29 +1041,29 @@ msgstr "વીકી ફરીથી બનાવે છે.."
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1194
+#: ../IkiWiki.pm:1201
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 5fccea2c6..d13b3b969 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-05-06 12:58-0400\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\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:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr ""
 
@@ -199,7 +199,7 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
@@ -212,55 +212,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr ""
 
@@ -290,14 +290,14 @@ msgstr ""
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -368,6 +368,21 @@ msgstr ""
 msgid "prog not a valid graphviz program"
 msgstr ""
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:62
 msgid "Image::Magick is not installed"
 msgstr ""
@@ -701,24 +716,24 @@ msgstr ""
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -1009,29 +1024,29 @@ msgstr ""
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1194
+#: ../IkiWiki.pm:1201
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 534aaa7ff..631aa6260 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-05-06 12:58-0400\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\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:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr "Błąd"
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Wszystkie odnośniki są aktualne!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
@@ -218,55 +218,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr ""
 
@@ -296,14 +296,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:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr "edycja %s"
@@ -379,6 +379,21 @@ msgstr "awaria w trakcie uruchamiania wtyczki graphviz"
 msgid "prog not a valid graphviz program"
 msgstr "prog nie jest poprawnym programem graphviz"
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:62
 #, fuzzy
 msgid "Image::Magick is not installed"
@@ -731,24 +746,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "renderowanie %s"
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s"
@@ -1050,31 +1065,31 @@ msgstr "przebudowywanie wiki..."
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 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:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1194
+#: ../IkiWiki.pm:1201
 #, 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:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, 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 f50800ff0..8ace97a9d 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-05-06 12:58-0400\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\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:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr "Fel"
 
@@ -202,7 +202,7 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Det finns inga trasiga länkar!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
@@ -215,55 +215,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr ""
 
@@ -293,14 +293,14 @@ msgstr "tar bort gammal sida %s"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
@@ -376,6 +376,21 @@ msgstr "linkmap misslyckades att köra dot"
 msgid "prog not a valid graphviz program"
 msgstr ""
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:62
 #, fuzzy
 msgid "Image::Magick is not installed"
@@ -721,24 +736,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "ritar upp %s"
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "uppdatering av %s, %s av %s"
@@ -1039,29 +1054,29 @@ msgstr "bygger om wiki.."
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 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:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1194
+#: ../IkiWiki.pm:1201
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, 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 32cd4827d..219e15c44 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-05-06 12:58-0400\n"
+"POT-Creation-Date: 2009-05-25 09:19+0200\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:1211
+#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218
 msgid "Error"
 msgstr "Lỗi"
 
@@ -203,7 +203,7 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Không có liên kết bị ngắt nào."
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
@@ -216,55 +216,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:333 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338
+#: ../IkiWiki/Plugin/comments.pm:343
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../IkiWiki/Plugin/comments.pm:361
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:368
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:457
+#: ../IkiWiki/Plugin/comments.pm:462
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:459
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:472
+#: ../IkiWiki/Plugin/comments.pm:477
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:476
+#: ../IkiWiki/Plugin/comments.pm:481
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:518 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:574
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:608
+#: ../IkiWiki/Plugin/comments.pm:613
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:759
+#: ../IkiWiki/Plugin/comments.pm:764
 msgid "Comments"
 msgstr ""
 
@@ -294,14 +294,14 @@ msgstr "đang gỡ bỏ trang cũ %s"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:289
+#: ../IkiWiki/Plugin/editpage.pm:291
 #, perl-format
 msgid "creating %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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
 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
@@ -377,6 +377,21 @@ msgstr "linkmap không chạy dot được"
 msgid "prog not a valid graphviz program"
 msgstr ""
 
+#: ../IkiWiki/Plugin/highlight.pm:46
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:57
+#, perl-format
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:122
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
 #: ../IkiWiki/Plugin/img.pm:62
 #, fuzzy
 msgid "Image::Magick is not installed"
@@ -722,24 +737,24 @@ msgstr ""
 msgid "rename %s"
 msgstr "đang vẽ %s"
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:140
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:226
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:229
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:340
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:495
 #, 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"
@@ -1040,29 +1055,29 @@ msgstr "đang xây dựng lại wiki.."
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:487
 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:526
+#: ../IkiWiki.pm:533
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:562
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1194
+#: ../IkiWiki.pm:1201
 #, 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:1732
+#: ../IkiWiki.pm:1733
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:1860
+#: ../IkiWiki.pm:1865
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "không thể đọc %s: %s"
-- 
cgit v1.2.3


From fd7db49f941eab604fcabdf78b3c36c743005d34 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 25 May 2009 12:40:40 -0400
Subject: Fix test suite to not rely on an installed copy of ikiwiki after
 underlaydir change. Closes: #530502

---
 debian/changelog         | 2 ++
 t/basewiki_brokenlinks.t | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8088fa705..2be245191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.14) UNRELEASED; urgency=low
   * 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
 
  -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 22:03:12 -0400
 
diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
index 479c71a93..2871b1dd2 100755
--- a/t/basewiki_brokenlinks.t
+++ b/t/basewiki_brokenlinks.t
@@ -14,6 +14,7 @@ foreach my $plugin ("", "listdirectives") {
 			"-plugin smiley ".
 			($plugin ? "-plugin $plugin " : "").
 			"-underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki ".
+			"-set underlaydirbase=t/tmp/install/usr/share/ikiwiki ".
 			"-templatedir=templates t/basewiki_brokenlinks t/tmp/out"));
 	my $result=`grep 'no broken links' t/tmp/out/index.html`;
 	ok(length($result));
-- 
cgit v1.2.3


From 3c68de2e1786d75f2dc4610163a881116958ac30 Mon Sep 17 00:00:00 2001
From: "http://dr.jones.dk/" <http://dr.jones.dk/@web>
Date: Mon, 25 May 2009 18:29:16 -0400
Subject: Mention bug#530574: improved po4a Markdown support

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

diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 5b33f6716..265f37fd2 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -423,3 +423,5 @@ daring a timid "please pull"... or rather, please review again :)
 >> --[[intrigeri]]
 >>
 >>> Did you get a chance to? --[[Joey]] 
+
+Related to this is [bug#530574](http://bugs.debian.org/530574) with improved po4a Markdown support. -- [[JonasSmedegaard]]
-- 
cgit v1.2.3


From 7d3b0018e600a2da44d572fd99634bd7d4371bc2 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 08:14:37 -0400
Subject: Added a reason for this to be an ikiwiki's concern.

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

diff --git a/doc/todo/section-numbering.mdwn b/doc/todo/section-numbering.mdwn
index 6f8c44a4c..3a2d232a8 100644
--- a/doc/todo/section-numbering.mdwn
+++ b/doc/todo/section-numbering.mdwn
@@ -2,4 +2,6 @@
 
 Optional automatic section numbering would help reading: otherwise, a reader (like me) gets lost in the structure of a long page.
 
-I guess it is implementable with complex CSS... but one has first to compose this CSS in any case. So, this wish still has a todo status.
+I guess it is implementable with complex CSS... but one has first to compose this CSS in any case. So, this wish still has a todo status. --Ivan Z.
+
+And another aspect why this is related to ikiwiki, not just authoring a CSS, is that the style of the numbers (genereated by CSS probably) should match the style of the numbers in ikiwiki's [[plugins/toc]]. --Ivan Z.
-- 
cgit v1.2.3


From 8662d5920f56c185b0e0c5ebdac2a09f74c93eaf Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 09:19:02 -0400
Subject: Report the unpleasant need to press "reload" in firefox.

---
 ...efox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn

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
new file mode 100644
index 000000000..8cb47f864
--- /dev/null
+++ b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
@@ -0,0 +1,5 @@
+I'm using firefox-3.0.8-alt0.M41.1 (Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.4pre) Gecko/2008100921 Firefox/3.0). I have noticed that quite often it shows an old state of a page at http://ikiwiki.info, e.g., [[recentchanges]] without my last edits, or the last page I edited (say, 50 min ago) in the state it was before I edited it.
+
+Only explicitly pressing "reload" helps.
+
+Is it a bug? I haven't been noticing such problems usually on other sites. --Ivan Z.
-- 
cgit v1.2.3


From 221f1bf624f27a470e44fd62c6256e37dc667c73 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 11:16:40 -0400
Subject: Comment: this illustrates there is no workaround.

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

diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
index 2b30f247e..86ed67252 100644
--- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
+++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
@@ -27,3 +27,5 @@ rationale on this, or what am I doing wrong, and how to achieve what I want?
 >> No, he has no pages under tagbase that aren't tags. This bug
 >> is valid. [[todo/matching_different_kinds_of_links]] is probably
 >> how it will eventually be solved. --[[Joey]] 
+
+> 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.
-- 
cgit v1.2.3


From a783062c6edab3355d6ac87b5431d80256807b9f Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 11:25:33 -0400
Subject: A workaround without introducing different kinds of links (but with
 completely auxiliary link targets).

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

diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
index 86ed67252..e7e4af7c3 100644
--- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
+++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
@@ -28,4 +28,6 @@ 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]] 
 
-> 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.
+> 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.
-- 
cgit v1.2.3


From df4cc4c16ca230ee99b80c80043ba54fb95f6e71 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 11:34:35 -0400
Subject: One more suggestion for the wiki-synatx.

---
 doc/todo/matching_different_kinds_of_links.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index b71d7cc5f..1d7c78d90 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -35,3 +35,13 @@ Besides pagespecs, the `rel=` attribute could be used for styles. --Ivan Z.
 > was not available, which is why I didn't make it differentiate from
 > normal links.) Might be better to go ahead and add the variable to
 > core though. --[[Joey]] 
+
+I saw somewhere else here soem 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>
+... the capital city is \[[Has capital::Berlin]] ...
+</pre>
+
+So a part of the effect of `\[[!taglink 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.
-- 
cgit v1.2.3


From 9b4c83127fdef0ceb682c104db9bfb321b17022e Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 11:51:48 -0400
Subject: Added a wikilink (for connectivity).

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

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 1d7c78d90..26c5a072b 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -36,12 +36,12 @@ 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 saw somewhere else here soem 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:
+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>
 ... the capital city is \[[Has capital::Berlin]] ...
 </pre>
 
-So a part of the effect of `\[[!taglink TAG]]` could be represented as something like `\[[tag::TAG]]` or (more understandable relation name in what concerns the direction) `\[[tagged::TAG]]`.
+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.
-- 
cgit v1.2.3


From 392157083be1ae66cc02687709f56bb001c5cac3 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 11:57:12 -0400
Subject: A misfeature I stumbled upon.

---
 ...ode___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn

diff --git a/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn b/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn
new file mode 100644
index 000000000..8cfe8aca6
--- /dev/null
+++ b/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn
@@ -0,0 +1,9 @@
+Example (from [](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/matching_different_kinds_of_links.mdwn;h=26c5a072bf3cb205b238a4e6fd0882583a0b7609;hp=1d7c78d9065d78307b43a1f58a53300cde4015fa;hb=9b4c83127fdef0ceb682c104db9bfb321b17022e;hpb=df4cc4c16ca230ee99b80c80043ba54fb95f6e71)):
+<pre>
+\[[`\\[[!taglink TAG\\]\\]`|plugins/tag]]
+</pre>
+gives:
+
+[[`\[[!taglink TAG\]\]`|plugins/tag]]
+
+Expected: there is a wikilink with the complex text as the displayed text. --Ivan Z.
-- 
cgit v1.2.3


From 0e72550870ed51aa6aee57e08f63edf0b07befc0 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 11:59:36 -0400
Subject: minor: A text for a link, otherwise it's not displayed; also rm
 unneeded escaping.

---
 ...iki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn b/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn
index 8cfe8aca6..9827250e6 100644
--- a/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn
+++ b/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn
@@ -1,6 +1,6 @@
-Example (from [](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/matching_different_kinds_of_links.mdwn;h=26c5a072bf3cb205b238a4e6fd0882583a0b7609;hp=1d7c78d9065d78307b43a1f58a53300cde4015fa;hb=9b4c83127fdef0ceb682c104db9bfb321b17022e;hpb=df4cc4c16ca230ee99b80c80043ba54fb95f6e71)):
+Example (from [here](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/matching_different_kinds_of_links.mdwn;h=26c5a072bf3cb205b238a4e6fd0882583a0b7609;hp=1d7c78d9065d78307b43a1f58a53300cde4015fa;hb=9b4c83127fdef0ceb682c104db9bfb321b17022e;hpb=df4cc4c16ca230ee99b80c80043ba54fb95f6e71)):
 <pre>
-\[[`\\[[!taglink TAG\\]\\]`|plugins/tag]]
+[[`\[[!taglink TAG\]\]`|plugins/tag]]
 </pre>
 gives:
 
-- 
cgit v1.2.3


From 7d881b7e3444a4e15d8ae1e338728c389ab50b31 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 12:01:17 -0400
Subject: minor: Added a wikilink (for connectivity).

---
 ..._wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn b/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn
index 9827250e6..364fae394 100644
--- a/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn
+++ b/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn
@@ -6,4 +6,4 @@ gives:
 
 [[`\[[!taglink TAG\]\]`|plugins/tag]]
 
-Expected: there is a wikilink with the complex text as the displayed text. --Ivan Z.
+Expected: there is a [[ikiwiki/wikilink]] with the complex text as the displayed text. --Ivan Z.
-- 
cgit v1.2.3


From 86b67554c17dd9dc26142f02911ae07348b0c94b Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 12:47:46 -0400
Subject: A wish.

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

diff --git a/doc/todo/target_filter_for_brokenlinks.mdwn b/doc/todo/target_filter_for_brokenlinks.mdwn
new file mode 100644
index 000000000..53347279d
--- /dev/null
+++ b/doc/todo/target_filter_for_brokenlinks.mdwn
@@ -0,0 +1,11 @@
+[[!tag wishlist]]
+
+Currently, [[plugins/brokenlinks]] supports filtering by the place where a broken wikilink is used.
+
+Filtering by the target of the broken link would also be useful, e.g.,
+
+<pre>
+\[[!brokenlinks matching="tagbase/*"]]
+</pre>
+
+would list the tags not yet "filled out". --Ivan Z.
-- 
cgit v1.2.3


From b1695647f63d27103e078a5b546b746973148ef2 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 12:52:40 -0400
Subject: minor invisible: I learned how to mark up code examples.

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

diff --git a/doc/todo/target_filter_for_brokenlinks.mdwn b/doc/todo/target_filter_for_brokenlinks.mdwn
index 53347279d..137277c21 100644
--- a/doc/todo/target_filter_for_brokenlinks.mdwn
+++ b/doc/todo/target_filter_for_brokenlinks.mdwn
@@ -4,8 +4,6 @@ Currently, [[plugins/brokenlinks]] supports filtering by the place where a broke
 
 Filtering by the target of the broken link would also be useful, e.g.,
 
-<pre>
-\[[!brokenlinks matching="tagbase/*"]]
-</pre>
+    \[[!brokenlinks matching="tagbase/*"]]
 
 would list the tags not yet "filled out". --Ivan Z.
-- 
cgit v1.2.3


From 96087cbd88fd056ae34675abfb0e3e411f019763 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 26 May 2009 17:04:49 -0400
Subject: call initLanguage after initTheme

See #530654
---
 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 4c02f6c23..20f79ef57 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -128,8 +128,8 @@ sub highlight ($$) {
 		$gen = highlightc::CodeGenerator_getInstance($highlightc::XHTML);
 		$gen->setFragmentCode(1); # generate html fragment
 		$gen->setHTMLEnclosePreTag(1); # include stylish <pre>
-		$gen->initLanguage($langfile);
 		$gen->initTheme("/dev/null"); # theme is not needed because CSS is not emitted
+		$gen->initLanguage($langfile); # must come after initTheme
 		$gen->setEncoding("utf-8");
 		$highlighters{$langfile}=$gen;
 	}
-- 
cgit v1.2.3


From 67cdee214b67d6f178570ae3ee9bdd6c137a7fb1 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 21:03:18 -0400
Subject: Added links to related work.

---
 doc/todo/latex.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/todo/latex.mdwn b/doc/todo/latex.mdwn
index 604c5e87f..f374f332b 100644
--- a/doc/todo/latex.mdwn
+++ b/doc/todo/latex.mdwn
@@ -7,10 +7,14 @@ render via [HeVeA](http://pauillac.inria.fr/~maranget/hevea/index.html),
 similar. Useful for mathematics, as well as for stuff like the LaTeX version
 of the ikiwiki [[/logo]].
 
+> [[users/Jason Blevins]] has also a plugin for including [[LaTeX]] expressions (by means of `itex2MML`) -- [[plugins/mdwn_itex]] (look at his page for the link). --Ivan Z.
+
 ----
 
 ikiwiki could also support LaTeX as a document type, again rendering to HTML.
 
+> [[users/Jason Blevins]] has also a [[plugins/pandoc]] plugin (look at his page for the link): in principle, [Pandoc](http://johnmacfarlane.net/pandoc/) can read and write [[LaTeX]]. --Ivan Z.
+
 ----
 
 Conversely, how about adding a plugin to support exporting to LaTeX?
@@ -25,6 +29,8 @@ Conversely, how about adding a plugin to support exporting to LaTeX?
 
 >>>> Interesting, just yesterday I was playing with pandoc to make PDFs from my Markdown. Could someone advise me on how to embed these PDFs into ikiwiki? I need some guidance in implementing this. --[[JosephTurian]]
 
+>>>> [[users/Jason Blevins]] has a [[plugins/pandoc]] plugin (look at his page for the link). --Ivan Z.
+
 ----
 
 [here](http://ng.l4x.org/gitweb/gitweb.cgi?p=ikiwiki.git/.git;a=blob;f=IkiWiki/Plugin/latex.pm) is a first stab at
-- 
cgit v1.2.3


From d1553bd361dd6c87470618a82cce27dea670496b Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 21:07:18 -0400
Subject: Made the links to the userpage work in the prev.edit.

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

diff --git a/doc/todo/latex.mdwn b/doc/todo/latex.mdwn
index f374f332b..4363003c1 100644
--- a/doc/todo/latex.mdwn
+++ b/doc/todo/latex.mdwn
@@ -7,13 +7,13 @@ render via [HeVeA](http://pauillac.inria.fr/~maranget/hevea/index.html),
 similar. Useful for mathematics, as well as for stuff like the LaTeX version
 of the ikiwiki [[/logo]].
 
-> [[users/Jason Blevins]] has also a plugin for including [[LaTeX]] expressions (by means of `itex2MML`) -- [[plugins/mdwn_itex]] (look at his page for the link). --Ivan Z.
+> [[users/JasonBlevins]] has also a plugin for including [[LaTeX]] expressions (by means of `itex2MML`) -- [[plugins/mdwn_itex]] (look at his page for the link). --Ivan Z.
 
 ----
 
 ikiwiki could also support LaTeX as a document type, again rendering to HTML.
 
-> [[users/Jason Blevins]] has also a [[plugins/pandoc]] plugin (look at his page for the link): in principle, [Pandoc](http://johnmacfarlane.net/pandoc/) can read and write [[LaTeX]]. --Ivan Z.
+> [[users/JasonBlevins]] has also a [[plugins/pandoc]] plugin (look at his page for the link): in principle, [Pandoc](http://johnmacfarlane.net/pandoc/) can read and write [[LaTeX]]. --Ivan Z.
 
 ----
 
@@ -29,7 +29,7 @@ Conversely, how about adding a plugin to support exporting to LaTeX?
 
 >>>> Interesting, just yesterday I was playing with pandoc to make PDFs from my Markdown. Could someone advise me on how to embed these PDFs into ikiwiki? I need some guidance in implementing this. --[[JosephTurian]]
 
->>>> [[users/Jason Blevins]] has a [[plugins/pandoc]] plugin (look at his page for the link). --Ivan Z.
+>>>> [[users/JasonBlevins]] has a [[plugins/pandoc]] plugin (look at his page for the link). --Ivan Z.
 
 ----
 
-- 
cgit v1.2.3


From 04a7da956f62ff0c0559a1e80957e7d8814b8392 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 21:13:01 -0400
Subject: minor: Added wikilinks for better "connectivity".

---
 doc/users/jasonblevins.mdwn | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/users/jasonblevins.mdwn b/doc/users/jasonblevins.mdwn
index 0030a30d3..9d09ac78a 100644
--- a/doc/users/jasonblevins.mdwn
+++ b/doc/users/jasonblevins.mdwn
@@ -2,12 +2,12 @@
 
 I'm currently hosting a private ikiwiki for keeping research notes
 which, with some patches and a plugin (below), will
-convert inline LaTeX expressions to MathML.  I'm working towards a
+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 SVG on the homepage (note that the logo scales along with the
+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
@@ -32,23 +32,23 @@ These plugins are experimental.  Use them at your own risk.  Read the
 perldoc documentation for more details.  Patches and suggestions are
 welcome.
 
- * [mdwn_itex][] - Works with the `mdwn` plugin to convert inline LaTeX
-   expressions to MathML using `itex2MML`.
+ * [mdwn_itex][] - Works with the `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 syntax highlighting
+ * [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.
 
- * [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][] - Markdown page processing via [Pandoc](http://johnmacfarlane.net/pandoc/) (a Haskell library for converting from one markup format to another).  LaTeX and
-   reStructuredText are optional.
+ * [pandoc][] - 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`.
-- 
cgit v1.2.3


From 1151d06d540f740bad932bd9b690a8a08476b6b7 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Tue, 26 May 2009 21:18:03 -0400
Subject: minor: A bit more wikilinks.

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

diff --git a/doc/users/jasonblevins.mdwn b/doc/users/jasonblevins.mdwn
index 9d09ac78a..b50e4844a 100644
--- a/doc/users/jasonblevins.mdwn
+++ b/doc/users/jasonblevins.mdwn
@@ -32,7 +32,7 @@ These plugins are experimental.  Use them at your own risk.  Read the
 perldoc documentation for more details.  Patches and suggestions are
 welcome.
 
- * [mdwn_itex][] - Works with the `mdwn` plugin to convert inline [[todo/LaTeX]]
+ * [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
@@ -47,7 +47,7 @@ welcome.
    headers at top of a file (e.g., `title: Page Title` or
    `date: November 2, 2008 11:14 EST`).
 
- * [pandoc][] - 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
-- 
cgit v1.2.3


From 82a4ea3ab4cd3c36bce47e9276a48bed1df9656c Mon Sep 17 00:00:00 2001
From: lnussel <lnussel@web>
Date: Wed, 27 May 2009 08:09:51 -0400
Subject: add link to openSUSE packages

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

diff --git a/doc/download.mdwn b/doc/download.mdwn
index 507b250a5..448bdeeb9 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -32,6 +32,8 @@ FreeBSD has ikiwiki in its
 
 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`.
 
-- 
cgit v1.2.3


From 817a40b7812d8bb5eacf2d0a265ef175ac74e1ea Mon Sep 17 00:00:00 2001
From: "http://dr.jones.dk/" <http://dr.jones.dk/@web>
Date: Thu, 28 May 2009 04:13:33 -0400
Subject: Move po4a patch note up close to "translated basewiki", and expand
 with note on danish translation.

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

diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 265f37fd2..364d8e6b2 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -153,6 +153,14 @@ Any thoughts on this?
 >> basewiki, which seems like it should be pretty easy to do, and would be
 >> a great demo! --[[Joey]]
 >>
+>>> I have a complete translation of basewiki into danish, and am working with
+>>> others on preparing one in german.  For a complete translated user
+>>> experience, however, you will also need templates translated (there are a few
+>>> translatable strings there too).  My not-yet-merged po4a Markdown improvements
+>>> (see [bug#530574](http://bugs.debian.org/530574)) correctly handles multiple
+>>> files in a single PO which might be relevant for template translation handling.
+>>> --[[JonasSmedegaard]]
+>>
 >>> I've merged your changes into my own branch, and made great
 >>> progress on the various todo items. Please note my repository
 >>> location has changed a few days ago, my user page was updated
@@ -423,5 +431,3 @@ daring a timid "please pull"... or rather, please review again :)
 >> --[[intrigeri]]
 >>
 >>> Did you get a chance to? --[[Joey]] 
-
-Related to this is [bug#530574](http://bugs.debian.org/530574) with improved po4a Markdown support. -- [[JonasSmedegaard]]
-- 
cgit v1.2.3


From 52dc080ed149c3c23511fedc513f5a49d1415510 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 May 2009 11:06:03 -0400
Subject: Danish translation update. Closes: #530877

---
 debian/changelog | 1 +
 po/da.po         | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2be245191..c29c272dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.14) UNRELEASED; urgency=low
     htmlize hooks. Used by highlight.
   * Fix test suite to not rely on an installed copy of ikiwiki after
     underlaydir change. Closes: #530502
+  * Danish translation update. Closes: #530877
 
  -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 22:03:12 -0400
 
diff --git a/po/da.po b/po/da.po
index 34d298bbf..341300cd9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-25 09:19+0200\n"
-"PO-Revision-Date: 2009-04-26 23:34+0100\n"
+"PO-Revision-Date: 2009-05-28 14:58+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -378,17 +378,17 @@ msgstr "prog er ikke et gyldigt graphviz-program"
 #: ../IkiWiki/Plugin/highlight.pm:46
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
-msgstr ""
+msgstr "tohighlight indeholder ukendt filtype '%s'"
 
 #: ../IkiWiki/Plugin/highlight.pm:57
 #, perl-format
 msgid "Source code: %s"
-msgstr ""
+msgstr "Kildekode: %s"
 
 #: ../IkiWiki/Plugin/highlight.pm:122
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
-msgstr ""
+msgstr "advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel gennemkørsel"
 
 #: ../IkiWiki/Plugin/img.pm:62
 msgid "Image::Magick is not installed"
-- 
cgit v1.2.3


From e90adc56c38ebac42baddd05d68c9590465498ae Mon Sep 17 00:00:00 2001
From: "http://dr.jones.dk/" <http://dr.jones.dk/@web>
Date: Thu, 28 May 2009 13:20:52 -0400
Subject: Mention need for localized templates, and separation of system and
 page locales.

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

diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 364d8e6b2..51dca4bf4 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -431,3 +431,21 @@ daring a timid "please pull"... or rather, please review again :)
 >> --[[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
+   later patches in [bug#530574](http://bugs.debian.org/530574)) applied.
+
+ * It seems to me that the po plugin (and possibly other parts of ikiwiki) wrongly
+   uses gettext.  As I understand it, gettext (as used currently in ikiwiki) always
+   lookup a single language, That might make sense for a single-language site, but
+   multilingual sites should emit all strings targeted at the web output in each own
+   language.
+
+   So generally the system language (used for e.g. compile warnings) should be separated
+   from both master language and slave languages.
+
+   Preferrably the gettext subroutine could be extended to pass locale as optional
+   secondary parameter overriding the default locale (for messages like "N/A" as
+   percentage in po plugin).  Alternatively (with above mentioned template support)
+   all such strings could be externalized as templates that can then be localized.
-- 
cgit v1.2.3


From 42cc56f796dee9b6fcff830aa63f769ccbd6e5ad Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 1 Jun 2009 13:11:18 -0400
Subject: releasing version 3.14

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c29c272dc..4a1844e06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.14) UNRELEASED; urgency=low
+ikiwiki (3.14) unstable; urgency=low
 
   * highlight: New plugin supporting syntax highlighting of pretty much
     anything.
@@ -12,7 +12,7 @@ ikiwiki (3.14) UNRELEASED; urgency=low
     underlaydir change. Closes: #530502
   * Danish translation update. Closes: #530877
 
- -- Joey Hess <joeyh@debian.org>  Fri, 22 May 2009 22:03:12 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 01 Jun 2009 13:05:34 -0400
 
 ikiwiki (3.13) unstable; urgency=low
 
-- 
cgit v1.2.3


From b0fb8a62554578738b8ee7b0ca42c09e8ada8c20 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 1 Jun 2009 13:11:52 -0400
Subject: add news item for ikiwiki 3.14

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

diff --git a/doc/news/version_3.14.mdwn b/doc/news/version_3.14.mdwn
new file mode 100644
index 000000000..83c2b9188
--- /dev/null
+++ b/doc/news/version_3.14.mdwn
@@ -0,0 +1,13 @@
+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
-- 
cgit v1.2.3


From 15a3647b3f89d0629e77fbcf43335894329ffa24 Mon Sep 17 00:00:00 2001
From: pilchu <pilchu@web>
Date: Tue, 2 Jun 2009 10:20:38 -0400
Subject: testing 123

---
 doc/index.mdwn | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 93526c42c..98d8c29c8 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,27 +1,7 @@
-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]].
+Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
 
-[[!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.
-[[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]].
+-Lorem Ipsum is simply dummy text of the printing and typesetting 
+-industry. Lorem Ipsum has been the industry's standard dummy text 
+--ever since the 1500s, when an unknown printer took a galley of type 
+--and scrambled it to make a type specimen book. It has survived not 
+--only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
-- 
cgit v1.2.3


From 1b6f04424faf7e5b8c547631e4ca52405c7d6290 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 2 Jun 2009 12:25:39 -0400
Subject: Revert "add news item for ikiwiki 3.14"

This reverts commit b0fb8a62554578738b8ee7b0ca42c09e8ada8c20.

pilchu: abuse the front page again and you will be banned
---
 doc/news/version_3.14.mdwn | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 doc/news/version_3.14.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
-- 
cgit v1.2.3


From 9c7b2ad331af6427ad8cfaf102a9ff165ff98e99 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 2 Jun 2009 12:27:05 -0400
Subject: revert my incorrect reversion. oops

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

diff --git a/doc/news/version_3.14.mdwn b/doc/news/version_3.14.mdwn
new file mode 100644
index 000000000..83c2b9188
--- /dev/null
+++ b/doc/news/version_3.14.mdwn
@@ -0,0 +1,13 @@
+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
-- 
cgit v1.2.3


From bd1aed61e9d50865c503ba1063bffe5a56fc2c36 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 2 Jun 2009 12:27:22 -0400
Subject: Revert "testing 123"

This reverts commit 15a3647b3f89d0629e77fbcf43335894329ffa24.
---
 doc/index.mdwn | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 98d8c29c8..93526c42c 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,7 +1,27 @@
-Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
+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]].
 
--Lorem Ipsum is simply dummy text of the printing and typesetting 
--industry. Lorem Ipsum has been the industry's standard dummy text 
---ever since the 1500s, when an unknown printer took a galley of type 
---and scrambled it to make a type specimen book. It has survived not 
---only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
+[[!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.
+[[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 5cdee82ef6c8f9fa888b35ef81f2bcc35dd8ce4a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 2 Jun 2009 17:06:46 -0400
Subject: comment: Make comment directives no longer use the internal
 "_comment" form, and document the comment directive syntax.

Rationalle: Comments need to be user-editable so that they can be posted
via git commit etc.

The _comment directive is still supported, for back-compat.
---
 IkiWiki/Plugin/comments.pm         |  4 +++-
 debian/changelog                   |  7 +++++++
 doc/ikiwiki/directive/comment.mdwn | 38 ++++++++++++++++++++++++++++++++++++++
 doc/plugins/comments.mdwn          |  2 +-
 templates/editcomment.tmpl         |  1 -
 5 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 doc/ikiwiki/directive/comment.mdwn

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 0aa4759d8..517e16f9f 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -21,6 +21,8 @@ my %commentstate;
 sub import {
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
+	hook(type => "preprocess", id => 'comment', call => \&preprocess);
+	# here for backwards compatability with old comments
 	hook(type => "preprocess", id => '_comment', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
@@ -377,7 +379,7 @@ sub editcomment ($$) {
 
 	my $location=unique_comment_location($page, $config{srcdir});
 
-	my $content = "[[!_comment format=$type\n";
+	my $content = "[[!comment format=$type\n";
 
 	# FIXME: handling of double quotes probably wrong?
 	if (defined $session->param('name')) {
diff --git a/debian/changelog b/debian/changelog
index 4a1844e06..cee073b3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.15) UNRELEASED; urgency=low
+
+  * comment: Make comment directives no longer use the internal "_comment"
+    form, and document the comment directive syntax.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
+
 ikiwiki (3.14) unstable; urgency=low
 
   * highlight: New plugin supporting syntax highlighting of pretty much
diff --git a/doc/ikiwiki/directive/comment.mdwn b/doc/ikiwiki/directive/comment.mdwn
new file mode 100644
index 000000000..f03664d13
--- /dev/null
+++ b/doc/ikiwiki/directive/comment.mdwn
@@ -0,0 +1,38 @@
+The `comment` directive is supplied by the
+[[!iki plugins/comment desc=comment]] 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.
+
+Example:
+
+	\[[!comment format=mdwn
+	username="foo"
+	subject="Bar"
+	date="2009-06-02T19:05:01Z"
+	content="""
+	Blah blah.
+	"""
+	]]
+
+## usage
+
+The only required parameter is `content`, the others just add or override
+metadata of the comment.
+
+* `content` - Text to display for the comment.
+  Note that [[directives|ikiwiki/directive]]
+  may not be allowed, depending on the configuration
+  of the comment plugin.
+* `format` - Specifies the markup used for the content.
+* `subject` - Subject for the comment.
+* `date` - Date the comment was posted. Can be entered in
+  nearly any format, since it's parsed by [[!cpan TimeDate]]
+* `username` - Used to record the username (or OpenID)
+  of a logged in commenter.
+* `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)
+  name.
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index c13a6daa6..7e2232411 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -19,7 +19,7 @@ users 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
-`\[[!_comment]]` [[ikiwiki/directive]].
+[[comment_directive|ikiwiki/directive/comment]].
 
 There are some global options for the setup file:
 
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index 27d9457d4..545edb596 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -16,7 +16,6 @@ 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 />
-IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
 <TMPL_VAR NAME="FORM-END">
 <TMPL_VAR WMD_PREVIEW>
 
-- 
cgit v1.2.3


From 2ab9e4b4d48d556b38135986ecfceecdcd1f1d95 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Wed, 3 Jun 2009 07:34:25 -0400
Subject: Correct wikilink.

---
 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 f03664d13..21386dfc3 100644
--- a/doc/ikiwiki/directive/comment.mdwn
+++ b/doc/ikiwiki/directive/comment.mdwn
@@ -1,5 +1,5 @@
 The `comment` directive is supplied by the
-[[!iki plugins/comment desc=comment]] plugin, and is used to add a comment
+[[!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.
 
-- 
cgit v1.2.3


From 9470667a0dcb27a6dcdf51657b85c939ff708af3 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@web>
Date: Wed, 3 Jun 2009 12:09:29 -0400
Subject: new bug and patch

---
 ...anted_discussion_links_on_discussion_pages.mdwn | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn

diff --git a/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn b/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn
new file mode 100644
index 000000000..c7506c6de
--- /dev/null
+++ b/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn
@@ -0,0 +1,34 @@
+Background: some po translations (amongst which `fr.po`) translate "discussion" to an upper-cased word (in French: "Discussion").
+By the way, this is wished e.g. in German, where such a noun has to be written with an upper-cased "D", but I can not see
+the logic behind the added "D" in French.
+
+Anyway, this gettext-translated word is used to name the discussion pages, as `$discussionlink` in `Render.pm` is
+built from `gettext("discussion")`. In the same piece of code, a case-sensitive regexp that tests wether the page
+being rendered is a discussion page is case-sensitive.
+
+On the other hand, new discussion pages are created with a name built from `gettext("Discussion")` (please note the upper-cased
+"D"). Such a new page name seems to be automagically downcased.
+
+This leads to newly created discussion pages not being recognized as discussion pages by the
+`$page !~ /.*\/\Q$discussionlink\E$/` regexp, so that then end with an unwanted discussion link.
+
+A simple fix that seems to work is to make this regexp case-insensitive:
+
+    git diff IkiWiki/Render.pm
+    diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
+    index adae9f0..093c25b 100644
+    --- a/IkiWiki/Render.pm
+    +++ b/IkiWiki/Render.pm
+    @@ -77,7 +77,7 @@ sub genpage ($$) {
+            }
+            if ($config{discussion}) {
+                    my $discussionlink=gettext("discussion");
+    -               if ($page !~ /.*\/\Q$discussionlink\E$/ &&
+    +               if ($page !~ /.*\/\Q$discussionlink\E$/i &&
+                       (length $config{cgiurl} ||
+                        exists $links{$page."/".$discussionlink})) {
+                            $template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), noimageinline => 1, forcesubpage => 1));
+
+But the best way would be to avoid assuming implicitely that translators will translate "discussion" and "Discussion" the same way.
+
+[[!tag patch]]
-- 
cgit v1.2.3


From f902bedd322b1e64d50444d21c2b753240d7dc01 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 3 Jun 2009 18:31:41 +0200
Subject: po: fixed one of the last Joey's concerns

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

diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 51dca4bf4..665e48343 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -391,6 +391,9 @@ daring a timid "please pull"... or rather, please review again :)
 >>> "discussion". Also, I consider `$config{cgi}` and `%links` (etc)
 >>> documented parts of the plugin interface, which won't change; po could
 >>> rely on them to avoid this minor problem. --[[Joey]] 
+>>>> 
+>>>> Done in my branch. --[[intrigeri]]
+>>>> 
 >
 > * Is there any real reason not to allow removing a translation?
 >   I'm imagining a spammy translation, which an admin might not
-- 
cgit v1.2.3


From 068f1398852ae963158f475242ef1e4465d13a8b Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Wed, 3 Jun 2009 12:50:22 -0400
Subject: Fixing a broken link: since it's not obvious how many broken links
 point to this location, I'm creating a redirect rather than just fixing one
 broken link.

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

diff --git a/doc/plugins/mailbox.mdwn b/doc/plugins/mailbox.mdwn
new file mode 100644
index 000000000..595bcfbc1
--- /dev/null
+++ b/doc/plugins/mailbox.mdwn
@@ -0,0 +1 @@
+[[!meta redir=contrib/mailbox]]
-- 
cgit v1.2.3


From 1f0560d262144be7d1be75e931db4a194d9ff85e Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Wed, 3 Jun 2009 12:53:51 -0400
Subject: Adding a plain link along with a redirect in order to track backlinks
 at the bottom of the target page correctly.

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

diff --git a/doc/plugins/mailbox.mdwn b/doc/plugins/mailbox.mdwn
index 595bcfbc1..d3646486c 100644
--- a/doc/plugins/mailbox.mdwn
+++ b/doc/plugins/mailbox.mdwn
@@ -1 +1,3 @@
 [[!meta redir=contrib/mailbox]]
+
+Redirecting to [[contrib/mailbox]].
-- 
cgit v1.2.3


From 296554daaf771d64e76355638aec986a3b22e421 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 3 Jun 2009 14:21:40 -0400
Subject:

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

diff --git a/doc/bugs/support_for_openid2_logins.mdwn b/doc/bugs/support_for_openid2_logins.mdwn
index f78d50c3c..bc48808fd 100644
--- a/doc/bugs/support_for_openid2_logins.mdwn
+++ b/doc/bugs/support_for_openid2_logins.mdwn
@@ -8,3 +8,6 @@ I've contacted JanRain who have pointed me to:
 * Some [work](http://code.sixapart.com/svn/openid/trunk/perl/) by David Recordon
 
 However both Perl OpenID 2.x implementations have not been released and are incomplete implementations. :(
+
+> Net::OpenID::Consumer 0.x in Debian is only an OpenID 1 implementation. However,
+> Net::OpenID::Consumer 1.x claims to be an OpenID 2 implementation. --[[smcv]]
-- 
cgit v1.2.3


From 25aa050305b3e788e9287163bfa7f59d15aa747b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 3 Jun 2009 14:28:21 -0400
Subject: fixed upstream, debian bug opened

---
 doc/bugs/support_for_openid2_logins.mdwn | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/bugs/support_for_openid2_logins.mdwn b/doc/bugs/support_for_openid2_logins.mdwn
index bc48808fd..1d99370f6 100644
--- a/doc/bugs/support_for_openid2_logins.mdwn
+++ b/doc/bugs/support_for_openid2_logins.mdwn
@@ -9,5 +9,9 @@ I've contacted JanRain who have pointed me to:
 
 However both Perl OpenID 2.x implementations have not been released and are incomplete implementations. :(
 
-> Net::OpenID::Consumer 0.x in Debian is only an OpenID 1 implementation. However,
-> Net::OpenID::Consumer 1.x claims to be an OpenID 2 implementation. --[[smcv]]
+> Both of the projects referenced above have since been released.
+> Net::OpenID::Consumer 0.x in Debian is indeed only an OpenID 1
+> implementation. However, Net::OpenID::Consumer 1.x claims to be
+> an OpenID 2 implementation (it's the second of the projects
+> above). I've filed a bug in Debian asking for the package to be
+> updated. --[[smcv]]
-- 
cgit v1.2.3


From 5193f9ee6b3b2a5c914d4de56cf25db52c47aa1c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 3 Jun 2009 15:42:04 -0400
Subject: update openid docs regarding openid 2, since smcv noticed a newer
 perl module supports it. Although, based on its bug reports at
 <http://rt.cpan.org/Public/Dist/Display.html?Name=Net-OpenID-Consumer>, there
 may be some problems (myspace is known not to work, for example).

---
 doc/ikiwiki/openid.mdwn |  2 +-
 doc/plugins/openid.mdwn | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/ikiwiki/openid.mdwn b/doc/ikiwiki/openid.mdwn
index 5c91dfb58..a79655284 100644
--- a/doc/ikiwiki/openid.mdwn
+++ b/doc/ikiwiki/openid.mdwn
@@ -16,7 +16,7 @@ To sign up for an OpenID, visit one of the following identity providers:
 * [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) (but not [Yahoo](http://openid.yahoo.com) [[yet|plugins/openid/discussion/#Yahoo_unsupported]]).
+* 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="""
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index d4aa18c7d..91fc7cddc 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -4,10 +4,12 @@
 This plugin allows users to use their [OpenID](http://openid.net/) to log
 into the wiki.
 
-The plugin needs the [[!cpan Net::OpenID::Consumer]] perl module. 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.
+The plugin needs the [[!cpan Net::OpenID::Consumer]] perl module.
+Version 1.x is needed in order for OpenID v2 to work.
+
+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
-- 
cgit v1.2.3


From 95e3e2d352b43e88a4ad87ef6d25ec53a7474422 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 3 Jun 2009 15:46:47 -0400
Subject: fix link, remove redirection page

There was only one broken links. See plugins/brokenlinks for
a list.
---
 doc/plugins/mailbox.mdwn | 3 ---
 doc/todo/mbox.mdwn       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 doc/plugins/mailbox.mdwn

diff --git a/doc/plugins/mailbox.mdwn b/doc/plugins/mailbox.mdwn
deleted file mode 100644
index d3646486c..000000000
--- a/doc/plugins/mailbox.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-[[!meta redir=contrib/mailbox]]
-
-Redirecting to [[contrib/mailbox]].
diff --git a/doc/todo/mbox.mdwn b/doc/todo/mbox.mdwn
index 31e4a9863..a6af0c3c5 100644
--- a/doc/todo/mbox.mdwn
+++ b/doc/todo/mbox.mdwn
@@ -3,7 +3,7 @@ I'd like to be able to drop an unmodified RFC2822 email message into ikiwiki, an
 > We're discussing doing just that (well, whole mailboxes, really) over in
 > [[comment_by_mail]] --[[Joey]]
 >> The 
->> [[plugins/mailbox]]
+>> [[plugins/contrib/mailbox]]
 >> plugin is roughly feature complete at this point.  It can read mbox, maildir, and
 >> MH folders, does threading, and deals with MIME (now with 
 >> pagespec based sanity checking).  No doubt lots of things could be 
-- 
cgit v1.2.3


From 2e48da19a29d6c06dbdb8c1e0a00a2c3528cf8ee Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Thu, 4 Jun 2009 10:53:15 -0400
Subject: Reporting minor problems with cvonnecting to the remote repo.

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

diff --git a/doc/plugins/contrib/mailbox/discussion.mdwn b/doc/plugins/contrib/mailbox/discussion.mdwn
new file mode 100644
index 000000000..00fb0c05f
--- /dev/null
+++ b/doc/plugins/contrib/mailbox/discussion.mdwn
@@ -0,0 +1,5 @@
+# The remote repo
+
+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.
-- 
cgit v1.2.3


From 6842328405494dd4971d3bfa443901084efe87ed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Jun 2009 13:15:05 -0400
Subject: Avoid relying on translators preserving the case when translating
 "discussion", which caused Discussion pages to get unwanted Discussion links.

---
 IkiWiki/Render.pm                                           | 2 +-
 debian/changelog                                            | 3 +++
 doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index adae9f0d5..ba1d1eae5 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -76,7 +76,7 @@ sub genpage ($$) {
 		$actions++;
 	}
 	if ($config{discussion}) {
-		my $discussionlink=gettext("discussion");
+		my $discussionlink=lc(gettext("Discussion"));
 		if ($page !~ /.*\/\Q$discussionlink\E$/ &&
 		   (length $config{cgiurl} ||
 		    exists $links{$page."/".$discussionlink})) {
diff --git a/debian/changelog b/debian/changelog
index cee073b3a..be1db6f3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ ikiwiki (3.15) UNRELEASED; urgency=low
 
   * 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.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 
diff --git a/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn b/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn
index c7506c6de..c74a094ce 100644
--- a/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn
+++ b/doc/bugs/unwanted_discussion_links_on_discussion_pages.mdwn
@@ -31,4 +31,6 @@ A simple fix that seems to work is to make this regexp case-insensitive:
 
 But the best way would be to avoid assuming implicitely that translators will translate "discussion" and "Discussion" the same way.
 
+> [[done]] --[[Joey]] 
+
 [[!tag patch]]
-- 
cgit v1.2.3


From 059d6f01fa7b34b67d60b99ccbc21bf188543531 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Jun 2009 13:20:52 -0400
Subject: fix further places where translated discussion case was assumed

Another benefit is that consistently using gettext("Discussion")
eliminates the need to translate one string.
---
 IkiWiki/Plugin/brokenlinks.pm    | 2 +-
 IkiWiki/Plugin/editpage.pm       | 2 +-
 IkiWiki/Plugin/inline.pm         | 2 +-
 IkiWiki/Plugin/opendiscussion.pm | 2 +-
 IkiWiki/Plugin/orphans.pm        | 2 +-
 IkiWiki/Render.pm                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm
index da97dbc28..cf8f25281 100644
--- a/IkiWiki/Plugin/brokenlinks.pm
+++ b/IkiWiki/Plugin/brokenlinks.pm
@@ -30,7 +30,7 @@ sub preprocess (@) {
 	my %broken;
 	foreach my $page (pagespec_match_list([keys %links],
 			$params{pages}, location => $params{page})) {
-		my $discussion=gettext("discussion");
+		my $discussion=gettext("Discussion");
 		my %seen;
 		foreach my $link (@{$links{$page}}) {
 			next if $seen{$link};
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 8effc02d0..467cd9ed5 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -230,7 +230,7 @@ sub cgi_editpage ($$) {
 				$dir=~s![^/]+/+$!!;
 				
 				if ((defined $form->field('subpage') && length $form->field('subpage')) ||
-				    $page eq gettext('discussion')) {
+				    $page eq lc(gettext('Discussion'))) {
 					$best_loc="$from/$page";
 				}
 				else {
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 27ea1c4a6..9d5ebc34d 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -354,7 +354,7 @@ sub preprocess_inline (@) {
 					my $file = $pagesources{$page};
 					my $type = pagetype($file);
 					if ($config{discussion}) {
-						my $discussionlink=gettext("discussion");
+						my $discussionlink=lc(gettext("Discussion"));
 						if ($page !~ /.*\/\Q$discussionlink\E$/ &&
 						    (length $config{cgiurl} ||
 						     exists $links{$page."/".$discussionlink})) {
diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 3da01efee..60b193eca 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -23,7 +23,7 @@ sub canedit ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
-	my $discussion=gettext("discussion");
+	my $discussion=lc(gettext("Discussion"));
 	return "" if $page=~/(\/|^)\Q$discussion\E$/;
 	return undef;
 }
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index cf74c9b79..944eba541 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -34,7 +34,7 @@ sub preprocess (@) {
 	}
 	
 	my @orphans;
-	my $discussion=gettext("discussion");
+	my $discussion=lc(gettext("Discussion"));
 	foreach my $page (pagespec_match_list(
 			[ grep { ! $linkedto{$_} && $_ ne 'index' }
 				keys %pagesources ],
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index ba1d1eae5..f4de19378 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -146,7 +146,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."/".gettext("discussion") ];
+			$links{$page}=[ $page."/".lc(gettext("Discussion")) ];
 		}
 		else {
 			$links{$page}=[];
-- 
cgit v1.2.3


From 27624f045608e131d376e90d963bc5aa7c6ab419 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Jun 2009 13:24:45 -0400
Subject: update po files

---
 po/bg.po       | 49 +++++++++++++++++++--------------------
 po/cs.po       | 49 +++++++++++++++++++--------------------
 po/da.po       | 53 +++++++++++++++++++++---------------------
 po/de.po       | 47 ++++++++++++++++++-------------------
 po/es.po       | 73 ++++++++++++++++++++++++++++++++--------------------------
 po/fr.po       | 47 ++++++++++++++++++-------------------
 po/gu.po       | 47 ++++++++++++++++++-------------------
 po/ikiwiki.pot | 44 ++++++++++++++++-------------------
 po/pl.po       | 49 +++++++++++++++++++--------------------
 po/sv.po       | 49 +++++++++++++++++++--------------------
 po/vi.po       | 49 +++++++++++++++++++--------------------
 11 files changed, 276 insertions(+), 280 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 306278343..b9c32cf72 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-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-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"
@@ -188,11 +188,11 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
-msgstr "дискусия"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
+msgstr "Дискусия"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
 #, perl-format
@@ -203,68 +203,68 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Няма „счупени” връзки!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../IkiWiki/Plugin/comments.pm:363
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:368
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 ""
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr ""
 
@@ -452,10 +452,6 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr "Дискусия"
-
 #: ../IkiWiki/Plugin/inline.pm:596
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
@@ -1108,6 +1104,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "дискусия"
+
 #~ msgid "failed to write %s: %s"
 #~ msgstr "грешка при запис на файла „%s”: %s"
 
diff --git a/po/cs.po b/po/cs.po
index 95c316d01..70336e41b 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-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-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"
@@ -185,11 +185,11 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
-msgstr "diskuse"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
+msgstr "Diskuse"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
 #, perl-format
@@ -200,68 +200,68 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Žádné porušené odkazy!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../IkiWiki/Plugin/comments.pm:363
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:368
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 ""
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr ""
 
@@ -446,10 +446,6 @@ msgstr "Přidat nový příspěvek nazvaný:"
 msgid "nonexistant template %s"
 msgstr "neexistující šablona %s"
 
-#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr "Diskuse"
-
 #: ../IkiWiki/Plugin/inline.pm:596
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
@@ -1088,6 +1084,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "diskuse"
+
 #~ msgid "failed to write %s: %s"
 #~ msgstr "nelze zapsat %s: %s"
 
diff --git a/po/da.po b/po/da.po
index 341300cd9..c94b71feb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-0400\n"
 "PO-Revision-Date: 2009-05-28 14:58+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -191,11 +191,11 @@ msgstr ""
 "a>: "
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
-msgstr "diskussion"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
+msgstr "Diskussion"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
 #, perl-format
@@ -206,68 +206,68 @@ msgstr "%s fra %s"
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Ikke-understøttet sideformat %s"
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr "kommentar skal have indhold"
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr "dårligt sidenavn"
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommenterer på %s"
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../IkiWiki/Plugin/comments.pm:363
 #, 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:368
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "kommentarer på side '%s' er lukket"
 
-#: ../IkiWiki/Plugin/comments.pm:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr "kommentar gemt for moderering"
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
 msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn"
 
-#: ../IkiWiki/Plugin/comments.pm:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr "Tilføjede en kommentar"
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Tilføjede en kommentar: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 "du er ikke logget på som en administrator"
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr "Kommentarmoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr "kommentarkoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr "Kommentarer"
 
@@ -388,7 +388,9 @@ msgstr "Kildekode: %s"
 #: ../IkiWiki/Plugin/highlight.pm:122
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
-msgstr "advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel gennemkørsel"
+msgstr ""
+"advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel "
+"gennemkørsel"
 
 #: ../IkiWiki/Plugin/img.pm:62
 msgid "Image::Magick is not installed"
@@ -445,10 +447,6 @@ msgstr "Tilføj nyt indlæg med følgende titel:"
 msgid "nonexistant template %s"
 msgstr "ikke-eksisterende skabelon: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr "Diskussion"
-
 #: ../IkiWiki/Plugin/inline.pm:596
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client ikke fundet, pinger ikke"
@@ -1089,6 +1087,9 @@ msgstr "Hvilken wiki bruger (eller openid) skal være administrator?"
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er domænenavnet på webserveren?"
 
+#~ msgid "discussion"
+#~ msgstr "diskussion"
+
 #~ msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 #~ msgstr "<p class=\"error\">Fejl: %s sluttede med fejl (%s)"
 
diff --git a/po/de.po b/po/de.po
index 8ee9cdb93..ee779c795 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.06\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-0400\n"
 "PO-Revision-Date: 2009-03-02 15:39+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -187,10 +187,10 @@ msgstr ""
 "als Spam ein: "
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
 msgstr "Diskussion"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
@@ -202,71 +202,71 @@ msgstr "%s von %s"
 msgid "There are no broken links!"
 msgstr "Es gibt keine ungültigen Links!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "nicht unterstütztes Seitenformat %s"
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr "Kommentare dürfen nicht leer sein."
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr "Anonymer Benutzer"
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr "fehlerhafter Seitenname"
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommentiere %s"
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../IkiWiki/Plugin/comments.pm:363
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 "Die Seite »%s« existiert nicht, deshalb können Sie sie nicht kommentieren."
 
-#: ../IkiWiki/Plugin/comments.pm:368
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 "Es können keine weiteren Kommentare für die Seite »%s« abgegeben werden."
 
-#: ../IkiWiki/Plugin/comments.pm:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr "Kommentar wurde gespeichert und erwartet Freischaltung."
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 "Ihr Kommentar wird freigegeben, nachdem ein Moderator ihn überprüft hat."
 
-#: ../IkiWiki/Plugin/comments.pm:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr "Kommentar hinzugefügt."
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Kommentar hinzugefügt: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 "Sie sind nicht als Administrator angemeldet"
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr "Kommentarmoderation"
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr "Kommentarmoderation"
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr "Kommentare"
 
@@ -448,10 +448,6 @@ msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 msgid "nonexistant template %s"
 msgstr "nicht-vorhandene Vorlage %s"
 
-#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr "Diskussion"
-
 #: ../IkiWiki/Plugin/inline.pm:596
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
@@ -1102,6 +1098,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "Wie lautet der Domainname des Webservers?"
 
+#~ msgid "discussion"
+#~ msgstr "Diskussion"
+
 #~ msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 #~ msgstr ""
 #~ "<p class=\"error\">Fehler: %s beendete sich mit einem Wert ungleich Null "
diff --git a/po/es.po b/po/es.po
index c029c914e..dda242df9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-0400\n"
 "PO-Revision-Date: 2009-05-25 09:30+0200\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"
@@ -34,7 +34,8 @@ msgstr ""
 
 #: ../IkiWiki/CGI.pm:149
 msgid "login failed, perhaps you need to turn on cookies?"
-msgstr "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
+msgstr ""
+"registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
 
 #: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
 msgid "Your login session has expired."
@@ -70,7 +71,8 @@ msgstr "Contenido añadido activado vía web."
 
 #: ../IkiWiki/Plugin/aggregate.pm:93
 msgid "Nothing to do right now, all feeds are up-to-date!"
-msgstr "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !"
+msgstr ""
+"¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !"
 
 #: ../IkiWiki/Plugin/aggregate.pm:220
 #, perl-format
@@ -192,11 +194,11 @@ 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/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
-msgstr "comentarios"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
+msgstr "Comentarios"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
 #, perl-format
@@ -207,68 +209,68 @@ msgstr "%s desde la página %s"
 msgid "There are no broken links!"
 msgstr "¡ No hay enlaces rotos !"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "formato de página %s no soportado"
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr "Un comentario debe tener algún contenido"
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr "nombre de página erróneo"
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, perl-format
 msgid "commenting on %s"
 msgstr "creando comentarios en la página %s"
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../IkiWiki/Plugin/comments.pm:363
 #, 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:368
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "los comentarios para la página '%s' están cerrados"
 
-#: ../IkiWiki/Plugin/comments.pm:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr "comentario guardado a la espera de aprobación"
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 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:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr "Añadir un comentario"
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Comentario añadido: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 "No está registrado como un administrador"
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr "Aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr "aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr "Comentarios"
 
@@ -359,7 +361,8 @@ msgstr ""
 
 #: ../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"
+msgstr ""
+"Error en el análisis del URL, no puedo determinar el nombre del dominio"
 
 #: ../IkiWiki/Plugin/goto.pm:49
 msgid "missing page"
@@ -389,8 +392,11 @@ msgid "Source code: %s"
 msgstr "Código fuente: %s"
 
 #: ../IkiWiki/Plugin/highlight.pm:122
-msgid "warning: highlight perl module not available; falling back to pass through"
-msgstr "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada para continuar el proceso. "
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+"aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada "
+"para continuar el proceso. "
 
 #: ../IkiWiki/Plugin/img.pm:62
 msgid "Image::Magick is not installed"
@@ -451,10 +457,6 @@ msgstr "Añadir una entrada nueva titulada:"
 msgid "nonexistant template %s"
 msgstr "la plantilla %s no existe "
 
-#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr "Comentarios"
-
 #: ../IkiWiki/Plugin/inline.pm:596
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
@@ -470,7 +472,8 @@ msgstr "La página %s está bloqueada y no puede modificarse"
 
 #: ../IkiWiki/Plugin/mdwn.pm:44
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
-msgstr "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown"
+msgstr ""
+"el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown"
 
 #: ../IkiWiki/Plugin/mdwn.pm:67
 #, perl-format
@@ -892,7 +895,8 @@ msgid "plugins"
 msgstr "complementos"
 
 #: ../IkiWiki/Plugin/websetup.pm:395
-msgid "The configuration changes shown below require a wiki rebuild to take effect."
+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."
@@ -1010,7 +1014,8 @@ msgstr "el programa %s no parece ser ejecutable"
 
 #: ../IkiWiki/Wrapper.pm:20
 msgid "cannot create a wrapper that uses a setup file"
-msgstr "no puedo crear un programa envoltorio que utiliza un archivo de configuración"
+msgstr ""
+"no puedo crear un programa envoltorio que utiliza un archivo de configuración"
 
 #: ../IkiWiki/Wrapper.pm:24
 msgid "wrapper filename not specified"
@@ -1105,3 +1110,5 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#~ msgid "discussion"
+#~ msgstr "comentarios"
diff --git a/po/fr.po b/po/fr.po
index 9e930dd71..9724633c0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.04\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-0400\n"
 "PO-Revision-Date: 2009-03-15 16:10+0100\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -189,10 +189,10 @@ msgstr ""
 "blogspam.net/\">blogspam</a>: "
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
 msgstr "Discussion"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
@@ -204,68 +204,68 @@ msgstr "%s sur %s"
 msgid "There are no broken links!"
 msgstr "Aucun lien cassé !"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr "Format de page non reconnu %s"
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr "Un commentaire doit avoir un contenu."
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr "Nom de page incorrect"
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, perl-format
 msgid "commenting on %s"
 msgstr "Faire un commentaire sur %s"
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../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:368
+#: ../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:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr "Le commentaire a été enregistré en attente de modération"
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
 msgstr "Votre commentaire sera publié après que le modérateur l'ait vérifié"
 
-#: ../IkiWiki/Plugin/comments.pm:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr "Commentaire ajouté"
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Commentaire ajouté : %s"
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 "Vous n'êtes pas authentifié comme administrateur"
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr "Modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr "modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr "Commentaires"
 
@@ -445,10 +445,6 @@ 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:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr "Discussion"
-
 #: ../IkiWiki/Plugin/inline.pm:596
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
@@ -1096,6 +1092,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 "<p class=\"error\">Error: %s exited nonzero (%s)"
 #~ msgstr ""
 #~ "<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero (%"
diff --git a/po/gu.po b/po/gu.po
index f852af0f5..fe42deed4 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-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-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"
@@ -186,10 +186,10 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
 msgstr "ચર્ચા"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
@@ -201,68 +201,68 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "અહીં કોઇ તૂટેલ કડી નથી!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../IkiWiki/Plugin/comments.pm:363
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:368
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 ""
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr ""
 
@@ -447,10 +447,6 @@ msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેર
 msgid "nonexistant template %s"
 msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
 
-#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr "ચર્ચા"
-
 #: ../IkiWiki/Plugin/inline.pm:596
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
@@ -1088,6 +1084,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "ચર્ચા"
+
 #~ msgid "failed to write %s: %s"
 #~ msgstr "%s લખવામાં નિષ્ફળ: %s"
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index d13b3b969..d5e54f468 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-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-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"
@@ -184,10 +184,10 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
@@ -199,68 +199,68 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../IkiWiki/Plugin/comments.pm:363
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:368
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 ""
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr ""
 
@@ -438,10 +438,6 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr ""
-
 #: ../IkiWiki/Plugin/inline.pm:596
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 631aa6260..16f3a18b1 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-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-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"
@@ -190,11 +190,11 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
-msgstr "dyskusja"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
+msgstr "Dyskusja"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
 #, perl-format
@@ -205,68 +205,68 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Wszystkie odnośniki są aktualne!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../IkiWiki/Plugin/comments.pm:363
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:368
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 ""
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr ""
 
@@ -454,10 +454,6 @@ msgstr "Tytuł nowego wpisu"
 msgid "nonexistant template %s"
 msgstr "brakujący szablon %s"
 
-#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr "Dyskusja"
-
 #: ../IkiWiki/Plugin/inline.pm:596
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
@@ -1114,6 +1110,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "dyskusja"
+
 #~ msgid "failed to write %s: %s"
 #~ msgstr "awaria w trakcie zapisu %s: %s"
 
diff --git a/po/sv.po b/po/sv.po
index 8ace97a9d..1951cb91d 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-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-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"
@@ -187,11 +187,11 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
-msgstr "diskussion"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
+msgstr "Diskussion"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
 #, perl-format
@@ -202,68 +202,68 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Det finns inga trasiga länkar!"
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../IkiWiki/Plugin/comments.pm:363
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:368
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 ""
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr ""
 
@@ -449,10 +449,6 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr "Diskussion"
-
 #: ../IkiWiki/Plugin/inline.pm:596
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
@@ -1101,6 +1097,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "diskussion"
+
 #~ msgid "failed to write %s: %s"
 #~ msgstr "misslyckades med att skriva %s: %s"
 
diff --git a/po/vi.po b/po/vi.po
index 219e15c44..1415269f6 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-05-25 09:19+0200\n"
+"POT-Creation-Date: 2009-06-04 13:21-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"
@@ -188,11 +188,11 @@ msgid ""
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
-msgstr "thảo luận"
+#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
+#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149
+msgid "Discussion"
+msgstr "Thảo luận"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:48
 #, perl-format
@@ -203,68 +203,68 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr "Không có liên kết bị ngắt nào."
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38
+#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:129
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:185
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:343
+#: ../IkiWiki/Plugin/comments.pm:345
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/comments.pm:361
+#: ../IkiWiki/Plugin/comments.pm:363
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:368
+#: ../IkiWiki/Plugin/comments.pm:370
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:462
+#: ../IkiWiki/Plugin/comments.pm:464
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:464
+#: ../IkiWiki/Plugin/comments.pm:466
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:477
+#: ../IkiWiki/Plugin/comments.pm:479
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:481
+#: ../IkiWiki/Plugin/comments.pm:483
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:523 ../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 ""
 
-#: ../IkiWiki/Plugin/comments.pm:574
+#: ../IkiWiki/Plugin/comments.pm:576
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:613
+#: ../IkiWiki/Plugin/comments.pm:615
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:764
+#: ../IkiWiki/Plugin/comments.pm:766
 msgid "Comments"
 msgstr ""
 
@@ -452,10 +452,6 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83
-msgid "Discussion"
-msgstr "Thảo luận"
-
 #: ../IkiWiki/Plugin/inline.pm:596
 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"
@@ -1102,6 +1098,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "discussion"
+#~ msgstr "thảo luận"
+
 #~ msgid "failed to write %s: %s"
 #~ msgstr "lỗi ghi %s: %s"
 
-- 
cgit v1.2.3


From e78883e07fc518cea2315b3765631d747550905a Mon Sep 17 00:00:00 2001
From: Lunar <lunar@qamar.(none)>
Date: Fri, 5 Jun 2009 13:22:03 +0200
Subject: Some thoughts on how to disable 'Preferences' link when irrelevant

---
 doc/todo/Allow_disabling_edit_and_preferences_links.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn b/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn
index a356c69df..5b9cc8742 100644
--- a/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn
+++ b/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn
@@ -52,3 +52,18 @@ Patch:
 >>> is not controlled by any plugin.  It would be nice if it were; I am
 >>> trying to achieve a configuration where the only action supported
 >>> via CGI is blog-style comments.  --[Zack](http://zwol.livejournal.com/)
+
+>>> Like [[puck]], I'd like to keep search available but I want to disable all
+>>> login facitilities and thus disable the "Preferences" link.
+>>>
+>>> After digging a little bit in the source code, my first attempt was to make
+>>> the "Preferences" link appear only if there is `sessioncgi` hooks
+>>> registered.  But this will not work as the [[plugins/inline]] plugin also
+>>> defines it.
+>>>
+>>> Looking for `auth` hooks currently would not work as at least
+>>> [[plugins/passwordauth]] does not register one.
+>>>
+>>> Adding a new `canlogin` hook looks like overkill to me.  [[Joey]], how
+>>> about making registration of the `auth` hook mandatory for all plugins
+>>> making sense of the "Preferences" link? --[[Lunar]]
-- 
cgit v1.2.3


From 52b635c70827ef2cab65a97097e5896e9f7adf90 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 13:55:48 -0400
Subject: Fixed a wikilink.

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

diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn
index 77d94d450..420898d09 100644
--- a/doc/plugins/txt.mdwn
+++ b/doc/plugins/txt.mdwn
@@ -8,7 +8,7 @@ Unlike other [[type/format]] plugins, no formatting of markup in
 txt files is done; the file contents is displayed to the user as-is,
 with html markup characters such as ">" escaped.
 
-The only exceptions are that [[WikiLinks|WikiLink]] and
+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.
-- 
cgit v1.2.3


From 9362aa77563bc0a0f72e8ae1a31b8b0721a08fbf Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:31:16 -0400
Subject: Test the more plugin.

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

diff --git a/doc/plugins/more/discussion.mdwn b/doc/plugins/more/discussion.mdwn
new file mode 100644
index 000000000..f369d1e12
--- /dev/null
+++ b/doc/plugins/more/discussion.mdwn
@@ -0,0 +1,7 @@
+# Test:
+
+[[!more  linktext="click for more" text="""
+This is the rest of my post. Not intended for people catching up on
+their blogs at 30,000 feet. Because I like to make things
+difficult.
+"""]]
-- 
cgit v1.2.3


From c873dd03b8ee390e2e036c98fcf0748da39e35be Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:37:14 -0400
Subject: Report the failed test of the "more" plugin.

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

diff --git a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
new file mode 100644
index 000000000..5a501fe0e
--- /dev/null
+++ b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
@@ -0,0 +1,10 @@
+As one can see at [[plugins/more/discussion]], the [[plugins/more]] doesn't work --- it renders as:
+
+  <p><a name="more"></a></p>
+  
+  <p>This is the rest of my post. Not intended for people catching up on
+  their blogs at 30,000 feet. Because I like to make things
+  difficult.</p>
+
+No way to toggle visibility.
+-- Ivan Z.
-- 
cgit v1.2.3


From 08b5581b92277faaad95ff4ecf187be9bafef3bc Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:38:49 -0400
Subject: minor: Formatting the code.

---
 doc/bugs/__34__more__34___doesn__39__t_work.mdwn | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
index 5a501fe0e..731d6a3bb 100644
--- a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
+++ b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
@@ -1,10 +1,10 @@
 As one can see at [[plugins/more/discussion]], the [[plugins/more]] doesn't work --- it renders as:
 
-  <p><a name="more"></a></p>
-  
-  <p>This is the rest of my post. Not intended for people catching up on
-  their blogs at 30,000 feet. Because I like to make things
-  difficult.</p>
+    <p><a name="more"></a></p>
+    
+    <p>This is the rest of my post. Not intended for people catching up on
+    their blogs at 30,000 feet. Because I like to make things
+    difficult.</p>
 
 No way to toggle visibility.
 -- Ivan Z.
-- 
cgit v1.2.3


From 7158fab372e94bfd8f1cd7d16756b80df55d876a Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:41:05 -0400
Subject: minor: Style.

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

diff --git a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
index 731d6a3bb..fbe285485 100644
--- a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
+++ b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
@@ -1,4 +1,4 @@
-As one can see at [[plugins/more/discussion]], the [[plugins/more]] doesn't work --- it renders as:
+As one can see at [[plugins/more/discussion]], the [[plugins/more]] plugin doesn't work --- it renders as:
 
     <p><a name="more"></a></p>
     
-- 
cgit v1.2.3


From c715c20fde41404fc635389676cc47ad30b5a911 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:49:39 -0400
Subject: Put wikilink on a useful term (perhaps, someday there is an
 explanation there about all relevant stuff about anchors in ikiwiki).

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

diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index 371c2528f..69247f3ed 100644
--- a/doc/ikiwiki/wikilink.mdwn
+++ b/doc/ikiwiki/wikilink.mdwn
@@ -20,8 +20,8 @@ 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]].
 
-To link to an anchor inside a page, you can use something like
-`\[[WikiLink#foo]]`
+To link to an [[ikiwiki/anchor]] inside a page, you can use something like
+`\[[WikiLink#foo]]` .
 
 ## Directives and WikiLinks
 
-- 
cgit v1.2.3


From 62bec4f47b6c447f38428bfeaf19d383b43ed922 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:50:53 -0400
Subject: Added a keyword to the description, so that this plugin can be found
 by searching.

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

diff --git a/doc/plugins/contrib/headinganchors.mdwn b/doc/plugins/contrib/headinganchors.mdwn
index c80cc0b49..0b007f00e 100644
--- a/doc/plugins/contrib/headinganchors.mdwn
+++ b/doc/plugins/contrib/headinganchors.mdwn
@@ -1,6 +1,6 @@
 [[!template id=plugin name=headinganchors author="[[PaulWise]]"]]
 
-This is a simple plugin to add ids to all headings, based on their text. It
+This is a simple plugin to add ids (which will server as [[ikiwiki/anchor]]s) to all headings, based on their text. It
 works as a postprocessing filter, allowing it to work on mdwn, wiki, html,
 rst and any other format that produces html. The code is available here:
 
-- 
cgit v1.2.3


From 91edfd285126e832812e027cea60b87f808cb4aa Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:55:27 -0400
Subject: A suggestion to simply extract/merge this functionality from/with
 another plugin.

---
 doc/plugins/contrib/headinganchors/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/plugins/contrib/headinganchors/discussion.mdwn

diff --git a/doc/plugins/contrib/headinganchors/discussion.mdwn b/doc/plugins/contrib/headinganchors/discussion.mdwn
new file mode 100644
index 000000000..a5e4dd54f
--- /dev/null
+++ b/doc/plugins/contrib/headinganchors/discussion.mdwn
@@ -0,0 +1 @@
+Isn't this functionality a part of what [[plugins/toc]] needs and does? Then probably the [[plugins/toc]] plugin's code could be split into the part that implements the [[plugins.contrib/headinganchors]]'s functionality and the TOC generation itself. That will bring more order into the code and the set of available plugins. --Ivan Z.
-- 
cgit v1.2.3


From 30d23b969ea85a4a4472d6c64d3e99060b79d7f3 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:56:41 -0400
Subject: Fixed a wikilink target.

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

diff --git a/doc/plugins/contrib/headinganchors/discussion.mdwn b/doc/plugins/contrib/headinganchors/discussion.mdwn
index a5e4dd54f..91fe04a6d 100644
--- a/doc/plugins/contrib/headinganchors/discussion.mdwn
+++ b/doc/plugins/contrib/headinganchors/discussion.mdwn
@@ -1 +1 @@
-Isn't this functionality a part of what [[plugins/toc]] needs and does? Then probably the [[plugins/toc]] plugin's code could be split into the part that implements the [[plugins.contrib/headinganchors]]'s functionality and the TOC generation itself. That will bring more order into the code and the set of available plugins. --Ivan Z.
+Isn't this functionality a part of what [[plugins/toc]] needs and does? Then probably the [[plugins/toc]] plugin's code could be split into the part that implements the [[plugins/contrib/headinganchors]]'s functionality and the TOC generation itself. That will bring more order into the code and the set of available plugins. --Ivan Z.
-- 
cgit v1.2.3


From 891ccea06ff5b7046c2bd5883bddb3787ae39511 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:57:14 -0400
Subject: Added a wikilink on a term (to keep track of the discussions of
 anchors).

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

diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index 0677ff7de..89ea3d475 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -1,4 +1,4 @@
-# Creating an anchor in Markdown
+# Creating an [[ikiwiki/anchor]] in Markdown
 
 Is it a native Markdown "tag" for creating an anchor? Unfortunately,
 I haven't any information about it at
-- 
cgit v1.2.3


From 3b1dd0facb9b80ece84ff5f02df1a67e90484964 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:58:29 -0400
Subject: Created the page, so that one can inspect the backlinks.

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

diff --git a/doc/ikiwiki/anchor.mdwn b/doc/ikiwiki/anchor.mdwn
new file mode 100644
index 000000000..012e52fa0
--- /dev/null
+++ b/doc/ikiwiki/anchor.mdwn
@@ -0,0 +1,3 @@
+ikiwiki works with anchors in various situations.
+
+This page accumulates links to the concept of anchors.
-- 
cgit v1.2.3


From ba78867d7385e9dba5c8074b86ea42dacd528afd Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 14:59:56 -0400
Subject: minor formatting issue: Having a wikilink in the heading was not very
 nice.

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

diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index 89ea3d475..ac32834b2 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -1,6 +1,6 @@
 # Creating an [[ikiwiki/anchor]] in Markdown
 
-Is it a native Markdown "tag" for creating an anchor? Unfortunately,
+Is it a native Markdown "tag" for creating an [[ikiwiki/anchor]]? Unfortunately,
 I haven't any information about it at
 [Markdown syntax](http://daringfireball.net/projects/markdown/syntax) page.
 
-- 
cgit v1.2.3


From 1d57a21c987a5e970df01efe10acdf69982c2d61 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Jun 2009 15:04:49 -0400
Subject: close

---
 doc/bugs/__34__more__34___doesn__39__t_work.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
index fbe285485..45757f9e4 100644
--- a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
+++ b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
@@ -8,3 +8,8 @@ As one can see at [[plugins/more/discussion]], the [[plugins/more]] plugin doesn
 
 No way to toggle visibility.
 -- Ivan Z.
+
+> More is not about toggling visibility. Perhaps you want
+> [[ikiwiki/plugins/toggle]]? More is about displaying the whole page
+> content when it's a standalone page, and only displaying a fragment when
+> it's inlined into a blog. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 763f4b91da9bb8701b3000a1290a1d5f22850551 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Jun 2009 16:10:08 -0400
Subject: add test case for unterminated """ string

A directive that contains an unterminated """ string should not
cause each word of the string to be treated as a bare word. Instead,
the directive should fail to parse.

There are two tests. One just checks that a complete directive
containing such a string fails to parse. The other checks for a case
where a directive ends with a very long unterminated """ string,
and the directive is itself not closed. While this test won't fail,
it does trigger a nasty perl warning.
---
 t/preprocess.t | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/t/preprocess.t b/t/preprocess.t
index 7699f56ba..e5026ed64 100755
--- a/t/preprocess.t
+++ b/t/preprocess.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 19;
+use Test::More tests => 21;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -51,6 +51,11 @@ is(IkiWiki::preprocess("foo", "foo", '[[foo a="""'.$multiline.'""" b="foo"]]', 0
 	"foo(a => $multiline, b => foo)");
 is(IkiWiki::preprocess("foo", "foo", '[[foo a="""'."\n".$multiline."\n".'""" b="foo"]]', 0, 0),
 	"foo(a => $multiline, b => foo)", "leading/trailing newline stripped");
+my $long='[[foo a="""'.("a" x 100000).'';
+is(IkiWiki::preprocess("foo", "foo", $long, 0, 0), $long,
+	"unterminated triple-quoted string inside unterminated directive(should not warn about over-recursion)");
+is(IkiWiki::preprocess("foo", "foo", $long."]]", 0, 0), $long."]]",
+	"unterminated triple-quoted string is not treated as a bare word");
 
 TODO: {
 	local $TODO = "nested strings not yet implemented";
-- 
cgit v1.2.3


From bd78168f71c078c481f6afca899796390133e09e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Jun 2009 16:14:51 -0400
Subject: Tighten up matching of bare words inside directives

Do not allow an unterminated """ string to be treated as a series of bare
words. Fixes runaway regexp recursion/backtracking in strange situations.

(See 1d57a21c987a5e970df01efe10acdf69982c2d61 for test case.)
---
 IkiWiki.pm       | 4 ++--
 debian/changelog | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 061a1c6db..d7c827c89 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1253,7 +1253,7 @@ sub preprocess ($$$;$$) {
 						|
 						"[^"]+"		# single-quoted value
 						|
-						[^\s\]]+	# unquoted value
+						[^"\s\]]+	# unquoted value
 					)
 					\s*			# whitespace or end
 								# of directive
@@ -1276,7 +1276,7 @@ sub preprocess ($$$;$$) {
 						|
 						"[^"]+"		# single-quoted value
 						|
-						[^\s\]]+	# unquoted value
+						[^"\s\]]+	# unquoted value
 					)
 					\s*			# whitespace or end
 								# of directive
diff --git a/debian/changelog b/debian/changelog
index be1db6f3c..bbc9b2c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ ikiwiki (3.15) UNRELEASED; urgency=low
   * 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 """ string to be treated as a series
+    of bare words. Fixes runaway regexp recursion/backtracking
+    in strange situations.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 
-- 
cgit v1.2.3


From dd4e363215ace3ae1ced460ddc4d84b496110f2e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Jun 2009 16:18:19 -0400
Subject: remove link to page outside the base wiki

I'm sorry, but you can't simply go around adding links to pages that are
part of the basewiki, that point to pages outside the basewiki. Doing
so causes the test suite to fail, since the basewiki is then not
self-contained and has broken links.

FYI, the ikiwiki/anchor page you added is not part of the basewiki because
there's not a symlink to it in underlays/basewiki/ikiwiki in ikiwiki's
source. And I can't condone cluttering up the basewiki with such a page,
at least unless it gets significantly more useful somehow.
---
 doc/ikiwiki/wikilink.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index 69247f3ed..f561d5850 100644
--- a/doc/ikiwiki/wikilink.mdwn
+++ b/doc/ikiwiki/wikilink.mdwn
@@ -20,7 +20,7 @@ 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]].
 
-To link to an [[ikiwiki/anchor]] inside a page, you can use something like
+To link to an anchor inside a page, you can use something like
 `\[[WikiLink#foo]]` .
 
 ## Directives and WikiLinks
-- 
cgit v1.2.3


From df20a91bc9efe48cb96ecb7efd39643a816dd489 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Jun 2009 16:24:46 -0400
Subject: move anchor page out of ikiwiki subdir

Since this page is not in the basewiki, it is confusing to put it in
the ikiwiki subdir, which is intended for basewiki and other underlay pages
that are used to document ikiwiki on other wikis.
---
 doc/anchor.mdwn                         | 3 +++
 doc/ikiwiki/anchor.mdwn                 | 3 ---
 doc/ikiwiki/wikilink/discussion.mdwn    | 4 ++--
 doc/plugins/contrib/headinganchors.mdwn | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 doc/anchor.mdwn
 delete mode 100644 doc/ikiwiki/anchor.mdwn

diff --git a/doc/anchor.mdwn b/doc/anchor.mdwn
new file mode 100644
index 000000000..012e52fa0
--- /dev/null
+++ b/doc/anchor.mdwn
@@ -0,0 +1,3 @@
+ikiwiki works with anchors in various situations.
+
+This page accumulates links to the concept of anchors.
diff --git a/doc/ikiwiki/anchor.mdwn b/doc/ikiwiki/anchor.mdwn
deleted file mode 100644
index 012e52fa0..000000000
--- a/doc/ikiwiki/anchor.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-ikiwiki works with anchors in various situations.
-
-This page accumulates links to the concept of anchors.
diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index ac32834b2..b146c9447 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -1,6 +1,6 @@
-# Creating an [[ikiwiki/anchor]] in Markdown
+# Creating an [[anchor]] in Markdown
 
-Is it a native Markdown "tag" for creating an [[ikiwiki/anchor]]? Unfortunately,
+Is it a native Markdown "tag" for creating an [[anchor]]? Unfortunately,
 I haven't any information about it at
 [Markdown syntax](http://daringfireball.net/projects/markdown/syntax) page.
 
diff --git a/doc/plugins/contrib/headinganchors.mdwn b/doc/plugins/contrib/headinganchors.mdwn
index 0b007f00e..becbf89a5 100644
--- a/doc/plugins/contrib/headinganchors.mdwn
+++ b/doc/plugins/contrib/headinganchors.mdwn
@@ -1,6 +1,6 @@
 [[!template id=plugin name=headinganchors author="[[PaulWise]]"]]
 
-This is a simple plugin to add ids (which will server as [[ikiwiki/anchor]]s) to all headings, based on their text. It
+This is a simple plugin to add ids (which will serve as [[anchor]]s) to all headings, based on their text. It
 works as a postprocessing filter, allowing it to work on mdwn, wiki, html,
 rst and any other format that produces html. The code is available here:
 
-- 
cgit v1.2.3


From 9e74d600575f59456fa46df22f8be1ec411c9200 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Jun 2009 16:33:07 -0400
Subject: add note about the basewiki being self contained

---
 doc/basewiki.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/basewiki.mdwn b/doc/basewiki.mdwn
index c61ae3dba..8392884eb 100644
--- a/doc/basewiki.mdwn
+++ b/doc/basewiki.mdwn
@@ -18,3 +18,9 @@ It currently includes these pages:
 
 As well as a few other files, like [[favicon.ico]], [[local.css]],
 [[style.css]], and some icons.
+
+Note that an important property of the basewiki is that it should be
+self-contained. That means that the pages listed above cannot link
+to pages outside the basewiki. Ikiwiki's test suite checks that the
+basewiki is self-contained, and from time to time links have to be
+removed (or replaced with `iki` [[shortcuts]]) to keep this invariant.
-- 
cgit v1.2.3


From e8bd089583597539e37bdf1634741f2686947490 Mon Sep 17 00:00:00 2001
From: "http://lj.rossia.org/users/imz/" <http://lj.rossia.org/users/imz/@web>
Date: Fri, 5 Jun 2009 16:38:13 -0400
Subject: thanks.

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

diff --git a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
index 45757f9e4..e354e503a 100644
--- a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
+++ b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
@@ -13,3 +13,5 @@ No way to toggle visibility.
 > [[ikiwiki/plugins/toggle]]? More is about displaying the whole page
 > content when it's a standalone page, and only displaying a fragment when
 > it's inlined into a blog. --[[Joey]] [[done]]
+
+>> I see, thanks for bothering with the reply, I didn't understand this. --Ivan Z.
-- 
cgit v1.2.3


From 0293ae8e3d8e7dfd0a92bf20aa4c3d28e2d78ddb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Jun 2009 16:58:06 -0400
Subject: 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

---
 IkiWiki/Setup/Automator.pm | 23 +++++++++++++++++++++++
 debian/changelog           |  4 ++++
 2 files changed, 27 insertions(+)

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 5111541e4..742d67666 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -98,6 +98,29 @@ sub import (@) {
 		}
 	}
 
+	# Make sure that all the listed plugins can load
+	# and checkconfig is ok. If a plugin fails to work,
+	# remove it from the configuration and keep on truckin'.
+	my %bakconfig=%config; # checkconfig can modify %config so back up
+	if (! eval { IkiWiki::loadplugins(); IkiWiki::checkconfig() }) {
+		foreach my $plugin (@{$config{default_plugins}}, @{$bakconfig{add_plugins}}) {
+			eval {
+				# delete all hooks so that only this plugins's
+				# checkconfig will be run
+				%IkiWiki::hooks=();
+				IkiWiki::loadplugin($plugin);
+				IkiWiki::run_hooks(checkconfig => sub { shift->() });
+			};
+			if ($@) {
+				print STDERR sprintf(gettext("** Disabling plugin %s, since it is failing with this message:"),
+					$plugin)."\n";
+				print STDERR "$@\n";
+				push @{$bakconfig{disable_plugins}}, $plugin;
+			}
+		}
+	}
+	%config=%bakconfig;
+
 	# Generate setup file.
 	require IkiWiki::Setup;
 	IkiWiki::Setup::dump($config{dumpsetup});
diff --git a/debian/changelog b/debian/changelog
index bbc9b2c15..7d0fb5c80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ ikiwiki (3.15) UNRELEASED; urgency=low
     allow an unterminated """ 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
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 
-- 
cgit v1.2.3


From e27aaf967c52eac70452911d6623defcaa95ddf7 Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Fri, 5 Jun 2009 17:50:43 -0400
Subject: pagecount incorrectly claims there are 0 pages ...

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

diff --git a/doc/bugs/pagecount_is_broken.mdwn b/doc/bugs/pagecount_is_broken.mdwn
new file mode 100644
index 000000000..179981855
--- /dev/null
+++ b/doc/bugs/pagecount_is_broken.mdwn
@@ -0,0 +1 @@
+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)
-- 
cgit v1.2.3


From 8d7488823582d63948a856222f275a01ac1939a2 Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Fri, 5 Jun 2009 17:52:54 -0400
Subject: fixed link

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

diff --git a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
index e354e503a..b2d929f13 100644
--- a/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
+++ b/doc/bugs/__34__more__34___doesn__39__t_work.mdwn
@@ -10,7 +10,7 @@ No way to toggle visibility.
 -- Ivan Z.
 
 > More is not about toggling visibility. Perhaps you want
-> [[ikiwiki/plugins/toggle]]? More is about displaying the whole page
+> [[plugins/toggle]] More is about displaying the whole page
 > content when it's a standalone page, and only displaying a fragment when
 > it's inlined into a blog. --[[Joey]] [[done]]
 
-- 
cgit v1.2.3


From e8d8386e5258c055f253b20ad717461972b11c7d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Jun 2009 18:04:39 -0400
Subject: pagecount: Fix broken optimisation for * pagespec.

---
 IkiWiki/Plugin/pagecount.pm       | 9 +++++++--
 debian/changelog                  | 1 +
 doc/bugs/pagecount_is_broken.mdwn | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 1955603b0..5a2301af4 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -26,8 +26,13 @@ sub preprocess (@) {
 	# register a dependency.
 	add_depends($params{page}, $params{pages});
 	
-	my @pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page})
-		if $params{pages} ne "*"; # optimisation;
+	my @pages;
+	if ($params{pages} eq "*") {
+		@pages=keys %pagesources;
+	}
+	else {
+		@pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page});
+	}
 	return $#pages+1;
 }
 
diff --git a/debian/changelog b/debian/changelog
index 7d0fb5c80..df4429326 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.15) UNRELEASED; urgency=low
     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
+  * pagecount: Fix broken optimisation for * pagespec.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 
diff --git a/doc/bugs/pagecount_is_broken.mdwn b/doc/bugs/pagecount_is_broken.mdwn
index 179981855..101230d94 100644
--- a/doc/bugs/pagecount_is_broken.mdwn
+++ b/doc/bugs/pagecount_is_broken.mdwn
@@ -1 +1,3 @@
 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 07b61ec8b6994fac49ba5f0e22397e8fb143bf87 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Jun 2009 02:25:25 -0400
Subject: add

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

diff --git a/doc/bugs/goto_with_bad_page_name.mdwn b/doc/bugs/goto_with_bad_page_name.mdwn
new file mode 100644
index 000000000..722c4e266
--- /dev/null
+++ b/doc/bugs/goto_with_bad_page_name.mdwn
@@ -0,0 +1,23 @@
+If goto is passed a page name that 
+contains spaces or is otherwise not a valid page name,
+it will display a "page does not exist", with a create link. But,
+clicking on the link will result in "bad page name".
+
+I have found at least two ways it can happen:
+
+* If 404 is enabled, and the user goes to "http://wiki/some page with spaces"
+* If mercurial is used, it pulls the user's full name, with spaces,
+  out for `rcs_recentchanges` and that ends up on RecentChanges.
+
+When fixing, need to keep in mind that we can't just run the input through
+titlepage, since in all other circumstances, the page name is already valid
+and we don't want to doubly-encode it.
+
+Seems like the goto plugin needs to check if the page name is valid and
+pass it through titlepage if not.
+
+(As a side effect of this, 404 will start redirecting "http://wiki/some page
+with spaces" to "http://wiki/some_page_with_spaces", if the latter exists.
+That seems like a fairly good thing.)
+
+--[[Joey]] 
-- 
cgit v1.2.3


From e40d2a6b2b1bdf677f11cc4a71595acf609d1e75 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Jun 2009 02:36:40 -0400
Subject: 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.

---
 IkiWiki/Plugin/goto.pm                | 6 ++++++
 debian/changelog                      | 4 ++++
 doc/bugs/goto_with_bad_page_name.mdwn | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 3f40c5859..2e2dc04a1 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -32,6 +32,12 @@ sub cgi_goto ($;$) {
 		}
 	}
 
+	# It's possible that $page is not a valid page name;
+	# if so attempt to turn it into one.
+	if ($page !~ /$config{wiki_file_regexp}/) {
+		$page=titlepage($page);
+	}
+
 	IkiWiki::loadindex();
 
 	# If the page is internal (like a comment), see if it has a
diff --git a/debian/changelog b/debian/changelog
index df4429326..7f8257813 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ ikiwiki (3.15) UNRELEASED; urgency=low
     fails for any reason, disable it in the generated file.
     Closes: 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.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 
diff --git a/doc/bugs/goto_with_bad_page_name.mdwn b/doc/bugs/goto_with_bad_page_name.mdwn
index 722c4e266..bc462c840 100644
--- a/doc/bugs/goto_with_bad_page_name.mdwn
+++ b/doc/bugs/goto_with_bad_page_name.mdwn
@@ -20,4 +20,6 @@ pass it through titlepage if not.
 with spaces" to "http://wiki/some_page_with_spaces", if the latter exists.
 That seems like a fairly good thing.)
 
+[[done]]
+
 --[[Joey]] 
-- 
cgit v1.2.3