From fa59bfad847a9895a37803bc21fb28a27f0fc368 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/lingo.t.l.chen"
 <http://www.google.com/profiles/lingo.t.l.chen@web>
Date: Sat, 9 Jan 2010 13:56:39 +0000
Subject:

---
 doc/bugs/utf-8_bug_in_websetup.pm.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
index efa2c9ffe..c3a5262cd 100644
--- a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
+++ b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
@@ -1,4 +1,4 @@
-[[!tag patch]]
+[[!tag patch bugs]]
 
 I type chinese characters into the fields. After press "save setup" button the characters turn into gibberish.
 
-- 
cgit v1.2.3


From a8258dea709c801b148635feaa78bf99e077c5a6 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 19:47:32 +0000
Subject: new forum thread

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

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
new file mode 100644
index 000000000..2ec18d3a5
--- /dev/null
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -0,0 +1,9 @@
+how can I create a link to an image which is part of the wiki, without having it inserted in my page?
+
+I tought this:
+
+[[look at this|img/lolcat.png]] 
+
+would work, but it doesn't.
+
+Any hints?
-- 
cgit v1.2.3


From 3d729ee170ef7a3c1ac5210fd1b648ea1128f73d Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 19:48:19 +0000
Subject: corrected wikilink text

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

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 2ec18d3a5..ce7baba50 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -2,7 +2,7 @@ how can I create a link to an image which is part of the wiki, without having it
 
 I tought this:
 
-[[look at this|img/lolcat.png]] 
+    \[[look at this|img/lolcat.png]] 
 
 would work, but it doesn't.
 
-- 
cgit v1.2.3


From a0e06556db4a5c67f1fdf6f6dc4b6d275137b996 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 15:50:40 -0500
Subject: response

---
 ..._image_inside_the_wiki_without_inlining_it.mdwn | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index ce7baba50..f58b6b359 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -7,3 +7,35 @@ I tought this:
 would work, but it doesn't.
 
 Any hints?
+
+> Well, currently the syntax above will display the image
+> inline with the specified link text used as an alt attribute. Although
+> that does not seem to be documented anywhere.
+> 
+> A few places that use that (found with `git grep '\[\[' | egrep 'png|gif|jpeg|jpg' |grep \|`):
+> 
+> * [[logos]] uses it to provide useful alt texts for the logos. (This
+>   could easily be changed to use [[ikiwiki/directives/img]] though.)
+> * The `change.tmpl` template uses it to display 
+>   the [[diff|wikiicons/diff.png]] with a very useful "diff" alt text.
+>   Using [[ikiwiki/directives/img]] here would mean that the
+>   [[ikiwiki/plugins/recentchanges]] plugin would depend upon the img
+>   plugin.
+> 
+> I do like your suggestion, it makes more sense than the current behavior.
+> I'm not sure the transition pain to get from here to there is worth it,
+> though.
+> 
+> More broadly, if I were writing ikiwiki now, I might choose to leave out the
+> auto-inlining of images altogether. In practice, it has added a certian level
+> of complexity to ikiwiki, with numerous plugins needing to specify
+> `noimageinline` to avoid accidentially inlining an image. And there has not
+> been a lot of payoff from having the auto-inlining feature implicitly
+> available most places. And the img directive allows much needed control over
+> display, so it would be better for users to not have to worry about its
+> lesser cousin. But the transition from here to *there* would be another order
+> of pain.
+> 
+> Anyway, the cheap and simple answer to your question is to use html
+> or markdown instead of a [[ikiwiki/wikilink]]. Ie, 
+> `[look at this](img/lolcat.jpg)`. --[[Joey]]
-- 
cgit v1.2.3


From fb0524bd9be5f47cd71d89e2443665dd65d66c0f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 15:51:31 -0500
Subject: links

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

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index f58b6b359..91573d4b5 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -14,12 +14,12 @@ Any hints?
 > 
 > A few places that use that (found with `git grep '\[\[' | egrep 'png|gif|jpeg|jpg' |grep \|`):
 > 
-> * [[logos]] uses it to provide useful alt texts for the logos. (This
+> * [[logo]] uses it to provide useful alt texts for the logos. (This
 >   could easily be changed to use [[ikiwiki/directives/img]] though.)
 > * The `change.tmpl` template uses it to display 
 >   the [[diff|wikiicons/diff.png]] with a very useful "diff" alt text.
 >   Using [[ikiwiki/directives/img]] here would mean that the
->   [[ikiwiki/plugins/recentchanges]] plugin would depend upon the img
+>   [[plugins/recentchanges]] plugin would depend upon the img
 >   plugin.
 > 
 > I do like your suggestion, it makes more sense than the current behavior.
-- 
cgit v1.2.3


From 9d673e31e755a0e1595d3472de12937517d3a24a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 15:51:52 -0500
Subject: links

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

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 91573d4b5..8a7fd7a29 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -15,10 +15,10 @@ Any hints?
 > A few places that use that (found with `git grep '\[\[' | egrep 'png|gif|jpeg|jpg' |grep \|`):
 > 
 > * [[logo]] uses it to provide useful alt texts for the logos. (This
->   could easily be changed to use [[ikiwiki/directives/img]] though.)
+>   could easily be changed to use [[ikiwiki/directive/img]] though.)
 > * The `change.tmpl` template uses it to display 
 >   the [[diff|wikiicons/diff.png]] with a very useful "diff" alt text.
->   Using [[ikiwiki/directives/img]] here would mean that the
+>   Using [[ikiwiki/directive/img]] here would mean that the
 >   [[plugins/recentchanges]] plugin would depend upon the img
 >   plugin.
 > 
-- 
cgit v1.2.3


From d249f674161bcee5ee7387dfe2600e9e20292bc8 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 21:11:25 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 8a7fd7a29..67bb7f85f 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -6,7 +6,7 @@ I tought this:
 
 would work, but it doesn't.
 
-Any hints?
+Any hints? --[[jerojasro]]
 
 > Well, currently the syntax above will display the image
 > inline with the specified link text used as an alt attribute. Although
@@ -39,3 +39,6 @@ Any hints?
 > Anyway, the cheap and simple answer to your question is to use html
 > or markdown instead of a [[ikiwiki/wikilink]]. Ie, 
 > `[look at this](img/lolcat.jpg)`. --[[Joey]]
+
+> > thanks a lot, that's a quite straightforward solution. I actually wrote a
+> > broken plugin to do that, and now I can ditch it --[[jerojasro]]
-- 
cgit v1.2.3


From fe0f6866841d6fb6e85dec42e88c56114d98e7f4 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 21:12:00 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/users/jerojasro.mdwn b/doc/users/jerojasro.mdwn
new file mode 100644
index 000000000..4b331a0b9
--- /dev/null
+++ b/doc/users/jerojasro.mdwn
@@ -0,0 +1 @@
+Javier Rojas
-- 
cgit v1.2.3


From 59d929d6b1271c84c6d17ffbff65b57bf67d49e6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 16:20:09 -0500
Subject: websetup: Fix utf-8 problems.

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

(limited to 'doc')

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 9edd22d26..75aa3681c 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -139,7 +139,11 @@ sub showfields ($$$@) {
 		my $value=$config{$key};
 
 		if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
-			$value=[(ref $value eq 'ARRAY' ? @{$value} : ""), "", ""]; # blank items for expansion
+			$value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) }  @{$value} : ""),
+				"", ""]; # blank items for expansion
+		}
+		else {
+			$value=Encode::encode_utf8($value);
 		}
 
 		if ($info{type} eq "string") {
@@ -290,7 +294,6 @@ sub showform ($$) {
 		shift->(form => $form, cgi => $cgi, session => $session,
 			buttons => $buttons);
 	});
-	IkiWiki::decode_form_utf8($form);
 
 	my %fields=showfields($form, undef, undef, IkiWiki::getsetup());
 	
@@ -308,6 +311,8 @@ sub showform ($$) {
 			$fields{$_}=$shown{$_} foreach keys %shown;
 		}
 	}
+
+	IkiWiki::decode_form_utf8($form);
 	
 	if ($form->submitted eq "Cancel") {
 		IkiWiki::redirect($cgi, $config{url});
diff --git a/debian/changelog b/debian/changelog
index 4f7c1a60c..5d5cdd564 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
     are disabled.
   * comments: Fix permalinks for comments using new conflict-free filenames.
   * img: Support alignment of images with captions. (Giuseppe Bilotta)
+  * websetup: Fix utf-8 problems.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
diff --git a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
index c3a5262cd..debedb01c 100644
--- a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
+++ b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn
@@ -4,6 +4,8 @@ I type chinese characters into the fields. After press "save setup" button the c
 
 I submit a patch that solve the problem for me.  --Lingo
 
+> Fully fixing it is slightly more complex, but now [[done]] --[[Joey]] 
+
 ----
 
     --- websetup.pm	2009-12-02 05:07:46.000000000 +0800
-- 
cgit v1.2.3


From cebf8784f02d4706de4b98b76a8153cc32ff09b9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 16:30:26 -0500
Subject: followup

---
 .../link_to_an_image_inside_the_wiki_without_inlining_it.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 67bb7f85f..045f8cc68 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -42,3 +42,14 @@ Any hints? --[[jerojasro]]
 
 > > thanks a lot, that's a quite straightforward solution. I actually wrote a
 > > broken plugin to do that, and now I can ditch it --[[jerojasro]]
+
+>>> The plugin approach is not a bad idea if you want either the ability
+>>> to:
+>>>
+>>> * Have things that are wikilink-aware (like [[plugins/brokenlinks]]
+>>>   treat your link to the image as a wikilink. 
+>>> * Use standard wikilink path stuff (and not have to worry about 
+>>>   a raw html link breaking if the page it's on is inlined, for
+>>>   example).
+>>>
+>>> I can help you bang that plugin into shape if need be. --[[Joey]] 
-- 
cgit v1.2.3


From 10ca7c8f8ac2801ce50a362c58a3561add0b057e Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 21:33:05 +0000
Subject: details about user jerojasro

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

(limited to 'doc')

diff --git a/doc/users/jerojasro.mdwn b/doc/users/jerojasro.mdwn
index 4b331a0b9..e2e620d3f 100644
--- a/doc/users/jerojasro.mdwn
+++ b/doc/users/jerojasro.mdwn
@@ -1 +1,3 @@
 Javier Rojas
+
+I keep a personal [wiki](http://devnull.li/~jerojasro/wiki) and my [blog](http://devnull.li/~jerojasro/blog) in ikiwiki.
-- 
cgit v1.2.3


From cf7d03ec80e168ad18d65a90842773da353ee060 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 9 Jan 2010 22:57:11 +0100
Subject: fixed bug in my po branch, please pull

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

(limited to 'doc')

diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index ae59e14c2..55968e3d7 100644
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -2,3 +2,5 @@ Using the po plugin, a link to /bla is present in the sidebar.
 When viewing /bla in the default language, this link is detected as
 a selflink. When viewing a translation of /bla, it
 isn't. --[[intrigeri]]
+
+Fixed in my po branch => [[!tag patch]]. --[[intrigeri]]
-- 
cgit v1.2.3


From 62a67e161bccba431b8b8a501967ba7acf6e197a Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 9 Jan 2010 22:59:46 +0100
Subject: wiki syntax fix

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

(limited to 'doc')

diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index 55968e3d7..87fa38911 100644
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -3,4 +3,6 @@ When viewing /bla in the default language, this link is detected as
 a selflink. When viewing a translation of /bla, it
 isn't. --[[intrigeri]]
 
-Fixed in my po branch => [[!tag patch]]. --[[intrigeri]]
+Fixed in my po branch. --[[intrigeri]]
+
+[[!tag patch]]
-- 
cgit v1.2.3


From f00b15cc369e1e3b7949a10a6fa9d8688f60a82f Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 23:00:00 +0000
Subject: help request with plugin draft

---
 .../link_to_an_image_inside_the_wiki_without_inlining_it.mdwn      | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 045f8cc68..2b91cd856 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -53,3 +53,10 @@ Any hints? --[[jerojasro]]
 >>>   example).
 >>>
 >>> I can help you bang that plugin into shape if need be. --[[Joey]] 
+
+>>>> both my plugin and your suggestion yield broken html links when inlining the page
+>>>>
+>>>> I thought using the `bestlink` function would take care of that, but alas, it doesn't.
+>>>> Get the "plugin" [here](http://devnull.li/~jerojasro/files/linktoimgonly.pm), see the broken 
+>>>> links generated [here](http://devnull.li/~jerojasro/blog/posts/job_offers/) and the source 
+>>>> file for that page [here](http://git.devnull.li/cgi-bin/gitweb.cgi?p=blog-jerojasro.git;a=blob;f=posts/job_offers.mdwn;hb=HEAD) --[[jerojasro]]
-- 
cgit v1.2.3


From fc760812130b2acfad6105d8444af730d3785cbe Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 23:50:23 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 2b91cd856..3b19bab15 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -54,7 +54,7 @@ Any hints? --[[jerojasro]]
 >>>
 >>> I can help you bang that plugin into shape if need be. --[[Joey]] 
 
->>>> both my plugin and your suggestion yield broken html links when inlining the page
+>>>> both my plugin and your suggestion yield broken html links when inlining the page (although propably that's what is expected from your suggestion (`[]()`))
 >>>>
 >>>> I thought using the `bestlink` function would take care of that, but alas, it doesn't.
 >>>> Get the "plugin" [here](http://devnull.li/~jerojasro/files/linktoimgonly.pm), see the broken 
-- 
cgit v1.2.3


From a23d3b6547b80064f8e9af94076aa43798cf6558 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 9 Jan 2010 23:50:45 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 3b19bab15..53544e2c4 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -54,7 +54,7 @@ Any hints? --[[jerojasro]]
 >>>
 >>> I can help you bang that plugin into shape if need be. --[[Joey]] 
 
->>>> both my plugin and your suggestion yield broken html links when inlining the page (although propably that's what is expected from your suggestion (`[]()`))
+>>>> both my plugin and your suggestion yield broken html links when inlining the page (although probably that's what is expected from your suggestion (`[]()`))
 >>>>
 >>>> I thought using the `bestlink` function would take care of that, but alas, it doesn't.
 >>>> Get the "plugin" [here](http://devnull.li/~jerojasro/files/linktoimgonly.pm), see the broken 
-- 
cgit v1.2.3


From 149e8e1c62a11d73f2fbea4e653cff7f3460c8f2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 9 Jan 2010 21:25:37 -0500
Subject: response

---
 .../link_to_an_image_inside_the_wiki_without_inlining_it.mdwn    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 53544e2c4..e92cc1b1c 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -49,7 +49,7 @@ Any hints? --[[jerojasro]]
 >>> * Have things that are wikilink-aware (like [[plugins/brokenlinks]]
 >>>   treat your link to the image as a wikilink. 
 >>> * Use standard wikilink path stuff (and not have to worry about 
->>>   a raw html link breaking if the page it's on is inlined, for
+>>>   a relative html link breaking if the page it's on is inlined, for
 >>>   example).
 >>>
 >>> I can help you bang that plugin into shape if need be. --[[Joey]] 
@@ -60,3 +60,10 @@ Any hints? --[[jerojasro]]
 >>>> Get the "plugin" [here](http://devnull.li/~jerojasro/files/linktoimgonly.pm), see the broken 
 >>>> links generated [here](http://devnull.li/~jerojasro/blog/posts/job_offers/) and the source 
 >>>> file for that page [here](http://git.devnull.li/cgi-bin/gitweb.cgi?p=blog-jerojasro.git;a=blob;f=posts/job_offers.mdwn;hb=HEAD) --[[jerojasro]]
+
+>>>>> Use this --[[Joey]] 
+
+	return htmllink($params{page}, $params{destpage}, $params{"img"},
+	    linktext => $params{text},
+	    noimageinline => 1);
+
-- 
cgit v1.2.3


From 0c89eabcf5a7f9dd881abc8a8cb5f2271ec4e01e Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 00:37:56 +0000
Subject: more options for field configuration, additional pagespec test

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/field.mdwn b/doc/plugins/contrib/field.mdwn
index a43bf24b2..09646d28a 100644
--- a/doc/plugins/contrib/field.mdwn
+++ b/doc/plugins/contrib/field.mdwn
@@ -13,6 +13,9 @@ IkiWiki::Plugin::field - front-end for per-page record fields.
     # simple registration
     field_register => [qw{meta}],
 
+    # allow the config to be queried as a field
+    field_allow_config => 1,
+
 ## DESCRIPTION
 
 This plugin is meant to be used in conjunction with other plugins
@@ -32,8 +35,17 @@ a given page.  This can be used in three ways:
 
 The following options can be set in the ikiwiki setup file.
 
+**field_allow_config**
+
+    field_allow_config => 1,
+
+Allow the $config hash to be queried like any other field; the 
+keys of the config hash are the field names.
+
 **field_register**
 
+    field_register => [qw{meta}],
+
 A list of plugin-IDs to register.  This assumes that the plugins in
 question store data in the %pagestatus hash using the ID of that plugin,
 and thus the field values are looked for there.
@@ -46,12 +58,17 @@ registered with the "field" plugin.
 
 The "field" PageSpec function can be used to match the value of a field for a page.
 
-field(*name* *glob*)
+**field(*name* *glob*)**
 
 For example:
 
 field(bar Foo*) will match if the "bar" field starts with "Foo".
 
+**destfield(*name* *glob*)**
+
+is the same, except that it tests the destination page (that is, in cases
+when the source page is being included in another page).
+
 ## FUNCTIONS
 
 ### field_register
-- 
cgit v1.2.3


From 9ccd1ba41bff43c1a5d06197b454c8748224e30f Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:20:34 +0000
Subject: ymlfront: backend for structured data

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ymlfront.mdwn b/doc/plugins/contrib/ymlfront.mdwn
new file mode 100644
index 000000000..f4438f23c
--- /dev/null
+++ b/doc/plugins/contrib/ymlfront.mdwn
@@ -0,0 +1,99 @@
+[[!template id=plugin name=ymlfront author="[[rubykat]]"]]
+[[!tag type/meta]]
+[[!toc]]
+## NAME
+
+IkiWiki::Plugin::ymlfront - add YAML-format data to a page
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff ymlfront ....}],
+
+## DESCRIPTION
+
+This plugin provides a way of adding arbitrary meta-data (data fields) to any
+page by prefixing the page with a YAML-format document.  This provides a way to
+create per-page structured data, where each page is treated like a record, and
+the structured data are fields in that record.  This can include the meta-data
+for that page, such as the page title.
+
+This plugin is meant to be used in conjunction with the [[field]] plugin.
+
+## DETAILS
+
+The YAML-format data in a page must be placed at the start of the page
+and delimited by lines containing precisely three dashes.  The "normal"
+content of the page then follows.
+
+For example:
+
+    ---
+    title: Foo does not work
+    Urgency: High
+    Status: Assigned
+    AssignedTo: Fred Nurk
+    Version: 1.2.3
+    ---
+    When running on the Sprongle system, the Foo function returns incorrect data.
+
+What will normally be displayed is everything following the second line of dashes.
+That will be htmlized using the page-type of the page-file.
+
+### Accessing the Data
+
+There are three ways to access the data given in the YAML section.
+
+* [[getfield]] plugin
+
+  The **getfield** plugin can display the data as individual variable values.
+
+  For example:
+
+    	---
+    	title: Foo does not work
+    	Urgency: High
+    	Status: Assigned
+    	AssignedTo: Fred Nurk
+    	Version: 1.2.3
+    	---
+    	# {{$title}}
+
+    	**Urgency:** {{$Urgency}}\\
+    	**Status:** {{$Status}}\\
+    	**Assigned To:** {{$AssignedTo}}\\
+    	**Version:** {{$Version}}
+
+    When running on the Sprongle system, the Foo function returns incorrect data.
+
+* [[ftemplate]] plugin
+
+  The **ftemplate** plugin is like the [[plugins/template]] plugin, but it is also aware of [[field]] values.
+
+  For example:
+
+    	---
+    	title: Foo does not work
+    	Urgency: High
+    	Status: Assigned
+    	AssignedTo: Fred Nurk
+    	Version: 1.2.3
+    	---
+    	\[[!ftemplate id="bug_display_template"]]
+
+    	When running on the Sprongle system, the Foo function returns incorrect data.
+
+* write your own plugin
+
+  In conjunction with the [[field]] plugin, you can write your own plugin to access the data.
+
+## PREREQUISITES
+
+    IkiWiki
+    IkiWiki::Plugin::field
+    YAML::Any
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/ymlfront.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From ccc8e8868269bf2751596e04f792c388acb85c12 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:27:59 +0000
Subject: getfield: query field (meta-data) values

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield.mdwn b/doc/plugins/contrib/getfield.mdwn
new file mode 100644
index 000000000..ed03dc439
--- /dev/null
+++ b/doc/plugins/contrib/getfield.mdwn
@@ -0,0 +1,85 @@
+[[!template id=plugin name=getfield author="[[rubykat]]"]]
+[[!tag type/meta]]
+[[!toc]]
+## NAME
+
+IkiWiki::Plugin::getfield - query the values of fields
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff getfield ....}],
+
+## DESCRIPTION
+
+This plugin provides a way of querying the meta-data (data fields) of a page
+inside the page content (rather than inside a template) This provides a way to
+use per-page structured data, where each page is treated like a record, and the
+structured data are fields in that record.  This can include the meta-data for
+that page, such as the page title.
+
+This plugin is meant to be used in conjunction with the B<field> plugin.
+
+### USAGE
+
+One can get the value of a field by using special markup in the page.
+This does not use directive markup, in order to make it easier to
+use the markup inside other directives.  There are two forms:
+
+* {{$*fieldname*}}
+
+  This queries the value of *fieldname* for the source page.
+
+  For example:
+
+    	\[[!meta title="My Long and Complicated Title With Potential For Spelling Mistakes"]]
+    	# {{$title}}
+
+  When the page is processed, this will give you:
+
+    	<h1>My Long and Complicated Title With Potential For Spelling Mistakes</h1>
+
+* {{+$*fieldname*+}}
+
+  This queries the value of *fieldname* for the destination page; that is,
+  the value when this page is included inside another page.
+
+  For example:
+
+  On PageA:
+
+    	\[[!meta title="I Am Page A"]]
+    	# {{+$title+}}
+
+    	Stuff about A.
+
+  On PageB:
+
+    	\[[!meta title="I Am Page B"]]
+    	\[[!inline pagespec="PageA"]]
+
+  When PageA is displayed:
+
+    	<h1>I Am Page A</h1>
+    	<p>Stuff about A.</p>
+
+  When PageB is displayed:
+
+    	<h1>I Am Page B</h1>
+    	<p>Stuff about A.</p>
+
+### More Examples
+
+Listing all the sub-pages of the current page:
+
+    \[[!map pages="{{$page}}/*"]]
+
+### LIMITATIONS
+
+One cannot query the values of fields on pages other than the current
+page or the destination page.
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/field.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From 7d997f1007b240c14c04ff73b09a2a62fa3e64ad Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:36:28 +0000
Subject: ftemplate: field-aware structured template plugin

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ftemplate.mdwn b/doc/plugins/contrib/ftemplate.mdwn
new file mode 100644
index 000000000..bcc6f2c67
--- /dev/null
+++ b/doc/plugins/contrib/ftemplate.mdwn
@@ -0,0 +1,94 @@
+[[!template id=plugin name=ftemplate author="[[rubykat]]"]]
+[[!tag type/meta type/format]]
+[[!toc]]
+## NAME
+
+IkiWiki::Plugin::ftemplate - field-aware structured template plugin
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff ftemplate ....}],
+
+## DESCRIPTION
+
+This plugin provides the **ftemplate** directive.  This is like
+the [[ikiwiki/directive/template]] directive, with the addition that one does not
+have to provide all the values in the call to the template,
+because ftemplate can query structured data ("fields") using
+the [[field]] plugin.
+
+Templates are files that can be filled out and inserted into pages in
+the wiki, by using the ftemplate directive. The directive has an id
+parameter that identifies the template to use.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One is, as with the
+[[plugins/template]] plugin, in the /templates directory on the wiki.  These
+templates are wiki pages, and can be edited from the web like other wiki
+pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+### EXAMPLES
+
+#### Example 1
+
+PageA:
+
+    [[!meta title="I Am Page A"]]
+    [[!meta description="A is for Apple."]]
+    [[!meta author="Fred Nurk"]]
+    [[!ftemplate id="mytemplate"]]
+
+Template "mytemplate":
+
+    # <TMPL_VAR NAME="TITLE">
+    by <TMPL_VAR NAME="AUTHOR">
+
+    **Summary:** <TMPL_VAR NAME="DESCRIPTION">
+
+This will give:
+
+    <h1>I Am Page A</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> A is for Apple.
+
+#### Example 2: Overriding values
+
+PageB:
+
+    [[!meta title="I Am Page B"]]
+    [[!meta description="B is for Banana."]]
+    [[!meta author="Fred Nurk"]]
+    [[!ftemplate id="mytemplate" title="Bananananananas"]]
+
+This will give:
+
+    <h1>Bananananananas</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> B is for Banana.
+
+### LIMITATIONS
+
+One cannot query the values of fields on pages other than the current
+page.
+
+## PREREQUISITES
+
+    IkiWiki
+    IkiWiki::Plugin::field
+    HTML::Template
+    Encode
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/ftemplate.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From a3527672769b93eeb4a70fbe9f316c986706c375 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:37:27 +0000
Subject: fixed title

---
 doc/plugins/contrib/ftemplate.mdwn | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/ftemplate.mdwn b/doc/plugins/contrib/ftemplate.mdwn
index bcc6f2c67..fba51e1c2 100644
--- a/doc/plugins/contrib/ftemplate.mdwn
+++ b/doc/plugins/contrib/ftemplate.mdwn
@@ -43,10 +43,10 @@ them work as wiki pages.
 
 PageA:
 
-    [[!meta title="I Am Page A"]]
-    [[!meta description="A is for Apple."]]
-    [[!meta author="Fred Nurk"]]
-    [[!ftemplate id="mytemplate"]]
+    \[[!meta title="I Am Page A"]]
+    \[[!meta description="A is for Apple."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate"]]
 
 Template "mytemplate":
 
@@ -65,10 +65,10 @@ This will give:
 
 PageB:
 
-    [[!meta title="I Am Page B"]]
-    [[!meta description="B is for Banana."]]
-    [[!meta author="Fred Nurk"]]
-    [[!ftemplate id="mytemplate" title="Bananananananas"]]
+    \[[!meta title="I Am Page B"]]
+    \[[!meta description="B is for Banana."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate" title="Bananananananas"]]
 
 This will give:
 
-- 
cgit v1.2.3


From 2cbf60a431d41b3cb0767f1c0fb1ecf50103bcb0 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:38:33 +0000
Subject: correcting link

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield.mdwn b/doc/plugins/contrib/getfield.mdwn
index ed03dc439..5e6b01113 100644
--- a/doc/plugins/contrib/getfield.mdwn
+++ b/doc/plugins/contrib/getfield.mdwn
@@ -81,5 +81,5 @@ page or the destination page.
 
 ## DOWNLOAD
 
-* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/field.pm>
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/getfield.pm>
 * git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From 39e1524e9e12e538b439310a20325064657f5979 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:45:44 +0000
Subject: more progress on this approach

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

(limited to 'doc')

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index fb007f7e9..eb6ee4445 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -1,3 +1,5 @@
+## First Pass
+
 Looking at the discussion about [[todo/structured_page_data]], it looks a bit like folks are bogged down in figuring out what *markup* to use for structured page data, something I doubt that people will really agree on.  And thus, little progress is made.
 
 I propose that, rather than worry about what the data looks like, that we take a similar approach
@@ -15,3 +17,13 @@ I think it could be really powerful and useful, especially if it becomes part of
 --[[KathrynAndersen]]
 
 > It looks like an interesting idea.  I don't have time right now to look at it in depth, but it looks interesting. -- [[Will]]
+
+## Second Pass
+
+I have written additional plugins which integrate with the [[plugins/contrib/field]] plugin to both set and get structured page data.
+
+* [[plugins/contrib/getfield]] - query field values inside a page using {{$*fieldname*}} markup
+* [[plugins/contrib/ftemplate]] - like [[plugins/template]] but uses "field" data as well as passed-in data
+* [[plugins/contrib/ymlfront]] - looks for YAML-format data at the front of a page; this is just one possible back-end for the structured data
+
+--[[KathrynAndersen]]
-- 
cgit v1.2.3


From f90827f29bc1682bf3682375972f5cc836049dc7 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 13 Jan 2010 02:47:59 +0000
Subject: this is sort of format too

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield.mdwn b/doc/plugins/contrib/getfield.mdwn
index 5e6b01113..302569f4b 100644
--- a/doc/plugins/contrib/getfield.mdwn
+++ b/doc/plugins/contrib/getfield.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=getfield author="[[rubykat]]"]]
-[[!tag type/meta]]
+[[!tag type/meta type/format]]
 [[!toc]]
 ## NAME
 
-- 
cgit v1.2.3


From f2b8f358652e76e4047f4e304870e25cac51b681 Mon Sep 17 00:00:00 2001
From: parade <parade@web>
Date: Thu, 14 Jan 2010 14:25:56 +0000
Subject:

---
 doc/index.mdwn | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

(limited to 'doc')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..13e7564ea 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1,28 +1 @@
-Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
-suitable for publishing on a website. Ikiwiki stores pages and history in a
-[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
-There are many other [[features]], including support for
-[[blogging|blog]], as well as a large array of [[plugins]].
-
-[[!template id=links]]
-
-## using ikiwiki
-
-[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
-[[man_page|usage]]. There are some [[examples]] of things you can do
-with ikiwiki, and some [[tips]].
-
-All wikis are supposed to have a [[SandBox]], so this one does too.
-
-This site generally runs the latest release of ikiwiki; currently, it runs
-ikiwiki [[!version ]].
-
-## developer resources
-
-The [[RoadMap]] describes where the project is going.
-The [[forum]] is open for discussions.
-[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
-can be submitted and tracked using this wiki.
-
-ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]].
+o
-- 
cgit v1.2.3


From b3036541674cc90b1c48203244dd711e399ce9d7 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@schwinge.name>
Date: Thu, 14 Jan 2010 16:29:09 +0100
Subject: Restore page.

This reverts commit f2b8f358652e76e4047f4e304870e25cac51b681.
---
 doc/index.mdwn | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 13e7564ea..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -1 +1,28 @@
-o
+Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
+suitable for publishing on a website. Ikiwiki stores pages and history in a
+[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
+There are many other [[features]], including support for
+[[blogging|blog]], as well as a large array of [[plugins]].
+
+[[!template id=links]]
+
+## using ikiwiki
+
+[[Setup]] has a tutorial for setting up ikiwiki, or you can read the
+[[man_page|usage]]. There are some [[examples]] of things you can do
+with ikiwiki, and some [[tips]].
+
+All wikis are supposed to have a [[SandBox]], so this one does too.
+
+This site generally runs the latest release of ikiwiki; currently, it runs
+ikiwiki [[!version ]].
+
+## developer resources
+
+The [[RoadMap]] describes where the project is going.
+The [[forum]] is open for discussions.
+[[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
+can be submitted and tracked using this wiki.
+
+ikiwiki is developed by [[Joey]] and many contributors,
+and is [[FreeSoftware]].
-- 
cgit v1.2.3


From 4f25d90ebc2d3ff2ad7a5d7bd8578a6c4d673aa8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 14 Jan 2010 18:56:05 -0500
Subject: mention that lighttpd does support this. Example needed.

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

(limited to 'doc')

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index f3b70b5f7..da85636ec 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -129,11 +129,10 @@ For details, see [Apache's documentation](http://httpd.apache.org/docs/2.2/conte
 lighttpd
 --------
 
-lighttpd unfortunately does not support content negotiation.
-
-**FIXME**: does `mod_magnet` provide the functionality needed to
- emulate this?
+Recent versions of lighttpd should be able to use
+`$HTTP["language"]` to configure the translatted pages to be served.
 
+TODO: Example
 
 Usage
 =====
-- 
cgit v1.2.3


From 65db2f47acfe5815952bb0bfbdbe15b5cf5ce7be Mon Sep 17 00:00:00 2001
From: Spida <Spida@web>
Date: Fri, 15 Jan 2010 00:15:33 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index da85636ec..576d36ec1 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -132,6 +132,8 @@ lighttpd
 Recent versions of lighttpd should be able to use
 `$HTTP["language"]` to configure the translatted pages to be served.
 
+See [Lighttpd Issue](http://redmine.lighttpd.net/issues/show/1119)
+
 TODO: Example
 
 Usage
-- 
cgit v1.2.3


From a1138ae820d3ea121cbd28552a3300631179b0a5 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 16 Jan 2010 05:19:42 +0000
Subject: the pod bold thingy didn't work, making it a markdown one

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield.mdwn b/doc/plugins/contrib/getfield.mdwn
index 302569f4b..929f70485 100644
--- a/doc/plugins/contrib/getfield.mdwn
+++ b/doc/plugins/contrib/getfield.mdwn
@@ -18,7 +18,7 @@ use per-page structured data, where each page is treated like a record, and the
 structured data are fields in that record.  This can include the meta-data for
 that page, such as the page title.
 
-This plugin is meant to be used in conjunction with the B<field> plugin.
+This plugin is meant to be used in conjunction with the **field** plugin.
 
 ### USAGE
 
-- 
cgit v1.2.3


From 353f722dc439a14d7e74dab9ca2818f955ff4d41 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 16 Jan 2010 05:29:53 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
new file mode 100644
index 000000000..61b9f5378
--- /dev/null
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -0,0 +1,3 @@
+## Templating, and other uses
+
+Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If it can be made to work anywhere, or from a specific place in the wiki - configurable, possibly - you'll have something very similar to mediawiki's templates. I can already think of a few uses for this combined with [[template]] ;) . --[[SR|users/simonraven]]
-- 
cgit v1.2.3


From 3b2772967fdb125bb8160f968729681b7af13269 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sat, 16 Jan 2010 08:08:46 +0000
Subject: responded to discussion

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 61b9f5378..78462197a 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -1,3 +1,12 @@
 ## Templating, and other uses
 
 Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If it can be made to work anywhere, or from a specific place in the wiki - configurable, possibly - you'll have something very similar to mediawiki's templates. I can already think of a few uses for this combined with [[template]] ;) . --[[SR|users/simonraven]]
+
+> Yes, I mentioned "only current page" in the "LIMITATIONS" section.
+
+> What do you think would be a good syntax for querying other pages?
+> It needs to resolve to a single page, though I guess using "bestlink" to find the closest page would mean that one didn't have to spell out the whole page.
+
+> I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
+
+> -- [[users/KathrynAndersen]]
-- 
cgit v1.2.3


From e3a09318a0686a7e3d01206f56ca6019c3c198e0 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 16 Jan 2010 08:42:56 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 78462197a..f3c844e94 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -7,6 +7,10 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 > What do you think would be a good syntax for querying other pages?
 > It needs to resolve to a single page, though I guess using "bestlink" to find the closest page would mean that one didn't have to spell out the whole page.
 
+>> I don't know the internals very well, I think that's how other plugins do it. *goes to check* Usually it's a `foreach` loop, and use a `pagestate{foo}` to check the page's status/state. There's also some stuff like 'pagespec_match_list($params{page}` ... they do slightly different thing depending on need. --[[SR|users/simonraven]]
+
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
 > -- [[users/KathrynAndersen]]
+
+>> Ooh, sounds nice :) . --[[SR|users/simonraven]]
-- 
cgit v1.2.3


From 354468d280354234d9c8c91333534c9784f427cf Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 17 Jan 2010 00:10:55 +0000
Subject: respond: markup, not internals

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index f3c844e94..37d65d851 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -9,6 +9,11 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 
 >> I don't know the internals very well, I think that's how other plugins do it. *goes to check* Usually it's a `foreach` loop, and use a `pagestate{foo}` to check the page's status/state. There's also some stuff like 'pagespec_match_list($params{page}` ... they do slightly different thing depending on need. --[[SR|users/simonraven]]
 
+>>> No, I meant what markup I should use; the actual implementation probably wouldn't be too difficult.
+
+>>> The current markup is {{$*fieldname*}}; what you're wanting, perhaps it should be represented like {{$*pagename*:*fieldname*}}, or {{$*pagename*::*fieldname*}} or something else...
+>>> -- [[KathrynAndersen]]
+
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
 > -- [[users/KathrynAndersen]]
-- 
cgit v1.2.3


From 1ddef7da7b170bb4bd7c816cba03e3e6338a50b2 Mon Sep 17 00:00:00 2001
From: "http://edrex.myopenid.com/" <http://edrex.myopenid.com/@web>
Date: Sun, 17 Jan 2010 07:22:03 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/todo/svg.mdwn b/doc/todo/svg.mdwn
index 0a15af4cd..f264f4107 100644
--- a/doc/todo/svg.mdwn
+++ b/doc/todo/svg.mdwn
@@ -3,6 +3,7 @@ We should support SVG.  In particular:
 * We could support rendering SVGs to PNGs when compiling the wiki.  Not all browsers support SVG yet.
 
 * We could support editing SVGs via the web interface.  SVG can contain unsafe content such as scripting, so we would need to whitelist safe markup.
+  * I am interested in seeing [svg-edit](http://code.google.com/p/svg-edit/) integrated --[EricDrechsel]]
 
 --[[JoshTriplett]]
 
-- 
cgit v1.2.3


From 5588abc2befbde83e43cf79f9717e323aa69da11 Mon Sep 17 00:00:00 2001
From: "http://edrex.myopenid.com/" <http://edrex.myopenid.com/@web>
Date: Sun, 17 Jan 2010 07:22:54 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/todo/svg.mdwn b/doc/todo/svg.mdwn
index f264f4107..89b183db6 100644
--- a/doc/todo/svg.mdwn
+++ b/doc/todo/svg.mdwn
@@ -3,7 +3,7 @@ We should support SVG.  In particular:
 * We could support rendering SVGs to PNGs when compiling the wiki.  Not all browsers support SVG yet.
 
 * We could support editing SVGs via the web interface.  SVG can contain unsafe content such as scripting, so we would need to whitelist safe markup.
-  * I am interested in seeing [svg-edit](http://code.google.com/p/svg-edit/) integrated --[EricDrechsel]]
+  * I am interested in seeing [svg-edit](http://code.google.com/p/svg-edit/) integrated -- [[EricDrechsel]]
 
 --[[JoshTriplett]]
 
-- 
cgit v1.2.3


From d652bf3ddf33505b540b46e6916d8a36cdeacc08 Mon Sep 17 00:00:00 2001
From: "http://edrex.myopenid.com/" <http://edrex.myopenid.com/@web>
Date: Sun, 17 Jan 2010 07:24:31 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/users/ericdrechsel.mdwn b/doc/users/ericdrechsel.mdwn
new file mode 100644
index 000000000..2efb7039c
--- /dev/null
+++ b/doc/users/ericdrechsel.mdwn
@@ -0,0 +1 @@
+[My homewiki profile](http://wiki.shared.dre.am/people/eric/)
-- 
cgit v1.2.3


From b3363aa89f840fd42b8a621b011326ef41b73513 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sun, 17 Jan 2010 09:28:07 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 37d65d851..9f1337046 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -14,6 +14,8 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 >>> The current markup is {{$*fieldname*}}; what you're wanting, perhaps it should be represented like {{$*pagename*:*fieldname*}}, or {{$*pagename*::*fieldname*}} or something else...
 >>> -- [[KathrynAndersen]]
 
+>>>> Oh. Hmm. I like your idea actually, or alternately, in keeping more with other plugins, doing it like {{pagename/fieldname}}. The meaning is less clear that way, but avoids potential issues with filename clashes that have a colon in them. It also keeps a certain logic - at least to me. Either way, I think both are good choices.
+
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
 > -- [[users/KathrynAndersen]]
-- 
cgit v1.2.3


From 2137d1f68c694af6135d0d84b59bbfbcffe36669 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sun, 17 Jan 2010 09:31:07 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 9f1337046..42338a3c7 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -14,7 +14,7 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 >>> The current markup is {{$*fieldname*}}; what you're wanting, perhaps it should be represented like {{$*pagename*:*fieldname*}}, or {{$*pagename*::*fieldname*}} or something else...
 >>> -- [[KathrynAndersen]]
 
->>>> Oh. Hmm. I like your idea actually, or alternately, in keeping more with other plugins, doing it like {{pagename/fieldname}}. The meaning is less clear that way, but avoids potential issues with filename clashes that have a colon in them. It also keeps a certain logic - at least to me. Either way, I think both are good choices.
+>>>> Oh. Hmm. I like your idea actually, or alternately, in keeping more with other plugins, doing it like {{pagename/fieldname}}. The meaning of the separator is less clear with /, but avoids potential issues with filename clashes that have a colon in them. It also keeps a certain logic - at least to me. Either way, I think both are good choices. [[SR|users/simonraven]]
 
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
-- 
cgit v1.2.3


From fc7a047a474cc19cc24a5a7d7119ef6f32f395b6 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Sun, 17 Jan 2010 09:55:07 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/users/Oblomov.mdwn b/doc/users/Oblomov.mdwn
new file mode 100644
index 000000000..be6e666cb
--- /dev/null
+++ b/doc/users/Oblomov.mdwn
@@ -0,0 +1 @@
+Getting started with Ikiwiki, like the git backend a lot, would like to see a dynamic version of it.
-- 
cgit v1.2.3


From fa0bbaab21a456f8115d9af508fef06443b8d275 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Sun, 17 Jan 2010 09:56:26 +0000
Subject: Suggest # as page-field separator

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 42338a3c7..900ca65b2 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -16,6 +16,9 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 
 >>>> Oh. Hmm. I like your idea actually, or alternately, in keeping more with other plugins, doing it like {{pagename/fieldname}}. The meaning of the separator is less clear with /, but avoids potential issues with filename clashes that have a colon in them. It also keeps a certain logic - at least to me. Either way, I think both are good choices. [[SR|users/simonraven]]
 
+>>>>> What about using {{pagename#fieldname}}? The meaning of the hash in URLs sort of fits with what is needed here (reference to a 'named' thing within the page) and it won't conflict with actual hash usages (unless we expect different named parts of pages to define different values for the same field ...)
+>>>>> -- [[Oblomov]]
+
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
 > -- [[users/KathrynAndersen]]
-- 
cgit v1.2.3


From 9c0c8b57fb9ccaf21888a7eb9e93dc0d312773e0 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sun, 17 Jan 2010 17:27:51 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 900ca65b2..ce6246034 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -18,6 +18,8 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 
 >>>>> What about using {{pagename#fieldname}}? The meaning of the hash in URLs sort of fits with what is needed here (reference to a 'named' thing within the page) and it won't conflict with actual hash usages (unless we expect different named parts of pages to define different values for the same field ...)
 >>>>> -- [[Oblomov]]
+>>>>>> That's a good one too. --[[simonraven]]
+
 
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
 
-- 
cgit v1.2.3


From f072f3a9c57bc590b4fb754a7cf65b5f93684006 Mon Sep 17 00:00:00 2001
From: "http://apoca.myopenid.com/" <http://apoca.myopenid.com/@web>
Date: Mon, 18 Jan 2010 17:25:13 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/removing_pages_with_utf8_characters.mdwn b/doc/bugs/removing_pages_with_utf8_characters.mdwn
new file mode 100644
index 000000000..a962a328a
--- /dev/null
+++ b/doc/bugs/removing_pages_with_utf8_characters.mdwn
@@ -0,0 +1,18 @@
+I have a page with the name "umläute". When I try to remove it, ikiwiki says:
+
+Error: ?umläute does not exist 
+
+I wrote the following patch, which seems to work on my machine. I'm running on FreeBSD 6.3-RELEASE with ikiwiki-3.20100102.3 and perl-5.8.9_3.
+
+    --- remove.pm.orig      2009-12-14 23:26:20.000000000 +0100
+    +++ remove.pm   2010-01-18 17:49:39.000000000 +0100
+    @@ -193,6 +193,7 @@
+                            # and that the user is allowed to edit(/remove) it.
+                            my @files;
+                            foreach my $page (@pages) {
+    +                               $page = Encode::decode_utf8($page);
+                                    check_canremove($page, $q, $session);
+     
+                                    # This untaint is safe because of the
+
+
-- 
cgit v1.2.3


From 265b4f0576d5e6be61d80239db372430c52f31b7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 12:38:05 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/bugs/removing_pages_with_utf8_characters.mdwn b/doc/bugs/removing_pages_with_utf8_characters.mdwn
index a962a328a..77ec00575 100644
--- a/doc/bugs/removing_pages_with_utf8_characters.mdwn
+++ b/doc/bugs/removing_pages_with_utf8_characters.mdwn
@@ -2,6 +2,10 @@ I have a page with the name "umläute". When I try to remove it, ikiwiki says:
 
 Error: ?umläute does not exist 
 
+> I'm curious about the '?' in the "?umläute" message. Suggests that the
+> filename starts with another strange character. Can I get a copy of a
+> git repository or tarball containing this file? --[[Joey]] 
+
 I wrote the following patch, which seems to work on my machine. I'm running on FreeBSD 6.3-RELEASE with ikiwiki-3.20100102.3 and perl-5.8.9_3.
 
     --- remove.pm.orig      2009-12-14 23:26:20.000000000 +0100
@@ -16,3 +20,9 @@ I wrote the following patch, which seems to work on my machine. I'm running on F
                                     # This untaint is safe because of the
 
 
+> The problem with this patch is that, in a recent fix to the same
+> plugin, I made `@pages` come from `$form->field("page")`, and
+> that, in turn is already run through `decode_form_utf8` just above the
+> code you patched. So I need to understand why that is apparently not
+> working for you. (It works fine for me, even when deleting a file named 
+> "umläute" --[[Joey]] 
-- 
cgit v1.2.3


From be523e7740339d7884dabfa915c7c2df8c60bf27 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Mon, 18 Jan 2010 19:13:00 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index e386a8d96..0a62164cb 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -54,3 +54,7 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >>>>>> change. And then the Edit link for Discussion subpages could do
 >>>>>> as you suggest, adding one click for the httpauth user, who won't
 >>>>>> often need to edit those subpages. --[[schmonz]]
+
+>> On reflection, I've stopped being bothered by the
+>> redirect-to-signin-page approach. (It only needs to happen once per
+>> browser session, anyway.) Can we try that? --[[schmonz]]
-- 
cgit v1.2.3


From 4a8389825ae0715ba68846881ddc8d25b3f9ccb8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 18:00:10 -0500
Subject: update

---
 doc/bugs/removing_pages_with_utf8_characters.mdwn | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/removing_pages_with_utf8_characters.mdwn b/doc/bugs/removing_pages_with_utf8_characters.mdwn
index 77ec00575..2fa4efa8b 100644
--- a/doc/bugs/removing_pages_with_utf8_characters.mdwn
+++ b/doc/bugs/removing_pages_with_utf8_characters.mdwn
@@ -26,3 +26,24 @@ I wrote the following patch, which seems to work on my machine. I'm running on F
 > code you patched. So I need to understand why that is apparently not
 > working for you. (It works fine for me, even when deleting a file named 
 > "umläute" --[[Joey]] 
+
+----
+
+> Update, having looked at the file in the src of the wiki that
+> is causing trouble for remove, it is: `uml\303\203\302\244ute.mdwn`  
+> And that is not utf-8 encoded, which, represented the same
+> would be: `uml\303\244ute.mdwn`
+> 
+> I think it's doubly-utf-8 encoded, which perhaps explains why the above
+> patch works around the problem (since the page name gets doubly-decoded
+> with it). The patch doesn't fix related problems when using remove, etc.
+> 
+> Apparently, on apoca's system, perl encodes filenames differently
+> depending on locale settings. On mine, it does not. Ie, this perl
+> program always creates a file named `uml\303\244ute`, no matter
+> whether I run it with LANG="" or LANG="en_US.UTF-8":
+> 
+>	perl -e 'use IkiWiki; writefile("umläute", "./", "baz")'
+> 
+> Remains to be seen if this is due to the older version of perl used
+> there, or perhaps FreeBSD itself. --[[Joey]] 
-- 
cgit v1.2.3


From 30c5f62f741b8be4677b46b19a6c7ccb5963e101 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 18 Jan 2010 20:41:12 -0500
Subject: update

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

(limited to 'doc')

diff --git a/doc/bugs/removing_pages_with_utf8_characters.mdwn b/doc/bugs/removing_pages_with_utf8_characters.mdwn
index 2fa4efa8b..0d96aa75f 100644
--- a/doc/bugs/removing_pages_with_utf8_characters.mdwn
+++ b/doc/bugs/removing_pages_with_utf8_characters.mdwn
@@ -47,3 +47,5 @@ I wrote the following patch, which seems to work on my machine. I'm running on F
 > 
 > Remains to be seen if this is due to the older version of perl used
 > there, or perhaps FreeBSD itself. --[[Joey]] 
+> 
+> Update: Perl 5.10 fixed the problem. --[[Joey]] 
-- 
cgit v1.2.3


From 2e585ec001e5b593b14307f7a871e48891c606df Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 22 Jan 2010 07:36:24 +0000
Subject: query, help!

---
 ...e_than_one_dest_page_from_same_source_page.mdwn | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn

(limited to 'doc')

diff --git a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
new file mode 100644
index 000000000..db7b49ae4
--- /dev/null
+++ b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
@@ -0,0 +1,23 @@
+Is it possible to render more than one destination page from the same source page?
+That is, same source, slightly different presentation at the other end, needing a different output file.
+
+I have two problems that would be solved by being able to do this.
+
+1. "full" and "print" versions of a page.
+
+One has a page "foo", which is rendered into foo.html.
+One also wants a foo-print.html page, which uses "page-print.tmpl" rather than "page.tmpl" as its template.
+
+I want to do this for every page on the site, automatically, so it isn't feasible to do it by hand.
+
+2. "en" and "en-us" versions of a page.
+
+My site is in non-US English.  However, I want US-English people to find my site when they search for it when they use US spelling on certain search terms (such as "optimise" versus "optimize").  This requires a (crude) US-English version of the site where the spellings are changed automatically, and the LANG is "en-us" rather than "en".  (No, don't tell me to use keywords; Google ignores keywords and has for a number of years).
+
+So I want the page "foo" to render to "foo.en.html" and "foo.en-us.html" where the content is the same, just some automated word-substitution applied before foo.en-us.html is written.  And do this for every page on the site.
+
+I can't do this with the "po" plugin, as it considers "en-us" not to be a valid language.  And the "po" plugin is probably overkill for what I want anyway.
+
+But I'm not sure how to achieve the result I need.
+
+-- [[KathrynAndersen]]
-- 
cgit v1.2.3


From f24ca627ddf147491dfc987c99b7fda9d5a63f95 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 22 Jan 2010 07:38:12 +0000
Subject: formatting

---
 doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
index db7b49ae4..73375938c 100644
--- a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
+++ b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
@@ -3,14 +3,16 @@ That is, same source, slightly different presentation at the other end, needing
 
 I have two problems that would be solved by being able to do this.
 
-1. "full" and "print" versions of a page.
+[[!toc startlevel=2]]
+
+##"full" and "print" versions of a page.
 
 One has a page "foo", which is rendered into foo.html.
 One also wants a foo-print.html page, which uses "page-print.tmpl" rather than "page.tmpl" as its template.
 
 I want to do this for every page on the site, automatically, so it isn't feasible to do it by hand.
 
-2. "en" and "en-us" versions of a page.
+##"en" and "en-us" versions of a page.
 
 My site is in non-US English.  However, I want US-English people to find my site when they search for it when they use US spelling on certain search terms (such as "optimise" versus "optimize").  This requires a (crude) US-English version of the site where the spellings are changed automatically, and the LANG is "en-us" rather than "en".  (No, don't tell me to use keywords; Google ignores keywords and has for a number of years).
 
-- 
cgit v1.2.3


From d264164673fd64f2e15bd14fa8179d182afd03d7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 Jan 2010 15:54:00 -0500
Subject: response

---
 ...ore_than_one_dest_page_from_same_source_page.mdwn | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
index 73375938c..e88c23b07 100644
--- a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
+++ b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
@@ -1,6 +1,17 @@
 Is it possible to render more than one destination page from the same source page?
 That is, same source, slightly different presentation at the other end, needing a different output file.
 
+> It's possible to render more than one output _file_ from a given source
+> page. See, for example, the inline plugin's generation of rss files.
+> This is done by calling `will_render()` and using `writefile()` to
+> generate the additional files. Probably in a format hook if you want
+> to generate html files.
+> 
+> It's not possible for one source file to represent multiple wiki pages.
+> There is a 1:1 mapping between source filenames and page names. The
+> difference between wiki pages and output files is that you can use
+> wikilinks to link to wiki pages, etc. --[[Joey]] 
+
 I have two problems that would be solved by being able to do this.
 
 [[!toc startlevel=2]]
@@ -12,6 +23,12 @@ One also wants a foo-print.html page, which uses "page-print.tmpl" rather than "
 
 I want to do this for every page on the site, automatically, so it isn't feasible to do it by hand.
 
+> Did you know that ikiwiki's `style.css` arranges for pages to display
+> differently when printed out? Things like the Action bar are hidden in
+> printouts (search for `@media print`). So I don't see a reason to need
+> whole files for printing when you can use these style sheet tricks.
+> --[[Joey]] 
+
 ##"en" and "en-us" versions of a page.
 
 My site is in non-US English.  However, I want US-English people to find my site when they search for it when they use US spelling on certain search terms (such as "optimise" versus "optimize").  This requires a (crude) US-English version of the site where the spellings are changed automatically, and the LANG is "en-us" rather than "en".  (No, don't tell me to use keywords; Google ignores keywords and has for a number of years).
@@ -23,3 +40,6 @@ I can't do this with the "po" plugin, as it considers "en-us" not to be a valid
 But I'm not sure how to achieve the result I need.
 
 -- [[KathrynAndersen]]
+
+> Sounds like this could be considered a single page that generates two
+> html files, so could be handled per above. --[[Joey]] 
-- 
cgit v1.2.3


From 450f8b78b87e18374a0c0f4d7461ed29a4d8cdcb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 22 Jan 2010 16:26:31 -0500
Subject: add news item for ikiwiki 3.20100122

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

(limited to 'doc')

diff --git a/doc/news/version_3.20091031.mdwn b/doc/news/version_3.20091031.mdwn
deleted file mode 100644
index bb77bfa31..000000000
--- a/doc/news/version_3.20091031.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-ikiwiki 3.20091031 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * po: Fix breakage caused by changes to render code.
-   * mdwn: Avoid trying to use multimarkdown if it is not installed.
-   * moderatedcomments: New plugin to allow comment moderation w/o relying
-     on blogspam.net.
-   * When redirecting to a page, ie, after editing, ensure that the
-     url is uri-encoded. Most browsers other than MSIE don't care, but it's
-     the right thing to do.
-   * Add a spec file to allow building rpm from the source package.
-   * google: Pass the whole wiki url to google, not just the domain,
-     so that search works correctly for wikis that are located in
-     subdirectories of domains."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100122.mdwn b/doc/news/version_3.20100122.mdwn
new file mode 100644
index 000000000..11051fad8
--- /dev/null
+++ b/doc/news/version_3.20100122.mdwn
@@ -0,0 +1,15 @@
+ikiwiki 3.20100122 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * inline: Avoid showing edit links if page editing is disabled.
+     (Sjoerd)
+   * signinedit: Auto-disable the plugin when all authentication methods
+     are disabled.
+   * comments: Fix permalinks for comments using new conflict-free filenames.
+   * img: Support alignment of images with captions. (Giuseppe Bilotta)
+   * websetup: Fix utf-8 problems.
+   * websetup: Fix bug in array change detection.
+   * linkmap: Simplify and improve browser compatibility by using an img,
+     not object tag.
+   * git: The new git-notes feature in git 1.6.6 changes git log output
+     in a way that broke ikiwiki's parser if notes are added to commits.
+   * po: Avoid crash when a page is empty."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 6c5f9b914a067056e1d42921e639515507b34302 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Fri, 22 Jan 2010 22:46:31 +0000
Subject: new forum thread - file navigation

---
 ...of_wiki_pages_on_local_filesystem_with_vim.mdwn | 72 ++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
new file mode 100644
index 000000000..1f67a041d
--- /dev/null
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -0,0 +1,72 @@
+I wrote a vim function to help me navigate the wiki when I'm editing it. It extends the 'gf' (goto file) functionality. Once installed, you place the cursor on a wiki page name and press 'gf' (without the quotes); if the file exists, it gets loaded.
+
+This function takes into account the ikiwiki linking rules when deciding which file to go to.
+
+let me know what you think
+
+To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwiki.vim` file
+
+    " returns the directory which can be considered the root of the wiki the
+    " current buffer belongs to, or an empty string if we are not inside an
+    " ikiwiki wiki
+    "
+    " NOTE: the root of the wiki is considered the first directory that contains a
+    " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir)
+    "
+    " if you can think of a better heuristic to get ikiwiki's root, let me know!
+    function! GetWikiRootDir()
+      let check_str = '%:p:h'
+      let pos_wiki_root = expand(check_str)
+      while pos_wiki_root != '/'
+        if isdirectory(pos_wiki_root . '/.ikiwiki') && pos_wiki_root != $HOME
+          return pos_wiki_root
+        endif
+        let check_str = check_str . ':h'
+        let pos_wiki_root = expand(check_str)
+      endwhile
+      if isdirectory('/.ikiwiki')
+        return '/'
+      endif
+      return ''
+    endfunction
+    
+    " This function searches for a .mdwn file (<a:name>.mdwn) using the ikiwiki
+    " WikiLink rules and returns its full path.
+    "
+    " The rules are the following
+    "
+    " if the filename starts with '/', use as base dir the root directory of the
+    " wiki
+    "
+    " if not:
+    "
+    " try first ./<bufname>/<a:name>.mdwn
+    " then for  ./<a:name>.mdwn
+    " then for  <root_of_wiki>/<a:name>.mdwn
+    "
+    " return the first one that exists
+    "
+    " the base path (. above) is the directory that contains the current buffer
+    "
+    function! FileForWikiLink(name)
+      let target_fname=a:name . ".mdwn"
+      let wikiroot_dir = GetWikiRootDir()
+      if match(target_fname, '^/') >= 0
+        return wikiroot_dir . target_fname
+      endif
+      let subdir_file = expand('%:p:r') . "/" . target_fname
+      let currdir_file = expand('%:p:h') . "/" . target_fname
+      let wikiroot_file = wikiroot_dir . "/" . target_fname
+      if filewritable(subdir_file)
+        return subdir_file
+      endif
+      if filewritable(currdir_file)
+        return currdir_file
+      endif
+      if filewritable(wikiroot_file)
+        return wikiroot_file
+      endif
+      return a:name
+    endfunction
+    
+    setlocal includeexpr=FileForWikiLink(v:fname)
-- 
cgit v1.2.3


From cefcf60843968389ad85c232ecbf38dff19a4b67 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 22 Jan 2010 23:24:20 +0000
Subject:

---
 .../Render_more_than_one_dest_page_from_same_source_page.mdwn     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
index e88c23b07..e7362c903 100644
--- a/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
+++ b/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn
@@ -6,7 +6,9 @@ That is, same source, slightly different presentation at the other end, needing
 > This is done by calling `will_render()` and using `writefile()` to
 > generate the additional files. Probably in a format hook if you want
 > to generate html files.
-> 
+
+>> Thanks for the tip, I'll take a look at that. -- [[KathrynAndersen]]
+ 
 > It's not possible for one source file to represent multiple wiki pages.
 > There is a 1:1 mapping between source filenames and page names. The
 > difference between wiki pages and output files is that you can use
@@ -29,6 +31,8 @@ I want to do this for every page on the site, automatically, so it isn't feasibl
 > whole files for printing when you can use these style sheet tricks.
 > --[[Joey]] 
 
+>>Fair enough. --[[KathrynAndersen]]
+
 ##"en" and "en-us" versions of a page.
 
 My site is in non-US English.  However, I want US-English people to find my site when they search for it when they use US spelling on certain search terms (such as "optimise" versus "optimize").  This requires a (crude) US-English version of the site where the spellings are changed automatically, and the LANG is "en-us" rather than "en".  (No, don't tell me to use keywords; Google ignores keywords and has for a number of years).
@@ -43,3 +47,5 @@ But I'm not sure how to achieve the result I need.
 
 > Sounds like this could be considered a single page that generates two
 > html files, so could be handled per above. --[[Joey]] 
+
+>>Thanks! --[[KathrynAndersen]]
-- 
cgit v1.2.3


From b3b2402647e1628cea76922f5a6dc12adaa5a2b7 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 22 Jan 2010 23:36:17 +0000
Subject: discovered a wrinkle

---
 .../discussion.mdwn                                            | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
new file mode 100644
index 000000000..183a8ef55
--- /dev/null
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
@@ -0,0 +1,10 @@
+        " NOTE: the root of the wiki is considered the first directory that contains a
+        " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir)
+
+That's not going to work in all situations; for example, with an ikiwiki which uses git as the backend, the normal setup is that one has
+
+* a bare git repository
+* a git repository which ikiwiki builds the wiki from (which has a .ikiwiki directory in it)
+* an *additional* git repository cloned from the bare repository, which is used for making changes from the command-line rather than the web.  It is this repository in which one would be editing files with vim, and *this* repository does not have a .ikiwiki directory in it.  It does have a .git directory in the root, however, so I suppose you could use that as a method of detection of a root directory, but of course that would only work for git repositories.
+
+-- [[KathrynAndersen]]
-- 
cgit v1.2.3


From d0a06e6952f13a9a0c7d2959e393f700ee66c192 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Sat, 23 Jan 2010 16:37:42 +0000
Subject: update about wiki page navigation

---
 .../navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn    | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 1f67a041d..9545fda53 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -2,6 +2,14 @@ I wrote a vim function to help me navigate the wiki when I'm editing it. It exte
 
 This function takes into account the ikiwiki linking rules when deciding which file to go to.
 
+> 'gf' gets in the way when there are directories with the same name of a wiki page. The 
+> function below doesn't implement the linking rules properly (test the link (ignoring case),
+> if there is no match ascend the dir. hierarchy and start over, until we reach the root of
+> the wiki). I'm rewriting it to follow these rules properly
+> 
+> I think the page for [[LinkingRules|ikiwiki/subpage/linkingrules]] should say that ikiwiki **ascends**
+> the dir. hierarchy when looking for a wikilink, not that it **descends** it. Am I correct? --[[jerojasro]]
+
 let me know what you think
 
 To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwiki.vim` file
-- 
cgit v1.2.3


From 5456f720cd6fca6c5d8ec2d7da3dd745799ea26c Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/gsvick"
 <http://www.google.com/profiles/gsvick@web>
Date: Sat, 23 Jan 2010 19:03:32 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
new file mode 100644
index 000000000..59974ca00
--- /dev/null
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -0,0 +1,5 @@
+I'm trying to use ikiwiki for the first time. In the start, I had problems with installing the package, because I don't have a root account on my server.
+
+When I solved this, I finally set up my wiki, but whenever I try to edit a page, I get an error: “Error: bad page name”.
+
+What am I doing wrong? The wiki is at <http://atrey.karlin.mff.cuni.cz/~onderka/wiki/>, the setupfile I used at <http://atrey.karlin.mff.cuni.cz/~onderka/wiki/ikiwiki.setup>.
-- 
cgit v1.2.3


From 8b2977ea7a78556ace2e14a5d30b48e455e37ad0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 Jan 2010 14:14:34 -0500
Subject: response

---
 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 9545fda53..14f592fd7 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -10,6 +10,9 @@ This function takes into account the ikiwiki linking rules when deciding which f
 > I think the page for [[LinkingRules|ikiwiki/subpage/linkingrules]] should say that ikiwiki **ascends**
 > the dir. hierarchy when looking for a wikilink, not that it **descends** it. Am I correct? --[[jerojasro]]
 
+>> Conventionally, the root directory is considered to be lower than other
+>> directories, so I think the current wording is correct. --[[Joey]]
+
 let me know what you think
 
 To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwiki.vim` file
-- 
cgit v1.2.3


From dcc70ca629cf999b43bf32d38980df6381f8f282 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 Jan 2010 14:34:31 -0500
Subject: response

---
 doc/forum/Error:_bad_page_name.mdwn | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index 59974ca00..a16decedb 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -1,5 +1,21 @@
-I'm trying to use ikiwiki for the first time. In the start, I had problems with installing the package, because I don't have a root account on my server.
+I'm trying to use ikiwiki for the first time. In the start, I had problems
+with installing the package, because I don't have a root account on my
+server.
 
-When I solved this, I finally set up my wiki, but whenever I try to edit a page, I get an error: “Error: bad page name”.
+When I solved this, I finally set up my wiki, but whenever I try to edit a
+page, I get an error: “Error: bad page name”.
 
-What am I doing wrong? The wiki is at <http://atrey.karlin.mff.cuni.cz/~onderka/wiki/>, the setupfile I used at <http://atrey.karlin.mff.cuni.cz/~onderka/wiki/ikiwiki.setup>.
+What am I doing wrong? The wiki is at
+<http://atrey.karlin.mff.cuni.cz/~onderka/wiki/>, the setupfile I used at
+<http://atrey.karlin.mff.cuni.cz/~onderka/wiki/ikiwiki.setup>.
+
+> This means that one of the checks that ikiwiki uses to prevent
+> editing files with strange or insecure names has fired incorrectly.
+> Your setup file seems fine.
+> We can figure out what is going wrong through a series of tests:
+> 
+> * Test if your perl has a problem with matching alphanumerics:
+>   `perl -le 'print int "index"=~/^([-[:alnum:]+\/.:_]+)$/'`
+> * Check if something is breaking pruning of disallowed files:
+>   `perl -le 'use IkiWiki; %config=IkiWiki::defaultconfig(); print ! IkiWiki::file_pruned("index")'`
+> --[[Joey]] 
-- 
cgit v1.2.3


From a94039601a46c9679aa81ee01f6462f67652b114 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/gsvick"
 <http://www.google.com/profiles/gsvick@web>
Date: Sat, 23 Jan 2010 19:55:06 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index a16decedb..17979fd13 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -19,3 +19,10 @@ What am I doing wrong? The wiki is at
 > * Check if something is breaking pruning of disallowed files:
 >   `perl -le 'use IkiWiki; %config=IkiWiki::defaultconfig(); print ! IkiWiki::file_pruned("index")'`
 > --[[Joey]] 
+
+>>Both seem to run fine:
+
+    onderka@atrey:~$ perl -le 'print int "index"=~/^([-[:alnum:]+\/.:_]+)$/'
+    1
+    onderka@atrey:~$ perl -le 'use IkiWiki; %config=IkiWiki::defaultconfig(); print ! IkiWiki::file_pruned("index")'
+    1
-- 
cgit v1.2.3


From ce6432128253310dd65dea35a6f7f0a258eb621b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 Jan 2010 15:26:12 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index 17979fd13..a1d6890a6 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -26,3 +26,8 @@ What am I doing wrong? The wiki is at
     1
     onderka@atrey:~$ perl -le 'use IkiWiki; %config=IkiWiki::defaultconfig(); print ! IkiWiki::file_pruned("index")'
     1
+
+>>> Try installing this [instrumented
+>>> version](http://kitenet.net/~joey/tmp/editpage.pm) of
+>>> `IkiWiki/Plugin/editpage.pm`, which will add some debugging info
+>>> to the error message. --[[Joey]] 
-- 
cgit v1.2.3


From c301ce26a4d5d58a6b57b22fc184a763b310b257 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/gsvick"
 <http://www.google.com/profiles/gsvick@web>
Date: Sat, 23 Jan 2010 20:46:58 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index a1d6890a6..54fb83532 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -31,3 +31,7 @@ What am I doing wrong? The wiki is at
 >>> version](http://kitenet.net/~joey/tmp/editpage.pm) of
 >>> `IkiWiki/Plugin/editpage.pm`, which will add some debugging info
 >>> to the error message. --[[Joey]] 
+
+>>>>When I tried to `make` ikiwiki with this file, I got the error
+
+    ../IkiWiki/Plugin/editpage.pm:101: invalid variable interpolation at "$"
-- 
cgit v1.2.3


From 58eaf27137f57b9a58cec114280125a2c00357e9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 Jan 2010 18:33:13 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index 54fb83532..401815f7c 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -35,3 +35,5 @@ What am I doing wrong? The wiki is at
 >>>>When I tried to `make` ikiwiki with this file, I got the error
 
     ../IkiWiki/Plugin/editpage.pm:101: invalid variable interpolation at "$"
+
+>>>>> Sorry about that, I've corrected the above file. --[[Joey]] 
-- 
cgit v1.2.3


From 5bcbb584134cf5a52dedd498a973691a2a45d10f Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/gsvick"
 <http://www.google.com/profiles/gsvick@web>
Date: Sun, 24 Jan 2010 00:03:08 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index 401815f7c..23b5e7262 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -37,3 +37,5 @@ What am I doing wrong? The wiki is at
     ../IkiWiki/Plugin/editpage.pm:101: invalid variable interpolation at "$"
 
 >>>>> Sorry about that, I've corrected the above file. --[[Joey]] 
+
+>>>>>> Hmm, funny. Now that I reinstalled it with your changed file, it started working. I didn't remember how exactly did I install it the last time, so this time, it seems I did it correctly. Thank you very much for your help.
-- 
cgit v1.2.3


From 4affa37f8b5fdc61e2e07cfb7c8190041a4ffa4e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 23 Jan 2010 21:13:29 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/Error:_bad_page_name.mdwn b/doc/forum/Error:_bad_page_name.mdwn
index 23b5e7262..70277a1e4 100644
--- a/doc/forum/Error:_bad_page_name.mdwn
+++ b/doc/forum/Error:_bad_page_name.mdwn
@@ -39,3 +39,8 @@ What am I doing wrong? The wiki is at
 >>>>> Sorry about that, I've corrected the above file. --[[Joey]] 
 
 >>>>>> Hmm, funny. Now that I reinstalled it with your changed file, it started working. I didn't remember how exactly did I install it the last time, so this time, it seems I did it correctly. Thank you very much for your help.
+
+>>>>>>> Well, this makes me suspect you installed an older version of
+>>>>>>> ikiwiki and my file, which is from the latest version, included a
+>>>>>>> fix for whatever bug you were seeing. If I were you, I'd ensure
+>>>>>>> that I have a current version of ikiwiki installed. --[[Joey]] 
-- 
cgit v1.2.3


From bcde9b74120d0572d41447d798917ae02134e059 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 24 Jan 2010 02:52:57 +0000
Subject: new report plugin

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/report.mdwn b/doc/plugins/contrib/report.mdwn
new file mode 100644
index 000000000..7130bcb5f
--- /dev/null
+++ b/doc/plugins/contrib/report.mdwn
@@ -0,0 +1,166 @@
+[[!template id=plugin name=report author="[[rubykat]]"]]
+[[!tag type/meta type/format]]
+[[!toc]]
+## NAME
+
+IkiWiki::Plugin::report - Produce templated reports from page field data.
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff report ....}],
+
+    \[[!report template="blog_summary"
+    pages="blog/*"
+    sort="mtime"]]
+
+## DESCRIPTION
+
+This plugin provides the **report** directive.  This enables one to report on
+the structured data ("field" values) of multiple pages; the output is formatted
+via a template.  This depends on the "field" plugin.
+
+The pages to report on are selected by a PageSpec given by the "pages"
+parameter.  The template is given by the "template" parameter.
+The template expects the data from a single page; it is applied
+to each matching page separately, one after the other.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One, as with the
+[[plugins/template]] plugin, is in the /templates directory on the wiki.  These
+templates are wiki pages, and can be edited from the web like other wiki
+pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+## OPTIONS
+
+**template**: The template to use for the report.
+
+**pages**: A PageSpec to determine the pages to report on.
+
+**sort**: How the matching pages should be sorted.  Sorting criteria are separated by spaces.
+
+The possible values for sorting are:
+
+* **page**: Sort by the full page ID.
+* **pagename**: Sort by the base page name.
+* **pagename_natural**: Sort by the base page name, using Sort::Naturally if it is installed.
+* **mtime**: Sort by the page modification time.
+* **age**: Sort by the page creation time, newest first.
+
+Any other value is taken to be a field name to sort by.
+If a sort value begins with a minus (-) then the order for that field is reversed.
+
+### Headers
+
+An additional option is the "headers" option.  This is a space-separated
+list of field names which are to be used as headers in the report.  This
+is a way of getting around one of the limitations of HTML::Template, that
+is, not being able to do tests such as
+"if this-header is not equal to previous-header".
+
+Instead, that logic is performed inside the plugin.  The template is
+given parameters "HEADER1", "HEADER2" and so on, for each header.
+If the value of a header field is the same as the previous value,
+then HEADER**N** is set to be empty, but if the value of the header
+field is new, then HEADER**N** is given that value.
+
+#### Example
+
+Suppose you're writing a blog in which you record "moods", and you
+want to display your blog posts by mood.
+
+    \[[!report template="mood_summary"
+    pages="blog/*"
+    sort="Mood Date title"
+    headers="Mood"]]
+
+The "mood_summary" template might be like this:
+
+    <TMPL_IF NAME="HEADER1">
+    ## <TMPL_VAR NAME="HEADER1">
+    </TMPL_IF>
+    ### <TMPL_VAR NAME="TITLE">
+    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE"]]
+    <TMPL_VAR NAME="DESCRIPTION">
+    
+### Advanced Options
+
+The following options are used to improve efficiency when dealing
+with large numbers of pages; most people probably won't need them.
+
+**trail**:
+
+A page or pages to use as a "trail" page.  When a trail page is used,
+the matching pages are limited to (a subset of) the pages which that
+page links to; the "pages" pagespec in this case, rather than selecting
+pages from the entire wiki, will select pages from within the set of pages
+given by the trail page.
+
+**doscan**:
+
+Whether this report should be called in "scan" mode; if it is, then
+the pages which match the pagespec are added to the list of links from
+this page.  This can be used by *another* report by setting this
+page to be a "trail" page in *that* report.
+It is not possible to use "trail" and "doscan" at the same time.
+By default, "doscan" is false.
+
+## TEMPLATE PARAMETERS
+
+The templates are in HTML::Template format, just as [[plugins/template]] and
+[[ftemplate]] are.  The parameters passed in to the template are as follows:
+
+***fields***:
+
+The structured data from the current matching page.  This includes
+"title" and "description" if they are defined.
+
+***common values***:
+
+Values known for all pages: "page", "destpage".  Also "basename" (the base name of the page).
+
+***passed-in values***:
+
+Any additional parameters to the report directive are passed to the
+template; a parameter will override the matching "field" value.
+For example, if you have a "Mood" field, and you pass Mood="bad" to
+the report, then that will be the Mood which is given for the whole
+report.
+
+Generally this is useful if one wishes to make a more generic
+template and hide or show portions of it depending on what
+values are passed in the report directive call.
+
+For example, one could have a "hide_mood" parameter which would hide
+the "Mood" section of your template when it is true, which one could
+use when the Mood is one of the headers.
+
+***headers***:
+
+See the section on Headers.
+
+***first and last***:
+
+If this is the first page-record in the report, then "first" is true.
+If this is the last page-record in the report, then "last" is true.
+
+## PREREQUISITES
+
+    IkiWiki
+    IkiWiki::Plugin::field
+    HTML::Template
+    Encode
+
+## DOWNLOAD
+
+* browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/report.pm>
+* git repo at git://github.com/rubykat/ikiplugins.git
-- 
cgit v1.2.3


From 27d2d7115df82908396d460d92857fd0990c556d Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 24 Jan 2010 02:59:11 +0000
Subject: note that report is now released

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index ce6246034..015e9f5a1 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -26,3 +26,6 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 > -- [[users/KathrynAndersen]]
 
 >> Ooh, sounds nice :) . --[[SR|users/simonraven]]
+
+>>> I've now released the [[plugins/contrib/report]] plugin.  I've been using it on my site; the holdup on releasing was because I hadn't yet written the docs for it. I hope you find it useful.
+>>> -- [[users/KathrynAndersen]]
-- 
cgit v1.2.3


From 29c475af4da5a50a857b94ff131313a05b1d7221 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 24 Jan 2010 03:06:06 +0000
Subject: link to site

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

(limited to 'doc')

diff --git a/doc/users/KathrynAndersen.mdwn b/doc/users/KathrynAndersen.mdwn
index 14fabbb01..16cb390c4 100644
--- a/doc/users/KathrynAndersen.mdwn
+++ b/doc/users/KathrynAndersen.mdwn
@@ -1,6 +1,7 @@
 * aka [[rubykat]]
 * Currently an active [PmWiki](http://www.pmwiki.org) user, but investigating changing over to ikiwiki (if I can write the plugins I need).
 * <http://kerravonsen.dreamwidth.org>
+* <http://www.katspace.org>
 * <http://github.com/rubykat>
 
 Has written the following plugins:
-- 
cgit v1.2.3


From f6b2edef642ccda83a4c96aeeb2e146202707a67 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 24 Jan 2010 09:38:40 +0000
Subject: new release of getfield; can now get values from other pages as well
 as current page

---
 doc/plugins/contrib/getfield.mdwn | 60 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield.mdwn b/doc/plugins/contrib/getfield.mdwn
index 929f70485..0a92894f1 100644
--- a/doc/plugins/contrib/getfield.mdwn
+++ b/doc/plugins/contrib/getfield.mdwn
@@ -18,13 +18,13 @@ use per-page structured data, where each page is treated like a record, and the
 structured data are fields in that record.  This can include the meta-data for
 that page, such as the page title.
 
-This plugin is meant to be used in conjunction with the **field** plugin.
+This plugin is meant to be used in conjunction with the [[field]] plugin.
 
 ### USAGE
 
 One can get the value of a field by using special markup in the page.
 This does not use directive markup, in order to make it easier to
-use the markup inside other directives.  There are two forms:
+use the markup inside other directives.  There are four forms:
 
 * {{$*fieldname*}}
 
@@ -39,6 +39,26 @@ use the markup inside other directives.  There are two forms:
 
     	<h1>My Long and Complicated Title With Potential For Spelling Mistakes</h1>
 
+* {{$*pagename*#*fieldname*}}
+
+  This queries the value of *fieldname* for the page *pagename*.
+
+  For example:
+
+  On PageFoo:
+
+    \[[!meta title="I Am Page Foo"]]
+
+    Stuff about Foo.
+
+  On PageBar:
+
+    For more info, see \[[{{$PageFoo#title}}|PageFoo]].
+
+  When PageBar is displayed:
+
+    &lt;p&gt;For more info, see &lt;a href="PageFoo"&gt;I Am Page Foo&lt;/a&gt;.&lt;/p&gt;
+
 * {{+$*fieldname*+}}
 
   This queries the value of *fieldname* for the destination page; that is,
@@ -68,17 +88,43 @@ use the markup inside other directives.  There are two forms:
     	<h1>I Am Page B</h1>
     	<p>Stuff about A.</p>
 
+* {{+$*pagename*#*fieldname*+}}
+
+  This queries the value of *fieldname* for the page *pagename*; the
+  only difference between this and {{$*pagename*#*fieldname*}} is
+  that the full name of *pagename* is calculated relative to the
+  destination page rather than the source page.
+
+  I can't really think of a reason why this should be needed, but
+  this format has been added for completeness.
+
+### No Value Found
+
+If no value is found for the given field, then the field name is returned.
+
+For example:
+
+On PageFoo:
+
+    \[[!meta title="Foo"]]
+    My title is {{$title}}.
+    
+    My description is {{$description}}.
+
+When PageFoo is displayed:
+
+    <p>My title is Foo.</p>
+    
+    <p>My description is description.</p>
+
+This is because "description" hasn't been defined for that page.
+
 ### More Examples
 
 Listing all the sub-pages of the current page:
 
     \[[!map pages="{{$page}}/*"]]
 
-### LIMITATIONS
-
-One cannot query the values of fields on pages other than the current
-page or the destination page.
-
 ## DOWNLOAD
 
 * browse at GitHub: <http://github.com/rubykat/ikiplugins/blob/master/IkiWiki/Plugin/getfield.pm>
-- 
cgit v1.2.3


From e9ee3d7d85e792ee6720696abe62f25cdd7f945a Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 24 Jan 2010 09:41:44 +0000
Subject: note new version of getfield

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/getfield/discussion.mdwn b/doc/plugins/contrib/getfield/discussion.mdwn
index 015e9f5a1..5f7fffead 100644
--- a/doc/plugins/contrib/getfield/discussion.mdwn
+++ b/doc/plugins/contrib/getfield/discussion.mdwn
@@ -19,6 +19,7 @@ Like you mentioned in [[ftemplate]] IIRC, it'll only work on the same page. If i
 >>>>> What about using {{pagename#fieldname}}? The meaning of the hash in URLs sort of fits with what is needed here (reference to a 'named' thing within the page) and it won't conflict with actual hash usages (unless we expect different named parts of pages to define different values for the same field ...)
 >>>>> -- [[Oblomov]]
 >>>>>> That's a good one too. --[[simonraven]]
+>>>>>>> Done!  I used {{$*pagename*#*fieldname*}} for the format. -- [[users/KathrynAndersen]]
 
 
 > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page.
-- 
cgit v1.2.3


From 2f4ae4fa057bd46001453b5e70f56b4e2ad77b83 Mon Sep 17 00:00:00 2001
From: HelenOliver <HelenOliver@web>
Date: Mon, 25 Jan 2010 04:21:27 +0000
Subject: added references

---
 doc/blog.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/blog.mdwn b/doc/blog.mdwn
index c4a379fdb..222351498 100644
--- a/doc/blog.mdwn
+++ b/doc/blog.mdwn
@@ -1,4 +1,8 @@
-Ikiwiki allows turning any page into a weblog, by using the
+Ikiwiki allows turning any page into a weblog, or any information reflected on a [research paper](http://www.superiorpapers.com/) by using the
 [[ikiwiki/directive/inline]] [[ikiwiki/directive]]. For example:
 
 	\[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
+
+For additional information or [homework help](http://www.superiorpapers.com/homework.php) about ikiwiki, consult these online information:
+1. [Ikiwiki on Wikipedia](http://en.wikipedia.org/wiki/Ikiwiki)
+2. [Debian package of ikiwiki](http://packages.debian.org/sid/ikiwiki)
-- 
cgit v1.2.3


From f89b6f49d021762de8a260e92a4a3787cbf89b32 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 24 Jan 2010 23:32:19 -0500
Subject: Revert spam

---
 doc/blog.mdwn | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/blog.mdwn b/doc/blog.mdwn
index 222351498..c4a379fdb 100644
--- a/doc/blog.mdwn
+++ b/doc/blog.mdwn
@@ -1,8 +1,4 @@
-Ikiwiki allows turning any page into a weblog, or any information reflected on a [research paper](http://www.superiorpapers.com/) by using the
+Ikiwiki allows turning any page into a weblog, by using the
 [[ikiwiki/directive/inline]] [[ikiwiki/directive]]. For example:
 
 	\[[!inline pages="blog/* and !*/Discussion" show="10" rootpage="blog"]]
-
-For additional information or [homework help](http://www.superiorpapers.com/homework.php) about ikiwiki, consult these online information:
-1. [Ikiwiki on Wikipedia](http://en.wikipedia.org/wiki/Ikiwiki)
-2. [Debian package of ikiwiki](http://packages.debian.org/sid/ikiwiki)
-- 
cgit v1.2.3


From e269fbd7af187b986c9e52ae8459b57d70c64bcd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 04:35:58 -0500
Subject: new repo

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

(limited to 'doc')

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 5167ad004..30fed6afc 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -56,7 +56,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[ktf]] `git://github.com/ktf/ikiwiki.git`
 * [[tove]] `git://github.com/tove/ikiwiki.git`
 * [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki`
-
+* [[roktas]] `git://github.com/roktas/ikiwiki.git``
 
 ## branches
 
-- 
cgit v1.2.3


From bcf74bd8f8b72abb6466fef1b6848dc4cb5eb7b2 Mon Sep 17 00:00:00 2001
From: MariaJackson <MariaJackson@web>
Date: Thu, 28 Jan 2010 09:58:20 +0000
Subject:

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 683a3f8ac..8e1ab2e56 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -8,6 +8,7 @@ there are some variations on the approach that might be useful:
  * Or, querying the mysql back-end to get the names
  * using WWW::MediaWiki for importing/exporting pages from the wiki, instead
    of Special::Export
+ * use <a href="http://www.overnightpools.com/Winter_Covers.htm">pool covers</a>
 
 Also, some detail on converting mediawiki transclusion to ikiwiki inlines...
 
-- 
cgit v1.2.3


From 7f462b658953c7907d942e71a17b53a678b2ccc6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 05:23:28 -0500
Subject: revert spam

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 1 -
 1 file changed, 1 deletion(-)

(limited to 'doc')

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 8e1ab2e56..683a3f8ac 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -8,7 +8,6 @@ there are some variations on the approach that might be useful:
  * Or, querying the mysql back-end to get the names
  * using WWW::MediaWiki for importing/exporting pages from the wiki, instead
    of Special::Export
- * use <a href="http://www.overnightpools.com/Winter_Covers.htm">pool covers</a>
 
 Also, some detail on converting mediawiki transclusion to ikiwiki inlines...
 
-- 
cgit v1.2.3


From 5ba9a0ae9797ad5e147985f3ea450a21bfe28667 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 22:41:06 -0500
Subject: added Anna and Mark's bevvy of websites

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 0ebab313d..aa4d9b96a 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -50,6 +50,7 @@ Projects & Organizations
 * [The XCB library](http://xcb.freedesktop.org/)
 * [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/)
 * [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/)
+* [Wetknee Books](http://www.wetknee.com/)
 
 Personal sites and blogs
 ========================
@@ -131,6 +132,10 @@ Personal sites and blogs
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
 * [Nico Schottelius' homepage](http://www.nico.schottelius.org)
 * [Andreas Zwinkaus homepage](http://beza1e1.tuxen.de)
+* [Walden Effect](http://waldeneffect.org)
+* [Avian Aqua Miser](http://www.avianaquamiser.com/)
+* [Cosmic Cookout](http://www.cosmiccookout.com/)
+* [Backyard Deer Deterrents](http://www.backyarddeer.com/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 3f822ed95fec3a9396cd4afe384ccf5067b82f2c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 22:41:35 -0500
Subject: iainmclaren.com not using ikiwiki now

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index aa4d9b96a..153a7fd92 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -82,7 +82,6 @@ Personal sites and blogs
 * [Proper Treatment 正當作法](http://conway.rutgers.edu/~ccshan/wiki/)
 * [lost scraps](http://web.mornfall.net), pages/blog of Petr Ročkai aka mornfall
 * [Ronan Le Hy's blog](http://bayesien.org), in French.
-* <http://iainmclaren.com>.
 * [formorers blog and website](http://www.formorer.de/webwiki/)
 * [Mark Jaroski's blog](http://movemearound.org/)
 * I keep my personal project notes and specs in a private ikiwiki - it's the perfect tool for this task. - [the daniel](http://neoglam.com)
-- 
cgit v1.2.3


From ca76d8f38beccfeba40d52e1d8fd2362cada3197 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 28 Jan 2010 22:43:23 -0500
Subject: oh, we didn't convert this one yet.

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 153a7fd92..f750fb4b0 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -134,7 +134,6 @@ Personal sites and blogs
 * [Walden Effect](http://waldeneffect.org)
 * [Avian Aqua Miser](http://www.avianaquamiser.com/)
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
-* [Backyard Deer Deterrents](http://www.backyarddeer.com/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From a2ee2aa9c733b2a8df1fc564e5634abe7d209c05 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 29 Jan 2010 16:05:45 -0500
Subject: note on filtering

---
 doc/tips/add_chatterbox_to_blog.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/tips/add_chatterbox_to_blog.mdwn b/doc/tips/add_chatterbox_to_blog.mdwn
index aa35b9331..e07e36b07 100644
--- a/doc/tips/add_chatterbox_to_blog.mdwn
+++ b/doc/tips/add_chatterbox_to_blog.mdwn
@@ -18,4 +18,7 @@ from there, like I have on [my blog](http://kitenet.net/~joey/blog/)
 	show=5 feeds=no]]
 	"""]]
 
+* To filter out `@-replies`, append "and !*@*" to the [[ikiwiki/PageSpec]].
+  The same technique can be used for other filtering.
+
 Note: Works best with ikiwiki 3.10 or better.
-- 
cgit v1.2.3


From e9b349fdb0d9bcd3ff8389b4cbf6d5f14e84a740 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Sat, 30 Jan 2010 21:30:14 -0500
Subject: testing push

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

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
index 183a8ef55..62f853f8c 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
@@ -8,3 +8,5 @@ That's not going to work in all situations; for example, with an ikiwiki which u
 * an *additional* git repository cloned from the bare repository, which is used for making changes from the command-line rather than the web.  It is this repository in which one would be editing files with vim, and *this* repository does not have a .ikiwiki directory in it.  It does have a .git directory in the root, however, so I suppose you could use that as a method of detection of a root directory, but of course that would only work for git repositories.
 
 -- [[KathrynAndersen]]
+
+
-- 
cgit v1.2.3


From a4611bdebdf8f55bd163b7b3d38366cd2998d931 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Sat, 30 Jan 2010 21:35:12 -0500
Subject: reply to forum discussion

---
 .../discussion.mdwn                                               | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
index 62f853f8c..99e83b50f 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
@@ -9,4 +9,12 @@ That's not going to work in all situations; for example, with an ikiwiki which u
 
 -- [[KathrynAndersen]]
 
+You are completely right; all of my wikis are compiled both locally and
+remotely, and so the local repo also has a `.ikiwiki` folder. And that's not the
+"usual" setup.
 
+checking for a `.git` dir would not work when the wiki's source files aren't
+located at the root of the repo.
+
+So, besides of doing a `touch .ikiwiki` at the root of the wiki in your local
+repo, do you see any alternative?
-- 
cgit v1.2.3


From 91cb8d75de2c0a8a57d79935aab7bde381c70b3b Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Sat, 30 Jan 2010 21:38:47 -0500
Subject: missing signature

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

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
index 99e83b50f..7b323860b 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
@@ -18,3 +18,5 @@ located at the root of the repo.
 
 So, besides of doing a `touch .ikiwiki` at the root of the wiki in your local
 repo, do you see any alternative?
+
+-- [[jerojasro]]
-- 
cgit v1.2.3


From 03bb16cf180f0d3af713b4b54a71787aa13fb9af Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Sun, 31 Jan 2010 11:35:33 -0500
Subject: moved discussion to the forum main page

---
 ...of_wiki_pages_on_local_filesystem_with_vim.mdwn | 22 ++++++++++++++++++++++
 .../discussion.mdwn                                | 22 ----------------------
 2 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 14f592fd7..fd9f67ee4 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -15,6 +15,28 @@ This function takes into account the ikiwiki linking rules when deciding which f
 
 let me know what you think
 
+>         " NOTE: the root of the wiki is considered the first directory that contains a
+>         " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir)
+> 
+> That's not going to work in all situations; for example, with an ikiwiki which uses git as the backend, the normal setup is that one has
+> 
+> * a bare git repository
+> * a git repository which ikiwiki builds the wiki from (which has a .ikiwiki directory in it)
+> * an *additional* git repository cloned from the bare repository, which is used for making changes from the command-line rather than the web.  It is this repository in which one would be editing files with vim, and *this* repository does not have a .ikiwiki directory in it.  It does have a .git directory in the root, however, so I suppose you could use that as a method of detection of a root directory, but of course that would only work for git repositories.
+> 
+> -- [[KathrynAndersen]]
+> 
+>> You are completely right; all of my wikis are compiled both locally and
+>> remotely, and so the local repo also has a `.ikiwiki` folder. And that's not the
+>> "usual" setup.
+>> 
+>> checking for a `.git` dir would not work when the wiki's source files aren't
+>> located at the root of the repo.
+>> 
+>> So, besides of doing a `touch .ikiwiki` at the root of the wiki in your local
+>> repo, do you see any alternative?
+>> 
+>> -- [[jerojasro]]
 To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwiki.vim` file
 
     " returns the directory which can be considered the root of the wiki the
diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
deleted file mode 100644
index 7b323860b..000000000
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim/discussion.mdwn
+++ /dev/null
@@ -1,22 +0,0 @@
-        " NOTE: the root of the wiki is considered the first directory that contains a
-        " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir)
-
-That's not going to work in all situations; for example, with an ikiwiki which uses git as the backend, the normal setup is that one has
-
-* a bare git repository
-* a git repository which ikiwiki builds the wiki from (which has a .ikiwiki directory in it)
-* an *additional* git repository cloned from the bare repository, which is used for making changes from the command-line rather than the web.  It is this repository in which one would be editing files with vim, and *this* repository does not have a .ikiwiki directory in it.  It does have a .git directory in the root, however, so I suppose you could use that as a method of detection of a root directory, but of course that would only work for git repositories.
-
--- [[KathrynAndersen]]
-
-You are completely right; all of my wikis are compiled both locally and
-remotely, and so the local repo also has a `.ikiwiki` folder. And that's not the
-"usual" setup.
-
-checking for a `.git` dir would not work when the wiki's source files aren't
-located at the root of the repo.
-
-So, besides of doing a `touch .ikiwiki` at the root of the wiki in your local
-repo, do you see any alternative?
-
--- [[jerojasro]]
-- 
cgit v1.2.3


From 1e0b724bac67d3f31bfb3620876937ec4291a326 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 31 Jan 2010 14:03:19 -0500
Subject: document that state variables are not available in the checkconfig
 hook

---
 doc/plugins/write.mdwn | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 45f083b42..082f0e38f 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -68,20 +68,21 @@ In roughly the order they are called.
 
 This allows for plugins to perform their own processing of command-line
 options and so add options to the ikiwiki command line. It's called during
-command line processing, with @ARGV full of any options that ikiwiki was
+command line processing, with `@ARGV` full of any options that ikiwiki was
 not able to process on its own. The function should process any options it
-can, removing them from @ARGV, and probably recording the configuration
-settings in %config. It should take care not to abort if it sees
+can, removing them from `@ARGV`, and probably recording the configuration
+settings in `%config`. It should take care not to abort if it sees
 an option it cannot process, and should just skip over those options and
-leave them in @ARGV.
+leave them in `@ARGV`.
 
 ### checkconfig
 
 	hook(type => "checkconfig", id => "foo", call => \&checkconfig);
 
 This is useful if the plugin needs to check for or modify ikiwiki's
-configuration. It's called early in the startup process. The
-function is passed no values. It's ok for the function to call
+configuration. It's called early in the startup process. `%config`
+is populated at this point, but other state has not yet been loaded.
+The function is passed no values. It's ok for the function to call
 `error()` if something isn't configured right.
 
 ### refresh
-- 
cgit v1.2.3


From 541406818b0ebc0023600db2d6e3fadaec7f9b41 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 1 Feb 2010 11:09:27 +0000
Subject: also potwiki

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

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index fd9f67ee4..c29985497 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -103,3 +103,5 @@ To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwik
     endfunction
     
     setlocal includeexpr=FileForWikiLink(v:fname)
+
+> Interesting. I was at one point looking at "potwiki.vim", which implements a local wiki and follows CamelCase links, creating new files where necessary etc., to see if it could be adapted for ikiwiki (See [[tips/vim syntax highlighting/discussion]]). I didn't get anywhere. -- [[Jon]]
-- 
cgit v1.2.3


From 438cb249a3f2bc9e04ea4b50d247daa7a43c281d Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Mon, 1 Feb 2010 14:32:21 +0000
Subject:

---
 ...of_wiki_pages_on_local_filesystem_with_vim.mdwn | 85 +++++-----------------
 1 file changed, 20 insertions(+), 65 deletions(-)

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index c29985497..261f1579f 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -37,71 +37,26 @@ let me know what you think
 >> repo, do you see any alternative?
 >> 
 >> -- [[jerojasro]]
-To enable this functionality, paste the code below in your `.vim/ftplugin/ikiwiki.vim` file
 
-    " returns the directory which can be considered the root of the wiki the
-    " current buffer belongs to, or an empty string if we are not inside an
-    " ikiwiki wiki
-    "
-    " NOTE: the root of the wiki is considered the first directory that contains a
-    " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir)
-    "
-    " if you can think of a better heuristic to get ikiwiki's root, let me know!
-    function! GetWikiRootDir()
-      let check_str = '%:p:h'
-      let pos_wiki_root = expand(check_str)
-      while pos_wiki_root != '/'
-        if isdirectory(pos_wiki_root . '/.ikiwiki') && pos_wiki_root != $HOME
-          return pos_wiki_root
-        endif
-        let check_str = check_str . ':h'
-        let pos_wiki_root = expand(check_str)
-      endwhile
-      if isdirectory('/.ikiwiki')
-        return '/'
-      endif
-      return ''
-    endfunction
-    
-    " This function searches for a .mdwn file (<a:name>.mdwn) using the ikiwiki
-    " WikiLink rules and returns its full path.
-    "
-    " The rules are the following
-    "
-    " if the filename starts with '/', use as base dir the root directory of the
-    " wiki
-    "
-    " if not:
-    "
-    " try first ./<bufname>/<a:name>.mdwn
-    " then for  ./<a:name>.mdwn
-    " then for  <root_of_wiki>/<a:name>.mdwn
-    "
-    " return the first one that exists
-    "
-    " the base path (. above) is the directory that contains the current buffer
-    "
-    function! FileForWikiLink(name)
-      let target_fname=a:name . ".mdwn"
-      let wikiroot_dir = GetWikiRootDir()
-      if match(target_fname, '^/') >= 0
-        return wikiroot_dir . target_fname
-      endif
-      let subdir_file = expand('%:p:r') . "/" . target_fname
-      let currdir_file = expand('%:p:h') . "/" . target_fname
-      let wikiroot_file = wikiroot_dir . "/" . target_fname
-      if filewritable(subdir_file)
-        return subdir_file
-      endif
-      if filewritable(currdir_file)
-        return currdir_file
-      endif
-      if filewritable(wikiroot_file)
-        return wikiroot_file
-      endif
-      return a:name
-    endfunction
-    
-    setlocal includeexpr=FileForWikiLink(v:fname)
+well. I've rewritten the whole thing, to take into account:
+  
+  * file matching ignoring case (MyPage matches mypage.mdwn)
+  * checking all the way down (up) to the root of the wiki (if there is a link `\[[foo]]` on `a/b/page`),
+  try `a/b/page/foo`, then `a/b/foo`, and so on, up to `foo`
+  * the alternate name for a page: when looking for the file for `\[[foo]]`, try both `foo.mdwn` and `foo/index.mdwn`
+
+you can find the file [here](http://git.devnull.li/cgi-bin/gitweb.cgi?p=vim-jerojasro.git;a=blob;f=.vim/ftplugin/ikiwiki_nav.vim;hb=HEAD). To use it, place it in `$HOME/.vim/ftplugin`. After that, hitting `<CR>` (Enter) in normal mode over a wikilink will take you to that page, if it exists.
+
+the plugin has, as of now, two problems:
+ 
+  * doesn't work with wikilinks that take more than one line (though this isn't really that bad)
+  * it assumes that the root of the wiki is the first directory down the filesystem hierarchy that 
+  has a `.ikiwiki` folder on it. If your copy of the wiki doesn't have it, you must create it for 
+  the plugin to work
+
+-- [[jerojasro]]
 
 > Interesting. I was at one point looking at "potwiki.vim", which implements a local wiki and follows CamelCase links, creating new files where necessary etc., to see if it could be adapted for ikiwiki (See [[tips/vim syntax highlighting/discussion]]). I didn't get anywhere. -- [[Jon]]
+
+>> when I wrote the plugin I also considered the possibility of creating files (and their dirs, if necessary) 
+>> from new wikilinks; the changes needed to get that working are fairly small -- [[jerojasro]]
-- 
cgit v1.2.3


From f963700a4f418f3498c8d855b5ce88d951391867 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 1 Feb 2010 15:34:10 -0500
Subject: ready to pull, and thoughts

---
 ...of_wiki_pages_on_local_filesystem_with_vim.mdwn | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 261f1579f..1cb5ed27e 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -60,3 +60,36 @@ the plugin has, as of now, two problems:
 
 >> when I wrote the plugin I also considered the possibility of creating files (and their dirs, if necessary) 
 >> from new wikilinks; the changes needed to get that working are fairly small -- [[jerojasro]]
+
+> Seems about ready for me to think about pulling it into ikiwiki
+> alongside [[tips/vim_syntax_highlighting/ikiwiki.vim]]. If you'll
+> please slap a license on it. :) --[[Joey]] 
+> 
+> Also, I have a possible other approach for finding ikiwiki's root. One
+> could consider that any subdirectory of an ikiwiki wiki is itself
+> a standalone wiki, though probably one missing a toplevel index page.
+> The relative wikilinks work such that this assumption makes sense;
+> you can build any subdirectory with ikiwiki and probably get something
+> reasonable with links that work, etc.
+> 
+> So, if that's the case, then one could say that the directory that the
+> user considers to be the toplevel of their wiki is really also a subwiki,
+> enclosed in a succession of parents that go all the way down to the root
+> directory (or alternatively, to the user's home directory). I think that
+> logically makes some sense.
+> 
+> And if that's the case, you can resolve an absolute link by looking for
+> the page closest to the root that matches the link.
+> 
+> It may even make sense to change ikiwiki's own handling of "absolute"
+> links to work that way. But even without changing ikiwiki, I think it
+> would be a reasonable thing for vim to do. It would only fail in two
+> unusual circumstances:
+> 
+> 1. There is a file further down, outside what the user considers
+>    the wiki, that matches. Say a `$HOME/index.mdwn`
+> 2. An absolute link is broken in that the page linked to does
+>    not exist in the root of the wiki. But it does exist in a subdir, 
+>    and vim would go to that file.
+> 
+> --[[Joey]] 
-- 
cgit v1.2.3


From b30fd6327966c4591c76041968b375b04c7e8982 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 1 Feb 2010 16:06:51 -0500
Subject: thanks schmonz for your kind donation

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

(limited to 'doc')

diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn
index 87a497fd1..b725a2eff 100644
--- a/doc/tipjar.mdwn
+++ b/doc/tipjar.mdwn
@@ -15,6 +15,7 @@ Thanks to the following people for their kind contributions:
 * Mick Pollard
 * Nico Schottelius
 * Jon Dowland
+* Amitai Schlair
 
 (Note that this page is locked to prevent anyone from tampering with the PayPal button.
 If you prefer your donation *not* be listed here, let [[Joey]] know.)
-- 
cgit v1.2.3


From deb0bc8bd57bc74709ecb12de36a9cb96c684a93 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Tue, 2 Feb 2010 02:56:06 -0800
Subject: New todo item for wrapperuser configuration option

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

(limited to 'doc')

diff --git a/doc/todo/wrapperuser.mdwn b/doc/todo/wrapperuser.mdwn
new file mode 100644
index 000000000..4c42b046f
--- /dev/null
+++ b/doc/todo/wrapperuser.mdwn
@@ -0,0 +1,7 @@
+ikiwiki's .setup file can specify wrappergroup, and ikiwiki will set the group
+of the wrappers accordingly.  Having had people encounter difficulty before
+when trying to do the same thing with users (for instance, making all wrappers
+6755 ikiwiki:ikiwiki), I think it would help to have "wrapperuser".  This could
+only actually take effect if building the wrappers as root (not really the best
+plan), but ikiwiki could at least warn if wrapperuser does not match the user
+the wrapper will end up with.
-- 
cgit v1.2.3


From 05b99e3cfa8c9044d18d5b07aec24fff555f2889 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 2 Feb 2010 13:54:51 +0100
Subject: Document git branch for automatically creating tag pages.

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index f1d33114f..95710ced0 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -123,3 +123,40 @@ On the second extra pass, it doesn't notice that it has to update the "?"-link.
                 }
 
 is not satisfied for the newly created tag page. I shall put debug msgs into Render.pm to find out better how it works. --Ivan Z.
+
+---
+
+I've made another attempt at fixiing this
+
+The current progress can be found at my [git repository][gitweb] on branch
+`autotag`:
+
+	git://git.liegesta.at/git/ikiwiki
+
+[gitweb]: http://git.liegesta.at/?p=ikiwiki.git;a=shortlog;h=refs/heads/autotag (gitweb for branch autotag)
+
+It's not entirely finished yet, but already quite usable. Testing and comments
+on code quality, implementation details, as well as other patches would be
+appreciated.
+
+Here's what it does right now:
+
+* enabled by setting `tag_autocreate=1` in the configuration.
+* Tag pages will be created in `tagbase` from the template `autotag.tmpl`.
+* Will correctly render all links, and dependencies. Well, AFAIK.
+* When a tag page is deleted it will automatically recreated from template. (I
+consider this a feature, not a bug)
+* Requires a rebuild on first use.
+* Adds a function `add_autofile()` to the plugin API, to do all this.
+
+Todo/Bugs:
+
+* Will still create a page even if there's a page other than `$tag` under
+`tagbase` satisfying the tag link.
+* Call from `IkiWiki.pm` to `Render.pm`, which adds a module dependency in the
+wrong direction.
+* Add files to RCS.
+* Unit tests.
+* Proper documentation.
+
+--[[David_Riebenbauer]]
-- 
cgit v1.2.3


From c6f27f9dfaa689a32342a412d6fd19d63453ee85 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 2 Feb 2010 14:32:51 +0100
Subject: add git repository 'davrieb' and document branch on userpage

---
 doc/git.mdwn                     | 4 +++-
 doc/users/David_Riebenbauer.mdwn | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 30fed6afc..289937121 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -56,7 +56,9 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[ktf]] `git://github.com/ktf/ikiwiki.git`
 * [[tove]] `git://github.com/tove/ikiwiki.git`
 * [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki`
-* [[roktas]] `git://github.com/roktas/ikiwiki.git``
+* [[roktas]] `git://github.com/roktas/ikiwiki.git`
+* [[davrieb|David_Riebenbauer]] `git://git.liegesta.at/git/ikiwiki`
+  ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
 
 ## branches
 
diff --git a/doc/users/David_Riebenbauer.mdwn b/doc/users/David_Riebenbauer.mdwn
index 372a28588..d7469696e 100644
--- a/doc/users/David_Riebenbauer.mdwn
+++ b/doc/users/David_Riebenbauer.mdwn
@@ -1,2 +1,8 @@
 Runs ikiwiki on his [homepage](http://liegesta.at/) and can be reached through
 <davrieb@liegesta.at>
+
+## Branches in his [[git]] repository ##
+
+* `autotag`
+([browse](http://git.liegesta.at/?p=ikiwiki.git;a=shortlog;h=refs/heads/autotag))
+See [[todo/auto-create_tag_pages_according_to_a_template]]
-- 
cgit v1.2.3


From 1febfda911d29a52b4c4aa1bb286f4c9e1862c5c Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 2 Feb 2010 14:50:01 +0100
Subject: also tag 'patch/core', considering that over half of the changes are
 there

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

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 95710ced0..8c586d706 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -4,7 +4,7 @@ Tags are mainly specific to the object to which they’re stuck. However, I ofte
 
 Also see: <http://madduck.net/blog/2008.01.06:new-blog/> and <http://users.itk.ppke.hu/~cstamas/code/ikiwiki/autocreatetagpage/>
 
-[[!tag wishlist plugins/tag patch]]
+[[!tag wishlist plugins/tag patch patch/core]]
 
 I would love to see this as well. -- dato
 
-- 
cgit v1.2.3


From 6b98269aa310abc121875753ded37042f3a95988 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 2 Feb 2010 13:31:07 -0500
Subject: partial review

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 8c586d706..a0e76fd48 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -160,3 +160,35 @@ wrong direction.
 * Proper documentation.
 
 --[[David_Riebenbauer]]
+
+> Starting review of this. Some of your commits are to very delicate,
+> optimised, and security-sensitive ground, so I have to look at them very
+> carefully. --[[Joey]]
+> 
+> * In the refactoring in f3abeac919c4736429bd3362af6edf51ede8e7fe,
+>   you introduced at least 2 bugs, one a possible security hole.
+>   Now one part of the code tests `if ($file)` and the other
+>   caller tests `if ($f)`. These two tests both tested `if (! defined $f)`
+>   before. Notice that the variable needs to be the untainted variable
+>   for both. Also notice that `if ($f)` fails if `$f` contains `0`,
+>   which is a very common perl gotcha.
+> * Your refactored code changes `-l $_ || -d _` to `-l $file || -d $file`.
+>   The latter makes one more stat system call; note the use of a
+>   bare `_` in the first to make perl reuse the stat buffer.
+> * (As a matter of style, could you put a space after the commas in your
+>   perl?)
+> 
+> I'd like to cherry-pick the above commit, once it's in shape, before
+> looking at the rest in detail. So just a few other things that stood out.
+> 
+> * Commit 4af4d26582f0c2b915d7102fb4a604b176385748 seems unnecessary.
+>   `srcfile($file, 1)` already is documented to return undef if the
+>   file does not exist. (But without the second parameter, it throws
+>   an error.)
+>
+> * Commit f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 adds a line
+>   that is intented by a space, not a tab.
+> 
+> * Commit f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 says that auto-added
+>   files will be recreated if the user deletes them. That seems bad.
+>   `autoindex` goes to some trouble to not recreate deleted files.
-- 
cgit v1.2.3


From 261dcd04750acb166915bfb1cf8d3c31a8fccb96 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Wed, 3 Feb 2010 21:59:38 -0500
Subject: response

---
 ...navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 1cb5ed27e..0497b66b6 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -64,6 +64,9 @@ the plugin has, as of now, two problems:
 > Seems about ready for me to think about pulling it into ikiwiki
 > alongside [[tips/vim_syntax_highlighting/ikiwiki.vim]]. If you'll
 > please slap a license on it. :) --[[Joey]] 
+>
+>> GPL version 2 or later (if that doesn't cause any problems here). I'll add it
+>> to the file --[[jerojasro]]
 > 
 > Also, I have a possible other approach for finding ikiwiki's root. One
 > could consider that any subdirectory of an ikiwiki wiki is itself
@@ -80,6 +83,10 @@ the plugin has, as of now, two problems:
 > 
 > And if that's the case, you can resolve an absolute link by looking for
 > the page closest to the root that matches the link.
+>
+>> I like your idea; it doesn't alter the matching of the relative links, and
+>> should work fine with absolute links too. I'll implement it, though I see
+>> some potential (but small) issues with it --[[jerojasro]]
 > 
 > It may even make sense to change ikiwiki's own handling of "absolute"
 > links to work that way. But even without changing ikiwiki, I think it
@@ -93,3 +100,7 @@ the plugin has, as of now, two problems:
 >    and vim would go to that file.
 > 
 > --[[Joey]] 
+>
+>> your approach will add more noise when the plugin grows the page-creation
+>> feature, since there will be no real root to limit the possible locations for
+>> the new page. But it is far better than demanding for a `.ikiwiki` dir --[[jerojasro]]
-- 
cgit v1.2.3


From c4db8d89a5c1b3eab519fc6268e1fed6b1f4eb2f Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Wed, 3 Feb 2010 22:47:26 -0500
Subject: new forum post

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

(limited to 'doc')

diff --git a/doc/forum/where_are_the_tags.mdwn b/doc/forum/where_are_the_tags.mdwn
new file mode 100644
index 000000000..f70c2e69a
--- /dev/null
+++ b/doc/forum/where_are_the_tags.mdwn
@@ -0,0 +1,2 @@
+Where is the tag cloud/tag listing of all the tags used in this wiki? I know we
+have tags enabled.
-- 
cgit v1.2.3


From 208335ec80f4678ea352823111b953f1d7eccff9 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Wed, 3 Feb 2010 22:48:15 -0500
Subject: signature

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

(limited to 'doc')

diff --git a/doc/forum/where_are_the_tags.mdwn b/doc/forum/where_are_the_tags.mdwn
index f70c2e69a..3a4debfe5 100644
--- a/doc/forum/where_are_the_tags.mdwn
+++ b/doc/forum/where_are_the_tags.mdwn
@@ -1,2 +1,2 @@
 Where is the tag cloud/tag listing of all the tags used in this wiki? I know we
-have tags enabled.
+have tags enabled. --[[jerojasro]]
-- 
cgit v1.2.3


From 0e67c26e2e656cf54aa13033c56e204237ef5775 Mon Sep 17 00:00:00 2001
From: "http://edward.myopenid.com/" <http://edward.myopenid.com/@web>
Date: Fri, 5 Feb 2010 03:25:22 +0000
Subject: add 'or' to pagespec

---
 doc/users/Edward_Betts.mdwn | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index b32927a1c..61d6150ef 100644
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,9 +1,4 @@
 My watchlist:
 
-[[!inline archive="yes" sort="mtime" atom="yes" pages="
-todo/allow_wiki_syntax_in_commit_messages*
-todo/shortcut_with_different_link_text*
-todo/structured_page_data*
-tips/convert_mediawiki_to_ikiwiki*
-"]]
+[[!inline archive="yes" sort="mtime" atom="yes" pages="todo/allow_wiki_syntax_in_commit_messages* or todo/shortcut_with_different_link_text* or todo/structured_page_data* or tips/convert_mediawiki_to_ikiwiki*"]]
 
-- 
cgit v1.2.3


From 34a64557cf5f4a913c07f04d021debdd5fb58b1b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Feb 2010 13:46:12 -0500
Subject: scratch patch

---
 doc/bugs/anonok_vs._httpauth.mdwn | 42 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 0a62164cb..1c492139b 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -58,3 +58,45 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >> On reflection, I've stopped being bothered by the
 >> redirect-to-signin-page approach. (It only needs to happen once per
 >> browser session, anyway.) Can we try that? --[[schmonz]]
+
+Here is an attempt. With this httpauth will only redirect to the
+`cgiauth_url` when a page is edited, and it will defer to other plugins
+like anonok first. I have not tested this. --[[Joey]] 
+
+<pre>
+diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
+index 127c321..c181164 100644
+--- a/IkiWiki/Plugin/httpauth.pm
++++ b/IkiWiki/Plugin/httpauth.pm
+@@ -9,6 +9,8 @@ use IkiWiki 3.00;
+ sub import {
+ 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
+ 	hook(type => "auth", id => "httpauth", call => \&auth);
++	hook(type => "canedit", id => "httpauth", call => \&canedit,
++		last => 1);
+ }
+ 
+ sub getsetup () {
+@@ -33,10 +35,20 @@ sub auth ($$) {
+ 	if (defined $cgi->remote_user()) {
+ 		$session->param("name", $cgi->remote_user());
+ 	}
+-	elsif (defined $config{cgiauthurl}) {
++}
++
++sub canedit ($$$) {
++	my $page=shift;
++	my $cgi=shift;
++	my $session=shift;
++
++	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
+ 		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+ 		exit;
+ 	}
++	else {
++		return undef;
++	}
+}
+ 
+ 1
+</pre>
-- 
cgit v1.2.3


From 5541b06de43c70ca9c23231d175d474789dacd25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Feb 2010 15:22:02 -0500
Subject: response

---
 IkiWiki/Plugin/httpauth.pm        | 14 +++++++++++++-
 doc/forum/where_are_the_tags.mdwn |  7 +++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 127c321f0..c1811643b 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -9,6 +9,8 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
 	hook(type => "auth", id => "httpauth", call => \&auth);
+	hook(type => "canedit", id => "httpauth", call => \&canedit,
+		last => 1);
 }
 
 sub getsetup () {
@@ -33,10 +35,20 @@ sub auth ($$) {
 	if (defined $cgi->remote_user()) {
 		$session->param("name", $cgi->remote_user());
 	}
-	elsif (defined $config{cgiauthurl}) {
+}
+
+sub canedit ($$$) {
+	my $page=shift;
+	my $cgi=shift;
+	my $session=shift;
+
+	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
 		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
 		exit;
 	}
+	else {
+		return undef;
+	}
 }
 
 1
diff --git a/doc/forum/where_are_the_tags.mdwn b/doc/forum/where_are_the_tags.mdwn
index 3a4debfe5..ecb49fe43 100644
--- a/doc/forum/where_are_the_tags.mdwn
+++ b/doc/forum/where_are_the_tags.mdwn
@@ -1,2 +1,9 @@
 Where is the tag cloud/tag listing of all the tags used in this wiki? I know we
 have tags enabled. --[[jerojasro]]
+
+> This wiki does not use one global toplevel set of tags (`tagbase` is not
+> set).
+> 
+> There are tags used for the [[plugins]], and a tag cloud of those
+> there. [[wishlist]] and [[patch]] are tags too, but I don't see the point
+> of a tag cloud for such tags. --[[Joey]]
-- 
cgit v1.2.3


From b384af237df92e787f84f845d0d2bc182f7775ff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 16:19:17 -0500
Subject: opendiscussion: This plugin will also now allow posting comments to
 otherwise locked-down sites.

---
 IkiWiki/Plugin/opendiscussion.pm |  1 +
 debian/changelog                 |  2 ++
 doc/plugins/comments.mdwn        |  4 ++--
 doc/plugins/lockedit.mdwn        | 11 +++--------
 doc/plugins/opendiscussion.mdwn  |  5 +++--
 5 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 4b91f5d83..5a455940b 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -25,6 +25,7 @@ sub canedit ($$) {
 	my $session=shift;
 
 	return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i;
+	return "" if pagespec_match($page, "postcomment(*)");
 	return undef;
 }
 
diff --git a/debian/changelog b/debian/changelog
index b4acac633..a65592277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * Add link to userpage (or creation link) to top of preferences page.
   * auto-blog.setup: Lock all pages, so only admin can post to the blog
     by default.
+  * opendiscussion: This plugin will also now allow posting comments
+    to otherwise locked-down sites. 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index b6d4d252b..f933d32be 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -14,8 +14,8 @@ authorship should hopefully be unforgeable by CGI users.
 The intention is that on a non-wiki site (like a blog) you can lock all
 pages for admin-only access, then allow otherwise unprivileged (or perhaps
 even anonymous) users to comment on posts. See the documentation of the
-[[lockedit]] and [[anonok]] pages for details on locking down a wiki so
-users can only post comments.
+[[opendiscussion]], [[lockedit]] and [[anonok]] pages for details on locking
+down a wiki so readers can only post comments.
 
 Individual comments are stored as internal-use pages named something like
 `page/comment_1`, `page/comment_2`, etc. These pages internally use a
diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn
index c8f64ea47..681163203 100644
--- a/doc/plugins/lockedit.mdwn
+++ b/doc/plugins/lockedit.mdwn
@@ -12,14 +12,9 @@ to lock. For example, you could choose to lock all pages created before
 2006, or all pages that are linked to from the page named "locked". More
 usually though, you'll just list some names of pages to lock.
 
-One handy thing to do if you're using ikiwiki for your blog is to lock
-"* and !*/Discussion". This prevents others from adding to or modifying
-posts in your blog, while still letting them comment via the Discussion
-pages.
-
-Alternatively, if you're using the [[comments]] plugin, you can lock
-"!postcomment(*)" to allow users to comment on pages, but not edit anything
-else.
+If you want to lock down a blog so only you can post to it, you can just
+lock "*", and enable the [[opendiscussion]] plugin, so readers can still post
+[[comments]].
 
 Wiki administrators can always edit locked pages. The [[ikiwiki/PageSpec]]
 can specify that some pages are not locked for some users. For example,
diff --git a/doc/plugins/opendiscussion.mdwn b/doc/plugins/opendiscussion.mdwn
index b2ba68bf7..3b5ab4858 100644
--- a/doc/plugins/opendiscussion.mdwn
+++ b/doc/plugins/opendiscussion.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=opendiscussion author="[[Joey]]"]]
 [[!tag type/auth]]
 
-This plugin allows editing of Discussion pages by anonymous users who have
-not logged into the wiki.
+This plugin allows editing of Discussion pages, and posting of comments,
+even when the [[lockedit]] plugin has been configured to otherwise prevent
+editing.
-- 
cgit v1.2.3


From 03810ebf4003a5c1cb8c8a247f0e2b429923a675 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 16:29:04 -0500
Subject: add noindex robots directives

---
 doc/ikiwiki/directive/date.mdwn   | 2 ++
 doc/ikiwiki/pagespec/po.mdwn      | 2 ++
 doc/ikiwiki/pagespec/sorting.mdwn | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/date.mdwn b/doc/ikiwiki/directive/date.mdwn
index df45fa840..b89241e4c 100644
--- a/doc/ikiwiki/directive/date.mdwn
+++ b/doc/ikiwiki/directive/date.mdwn
@@ -12,3 +12,5 @@ For example, an update to a page with an embedded date stamp could look
 like:
 
 	Updated \[[!date "Wed, 25 Nov 2009 01:11:55 -0500"]]: mumble mumble
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/ikiwiki/pagespec/po.mdwn b/doc/ikiwiki/pagespec/po.mdwn
index e0264dd50..40ed9efb6 100644
--- a/doc/ikiwiki/pagespec/po.mdwn
+++ b/doc/ikiwiki/pagespec/po.mdwn
@@ -14,3 +14,5 @@ wiki:
 
 Note that every non-po page is considered to be written in
 `po_master_language`, as specified in `ikiwiki.setup`.
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 41aa58151..697818a2a 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -9,3 +9,5 @@ orders can be specified.
 * `title_natural` - Only available if [[!cpan Sort::Naturally]] is
   installed. Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+
+[[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From aca4c725c37e6d75c7c8f4ba7596bb8358fb34b4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 16:35:01 -0500
Subject: update

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index f750fb4b0..3035aa8b0 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -134,6 +134,7 @@ Personal sites and blogs
 * [Walden Effect](http://waldeneffect.org)
 * [Avian Aqua Miser](http://www.avianaquamiser.com/)
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
+* [Backyard Deer](http://www.backyarddeer.com/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From b0857e75553f33114a0bd5484be86a02b35a09e6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 17:01:16 -0500
Subject: remove pigro.net

Unfortunatly, www.pigro.net is down, and has been for some time.
---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 3035aa8b0..469fc0f6d 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -42,7 +42,6 @@ Projects & Organizations
 * [The Walden Effect](http://www.waldeneffect.org/)
 * The support pages for [Trinity Centre for High Performance Computing](http://www.tchpc.tcd.ie/support/)
 * [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/)
-* [Pigro Network](http://www.pigro.net) is running a hg based ikiwiki. (And provides ikiwiki hosting for $10/m.)
 * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
-- 
cgit v1.2.3


From 961473473ae8f2a386322149cd4668f213aeed25 Mon Sep 17 00:00:00 2001
From: AlbertF <AlbertF@web>
Date: Sun, 7 Feb 2010 00:43:34 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index afd7dbeab..62f3ad21a 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -47,6 +47,7 @@ Bulleted list
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
+* [make money online](http://www.mooladays.com)
 
 -----
 
-- 
cgit v1.2.3


From a752bc3d1263c65958d978441ca850f6d70eabc2 Mon Sep 17 00:00:00 2001
From: AlbertF <AlbertF@web>
Date: Sun, 7 Feb 2010 00:44:09 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 62f3ad21a..1420c1d36 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -46,9 +46,11 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
+* [make money online](http://www.mooladays.com)
 * [GNU](http://www.gnu.org/)
 * [make money online](http://www.mooladays.com)
 
+
 -----
 
 [[!progress percent=27]]
-- 
cgit v1.2.3


From 343c8768220b3802e479ba466721ed2d2e43db0d Mon Sep 17 00:00:00 2001
From: AlbertF <AlbertF@web>
Date: Sun, 7 Feb 2010 00:45:02 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1420c1d36..29c592502 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -51,6 +51,7 @@ Bulleted list
 * [make money online](http://www.mooladays.com)
 
 
+
 -----
 
 [[!progress percent=27]]
-- 
cgit v1.2.3


From 2700379ef3ffbb504c1be05cc32a3f5f44ab5981 Mon Sep 17 00:00:00 2001
From: AlbertF <AlbertF@web>
Date: Sun, 7 Feb 2010 00:46:09 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 29c592502..cfa4e88f9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -48,7 +48,6 @@ Bulleted list
 * <http://www.gnu.org/>
 * [make money online](http://www.mooladays.com)
 * [GNU](http://www.gnu.org/)
-* [make money online](http://www.mooladays.com)
 
 
 
-- 
cgit v1.2.3


From 698386604a4cfa90a89595cfd3164b60046de474 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 6 Feb 2010 20:04:33 -0500
Subject: silly wabbit. spam written in sand washes away. ban for life of IP
 remains

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index cfa4e88f9..afd7dbeab 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -46,11 +46,8 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
-* [make money online](http://www.mooladays.com)
 * [GNU](http://www.gnu.org/)
 
-
-
 -----
 
 [[!progress percent=27]]
-- 
cgit v1.2.3


From 1bb06210e956801d4b64641dbc84059ad36f797e Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Sun, 7 Feb 2010 01:51:30 +0000
Subject: tested

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

(limited to 'doc')

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 1c492139b..1940fdad8 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -100,3 +100,6 @@ index 127c321..c181164 100644
  
  1
 </pre>
+
+> With `anonok` enabled, this works for anonymous editing of an
+> existing Discussion page. auth is still needed to create one. --[[schmonz]]
-- 
cgit v1.2.3


From 2e55a598350f422a8c064cad6bbba4e2fde13ed8 Mon Sep 17 00:00:00 2001
From: "http://gustaf.thorslund.org/" <http://gustaf.thorslund.org/@web>
Date: Sun, 7 Feb 2010 14:09:15 +0000
Subject: Added missing '!' in "!format perl..."

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

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/format.mdwn b/doc/ikiwiki/directive/format.mdwn
index 23830e9cd..7d11d225f 100644
--- a/doc/ikiwiki/directive/format.mdwn
+++ b/doc/ikiwiki/directive/format.mdwn
@@ -22,7 +22,7 @@ Note that if the highlight plugin is enabled, this directive can also be
 used to display syntax highlighted code. Many languages and formats are
 supported. For example:
 
-	\[[format perl """
+	\[[!format perl """
 	print "hello, world\n";
 	"""]]
 
-- 
cgit v1.2.3


From ef65fd58cf77c27b9063b46b5b61b3090662ddce Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sun, 7 Feb 2010 20:29:24 +0000
Subject: HTTP:BL plugin/inclusion

---
 doc/wishlist/http_bl_support.mdwn | 59 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 doc/wishlist/http_bl_support.mdwn

(limited to 'doc')

diff --git a/doc/wishlist/http_bl_support.mdwn b/doc/wishlist/http_bl_support.mdwn
new file mode 100644
index 000000000..30fb9c9b3
--- /dev/null
+++ b/doc/wishlist/http_bl_support.mdwn
@@ -0,0 +1,59 @@
+[Project Honeypot](http://projecthoneypot.org/) has an HTTP:BL API available to subscribed (it's free, accept donations) people/orgs. There's a basic perl package someone wrote, I'm including a copy here.
+
+[from here](http://projecthoneypot.org/board/read.php?f=10&i=112&t=112)
+
+<pre>
+package Honeypot;
+
+use Socket qw/inet_ntoa/;
+
+my $dns = 'dnsbl.httpbl.org';
+my %types = (
+0	=> 'Search Engine',
+1	=> 'Suspicious',
+2	=> 'Harvester',
+4	=> 'Comment Spammer'
+);
+sub query {
+my $key = shift || die 'You need a key for this, you get one at http://www.projecthoneypot.org';
+my $ip = shift || do {
+warn 'no IP for request in Honeypot::query().';
+return;
+};
+
+my @parts = reverse split /\./, $ip;
+my $lookup_name = join'.', $key, @parts, $dns;
+
+my $answer = gethostbyname ($lookup_name);
+return unless $answer;
+$answer = inet_ntoa($answer);
+my(undef, $days, $threat, $type) = split /\./, $answer;
+my @types;
+while(my($bit, $typename) = each %types) {
+push @types, $typename if $bit & $type;
+}
+return {
+days => $days,
+threat => $threat,
+type => join ',', @types
+};
+
+}
+1;
+</pre>
+
+From the page:
+
+> The usage is simple:
+
+> use Honeypot;
+> my $key = 'XXXXXXX'; # your key
+> my $ip = '....'; the IP you want to check
+> my $q = Honeypot::query($key, $ip);
+
+> use Data::Dumper;
+> print Dumper $q;
+
+Any chance of having this as a plugin?
+
+I could give it a go, too. Would be fun to try my hand at Perl. --[[simonraven]]
-- 
cgit v1.2.3


From c926d2d3f7a47e2c2918fd70634581ea8f1d11ff Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sun, 7 Feb 2010 20:30:59 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/wishlist/http_bl_support.mdwn b/doc/wishlist/http_bl_support.mdwn
index 30fb9c9b3..024c770d8 100644
--- a/doc/wishlist/http_bl_support.mdwn
+++ b/doc/wishlist/http_bl_support.mdwn
@@ -57,3 +57,5 @@ From the page:
 Any chance of having this as a plugin?
 
 I could give it a go, too. Would be fun to try my hand at Perl. --[[simonraven]]
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From fb6e73b3698089f47ae63d1569225938699d84e1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Feb 2010 13:46:49 -0500
Subject: move to correct location

---
 doc/todo/http_bl_support.mdwn     | 61 +++++++++++++++++++++++++++++++++++++++
 doc/wishlist/http_bl_support.mdwn | 61 ---------------------------------------
 2 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100644 doc/todo/http_bl_support.mdwn
 delete mode 100644 doc/wishlist/http_bl_support.mdwn

(limited to 'doc')

diff --git a/doc/todo/http_bl_support.mdwn b/doc/todo/http_bl_support.mdwn
new file mode 100644
index 000000000..024c770d8
--- /dev/null
+++ b/doc/todo/http_bl_support.mdwn
@@ -0,0 +1,61 @@
+[Project Honeypot](http://projecthoneypot.org/) has an HTTP:BL API available to subscribed (it's free, accept donations) people/orgs. There's a basic perl package someone wrote, I'm including a copy here.
+
+[from here](http://projecthoneypot.org/board/read.php?f=10&i=112&t=112)
+
+<pre>
+package Honeypot;
+
+use Socket qw/inet_ntoa/;
+
+my $dns = 'dnsbl.httpbl.org';
+my %types = (
+0	=> 'Search Engine',
+1	=> 'Suspicious',
+2	=> 'Harvester',
+4	=> 'Comment Spammer'
+);
+sub query {
+my $key = shift || die 'You need a key for this, you get one at http://www.projecthoneypot.org';
+my $ip = shift || do {
+warn 'no IP for request in Honeypot::query().';
+return;
+};
+
+my @parts = reverse split /\./, $ip;
+my $lookup_name = join'.', $key, @parts, $dns;
+
+my $answer = gethostbyname ($lookup_name);
+return unless $answer;
+$answer = inet_ntoa($answer);
+my(undef, $days, $threat, $type) = split /\./, $answer;
+my @types;
+while(my($bit, $typename) = each %types) {
+push @types, $typename if $bit & $type;
+}
+return {
+days => $days,
+threat => $threat,
+type => join ',', @types
+};
+
+}
+1;
+</pre>
+
+From the page:
+
+> The usage is simple:
+
+> use Honeypot;
+> my $key = 'XXXXXXX'; # your key
+> my $ip = '....'; the IP you want to check
+> my $q = Honeypot::query($key, $ip);
+
+> use Data::Dumper;
+> print Dumper $q;
+
+Any chance of having this as a plugin?
+
+I could give it a go, too. Would be fun to try my hand at Perl. --[[simonraven]]
+
+[[!tag wishlist]]
diff --git a/doc/wishlist/http_bl_support.mdwn b/doc/wishlist/http_bl_support.mdwn
deleted file mode 100644
index 024c770d8..000000000
--- a/doc/wishlist/http_bl_support.mdwn
+++ /dev/null
@@ -1,61 +0,0 @@
-[Project Honeypot](http://projecthoneypot.org/) has an HTTP:BL API available to subscribed (it's free, accept donations) people/orgs. There's a basic perl package someone wrote, I'm including a copy here.
-
-[from here](http://projecthoneypot.org/board/read.php?f=10&i=112&t=112)
-
-<pre>
-package Honeypot;
-
-use Socket qw/inet_ntoa/;
-
-my $dns = 'dnsbl.httpbl.org';
-my %types = (
-0	=> 'Search Engine',
-1	=> 'Suspicious',
-2	=> 'Harvester',
-4	=> 'Comment Spammer'
-);
-sub query {
-my $key = shift || die 'You need a key for this, you get one at http://www.projecthoneypot.org';
-my $ip = shift || do {
-warn 'no IP for request in Honeypot::query().';
-return;
-};
-
-my @parts = reverse split /\./, $ip;
-my $lookup_name = join'.', $key, @parts, $dns;
-
-my $answer = gethostbyname ($lookup_name);
-return unless $answer;
-$answer = inet_ntoa($answer);
-my(undef, $days, $threat, $type) = split /\./, $answer;
-my @types;
-while(my($bit, $typename) = each %types) {
-push @types, $typename if $bit & $type;
-}
-return {
-days => $days,
-threat => $threat,
-type => join ',', @types
-};
-
-}
-1;
-</pre>
-
-From the page:
-
-> The usage is simple:
-
-> use Honeypot;
-> my $key = 'XXXXXXX'; # your key
-> my $ip = '....'; the IP you want to check
-> my $q = Honeypot::query($key, $ip);
-
-> use Data::Dumper;
-> print Dumper $q;
-
-Any chance of having this as a plugin?
-
-I could give it a go, too. Would be fun to try my hand at Perl. --[[simonraven]]
-
-[[!tag wishlist]]
-- 
cgit v1.2.3


From 4ce14aa621be4c6b8551555395b80b68fbcc1ffe Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Feb 2010 13:49:34 -0500
Subject: nte blogspam

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

(limited to 'doc')

diff --git a/doc/todo/http_bl_support.mdwn b/doc/todo/http_bl_support.mdwn
index 024c770d8..f7a46ee6c 100644
--- a/doc/todo/http_bl_support.mdwn
+++ b/doc/todo/http_bl_support.mdwn
@@ -2,6 +2,12 @@
 
 [from here](http://projecthoneypot.org/board/read.php?f=10&i=112&t=112)
 
+> The [[plugins/blogspam]] service already checks urls against
+> the surbl, and has its own IP blacklist. The best way to
+> support the HTTP:BL may be to add a plugin
+> [there](http://blogspam.repository.steve.org.uk/file/cc858e497cae/server/plugins/).
+> --[[Joey]] 
+
 <pre>
 package Honeypot;
 
-- 
cgit v1.2.3


From 06a56ea9d51d472175cb9279d92f9fb7a62fdf46 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 8 Feb 2010 23:32:05 -0500
Subject: added tip about page navigation from within vim

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

(limited to 'doc')

diff --git a/doc/tips/follow_wikilinks_from_inside_vim.mdwn b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
new file mode 100644
index 000000000..93a95bc7a
--- /dev/null
+++ b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
@@ -0,0 +1,43 @@
+The [ikiwiki-nav](http://www.vim.org/scripts/script.php?script_id=2968) plugin
+for vim eases the editing of IkiWiki wikis, by letting you "follow" the
+wikilinks on your file (page), and loading the file associated with a given
+wikilink in vim. The plugin takes care of following the ikiwiki linking rules
+to figure out which file a wikilink points to 
+
+The plugin also includes commands (and mappings) to make the cursor jump to the
+previous/next wikilink in the current file 
+
+##  Jumping to pages 
+
+To open the file associated to a wikilink, place the cursor over its text, and
+hit Enter (`<CR>`). This functionality is also available through the
+`:IkiJumpToPage` command 
+
+## Moving to next/previous wikilink in current file 
+
+`Ctrl-j` will move the cursor to the next wikilink. `Ctrl-k` will move it to the
+previous wikilink. This functionality is also available through the
+`:IkiNextWikiLink` command. This command takes one argument, the direction to
+move into 
+
+  * `:IkiNextWikiLink 0` will look forward for the wikilink 
+  * `:IkiNextWikiLink 1` will look backwards for the wikilink 
+
+## Current issues: 
+
+  * The plugin only works for wikilinks contained in a single text line;
+    multiline wikilinks are not (yet) seen as such 
+
+## Notes 
+
+The official releases of the plugin are in the
+[vim.org script page](http://www.vim.org/scripts/script.php?script_id=2968)
+
+The latest version of this script can be found in the following location 
+
+<http://git.devnull.li/cgi-bin/gitweb.cgi?p=ikiwiki-nav.git;a=blob;f=ftplugin/ikiwiki_nav.vim;hb=HEAD>
+
+Any feedback you can provide is appreciated; the contact details can be found
+inside the plugin
+
+[[!tag vim]]
-- 
cgit v1.2.3


From 59868bce02f10e1ed378f5625618198daca58d3a Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 8 Feb 2010 23:37:24 -0500
Subject: more notes about the ikiwiki-nav plugin

added installation notes

added pointer in the forum page to the created tip
---
 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn | 4 ++++
 doc/tips/follow_wikilinks_from_inside_vim.mdwn                       | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 0497b66b6..980b92740 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -1,3 +1,7 @@
+**UPDATE** I have created a [[page|tips/follow_wikilinks_from_inside_vim]] in
+the tips section about the plugin, how to get it, install it and use it. Check
+that out. --[[jerojasro]]
+
 I wrote a vim function to help me navigate the wiki when I'm editing it. It extends the 'gf' (goto file) functionality. Once installed, you place the cursor on a wiki page name and press 'gf' (without the quotes); if the file exists, it gets loaded.
 
 This function takes into account the ikiwiki linking rules when deciding which file to go to.
diff --git a/doc/tips/follow_wikilinks_from_inside_vim.mdwn b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
index 93a95bc7a..df8145a51 100644
--- a/doc/tips/follow_wikilinks_from_inside_vim.mdwn
+++ b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
@@ -23,6 +23,10 @@ move into
   * `:IkiNextWikiLink 0` will look forward for the wikilink 
   * `:IkiNextWikiLink 1` will look backwards for the wikilink 
 
+## Installation
+
+Copy the `ikiwiki_nav.vim` file to your `.vim/ftplugin` directory.
+
 ## Current issues: 
 
   * The plugin only works for wikilinks contained in a single text line;
-- 
cgit v1.2.3


From f48e98a2ac0325f3e17b2c25151aa6af4ba93b20 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 8 Feb 2010 23:39:06 -0500
Subject: redaction

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

(limited to 'doc')

diff --git a/doc/tips/follow_wikilinks_from_inside_vim.mdwn b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
index df8145a51..015a4ecee 100644
--- a/doc/tips/follow_wikilinks_from_inside_vim.mdwn
+++ b/doc/tips/follow_wikilinks_from_inside_vim.mdwn
@@ -1,6 +1,6 @@
 The [ikiwiki-nav](http://www.vim.org/scripts/script.php?script_id=2968) plugin
 for vim eases the editing of IkiWiki wikis, by letting you "follow" the
-wikilinks on your file (page), and loading the file associated with a given
+wikilinks on your file (page), by loading the file associated with a given
 wikilink in vim. The plugin takes care of following the ikiwiki linking rules
 to figure out which file a wikilink points to 
 
-- 
cgit v1.2.3


From 5b55237ab14b9916bf51dff06d9a12c9ad81d21e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 10 Feb 2010 12:51:11 -0500
Subject: add a link to another vim plugin

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

(limited to 'doc')

diff --git a/doc/tips/vim_syntax_highlighting.mdwn b/doc/tips/vim_syntax_highlighting.mdwn
index 172b763c3..416318f28 100644
--- a/doc/tips/vim_syntax_highlighting.mdwn
+++ b/doc/tips/vim_syntax_highlighting.mdwn
@@ -1,4 +1,6 @@
 [[ikiwiki.vim]] is a vim syntax highlighting file for ikiwiki
-[[ikiwiki/markdown]] files. 
+[[ikiwiki/markdown]] files.
 
 Installation instructions are at the top of the file.
+
+See also: [[navigation_of_wiki_pages_on_local_filesystem_with_vim]]
-- 
cgit v1.2.3


From 99f32638fa768be331dfb20318082f7a49690bf2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 10 Feb 2010 12:52:04 -0500
Subject: question

---
 doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 980b92740..d3f074c96 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -71,6 +71,9 @@ the plugin has, as of now, two problems:
 >
 >> GPL version 2 or later (if that doesn't cause any problems here). I'll add it
 >> to the file --[[jerojasro]]
+>>
+>>> I see you've put the plugin on vim.org. Do you think it makes sense to
+>>> also include a copy in ikiwiki? --[[Joey]] 
 > 
 > Also, I have a possible other approach for finding ikiwiki's root. One
 > could consider that any subdirectory of an ikiwiki wiki is itself
-- 
cgit v1.2.3


From 8e75bcd2dc192da1e649ae70c3dd6a181367eb2c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 10 Feb 2010 12:55:46 -0500
Subject: fix

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

(limited to 'doc')

diff --git a/doc/tips/vim_syntax_highlighting.mdwn b/doc/tips/vim_syntax_highlighting.mdwn
index 416318f28..18b2f1c92 100644
--- a/doc/tips/vim_syntax_highlighting.mdwn
+++ b/doc/tips/vim_syntax_highlighting.mdwn
@@ -3,4 +3,5 @@
 
 Installation instructions are at the top of the file.
 
-See also: [[navigation_of_wiki_pages_on_local_filesystem_with_vim]]
+See also: [[follow_wikilinks_from_inside_vim]]
+[[!tag vim]]
-- 
cgit v1.2.3


From 08b335638c809268697bd97078225ece1065ff1c Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Wed, 10 Feb 2010 19:59:35 +0000
Subject: reply, and suggestion

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

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index d3f074c96..781245f03 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -74,6 +74,12 @@ the plugin has, as of now, two problems:
 >>
 >>> I see you've put the plugin on vim.org. Do you think it makes sense to
 >>> also include a copy in ikiwiki? --[[Joey]] 
+>>> 
+>>>> mmm, no. There would be two copies of it, and the git repo. I'd rather have 
+>>>> a unique place for the "official" version (vim.org), and another for the dev 
+>>>> version (its git repo).
+>>>> 
+>>>> actually, I would also suggest to upload the [[`ikiwiki.vim`|tips/vim_syntax_highlighting]] file to vim.org --[[jerojasro]]
 > 
 > Also, I have a possible other approach for finding ikiwiki's root. One
 > could consider that any subdirectory of an ikiwiki wiki is itself
-- 
cgit v1.2.3


From e91e88d68a833361f89a9c2fec119643f1295618 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 10 Feb 2010 15:09:08 -0500
Subject: response

---
 .../navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 781245f03..6bd2eb110 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -80,7 +80,12 @@ the plugin has, as of now, two problems:
 >>>> version (its git repo).
 >>>> 
 >>>> actually, I would also suggest to upload the [[`ikiwiki.vim`|tips/vim_syntax_highlighting]] file to vim.org --[[jerojasro]]
-> 
+>>>>>
+>>>>> If you have any interest in maintaining the syntax highlighting
+>>>>> plugin and putting it there, I'd be fine with that. I think it needs
+>>>>> some slight work to catch up with changes to ikiwiki's directives
+>>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]] 
+>
 > Also, I have a possible other approach for finding ikiwiki's root. One
 > could consider that any subdirectory of an ikiwiki wiki is itself
 > a standalone wiki, though probably one missing a toplevel index page.
-- 
cgit v1.2.3


From 8e0c0214bbef5ac67c5bd0a300e44d20f12f02f2 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI"
 <https://www.google.com/accounts/o8/id?id=AItOawn1lGvpPZ8dpuLSPLPa-jqpMef2KqeB1qI@web>
Date: Wed, 10 Feb 2010 23:30:11 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
index 6bd2eb110..7bc032949 100644
--- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
+++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn
@@ -84,7 +84,10 @@ the plugin has, as of now, two problems:
 >>>>> If you have any interest in maintaining the syntax highlighting
 >>>>> plugin and putting it there, I'd be fine with that. I think it needs
 >>>>> some slight work to catch up with changes to ikiwiki's directives
->>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]] 
+>>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]]
+>>>>> 
+>>>>>> I don't really know too much about syntax definitions in vim. But I'll give it a stab. I know it fails when there are 2 \[[my text|link]] wikilinks in the same page.
+>>>>>> I'm not promising anything, though ;) --[[jerojasro]]
 >
 > Also, I have a possible other approach for finding ikiwiki's root. One
 > could consider that any subdirectory of an ikiwiki wiki is itself
-- 
cgit v1.2.3


From 26c68a0c7ae6dd7810a2c4277b6589e03e4e9c47 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 16:28:22 -0500
Subject: refresh patch; remaining problem

---
 doc/bugs/anonok_vs._httpauth.mdwn | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 1940fdad8..d301b53fb 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -65,7 +65,7 @@ like anonok first. I have not tested this. --[[Joey]]
 
 <pre>
 diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
-index 127c321..c181164 100644
+index 127c321..a18f8ca 100644
 --- a/IkiWiki/Plugin/httpauth.pm
 +++ b/IkiWiki/Plugin/httpauth.pm
 @@ -9,6 +9,8 @@ use IkiWiki 3.00;
@@ -77,11 +77,13 @@ index 127c321..c181164 100644
  }
  
  sub getsetup () {
-@@ -33,10 +35,20 @@ sub auth ($$) {
+@@ -33,9 +35,21 @@ sub auth ($$) {
  	if (defined $cgi->remote_user()) {
  		$session->param("name", $cgi->remote_user());
  	}
 -	elsif (defined $config{cgiauthurl}) {
+-		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+-		exit;
 +}
 +
 +sub canedit ($$$) {
@@ -90,16 +92,29 @@ index 127c321..c181164 100644
 +	my $session=shift;
 +
 +	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
- 		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
- 		exit;
- 	}
++		return sub {
++			IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
++			exit;
++		};
++	}
 +	else {
 +		return undef;
-+	}
-}
+ 	}
+ }
  
- 1
 </pre>
 
 > With `anonok` enabled, this works for anonymous editing of an
 > existing Discussion page. auth is still needed to create one. --[[schmonz]]
+
+>> Refreshed above patch to fix that. --[[Joey]] 
+
+>> Remaining issue: Since both signinedit and httpauth have canedit hooks that
+>> run "last", behavior will vary depending on which wins and really goes
+>> last. So mixing this with openid or passwordauth won't work yet, though
+>> it will work mixed with anonok.
+>>
+>> Seems like what needs to happen is for httpauth's canedit to run before
+>> signinedit's, however it still needs to run relatively late; after eg,
+>> anonok's hook. Better hook ordering needed. I knew we'd need it sooner
+>> or later! --[[Joey]] 
-- 
cgit v1.2.3


From c47712b340153fca4015f8d0e344ced5b12a3e17 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 16:35:55 -0500
Subject: clarify

---
 doc/bugs/anonok_vs._httpauth.mdwn | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index d301b53fb..b738e3b6c 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -109,12 +109,8 @@ index 127c321..a18f8ca 100644
 
 >> Refreshed above patch to fix that. --[[Joey]] 
 
->> Remaining issue: Since both signinedit and httpauth have canedit hooks that
->> run "last", behavior will vary depending on which wins and really goes
->> last. So mixing this with openid or passwordauth won't work yet, though
->> it will work mixed with anonok.
->>
->> Seems like what needs to happen is for httpauth's canedit to run before
->> signinedit's, however it still needs to run relatively late; after eg,
->> anonok's hook. Better hook ordering needed. I knew we'd need it sooner
->> or later! --[[Joey]] 
+>> Remaining issue: This patch will work with anonok, but not openid or
+>> passwordauth, both of which want to display a login page at the same
+>> time that httpauth is redirecting to the cgiauthurl. As mentioned above,
+>> the only way to deal with that would be to add a link to the signin page
+>> that does the httpauth signin. --[[Joey]] 
-- 
cgit v1.2.3


From 046095552ac231366d71a3c7a84bdc6d46662212 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 17:26:09 -0500
Subject: httpauth: When cgiauthurl is configured, httpauth can now be used
 alongside other authentication methods (like openid or anonok). Rather than
 always redirect to the cgiauthurl for authentication, there is now a button
 on the login form to use it.

---
 IkiWiki/Plugin/httpauth.pm        | 35 +++++++++++++++++++++++++++++++----
 IkiWiki/Plugin/openid.pm          |  2 +-
 debian/changelog                  |  4 ++++
 doc/bugs/anonok_vs._httpauth.mdwn |  2 ++
 doc/plugins/httpauth.mdwn         |  9 +++++----
 5 files changed, 43 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index a18f8ca54..d0d4da0b7 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -11,6 +11,8 @@ sub import {
 	hook(type => "auth", id => "httpauth", call => \&auth);
 	hook(type => "canedit", id => "httpauth", call => \&canedit,
 		last => 1);
+	hook(type => "formbuilder_setup", id => "httpauth",
+		call => \&formbuilder_setup);
 }
 
 sub getsetup () {
@@ -27,6 +29,14 @@ sub getsetup () {
 			rebuild => 0,
 		},
 }
+			
+sub redir_cgiauthurl ($$) {
+	my $cgi=shift;
+	my $params=shift;
+
+	IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$params);
+	exit;
+}
 
 sub auth ($$) {
 	my $cgi=shift;
@@ -43,14 +53,31 @@ sub canedit ($$$) {
 	my $session=shift;
 
 	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
-		return sub {
-			IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
-			exit;
-		};
+		return sub { redir_cgiauthurl($cgi, $cgi->query_string()) };
 	}
 	else {
 		return undef;
 	}
 }
 
+sub formbuilder_setup (@) {
+	my %params=@_;
+
+	my $form=$params{form};
+	my $session=$params{session};
+	my $cgi=$params{cgi};
+	my $buttons=$params{buttons};
+
+	if ($form->title eq "signin" &&
+	    ! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
+		my $button_text="Login with HTTP auth";
+		push @$buttons, $button_text;
+
+		if ($form->submitted && $form->submitted eq $button_text) {
+			redir_cgiauthurl($cgi, "do=postsignin");
+			exit;
+		}
+	}
+}
+
 1
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index b60740c0e..382d8286f 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -56,7 +56,7 @@ sub formbuilder_setup (@) {
 		# OpenID fieldset.
 		$form->fieldsets("OpenID");
 
- 		$form->field(
+		$form->field(
 			name => "openid_url",
 			label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
 			fieldset => "OpenID",
diff --git a/debian/changelog b/debian/changelog
index 358a5dc5c..3dd68558e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * Fix color and format plugins to appear in the websetup interface.
   * amazon_s3: Fix to support the EU S3 datacenter, which is more picky
     about attempts to create already existing buckets.
+  * httpauth: When cgiauthurl is configured, httpauth can now be used
+    alongside other authentication methods (like openid or anonok). Rather
+    than always redirect to the cgiauthurl for authentication, there is now
+    a button on the login form to use it.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index b738e3b6c..bff37e18b 100644
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -114,3 +114,5 @@ index 127c321..a18f8ca 100644
 >> time that httpauth is redirecting to the cgiauthurl. As mentioned above,
 >> the only way to deal with that would be to add a link to the signin page
 >> that does the httpauth signin. --[[Joey]] 
+
+>>> That's dealt with in final version. [[done]] --[[Joey]] 
diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn
index 77796a3d7..a7aac558b 100644
--- a/doc/plugins/httpauth.mdwn
+++ b/doc/plugins/httpauth.mdwn
@@ -14,10 +14,11 @@ signed into the wiki. This method is suitable only for private wikis.
 ## separate cgiauthurl
 
 To use httpauth for a wiki where the content is public, and where
-the `ikiwiki.cgi` needs to be usable without authentication (for searching
-and so on), you can configure a separate url that is used for
-authentication, via the `cgiauthurl` option in the setup file. This
-url will then be redirected to whenever authentication is needed.
+the `ikiwiki.cgi` needs to be usable without authentication (for searching,
+or logging in using other methods, and so on), you can configure a separate
+url that is used for authentication, via the `cgiauthurl` option in the setup
+file. This url will then be redirected to when a user chooses to log in using
+httpauth.
 
 A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi` 
 into it. Then configure the web server to require authentication only for
-- 
cgit v1.2.3


From e11876b7003c700fbc3717ca9c5af5aac3b72ac2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 18:25:10 -0500
Subject: httpauth: Add httpauth_pagespec setting that can be used to limit
 pages to only being edited via users authed with httpauth.

---
 IkiWiki.pm                 |  7 ++++-
 IkiWiki/Plugin/httpauth.pm | 75 +++++++++++++++++++++++++++++++++-------------
 debian/changelog           |  2 ++
 doc/plugins/httpauth.mdwn  |  9 ++++++
 4 files changed, 72 insertions(+), 21 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2a0132745..de7dbfc79 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -941,7 +941,12 @@ sub linkpage ($) {
 sub cgiurl (@) {
 	my %params=@_;
 
-	return $config{cgiurl}."?".
+	my $cgiurl=$config{cgiurl};
+	if (exists $params{cgiurl}) {
+		$cgiurl=$params{cgiurl};
+		delete $params{cgiurl};
+	}
+	return $cgiurl."?".
 		join("&amp;", map $_."=".uri_escape_utf8($params{$_}), keys %params);
 }
 
diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index d0d4da0b7..202ca1153 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -9,10 +9,10 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
 	hook(type => "auth", id => "httpauth", call => \&auth);
-	hook(type => "canedit", id => "httpauth", call => \&canedit,
-		last => 1);
 	hook(type => "formbuilder_setup", id => "httpauth",
 		call => \&formbuilder_setup);
+	hook(type => "canedit", id => "httpauth", call => \&canedit);
+	hook(type => "pagetemplate", id => "httpauth", call => \&pagetemplate);
 }
 
 sub getsetup () {
@@ -28,13 +28,20 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 0,
 		},
+		httpauth_pagespec => {
+			type => "pagespec",
+			example => "!*/Discussion",
+			description => "PageSpec of pages where only httpauth will be used for authentication",
+			safe => 0,
+			rebuild => 0,
+		},
 }
 			
-sub redir_cgiauthurl ($$) {
+sub redir_cgiauthurl ($;@) {
 	my $cgi=shift;
-	my $params=shift;
 
-	IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$params);
+	IkiWiki::redirect($cgi, 
+		IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_));
 	exit;
 }
 
@@ -47,19 +54,6 @@ sub auth ($$) {
 	}
 }
 
-sub canedit ($$$) {
-	my $page=shift;
-	my $cgi=shift;
-	my $session=shift;
-
-	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
-		return sub { redir_cgiauthurl($cgi, $cgi->query_string()) };
-	}
-	else {
-		return undef;
-	}
-}
-
 sub formbuilder_setup (@) {
 	my %params=@_;
 
@@ -74,10 +68,51 @@ sub formbuilder_setup (@) {
 		push @$buttons, $button_text;
 
 		if ($form->submitted && $form->submitted eq $button_text) {
-			redir_cgiauthurl($cgi, "do=postsignin");
-			exit;
+			# bounce thru cgiauthurl and then back to
+			# the stored postsignin action
+			redir_cgiauthurl($cgi, do => "postsignin");
 		}
 	}
 }
 
+sub test_httpauth_pagespec ($) {
+	my $page=shift;
+
+	return defined $config{httpauth_pagespec} &&
+	       length $config{httpauth_pagespec} &&
+	       defined $config{cgiauthurl} &&
+	       pagespec_match($page, $config{httpauth_pagespec});
+}
+
+sub canedit ($$$) {
+	my $page=shift;
+	my $cgi=shift;
+	my $session=shift;
+
+	if (! defined $cgi->remote_user() && test_httpauth_pagespec($page)) {
+		return sub {
+			IkiWiki::redirect($cgi, 
+				$config{cgiauthurl}.'?'.$cgi->query_string());
+			exit;
+		};
+	}
+	else {
+		return undef;
+	}
+}
+
+sub pagetemplate (@_) {
+	my %params=@_;
+	my $template=$params{template};
+
+	if ($template->param("editurl") &&
+	    test_httpauth_pagespec($params{page})) {
+		# go directly to cgiauthurl when editing a page matching
+		# the pagespec
+		$template->param(editurl => IkiWiki::cgiurl(
+			cgiurl => $config{cgiauthurl},
+			do => "edit", page => $params{page}));
+	}
+}
+
 1
diff --git a/debian/changelog b/debian/changelog
index 3dd68558e..14be7ec69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     alongside other authentication methods (like openid or anonok). Rather
     than always redirect to the cgiauthurl for authentication, there is now
     a button on the login form to use it.
+  * httpauth: Add httpauth_pagespec setting that can be used to limit
+    pages to only being edited via users authed with httpauth.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn
index a7aac558b..0eda5554f 100644
--- a/doc/plugins/httpauth.mdwn
+++ b/doc/plugins/httpauth.mdwn
@@ -24,3 +24,12 @@ A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi`
 into it. Then configure the web server to require authentication only for
 access to the `auth` subdirectory. Then `cgiauthurl` is pointed at this
 symlink.
+
+## using only httpauth for some pages
+
+If you want to only use httpauth for editing some pages, while allowing
+other authentication methods to be used for other pages, you can
+configure `httpauth_pagespec` in the setup file. This makes Edit
+links on pages that match the [[ikiwiki/PageSpec]] automatically use
+the `cgiauthurl`, and prevents matching pages from being edited by
+users authentication via other methods.
-- 
cgit v1.2.3


From c923e0ba3377f85107ccea1933a042aaec675c77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 20:39:10 -0500
Subject: Allow globs to be used in user() pagespecs.

---
 IkiWiki.pm                | 4 +++-
 debian/changelog          | 1 +
 doc/ikiwiki/pagespec.mdwn | 3 ++-
 t/pagespec_match.t        | 9 ++++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index de7dbfc79..a96ff1236 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2266,11 +2266,13 @@ sub match_user ($$;@) {
 	my $user=shift;
 	my %params=@_;
 	
+	my $regexp=IkiWiki::glob2re($user);
+	
 	if (! exists $params{user}) {
 		return IkiWiki::ErrorReason->new("no user specified");
 	}
 
-	if (defined $params{user} && lc $params{user} eq lc $user) {
+	if (defined $params{user} && $params{user}=~/^$regexp$/i) {
 		return IkiWiki::SuccessReason->new("user is $user");
 	}
 	elsif (! defined $params{user}) {
diff --git a/debian/changelog b/debian/changelog
index 14be7ec69..d74abd0f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
     a button on the login form to use it.
   * httpauth: Add httpauth_pagespec setting that can be used to limit
     pages to only being edited via users authed with httpauth.
+  * Allow globs to be used in user() pagespecs.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 5f0f44e2e..8d8b1a507 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -44,7 +44,8 @@ Some more elaborate limits can be added to what matches using these functions:
   metadata, matching the specified glob.
 * "`user(username)`" - tests whether a modification is being made by a
   user with the specified username. If openid is enabled, an openid can also
-  be put here.
+  be put here. Glob patterns can be used in the username. For example, 
+  to match all openid users, use `user(*://.*)`
 * "`admin()`" - tests whether a modification is being made by one of the
   wiki admins.
 * "`ip(address)`" - tests whether a modification is being made from the
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index b96947407..197ff818b 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 64;
+use Test::More tests => 70;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -40,6 +40,13 @@ ok(! pagespec_match("foo", "foo and bar"), "foo and bar");
 ok(pagespec_match("{f}oo", "{*}*"), "curly match");
 ok(! pagespec_match("foo", "{*}*"), "curly !match");
 
+ok(pagespec_match("somepage", "user(frodo)", user => "frodo"));
+ok(pagespec_match("somepage", "user(frodo)", user => "Frodo"));
+ok(! pagespec_match("somepage", "user(frodo)", user => "Sam"));
+ok(pagespec_match("somepage", "user(*o)", user => "Bilbo"));
+ok(pagespec_match("somepage", "user(*o)", user => "frodo"));
+ok(! pagespec_match("somepage", "user(*o)", user => "Sam"));
+
 # The link and backlink stuff needs this.
 $config{userdir}="";
 $links{foo}=[qw{bar baz}];
-- 
cgit v1.2.3


From a63929f6cc7778ffc4ba57d784cdf2206ec650c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 22:24:15 -0500
Subject: Group related plugins into sections in the setup file, and drop
 unused rcs plugins from the setup file.

---
 IkiWiki/Plugin/anonok.pm            |  1 +
 IkiWiki/Plugin/blogspam.pm          |  1 +
 IkiWiki/Plugin/bzr.pm               |  1 +
 IkiWiki/Plugin/conditional.pm       |  1 +
 IkiWiki/Plugin/cvs.pm               |  1 +
 IkiWiki/Plugin/darcs.pm             |  1 +
 IkiWiki/Plugin/editpage.pm          |  1 +
 IkiWiki/Plugin/git.pm               |  1 +
 IkiWiki/Plugin/htmlscrubber.pm      |  1 +
 IkiWiki/Plugin/httpauth.pm          |  1 +
 IkiWiki/Plugin/inline.pm            |  1 +
 IkiWiki/Plugin/link.pm              |  1 +
 IkiWiki/Plugin/lockedit.pm          |  1 +
 IkiWiki/Plugin/mdwn.pm              |  1 +
 IkiWiki/Plugin/mercurial.pm         |  1 +
 IkiWiki/Plugin/meta.pm              |  1 +
 IkiWiki/Plugin/moderatedcomments.pm |  1 +
 IkiWiki/Plugin/monotone.pm          |  1 +
 IkiWiki/Plugin/opendiscussion.pm    |  1 +
 IkiWiki/Plugin/openid.pm            |  1 +
 IkiWiki/Plugin/parentlinks.pm       |  1 +
 IkiWiki/Plugin/passwordauth.pm      |  1 +
 IkiWiki/Plugin/recentchanges.pm     |  1 +
 IkiWiki/Plugin/signinedit.pm        |  1 +
 IkiWiki/Plugin/svn.pm               |  1 +
 IkiWiki/Plugin/tla.pm               |  1 +
 IkiWiki/Setup.pm                    | 32 ++++++++++++++++++++++++++------
 IkiWiki/Setup/Standard.pm           |  8 ++++++++
 debian/changelog                    |  2 ++
 doc/plugins/write.mdwn              | 13 ++++++++-----
 30 files changed, 70 insertions(+), 11 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/anonok.pm b/IkiWiki/Plugin/anonok.pm
index 243b98920..0e74cbfad 100644
--- a/IkiWiki/Plugin/anonok.pm
+++ b/IkiWiki/Plugin/anonok.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		anonok_pagespec => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 626c8ec42..c4e5cf390 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		blogspam_pagespec => {
 			type => 'pagespec',
diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 883007367..1ffdc2353 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -36,6 +36,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		bzr_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index aad617812..beeddc672 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -16,6 +16,7 @@ sub getsetup {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index f6db8bc98..26a3e9dd2 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -85,6 +85,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		cvsrepo => {
 			type => "string",
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 0d68f27e5..1c9538e83 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -92,6 +92,7 @@ sub getsetup() {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		darcs_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 9211cca89..44fe5514a 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 1eec6aee6..b02f4a5ed 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -68,6 +68,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		git_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index a249cdf7a..ee284a45c 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -40,6 +40,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 		htmlscrubber_skip => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index b2bb2701a..478f67446 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		cgiauthurl => {
 			type => "string",
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 401852513..44919e58c 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -49,6 +49,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 		rss => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 4c1add985..3838aec09 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 74ddbb153..1466e8337 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		locked_pages => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 3de59ef3d..4ddf097ba 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "core",
 		},
 		multimarkdown => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 11fdec529..ea00a3364 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -36,6 +36,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		mercurial_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 55c9ddbd1..5f046cb2a 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
index 2555927b7..afe1ceedf 100644
--- a/IkiWiki/Plugin/moderatedcomments.pm
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		moderate_users => {
 			type => 'boolean',
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 9502804f1..c33cf7e3a 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -68,6 +68,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		mtn_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 5a455940b..2805f60ef 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 }
 
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 382d8286f..bb99446b4 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -26,6 +26,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		openidsignup => {
 			type => "string",
diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index e678a057d..728bbc399 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index c07065b7d..4848b47bb 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		account_creation_password => {
 			type => "string",
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 5c7b71aaa..04219b721 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -22,6 +22,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 		recentchangespage => {
 			type => "string",
diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index 8b44a68f7..31160c02f 100644
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 }
 
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index 06b987f51..7d27ec842 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -44,6 +44,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		svnrepo => {
 			type => "string",
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index f4b20a6ec..16d73b136 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -34,6 +34,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		tla_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 8a25ecc57..b21bd7bfe 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -77,7 +77,6 @@ sub merge ($) {
 sub getsetup () {
 	# Gets all available setup data from all plugins. Returns an
 	# ordered list of [plugin, setup] pairs.
-	my @ret;
 
         # disable logging to syslog while dumping, broken plugins may
 	# whine when loaded
@@ -85,27 +84,48 @@ sub getsetup () {
         $config{syslog}=undef;
 
 	# Load all plugins, so that all setup options are available.
-	my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins());
-	unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
+	my @plugins=IkiWiki::listplugins();
 	foreach my $plugin (@plugins) {
 		eval { IkiWiki::loadplugin($plugin) };
 		if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
 			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
 		}
 	}
-
+	
+	my %sections;
 	foreach my $plugin (@plugins) {
 		if (exists $IkiWiki::hooks{getsetup}{$plugin}{call}) {
 			# use an array rather than a hash, to preserve order
 			my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() };
 			next unless @s;
-			push @ret, [ $plugin, \@s ],
+
+			# set default section value (note use of shared
+			# hashref between array and hash)
+			my %s=@s;
+			if (! exists $s{plugin} || ! $s{plugin}->{section}) {
+				$s{plugin}->{section}="misc";
+			}
+
+			# only the selected rcs plugin is included
+			if ($config{rcs} && $plugin eq $config{rcs}) {
+				$s{plugin}->{section}="core";
+			}
+			elsif ($s{plugin}->{section} eq "rcs") {
+				next;
+			}
+
+			push @{$sections{$s{plugin}->{section}}}, [ $plugin, \@s ];
 		}
 	}
 	
         $config{syslog}=$syslog;
 
-	return @ret;
+	return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} }
+		sort { # core first, then alphabetical
+			($b eq "core") <=> ($a eq "core")
+			   ||
+			$a cmp $b
+		} keys %sections;
 }
 
 sub dump ($) {
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 951bcfc56..c99dbb620 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -90,10 +90,18 @@ sub gendump ($) {
 	# disable logging to syslog while dumping
 	$config{syslog}=undef;
 
+	my $curr_section;
 	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
 	foreach my $pair (IkiWiki::Setup::getsetup()) {
 		my $plugin=$pair->[0];
 		my $setup=$pair->[1];
+		my %s=@{$setup};
+		my $section=$s{plugin}->{section};
+		if (! defined $curr_section || $curr_section ne $section) {
+			$curr_section=$section;
+			push @ret, "", "\t#", "\t# $section plugins", "\t#";
+		}
+
 		my @values=dumpvalues(\%setup, @{$setup});
 		if (@values) {
 			push @ret, "", "\t# $plugin plugin", @values;
diff --git a/debian/changelog b/debian/changelog
index d74abd0f9..f24a453c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * httpauth: Add httpauth_pagespec setting that can be used to limit
     pages to only being edited via users authed with httpauth.
   * Allow globs to be used in user() pagespecs.
+  * Group related plugins into sections in the setup file, and drop
+    unused rcs plugins from the setup file.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 082f0e38f..68454d56c 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -457,6 +457,12 @@ describing the option. There can also be an item named "plugin", which
 describes the plugin as a whole. For example:
 
                 return
+			plugin => {
+				description => "description of this plugin",
+				safe => 1,
+				rebuild => 1,
+				section => "misc",
+			},
 			option_foo => {
 				type => "boolean",
 				description => "enable foo?",
@@ -471,11 +477,6 @@ describes the plugin as a whole. For example:
 				safe => 1,
 				rebuild => 0,
 			},
-			plugin => {
-				description => "description of this plugin",
-				safe => 1,
-				rebuild => 1,
-			},
 
 * `type` can be "boolean", "string", "integer", "pagespec",
   or "internal" (used for values that are not user-visible). The type is
@@ -496,6 +497,8 @@ describes the plugin as a whole. For example:
   the plugin) will require a wiki rebuild, false if no rebuild is needed,
   and undef if a rebuild could be needed in some circumstances, but is not
   strictly required.
+* `section` can optionally specify which section in the config file
+  the plugin fits in.
 
 ### genwrapper
 
-- 
cgit v1.2.3


From e091fab0e742c3e3f9029c86d47c858e286becf3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 22:42:10 -0500
Subject: fix openid pagespec example

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

(limited to 'doc')

diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 8d8b1a507..5c191f23f 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -45,7 +45,7 @@ Some more elaborate limits can be added to what matches using these functions:
 * "`user(username)`" - tests whether a modification is being made by a
   user with the specified username. If openid is enabled, an openid can also
   be put here. Glob patterns can be used in the username. For example, 
-  to match all openid users, use `user(*://.*)`
+  to match all openid users, use `user(*://*)`
 * "`admin()`" - tests whether a modification is being made by one of the
   wiki admins.
 * "`ip(address)`" - tests whether a modification is being made from the
-- 
cgit v1.2.3


From 9cee2962e01ef0538cc8498951867a543f91b47d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 01:10:36 -0500
Subject: format plugin categorization

---
 IkiWiki/Plugin/creole.pm     | 1 +
 IkiWiki/Plugin/highlight.pm  | 1 +
 IkiWiki/Plugin/hnb.pm        | 1 +
 IkiWiki/Plugin/html.pm       | 1 +
 IkiWiki/Plugin/mdwn.pm       | 2 +-
 IkiWiki/Plugin/otl.pm        | 1 +
 IkiWiki/Plugin/po.pm         | 3 ++-
 IkiWiki/Plugin/rawhtml.pm    | 1 +
 IkiWiki/Plugin/textile.pm    | 1 +
 IkiWiki/Plugin/txt.pm        | 1 +
 IkiWiki/Plugin/wikitext.pm   | 1 +
 doc/plugins/conditional.mdwn | 2 +-
 doc/plugins/format.mdwn      | 2 +-
 doc/plugins/graphviz.mdwn    | 2 +-
 doc/plugins/more.mdwn        | 2 +-
 doc/plugins/shortcut.mdwn    | 2 +-
 doc/plugins/table.mdwn       | 2 +-
 doc/plugins/template.mdwn    | 2 +-
 doc/plugins/typography.mdwn  | 2 +-
 plugins/rst                  | 2 +-
 20 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index 425e71043..a1e4b31d3 100644
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -17,6 +17,7 @@ sub getsetup {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 9bdde85ae..947fb692e 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -23,6 +23,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 		tohighlight => {
 			type => "string",
diff --git a/IkiWiki/Plugin/hnb.pm b/IkiWiki/Plugin/hnb.pm
index bd2177a06..32c9cf3ad 100644
--- a/IkiWiki/Plugin/hnb.pm
+++ b/IkiWiki/Plugin/hnb.pm
@@ -23,6 +23,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm
index a7d5e8ce9..4dbae081b 100644
--- a/IkiWiki/Plugin/html.pm
+++ b/IkiWiki/Plugin/html.pm
@@ -21,6 +21,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 4ddf097ba..b892eabee 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -16,7 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
-			section => "core",
+			section => "format",
 		},
 		multimarkdown => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm
index 3ab2441bf..3801a6ec2 100644
--- a/IkiWiki/Plugin/otl.pm
+++ b/IkiWiki/Plugin/otl.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index f8801185e..2cbfb0a45 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -85,7 +85,8 @@ sub getsetup () {
 	return
 		plugin => {
 			safe => 0,
-			rebuild => 1,
+			rebuild => 1, # format plugin
+			section => "format",
 		},
 		po_master_language => {
 			type => "string",
diff --git a/IkiWiki/Plugin/rawhtml.pm b/IkiWiki/Plugin/rawhtml.pm
index ad8a610c1..0838bcb22 100644
--- a/IkiWiki/Plugin/rawhtml.pm
+++ b/IkiWiki/Plugin/rawhtml.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # changes file types
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/textile.pm b/IkiWiki/Plugin/textile.pm
index 8cc5a7951..56bb4bffc 100644
--- a/IkiWiki/Plugin/textile.pm
+++ b/IkiWiki/Plugin/textile.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
index 8599bdc8e..1ed9f0856 100644
--- a/IkiWiki/Plugin/txt.pm
+++ b/IkiWiki/Plugin/txt.pm
@@ -29,6 +29,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "format",
 		},
 }
 
diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index accb03bbe..b24630b15 100644
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # format plugin
 			rebuild => undef,
+			section => "format",
 		},
 }
 
diff --git a/doc/plugins/conditional.mdwn b/doc/plugins/conditional.mdwn
index 95ffb2764..27a99bb7c 100644
--- a/doc/plugins/conditional.mdwn
+++ b/doc/plugins/conditional.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=conditional core=1 author="[[Joey]]"]]
-[[!tag type/format]]
+[[!tag type/special-purpose]]
 
 This plugin provides the [[ikiwiki/directive/if]] [[ikiwiki/directive]].
 With this directive, you can make text be conditionally displayed on a page.
diff --git a/doc/plugins/format.mdwn b/doc/plugins/format.mdwn
index 91e707fcf..5ec0842ae 100644
--- a/doc/plugins/format.mdwn
+++ b/doc/plugins/format.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=format core=0 author="[[Joey]]"]]
-[[!tag type/format]]
+[[!tag type/useful]]
 
 This plugin allows mixing different page formats together, by embedding
 text formatted one way inside a page formatted another way. This is done
diff --git a/doc/plugins/graphviz.mdwn b/doc/plugins/graphviz.mdwn
index b89f16b59..8237ae9dc 100644
--- a/doc/plugins/graphviz.mdwn
+++ b/doc/plugins/graphviz.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=graphviz author="[[JoshTriplett]]"]]
-[[!tag type/chrome type/format]]
+[[!tag type/chrome]]
 
 This plugin provides the [[ikiwiki/directive/graph]] [[ikiwiki/directive]].
 This directive allows embedding [graphviz](http://www.graphviz.org/) graphs in a
diff --git a/doc/plugins/more.mdwn b/doc/plugins/more.mdwn
index e9a971289..81a9e67e8 100644
--- a/doc/plugins/more.mdwn
+++ b/doc/plugins/more.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=more author="Ben"]]
-[[!tag type/format]]
+[[!tag type/chrome]]
 
 This plugin provides the [[ikiwiki/directive/more]] [[ikiwiki/directive]],
 which is a way to have a "more" link on a post in a blog, that leads to the
diff --git a/doc/plugins/shortcut.mdwn b/doc/plugins/shortcut.mdwn
index cca1f4bdd..68896f4d3 100644
--- a/doc/plugins/shortcut.mdwn
+++ b/doc/plugins/shortcut.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=shortcut author="[[Joey]]"]]
-[[!tag type/format]]
+[[!tag type/useful]]
 
 This plugin provides the [[ikiwiki/directive/shortcut]] [[ikiwiki/directive]].
 It allows external links to commonly linked to sites to be made
diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index 10a85bb2c..fb830044f 100644
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=table author="[[VictorMoral]]"]]
-[[!tag type/format]]
+[[!tag type/useful]]
 
 This plugin provides the [[ikiwiki/directive/table]] [[ikiwiki/directive]].
 It can build HTML tables from data in CSV (comma-separated values)
diff --git a/doc/plugins/template.mdwn b/doc/plugins/template.mdwn
index 3485fe64c..6675207b2 100644
--- a/doc/plugins/template.mdwn
+++ b/doc/plugins/template.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=template author="[[Joey]]"]]
-[[!tag type/format]]
+[[!tag type/useful]]
 
 This plugin provides the [[ikiwiki/directive/template]] [[ikiwiki/directive]].
 With this plugin, you can set up templates, and cause them to be filled out
diff --git a/doc/plugins/typography.mdwn b/doc/plugins/typography.mdwn
index 030ef8052..9ff6c4ffd 100644
--- a/doc/plugins/typography.mdwn
+++ b/doc/plugins/typography.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=typography author="[[Roktas]]"]]
-[[!tag type/format]]
+[[!tag type/chrome]]
 
 This plugin, also known as
 [SmartyPants](http://daringfireball.net/projects/smartypants/), translates
diff --git a/plugins/rst b/plugins/rst
index 9f64b33a0..838667507 100755
--- a/plugins/rst
+++ b/plugins/rst
@@ -33,7 +33,7 @@ def _to_dict(args):
     return dict((k, v) for k, v in zip(*[iter(args)]*2))
 
 def getsetup(proxy, *kwargs):
-    return 'plugin', { 'safe' : 1, 'rebuild' : 1 }
+    return 'plugin', { 'safe' : 1, 'rebuild' : 1, 'section' : 'format' }
 
 import sys
 def debug(s):
-- 
cgit v1.2.3


From 04a99c84406d7b1552b15fc0b5ea598644f94c23 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 03:38:00 -0500
Subject: plugin tag reorg

---
 doc/plugins/404.mdwn            |  2 +-
 doc/plugins/aggregate.mdwn      |  2 +-
 doc/plugins/autoindex.mdwn      |  2 +-
 doc/plugins/calendar.mdwn       |  2 +-
 doc/plugins/color.mdwn          |  2 +-
 doc/plugins/comments.mdwn       |  2 +-
 doc/plugins/contrib/postal.mdwn |  2 +-
 doc/plugins/cutpaste.mdwn       |  2 +-
 doc/plugins/ddate.mdwn          |  1 +
 doc/plugins/filecheck.mdwn      |  2 +-
 doc/plugins/format.mdwn         |  2 +-
 doc/plugins/fortune.mdwn        |  1 +
 doc/plugins/goto.mdwn           |  2 +-
 doc/plugins/graphviz.mdwn       |  2 +-
 doc/plugins/haiku.mdwn          |  1 +
 doc/plugins/img.mdwn            |  2 +-
 doc/plugins/mirrorlist.mdwn     |  2 +-
 doc/plugins/more.mdwn           |  2 +-
 doc/plugins/poll.mdwn           |  2 +-
 doc/plugins/polygen.mdwn        |  1 +
 doc/plugins/prettydate.mdwn     |  1 +
 doc/plugins/relativedate.mdwn   |  1 +
 doc/plugins/repolist.mdwn       |  2 +-
 doc/plugins/shortcut.mdwn       |  2 +-
 doc/plugins/sparkline.mdwn      |  2 +-
 doc/plugins/table.mdwn          |  2 +-
 doc/plugins/template.mdwn       |  2 +-
 doc/plugins/testpagespec.mdwn   |  2 +-
 doc/plugins/teximg.mdwn         |  2 +-
 doc/plugins/toc.mdwn            |  2 +-
 doc/plugins/toggle.mdwn         |  2 +-
 doc/plugins/type/chrome.mdwn    |  2 +-
 doc/plugins/type/useful.mdwn    |  1 -
 doc/plugins/type/widget.mdwn    |  2 ++
 doc/plugins/underlay.mdwn       | 18 +++++++++---------
 doc/plugins/wmd.mdwn            |  2 +-
 36 files changed, 44 insertions(+), 37 deletions(-)
 delete mode 100644 doc/plugins/type/useful.mdwn
 create mode 100644 doc/plugins/type/widget.mdwn

(limited to 'doc')

diff --git a/doc/plugins/404.mdwn b/doc/plugins/404.mdwn
index ad332ee04..53dace3c9 100644
--- a/doc/plugins/404.mdwn
+++ b/doc/plugins/404.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=404 author="[[Simon_McVittie|smcv]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin lets you use the IkiWiki CGI script as an Apache 404 handler,
 to give the behaviour of various other wiki engines where visiting a
diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn
index e2efcd83f..bb828b05c 100644
--- a/doc/plugins/aggregate.mdwn
+++ b/doc/plugins/aggregate.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=aggregate author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
 This plugin allows content from other feeds to be aggregated into the
 wiki. To specify feeds to aggregate, use the
diff --git a/doc/plugins/autoindex.mdwn b/doc/plugins/autoindex.mdwn
index 03e2d12f3..d1133e4f5 100644
--- a/doc/plugins/autoindex.mdwn
+++ b/doc/plugins/autoindex.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=autoindex core=0 author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
 This plugin searches for [[SubPages|ikiwiki/subpage]] with a missing parent
 page, and generates the parent pages. The generated page content is
diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index bc1bc6c71..49fd90627 100644
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=calendar author="[[ManojSrivastava]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides a [[ikiwiki/directive/calendar]] [[ikiwiki/directive]].
 The directive displays a calendar, similar to the typical calendars shown on
diff --git a/doc/plugins/color.mdwn b/doc/plugins/color.mdwn
index dbb8b870c..d639bf563 100644
--- a/doc/plugins/color.mdwn
+++ b/doc/plugins/color.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=color core=0 author="[[ptecza]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides a [[ikiwiki/directive/color]] [[ikiwiki/directive]].
 The directive can be used to color a piece of text on a page.
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index f933d32be..775ef75a0 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=comments author="[[Simon_McVittie|smcv]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin adds "blog-style" comments. Unlike the wiki-style freeform 
 Discussion pages, these comments are posted by a simple form, cannot later
diff --git a/doc/plugins/contrib/postal.mdwn b/doc/plugins/contrib/postal.mdwn
index b2f875393..c522f8bcb 100644
--- a/doc/plugins/contrib/postal.mdwn
+++ b/doc/plugins/contrib/postal.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=postal author="[[DavidBremner]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
 The `postal` plugin allows users to send mail to
 a special address to comment on a page. It uses the [[mailbox]]
diff --git a/doc/plugins/cutpaste.mdwn b/doc/plugins/cutpaste.mdwn
index f74f8a269..ea3665c44 100644
--- a/doc/plugins/cutpaste.mdwn
+++ b/doc/plugins/cutpaste.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=cutpaste author="[[Enrico]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/cut]],
 [[ikiwiki/directive/copy]] and [[ikiwiki/directive/paste]]
diff --git a/doc/plugins/ddate.mdwn b/doc/plugins/ddate.mdwn
index 741606a6e..17bb16cff 100644
--- a/doc/plugins/ddate.mdwn
+++ b/doc/plugins/ddate.mdwn
@@ -1,6 +1,7 @@
 [[!template id=plugin name=ddate author="[[Joey]]"]]
 [[!tag type/fun]]
 [[!tag type/date]]
+[[!tag type/chrome]]
 
 Enables use of Discordian dates. `--timeformat` can be used to change
 the date format; see `ddate(1)`.
diff --git a/doc/plugins/filecheck.mdwn b/doc/plugins/filecheck.mdwn
index f4563d58e..e5f68b29c 100644
--- a/doc/plugins/filecheck.mdwn
+++ b/doc/plugins/filecheck.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=filecheck core=0 author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
 This plugin enhances the regular [[ikiwiki/PageSpec]] syntax with
 some additional tests, for things like file size, mime type, and virus
diff --git a/doc/plugins/format.mdwn b/doc/plugins/format.mdwn
index 5ec0842ae..b41d365aa 100644
--- a/doc/plugins/format.mdwn
+++ b/doc/plugins/format.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=format core=0 author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/widget]]
 
 This plugin allows mixing different page formats together, by embedding
 text formatted one way inside a page formatted another way. This is done
diff --git a/doc/plugins/fortune.mdwn b/doc/plugins/fortune.mdwn
index 9966f456d..3cb125ac1 100644
--- a/doc/plugins/fortune.mdwn
+++ b/doc/plugins/fortune.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=fortune author="[[Joey]]"]]
 [[!tag type/fun]]
+[[!tag type/widget]]
 
 This plugin implements the [[ikiwiki/directive/fortune]] [[ikiwiki/directive]].
 This directive  uses the `fortune` program to insert a fortune into the page.
diff --git a/doc/plugins/goto.mdwn b/doc/plugins/goto.mdwn
index 9c401c5d2..8e1de7a10 100644
--- a/doc/plugins/goto.mdwn
+++ b/doc/plugins/goto.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=goto author="[[Simon_McVittie|smcv]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin adds a `do=goto` mode for the IkiWiki CGI script. It's mainly
 for internal use by the [[404]], [[comments]] and [[recentchanges]]
diff --git a/doc/plugins/graphviz.mdwn b/doc/plugins/graphviz.mdwn
index 8237ae9dc..65130ae8c 100644
--- a/doc/plugins/graphviz.mdwn
+++ b/doc/plugins/graphviz.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=graphviz author="[[JoshTriplett]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/graph]] [[ikiwiki/directive]].
 This directive allows embedding [graphviz](http://www.graphviz.org/) graphs in a
diff --git a/doc/plugins/haiku.mdwn b/doc/plugins/haiku.mdwn
index 74eac1c29..448733d95 100644
--- a/doc/plugins/haiku.mdwn
+++ b/doc/plugins/haiku.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=haiku author="[[Joey]]"]]
 [[!tag type/fun]]
+[[!tag type/widget]]
 
 This plugin provides a [[ikiwiki/directive/haiku]] [[ikiwiki/directive]].
 The directive allows inserting a randomly generated haiku into a wiki page.
diff --git a/doc/plugins/img.mdwn b/doc/plugins/img.mdwn
index 114438765..a6cd90f28 100644
--- a/doc/plugins/img.mdwn
+++ b/doc/plugins/img.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=img author="Christian Mock"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/img]] [[ikiwiki/directive]].
 While ikiwiki supports inlining full-size images by making a
diff --git a/doc/plugins/mirrorlist.mdwn b/doc/plugins/mirrorlist.mdwn
index b371e8eb7..6e4964ed1 100644
--- a/doc/plugins/mirrorlist.mdwn
+++ b/doc/plugins/mirrorlist.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=mirror author="[[Joey]]"]]
-[[!tag type/special-purpose]]
+[[!tag type/chrome]]
 
 This plugin allows adding links a list of mirrors to each page in the
 wiki. For each mirror, a name and an url should be specified. Pages are
diff --git a/doc/plugins/more.mdwn b/doc/plugins/more.mdwn
index 81a9e67e8..a0664e843 100644
--- a/doc/plugins/more.mdwn
+++ b/doc/plugins/more.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=more author="Ben"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/more]] [[ikiwiki/directive]],
 which is a way to have a "more" link on a post in a blog, that leads to the
diff --git a/doc/plugins/poll.mdwn b/doc/plugins/poll.mdwn
index 510f67798..099cb399c 100644
--- a/doc/plugins/poll.mdwn
+++ b/doc/plugins/poll.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=poll author="[[Joey]]"]]
-[[!tag type/web]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/poll]] [[ikiwiki/directive]],
 which allows inserting an online poll into a page.
diff --git a/doc/plugins/polygen.mdwn b/doc/plugins/polygen.mdwn
index 6045c1ec9..f9cea1f4d 100644
--- a/doc/plugins/polygen.mdwn
+++ b/doc/plugins/polygen.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=polygen author="Enrico Zini"]]
 [[!tag type/fun]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/polygen]] [[ikiwiki/directive]],
 which allows inserting text generated by polygen into a wiki page.
diff --git a/doc/plugins/prettydate.mdwn b/doc/plugins/prettydate.mdwn
index 11ad4252f..149b7c29c 100644
--- a/doc/plugins/prettydate.mdwn
+++ b/doc/plugins/prettydate.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=prettydate author="[[Joey]]"]]
 [[!tag type/date]]
+[[!tag type/chrome]]
 
 Enabling this plugin changes the dates displayed on pages in the wiki to
 a format that is nice and easy to read. Examples: "late Wednesday evening, 
diff --git a/doc/plugins/relativedate.mdwn b/doc/plugins/relativedate.mdwn
index 50c96c5d7..d6e8eb08b 100644
--- a/doc/plugins/relativedate.mdwn
+++ b/doc/plugins/relativedate.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=relativedate author="[[Joey]]"]]
 [[!tag type/date]]
+[[!tag type/chrome]]
 
 This plugin lets dates be displayed in relative form. Examples: "2 days ago", 
 "1 month and 3 days ago", "30 minutes ago". Hovering over the date will
diff --git a/doc/plugins/repolist.mdwn b/doc/plugins/repolist.mdwn
index 9b3a7575e..efd9c9352 100644
--- a/doc/plugins/repolist.mdwn
+++ b/doc/plugins/repolist.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=repolist author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin allows you to configure ikiwiki with the location of
 [[rcs]] repositories for your wiki's source. This is done via the
diff --git a/doc/plugins/shortcut.mdwn b/doc/plugins/shortcut.mdwn
index 68896f4d3..1e8e85ed8 100644
--- a/doc/plugins/shortcut.mdwn
+++ b/doc/plugins/shortcut.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=shortcut author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/shortcut]] [[ikiwiki/directive]].
 It allows external links to commonly linked to sites to be made
diff --git a/doc/plugins/sparkline.mdwn b/doc/plugins/sparkline.mdwn
index bcc5daec6..ee3928d7e 100644
--- a/doc/plugins/sparkline.mdwn
+++ b/doc/plugins/sparkline.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=sparkline author="[[Joey]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/sparkline]]
 [[ikiwiki/directive]], which allows for easily embedding sparklines into
diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn
index fb830044f..fe66f90a8 100644
--- a/doc/plugins/table.mdwn
+++ b/doc/plugins/table.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=table author="[[VictorMoral]]"]]
-[[!tag type/useful]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/table]] [[ikiwiki/directive]].
 It can build HTML tables from data in CSV (comma-separated values)
diff --git a/doc/plugins/template.mdwn b/doc/plugins/template.mdwn
index 6675207b2..da775f232 100644
--- a/doc/plugins/template.mdwn
+++ b/doc/plugins/template.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=template author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/template]] [[ikiwiki/directive]].
 With this plugin, you can set up templates, and cause them to be filled out
diff --git a/doc/plugins/testpagespec.mdwn b/doc/plugins/testpagespec.mdwn
index dabcb0bec..8180d5d4b 100644
--- a/doc/plugins/testpagespec.mdwn
+++ b/doc/plugins/testpagespec.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=testpagespec author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
 This plugin provides a [[ikiwiki/directive/testpagespec]] [[ikiwiki/directive]].
 The directive allows testing a [[ikiwiki/PageSpec]] to see if it matches a
diff --git a/doc/plugins/teximg.mdwn b/doc/plugins/teximg.mdwn
index ae052837f..f3cade85f 100644
--- a/doc/plugins/teximg.mdwn
+++ b/doc/plugins/teximg.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=teximg author="[[PatrickWinnertz]]"]]
-[[!tag type/chrome type/slow]]
+[[!tag type/widget type/slow]]
 
 This plugin provides a [[ikiwiki/directive/teximg]] [[ikiwiki/directive]],
 that renders LaTeX formulas into images.
diff --git a/doc/plugins/toc.mdwn b/doc/plugins/toc.mdwn
index 2b7686681..a0ad3a5d0 100644
--- a/doc/plugins/toc.mdwn
+++ b/doc/plugins/toc.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=toc author="[[Joey]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/toc]] [[ikiwiki/directive]],
 which adds a table of contents to a page.
diff --git a/doc/plugins/toggle.mdwn b/doc/plugins/toggle.mdwn
index 69ac613e0..d1500eba0 100644
--- a/doc/plugins/toggle.mdwn
+++ b/doc/plugins/toggle.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=toggle author="[[Joey]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/toggle]] and
 [[ikiwiki/directive/toggleable]] [[directives|ikiwiki/directive]].
diff --git a/doc/plugins/type/chrome.mdwn b/doc/plugins/type/chrome.mdwn
index d3f0eb3d3..a1c6d0728 100644
--- a/doc/plugins/type/chrome.mdwn
+++ b/doc/plugins/type/chrome.mdwn
@@ -1 +1 @@
-These plugins affect the look and feel of the wiki.
+These plugins affect the look and feel of the overall wiki.
diff --git a/doc/plugins/type/useful.mdwn b/doc/plugins/type/useful.mdwn
deleted file mode 100644
index 92fcf5af1..000000000
--- a/doc/plugins/type/useful.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-These plugins perform various miscellaneous useful functions.
diff --git a/doc/plugins/type/widget.mdwn b/doc/plugins/type/widget.mdwn
new file mode 100644
index 000000000..875829d0b
--- /dev/null
+++ b/doc/plugins/type/widget.mdwn
@@ -0,0 +1,2 @@
+These plugins allow inserting various things into pages via a
+[[ikiwiki/directive]].
diff --git a/doc/plugins/underlay.mdwn b/doc/plugins/underlay.mdwn
index f7eafee7c..8836a394c 100644
--- a/doc/plugins/underlay.mdwn
+++ b/doc/plugins/underlay.mdwn
@@ -1,17 +1,17 @@
 [[!template id=plugin name=underlay author="[[Simon_McVittie|smcv]]"]]
-[[!tag type/useful]]
+[[!tag type/special-purpose]]
 
-This plugin adds an `add_underlays` option to the setup file.
-Its value is a list of underlay directories whose content is added to the wiki.
+This plugin adds an `add_underlays` option to the setup file. Its value is
+a list of underlay directories whose content is added to the wiki.
 
 Multiple underlays are normally set up automatically by other plugins (for
-instance, the images used by the [[plugins/smiley]] plugin), but they can also be
-used as a way to pull in external files that you don't want in revision control,
-like photos or software releases.
+instance, the images used by the [[plugins/smiley]] plugin), but they can
+also be used as a way to pull in external files that you don't want in
+revision control, like photos or software releases.
 
-Directories in `add_underlays` should usually be absolute. If relative, they're
-interpreted as relative to the parent directory of the basewiki underlay, which
-is probably not particularly useful in this context.
+Directories in `add_underlays` should usually be absolute. If relative,
+they're interpreted as relative to the parent directory of the basewiki
+underlay, which is probably not particularly useful in this context.
 
 --
 
diff --git a/doc/plugins/wmd.mdwn b/doc/plugins/wmd.mdwn
index dc9a30703..96c6e2e6c 100644
--- a/doc/plugins/wmd.mdwn
+++ b/doc/plugins/wmd.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=wmd author="[[Will]]"]]
-[[!tag type/chrome]]
+[[!tag type/web]]
 
 [WMD](http://wmd-editor.com/) is a What You See Is What You Mean editor for
 [[mdwn]]. This plugin makes WMD be used for editing pages in the wiki.
-- 
cgit v1.2.3


From 3ce8030dafc40a8188f6a32567c04d157b0ac39f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 03:43:01 -0500
Subject: more tag reorg

---
 doc/plugins/date.mdwn           | 2 +-
 doc/plugins/linkmap.mdwn        | 1 +
 doc/plugins/listdirectives.mdwn | 1 +
 doc/plugins/orphans.mdwn        | 1 +
 doc/plugins/pagecount.mdwn      | 1 +
 doc/plugins/pagestats.mdwn      | 2 +-
 doc/plugins/progress.mdwn       | 2 +-
 doc/plugins/version.mdwn        | 1 +
 8 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/date.mdwn b/doc/plugins/date.mdwn
index b8dbdfee5..2a33f014c 100644
--- a/doc/plugins/date.mdwn
+++ b/doc/plugins/date.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=date author="[[Joey]]"]]
-[[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/date]]
 [[ikiwiki/directive]], which provides a way to display an arbitrary date
diff --git a/doc/plugins/linkmap.mdwn b/doc/plugins/linkmap.mdwn
index 89cb9d8ae..7e51cd935 100644
--- a/doc/plugins/linkmap.mdwn
+++ b/doc/plugins/linkmap.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=linkmap author="[[Joey]]"]]
 [[!tag type/meta]]
+[[!tag type/widget]]
 [[!tag type/slow]]
 
 This plugin provides the [[ikiwiki/directive/linkmap]] [[ikiwiki/directive]].
diff --git a/doc/plugins/listdirectives.mdwn b/doc/plugins/listdirectives.mdwn
index 2d9bce01d..df854de52 100644
--- a/doc/plugins/listdirectives.mdwn
+++ b/doc/plugins/listdirectives.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=listdirectives author="Will"]]
 [[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/listdirectives]]
 [[ikiwiki/directive]], which inserts a list of currently available
diff --git a/doc/plugins/orphans.mdwn b/doc/plugins/orphans.mdwn
index e403c2d18..09ad0a51d 100644
--- a/doc/plugins/orphans.mdwn
+++ b/doc/plugins/orphans.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=orphans author="[[Joey]]"]]
 [[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/orphans]]
 [[ikiwiki/directive]], which generates a list of possibly orphaned pages --
diff --git a/doc/plugins/pagecount.mdwn b/doc/plugins/pagecount.mdwn
index a56027e60..71872fae8 100644
--- a/doc/plugins/pagecount.mdwn
+++ b/doc/plugins/pagecount.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=pagecount author="[[Joey]]"]]
 [[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/pagecount]]
 [[ikiwiki/directive]], which displays the number of pages
diff --git a/doc/plugins/pagestats.mdwn b/doc/plugins/pagestats.mdwn
index c3eba6363..347e39a89 100644
--- a/doc/plugins/pagestats.mdwn
+++ b/doc/plugins/pagestats.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=pagestats author="Enrico Zini"]]
-[[!tag type/meta type/tags]]
+[[!tag type/meta type/tags type/widget]]
 
 This plugin provides the [[ikiwiki/directive/pagestats]]
 [[ikiwiki/directive]], which can generate stats about how pages link to
diff --git a/doc/plugins/progress.mdwn b/doc/plugins/progress.mdwn
index e1b560cc8..20736d18c 100644
--- a/doc/plugins/progress.mdwn
+++ b/doc/plugins/progress.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=progress author="[[Will]]"]]
-[[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/progress]]
 [[ikiwiki/directive]], which generates a progress bar.
diff --git a/doc/plugins/version.mdwn b/doc/plugins/version.mdwn
index 43027bdd7..326a2e7ce 100644
--- a/doc/plugins/version.mdwn
+++ b/doc/plugins/version.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=version author="[[Joey]]"]]
 [[!tag type/meta]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/version]]
 [[ikiwiki/directive]], which inserts the current version
-- 
cgit v1.2.3


From 21b4f11cbb0796e858f95dcee2ff117fb4e10afe Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 03:47:21 -0500
Subject: more tag reorg

---
 doc/plugins/editpage.mdwn          | 1 +
 doc/plugins/getsource.mdwn         | 1 +
 doc/plugins/inline.mdwn            | 1 +
 doc/plugins/mirrorlist.mdwn        | 2 +-
 doc/plugins/parentlinks.mdwn       | 2 +-
 doc/plugins/recentchanges.mdwn     | 1 +
 doc/plugins/recentchangesdiff.mdwn | 1 +
 doc/plugins/rsync.mdwn             | 1 +
 8 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/editpage.mdwn b/doc/plugins/editpage.mdwn
index b830e51aa..346ee7c78 100644
--- a/doc/plugins/editpage.mdwn
+++ b/doc/plugins/editpage.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=editpage core=1 author="[[Joey]]"]]
+[[!tag type/web]]
 
 This plugin allows editing wiki pages in the web interface. It's enabled by
 default if [[cgi]] is enabled; disable it if you want cgi for other things
diff --git a/doc/plugins/getsource.mdwn b/doc/plugins/getsource.mdwn
index 20040ccee..d5404a628 100644
--- a/doc/plugins/getsource.mdwn
+++ b/doc/plugins/getsource.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=getsource author="[[Will_Uther|Will]]"]]
+[[!tag type/web]]
 
 This plugin adds a "Source" link to the top of each page that uses
 the CGI to display the page's source.
diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn
index 6c3282576..3eb849fdb 100644
--- a/doc/plugins/inline.mdwn
+++ b/doc/plugins/inline.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=inline core=1 author="[[Joey]]"]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/inline]]
 [[ikiwiki/directive]], which allows including one wiki page
diff --git a/doc/plugins/mirrorlist.mdwn b/doc/plugins/mirrorlist.mdwn
index 6e4964ed1..aedc1f4a0 100644
--- a/doc/plugins/mirrorlist.mdwn
+++ b/doc/plugins/mirrorlist.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=mirror author="[[Joey]]"]]
-[[!tag type/chrome]]
+[[!tag type/web]]
 
 This plugin allows adding links a list of mirrors to each page in the
 wiki. For each mirror, a name and an url should be specified. Pages are
diff --git a/doc/plugins/parentlinks.mdwn b/doc/plugins/parentlinks.mdwn
index ef262a30c..c2d364bef 100644
--- a/doc/plugins/parentlinks.mdwn
+++ b/doc/plugins/parentlinks.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=parentlinks core=1 author="[[intrigeri]]"]]
-[[!tag type/link]]
+[[!tag type/link type/chrome]]
 
 This plugin generates the links to a page's parents that typically appear
 at the top of a wiki page.
diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn
index 9375296a4..823f68502 100644
--- a/doc/plugins/recentchanges.mdwn
+++ b/doc/plugins/recentchanges.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=recentchanges core=1 author="[[Joey]]"]]
+[[!tag type/meta]]
 
 This plugin examines the [[revision_control_system|rcs]] history and
 generates a page describing each recent change made to the wiki. These
diff --git a/doc/plugins/recentchangesdiff.mdwn b/doc/plugins/recentchangesdiff.mdwn
index a7b113ade..57299f92d 100644
--- a/doc/plugins/recentchangesdiff.mdwn
+++ b/doc/plugins/recentchangesdiff.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=recentchangesdiff core=0 author="[[Joey]]"]]
+[[!tag type/meta]]
 
 This plugin extends the [[recentchanges]] plugin, adding a diff for each
 change. The diffs are by default hidden from display on the recentchanges
diff --git a/doc/plugins/rsync.mdwn b/doc/plugins/rsync.mdwn
index 315b663c0..e48886168 100644
--- a/doc/plugins/rsync.mdwn
+++ b/doc/plugins/rsync.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=rsync author="[[schmonz]]"]]
+[[!tag type/special-purpose]]
 
 This plugin allows ikiwiki to push generated pages to another host
 by running a command such as `rsync`.
-- 
cgit v1.2.3


From 1db0dd855ae49e4bb7b74e1158fc0356836d45a7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 03:56:56 -0500
Subject: one more

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

(limited to 'doc')

diff --git a/doc/plugins/map.mdwn b/doc/plugins/map.mdwn
index 8f5a9f15e..b164d5ca8 100644
--- a/doc/plugins/map.mdwn
+++ b/doc/plugins/map.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=map author="Alessandro Dotti Contra"]]
-[[!tag type/meta]]
+[[!tag type/meta type/widget]]
 
 This plugin provides the [[ikiwiki/directive/map]] [[ikiwiki/directive]],
 which generates a hierarchical page map for the wiki.
-- 
cgit v1.2.3


From a7eb434afd216e0b473ac82777544c9c45852792 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 04:10:11 -0500
Subject: another (last?) tag change

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

(limited to 'doc')

diff --git a/doc/plugins/postsparkline.mdwn b/doc/plugins/postsparkline.mdwn
index c81f91bdc..b0733e343 100644
--- a/doc/plugins/postsparkline.mdwn
+++ b/doc/plugins/postsparkline.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=postsparkline author="[[Joey]]"]]
-[[!tag type/chrome]]
+[[!tag type/widget]]
 
 This plugin provides the [[ikiwiki/directive/postsparkline]] [[ikiwiki/directive]].
 It uses the [[sparkline]] plugin to create a sparkline of
-- 
cgit v1.2.3


From 20ba12802b3897bf48d8a7704a57e9cede2466bd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 04:22:15 -0500
Subject: add section information

---
 IkiWiki/Plugin/404.pm          | 1 +
 IkiWiki/Plugin/aggregate.pm    | 1 +
 IkiWiki/Plugin/amazon_s3.pm    | 1 +
 IkiWiki/Plugin/attachment.pm   | 1 +
 IkiWiki/Plugin/autoindex.pm    | 1 +
 IkiWiki/Plugin/comments.pm     | 1 +
 IkiWiki/Plugin/editdiff.pm     | 1 +
 IkiWiki/Plugin/edittemplate.pm | 1 +
 IkiWiki/Plugin/getsource.pm    | 1 +
 IkiWiki/Plugin/google.pm       | 1 +
 IkiWiki/Plugin/goto.pm         | 1 +
 IkiWiki/Plugin/mirrorlist.pm   | 1 +
 IkiWiki/Plugin/norcs.pm        | 1 +
 IkiWiki/Plugin/pingee.pm       | 1 +
 IkiWiki/Plugin/pinger.pm       | 1 +
 IkiWiki/Plugin/remove.pm       | 1 +
 IkiWiki/Plugin/rename.pm       | 1 +
 IkiWiki/Plugin/repolist.pm     | 1 +
 IkiWiki/Plugin/rsync.pm        | 1 +
 IkiWiki/Plugin/search.pm       | 1 +
 IkiWiki/Plugin/testpagespec.pm | 1 +
 IkiWiki/Plugin/underlay.pm     | 1 +
 IkiWiki/Plugin/websetup.pm     | 1 +
 IkiWiki/Plugin/wmd.pm          | 2 ++
 doc/plugins/write.mdwn         | 3 ++-
 25 files changed, 27 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm
index 85486e559..8adfd5dd9 100644
--- a/IkiWiki/Plugin/404.pm
+++ b/IkiWiki/Plugin/404.pm
@@ -21,6 +21,7 @@ sub getsetup () {
 			# server admin action too
 			safe => 0,
 			rebuild => 0,
+			section => "web",
 		}
 }
 
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 5a9eb433d..c18d413e6 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -43,6 +43,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "special-purpose",
 		},
 		aggregateinternal => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index cfd8cd347..f2f4dbcf2 100644
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -45,6 +45,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => 0,
+			section => "special-purpose",
 		},
 		amazon_s3_key_id => {
 			type => "string",
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index cbe6efc21..ad1dd9bca 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		},
 		allowed_attachments => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 555856b11..e50464dca 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index caed0d58c..1e71749a4 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -38,6 +38,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 		comments_pagespec => {
 			type => 'pagespec',
diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm
index 7df6a9ffb..d8f53a42e 100644
--- a/IkiWiki/Plugin/editdiff.pm
+++ b/IkiWiki/Plugin/editdiff.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		},
 }
 
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index a163b0d84..5f0551d92 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -23,6 +23,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "web",
 		},
 }
 
diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm
index d1555430e..b362de726 100644
--- a/IkiWiki/Plugin/getsource.pm
+++ b/IkiWiki/Plugin/getsource.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 		getsource_mimetype => {
 			type => "string",
diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 483fa1707..48ad4c8ce 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 }
 
diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 439552f62..03bd682b3 100644
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -14,6 +14,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		}
 }
 
diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm
index d0a6107ef..92be7913e 100644
--- a/IkiWiki/Plugin/mirrorlist.pm
+++ b/IkiWiki/Plugin/mirrorlist.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 		mirrorlist => {
 			type => "string",
diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm
index bfe84c0e1..e6a05a3c5 100644
--- a/IkiWiki/Plugin/norcs.pm
+++ b/IkiWiki/Plugin/norcs.pm
@@ -25,6 +25,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => 0,
+			section => "rcs",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pingee.pm b/IkiWiki/Plugin/pingee.pm
index f5386d0ca..aafce9e70 100644
--- a/IkiWiki/Plugin/pingee.pm
+++ b/IkiWiki/Plugin/pingee.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index c20ecb5d4..a797fc7bd 100644
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -21,6 +21,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "special-purpose",
 		},
 		pinger_timeout => {
 			type => "integer",
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 3c1e0c713..f59d0269e 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		},
 }
 
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 8213d21f6..3908443ca 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		},
 }
 
diff --git a/IkiWiki/Plugin/repolist.pm b/IkiWiki/Plugin/repolist.pm
index f69ec3988..ba7c5f0aa 100644
--- a/IkiWiki/Plugin/repolist.pm
+++ b/IkiWiki/Plugin/repolist.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "web",
 		},
 		repositories => {
 			type => "string",
diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index e38801e4a..8dd983be7 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => 0,
+			section => "special-purpose",
 		},
 		rsync_command => {
 			type => "string",
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 393c17e0f..fb68396a1 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "web",
 		},
 		omega_cgi => {
 			type => "string",
diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index 440fca33b..17a77cb69 100644
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 116fe7324..ab74fc37e 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => undef,
+			section => "special-purpose",
 		},
 		add_underlays => {
 			type => "string",
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 445552e40..5c19c9b63 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "web",
 		},
 		websetup_force_plugins => {
 			type => "string",
diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 9ddd237ab..5361d2914 100644
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -17,6 +17,8 @@ sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
+			rebuild => 0,
+			section => "web",
 		},
 }
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 68454d56c..fbaabb6a0 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -498,7 +498,8 @@ describes the plugin as a whole. For example:
   and undef if a rebuild could be needed in some circumstances, but is not
   strictly required.
 * `section` can optionally specify which section in the config file
-  the plugin fits in.
+  the plugin fits in. The convention is to name the sections the
+  same as the tags used for [[plugins|plugin]] on this wiki.
 
 ### genwrapper
 
-- 
cgit v1.2.3


From 5d566d8b32e7ec260df996366b471631d6a3b47c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 14:38:43 -0500
Subject: reorg and expand docs of some variables

---
 doc/plugins/write.mdwn | 99 ++++++++++++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 44 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index fbaabb6a0..712dda8bf 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -31,7 +31,7 @@ they're the same as far as how they hook into ikiwiki. This document will
 explain how to write both sorts of plugins, albeit with an emphasis on perl
 plugins.
 
-## Considerations
+## Remember: Ikiwiki is a compiler
 
 One thing to keep in mind when writing a plugin is that ikiwiki is a wiki
 *compiler*. So plugins influence pages when they are built, not when they
@@ -40,7 +40,23 @@ example, will insert the build time. Also, as a compiler, ikiwiki avoids
 rebuilding pages unless they have changed, so a plugin that prints some
 random or changing thing on a page will generate a static page that won't
 change until ikiwiki rebuilds the page for some other reason, like the page
-being edited.
+being edited. The [[tutorial]] has some other examples of ways that ikiwiki
+being a compiler may trip up the unwary.
+
+## Plugin interface
+
+To import the ikiwiki plugin interface:
+
+	use IkiWiki '3.00';
+
+This will import several variables and functions into your plugin's
+namespace. These variables and functions are the ones most plugins need,
+and a special effort will be made to avoid changing them in incompatible
+ways, and to document any changes that have to be made in the future.
+
+Note that IkiWiki also provides other variables and functions that are not
+exported by default. No guarantee is made about these in the future, so if
+it's not exported, the wise choice is to not use it.
 
 ## Registering plugins
 
@@ -508,28 +524,17 @@ describes the plugin as a whole. For example:
 This hook is used to inject C code (which it returns) into the `main`
 function of the ikiwiki wrapper when it is being generated.
 
-## Plugin interface
-
-To import the ikiwiki plugin interface:
+### Exported variables
 
-	use IkiWiki '3.00';
+Several variables are exported to your plugin when you `use IkiWiki;`
 
-This will import several variables and functions into your plugin's
-namespace. These variables and functions are the ones most plugins need,
-and a special effort will be made to avoid changing them in incompatible
-ways, and to document any changes that have to be made in the future.
-
-Note that IkiWiki also provides other variables and functions that are not
-exported by default. No guarantee is made about these in the future, so if
-it's not exported, the wise choice is to not use it.
-
-### %config
+#### %config
 
 A plugin can access the wiki's configuration via the `%config`
 hash. The best way to understand the contents of the hash is to look at
 your ikiwiki setup file, which sets the hash content to configure the wiki.
 
-### %pagestate
+#### %pagestate
 
 The `%pagestate` hash can be used by plugins to save state that they will need
 next time ikiwiki is run. The hash holds per-page state, so to set a value,
@@ -547,7 +552,7 @@ When pages are deleted, ikiwiki automatically deletes their pagestate too.
 Note that page state does not persist across wiki rebuilds, only across
 wiki updates.
 
-### %wikistate
+#### %wikistate
 
 The `%wikistate` hash can be used by a plugin to store persistant state
 that is not bound to any one page. To set a value, use
@@ -556,19 +561,25 @@ serialize, `$key` is any string you like, and `$id` must be the same as the
 "id" parameter passed to `hook()` when registering the plugin, so that the
 state can be dropped if the plugin is no longer used.
 
-### Other variables
+#### %links
+
+The `%links` hash can be used to look up the names of each page that
+a page links to. The name of the page is the key; the value is an array
+reference. Do not modify this hash directly; call `add_link()`.
+
+#### %destsources
 
-If your plugin needs to access data about other pages in the wiki. It can
-use the following hashes, using a page name as the key:
+The `%destsources` hash records the name of the source file used to
+create each destination file. The key is the output filename (ie,
+"foo/index.html"), and the value is the source filename that it was built
+from (eg, "foo.mdwn"). Note that a single source file may create multiple
+destination files. Do not modify this hash directly; call `will_render()`.
 
-* `%links` lists the names of each page that a page links to, in an array
-  reference.
-* `%destsources` contains the name of the source file used to create each
-  destination file.
-* `%pagesources` contains the name of the source file for each page.
+#### %pagesources
 
-Also, the `%IkiWiki::version` variable contains the version number for the
-ikiwiki program.
+The `%pagesources` has can be used to look up the source filename
+of a page. So the key is the page name, and the value is the source
+filename. Do not modify this hash.
 
 ### Library functions
 
@@ -614,22 +625,6 @@ page created from it. (Ie, it appends ".html".)
 Use this when constructing the filename of a html file. Use `urlto` when
 generating a link to a page.
 
-### `deptype(@)`
-
-Use this function to generate ikiwiki's internal representation of a
-dependency type from one or more of these keywords:
-
-* `content` is the default. Any change to the content
-  of a page triggers the dependency.
-* `presence` is only triggered by a change to the presence
-  of a page.
-* `links` is only triggered by a change to the links of a page.
-  This includes when a link is added, removed, or changes what
-  it points to due to other changes. It does not include the
-  addition or removal of a duplicate link.
-
-If multiple types are specified, they are combined.
-
 #### `pagespec_match_list($$;@)`
 
 Passed a page name, and [[ikiwiki/PageSpec]], returns a list of pages
@@ -683,6 +678,22 @@ The most often used is "location", which specifies the location the
 PageSpec should match against. If not passed, relative PageSpecs will match
 relative to the top of the wiki.
 
+#### `deptype(@)`
+
+Use this function to generate ikiwiki's internal representation of a
+dependency type from one or more of these keywords:
+
+* `content` is the default. Any change to the content
+  of a page triggers the dependency.
+* `presence` is only triggered by a change to the presence
+  of a page.
+* `links` is only triggered by a change to the links of a page.
+  This includes when a link is added, removed, or changes what
+  it points to due to other changes. It does not include the
+  addition or removal of a duplicate link.
+
+If multiple types are specified, they are combined.
+
 #### `bestlink($$)`
 
 Given a page and the text of a link on the page, determine which
-- 
cgit v1.2.3


From b1c47b4065b245ccf46b99292d7de61800468237 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 14:41:28 -0500
Subject: heading tweaks

---
 doc/plugins/write.mdwn | 64 +++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 712dda8bf..17c54ffc7 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -524,17 +524,17 @@ describes the plugin as a whole. For example:
 This hook is used to inject C code (which it returns) into the `main`
 function of the ikiwiki wrapper when it is being generated.
 
-### Exported variables
+## Exported variables
 
 Several variables are exported to your plugin when you `use IkiWiki;`
 
-#### %config
+### %config
 
 A plugin can access the wiki's configuration via the `%config`
 hash. The best way to understand the contents of the hash is to look at
 your ikiwiki setup file, which sets the hash content to configure the wiki.
 
-#### %pagestate
+### %pagestate
 
 The `%pagestate` hash can be used by plugins to save state that they will need
 next time ikiwiki is run. The hash holds per-page state, so to set a value,
@@ -552,7 +552,7 @@ When pages are deleted, ikiwiki automatically deletes their pagestate too.
 Note that page state does not persist across wiki rebuilds, only across
 wiki updates.
 
-#### %wikistate
+### %wikistate
 
 The `%wikistate` hash can be used by a plugin to store persistant state
 that is not bound to any one page. To set a value, use
@@ -561,13 +561,13 @@ serialize, `$key` is any string you like, and `$id` must be the same as the
 "id" parameter passed to `hook()` when registering the plugin, so that the
 state can be dropped if the plugin is no longer used.
 
-#### %links
+### %links
 
 The `%links` hash can be used to look up the names of each page that
 a page links to. The name of the page is the key; the value is an array
 reference. Do not modify this hash directly; call `add_link()`.
 
-#### %destsources
+### %destsources
 
 The `%destsources` hash records the name of the source file used to
 create each destination file. The key is the output filename (ie,
@@ -575,15 +575,15 @@ create each destination file. The key is the output filename (ie,
 from (eg, "foo.mdwn"). Note that a single source file may create multiple
 destination files. Do not modify this hash directly; call `will_render()`.
 
-#### %pagesources
+### %pagesources
 
 The `%pagesources` has can be used to look up the source filename
 of a page. So the key is the page name, and the value is the source
 filename. Do not modify this hash.
 
-### Library functions
+## Library functions
 
-#### `hook(@)`
+### `hook(@)`
 
 Hook into ikiwiki's processing. See the discussion of hooks above.
 
@@ -592,12 +592,12 @@ named `no_override` is supported, If it's set to a true value, then this hook
 will not override any existing hook with the same id. This is useful if
 the id can be controled by the user.
 
-#### `debug($)`
+### `debug($)`
 
 Logs a debugging message. These are supressed unless verbose mode is turned
 on.
 
-#### `error($;$)`
+### `error($;$)`
 
 Aborts with an error message. If the second parameter is passed, it is a
 function that is called after the error message is printed, to do any final
@@ -611,13 +611,13 @@ In other hooks, error() is a fatal error, so use with care. Try to avoid
 dying on bad input when building a page, as that will halt
 the entire wiki build and make the wiki unusable.
 
-#### `template($;@)`
+### `template($;@)`
 
 Creates and returns a [[!cpan HTML::Template]] object. The first parameter
 is the name of the file in the template directory. The optional remaining
 parameters are passed to `HTML::Template->new`.
 
-#### `htmlpage($)`
+### `htmlpage($)`
 
 Passed a page name, returns the base name that will be used for a the html
 page created from it. (Ie, it appends ".html".)
@@ -625,7 +625,7 @@ page created from it. (Ie, it appends ".html".)
 Use this when constructing the filename of a html file. Use `urlto` when
 generating a link to a page.
 
-#### `pagespec_match_list($$;@)`
+### `pagespec_match_list($$;@)`
 
 Passed a page name, and [[ikiwiki/PageSpec]], returns a list of pages
 in the wiki that match the [[ikiwiki/PageSpec]]. 
@@ -656,7 +656,7 @@ Additional named parameters can be specified:
 Any other named parameters are passed on to `pagespec_match`, to further
 limit the match.
 
-#### `add_depends($$;$)`
+### `add_depends($$;$)`
 
 Makes the specified page depend on the specified [[ikiwiki/PageSpec]].
 
@@ -678,7 +678,7 @@ The most often used is "location", which specifies the location the
 PageSpec should match against. If not passed, relative PageSpecs will match
 relative to the top of the wiki.
 
-#### `deptype(@)`
+### `deptype(@)`
 
 Use this function to generate ikiwiki's internal representation of a
 dependency type from one or more of these keywords:
@@ -730,7 +730,7 @@ control some options. These are:
 * class - set to add a css class to the link
 * title - set to add a title attribute to the link
 
-#### `readfile($;$)`
+### `readfile($;$)`
 
 Given a filename, reads and returns the entire file.
 
@@ -739,7 +739,7 @@ in binary mode.
 
 A failure to read the file will result in it dying with an error.
 
-#### `writefile($$$;$$)`
+### `writefile($$$;$$)`
 
 Given a filename, a directory to put it in, and the file's content,
 writes a file. 
@@ -767,7 +767,7 @@ generally the directory parameter is a trusted toplevel directory like
 the srcdir or destdir, and any subdirectories of this are included in the
 filename parameter.
 
-#### `will_render($$)`
+### `will_render($$)`
 
 Given a page name and a destination file name (not including the base
 destination directory), register that the page will result in that file
@@ -783,34 +783,34 @@ Ikiwiki uses this information to automatically clean up rendered files when
 the page that rendered them goes away or is changed to no longer render
 them. will_render also does a few important security checks.
 
-#### `pagetype($)`
+### `pagetype($)`
 
 Given the name of a source file, returns the type of page it is, if it's
 a type that ikiwiki knowns how to htmlize. Otherwise, returns undef.
 
-#### `pagename($)`
+### `pagename($)`
 
 Given the name of a source file, returns the name of the wiki page
 that corresponds to that file.
 
-#### `pagetitle($)`
+### `pagetitle($)`
 
 Give the name of a wiki page, returns a version suitable to be displayed as
 the page's title. This is accomplished by de-escaping escaped characters in
 the page name. "_" is replaced with a space, and '__NN__' is replaced by 
 the UTF character with code NN.
 
-#### `titlepage($)`
+### `titlepage($)`
 
 This performs the inverse of `pagetitle`, ie, it converts a page title into
 a wiki page name.
 
-#### `linkpage($)`
+### `linkpage($)`
 
 This converts text that could have been entered by the user as a
 [[ikiwiki/WikiLink]] into a wiki page name.
 
-#### `srcfile($;$)`
+### `srcfile($;$)`
 
 Given the name of a source file in the wiki, searches for the file in
 the source directory and the underlay directories (most recently added
@@ -820,7 +820,7 @@ Normally srcfile will fail with an error message if the source file cannot
 be found. The second parameter can be set to a true value to make it return
 undef instead.
 
-#### `add_underlay($)`
+### `add_underlay($)`
 
 Adds a directory to the set of underlay directories that ikiwiki will
 search for files.
@@ -828,18 +828,18 @@ search for files.
 If the directory name is not absolute, ikiwiki will assume it is in
 the parent directory of the configured underlaydir.
 
-#### `displaytime($;$)`
+### `displaytime($;$)`
 
 Given a time, formats it for display.
 
 The optional second parameter is a strftime format to use to format the
 time.
 
-#### `gettext`
+### `gettext`
 
 This is the standard gettext function, although slightly optimised.
 
-#### `urlto($$;$)`
+### `urlto($$;$)`
 
 Construct a relative url to the first parameter from the page named by the
 second. The first parameter can be either a page name, or some other
@@ -848,13 +848,13 @@ destination file, as registered by `will_render`.
 If the third parameter is passed and is true, an absolute url will be
 constructed instead of the default relative url.
 
-#### `newpagefile($$)`
+### `newpagefile($$)`
 
 This can be called when creating a new page, to determine what filename
 to save the page to. It's passed a page name, and its type, and returns
 the name of the file to create, relative to the srcdir.
 
-#### `targetpage($$;$)`
+### `targetpage($$;$)`
 
 Passed a page and an extension, returns the filename that page will be
 rendered to.
@@ -863,7 +863,7 @@ Optionally, a third parameter can be passed, to specify the preferred
 filename of the page. For example, `targetpage("foo", "rss", "feed")`
 will yield something like `foo/feed.rss`.
 
-#### `add_link($$)`
+### `add_link($$)`
 
 This adds a link to `%links`, ensuring that duplicate links are not
 added. Pass it the page that contains the link, and the link text.
-- 
cgit v1.2.3


From ba19f940bd071f7065246594751dd49041cbbaba Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 14:44:26 -0500
Subject: move note to sidebox

---
 doc/plugins/write.mdwn | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 17c54ffc7..07bfd72ac 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -3,6 +3,20 @@ written to extend ikiwiki in many ways. Despite the length of this page,
 it's not really hard. This page is a complete reference to everything a
 plugin might want to do. There is also a quick [[tutorial]].
 
+[[!template type="note" text="""
+Ikiwiki is a compiler
+
+One thing to keep in mind when writing a plugin is that ikiwiki is a wiki
+*compiler*. So plugins influence pages when they are built, not when they
+are loaded. A plugin that inserts the current time into a page, for
+example, will insert the build time. Also, as a compiler, ikiwiki avoids
+rebuilding pages unless they have changed, so a plugin that prints some
+random or changing thing on a page will generate a static page that won't
+change until ikiwiki rebuilds the page for some other reason, like the page
+being edited. The [[tutorial]] has some other examples of ways that ikiwiki
+being a compiler may trip up the unwary.
+"""]]
+
 [[!toc levels=2]]
 
 ## Types of plugins
@@ -31,18 +45,6 @@ they're the same as far as how they hook into ikiwiki. This document will
 explain how to write both sorts of plugins, albeit with an emphasis on perl
 plugins.
 
-## Remember: Ikiwiki is a compiler
-
-One thing to keep in mind when writing a plugin is that ikiwiki is a wiki
-*compiler*. So plugins influence pages when they are built, not when they
-are loaded. A plugin that inserts the current time into a page, for
-example, will insert the build time. Also, as a compiler, ikiwiki avoids
-rebuilding pages unless they have changed, so a plugin that prints some
-random or changing thing on a page will generate a static page that won't
-change until ikiwiki rebuilds the page for some other reason, like the page
-being edited. The [[tutorial]] has some other examples of ways that ikiwiki
-being a compiler may trip up the unwary.
-
 ## Plugin interface
 
 To import the ikiwiki plugin interface:
-- 
cgit v1.2.3


From 60410369daef9ce990d516f0d538571db4623ceb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 14:48:22 -0500
Subject: add variable value examples

---
 doc/plugins/write.mdwn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 07bfd72ac..f2b96b6d9 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -3,7 +3,7 @@ written to extend ikiwiki in many ways. Despite the length of this page,
 it's not really hard. This page is a complete reference to everything a
 plugin might want to do. There is also a quick [[tutorial]].
 
-[[!template type="note" text="""
+[[!template id="note" text="""
 Ikiwiki is a compiler
 
 One thing to keep in mind when writing a plugin is that ikiwiki is a wiki
@@ -569,6 +569,8 @@ The `%links` hash can be used to look up the names of each page that
 a page links to. The name of the page is the key; the value is an array
 reference. Do not modify this hash directly; call `add_link()`.
 
+	$links{"foo"} = ["bar", "baz"];
+
 ### %destsources
 
 The `%destsources` hash records the name of the source file used to
@@ -576,6 +578,8 @@ create each destination file. The key is the output filename (ie,
 "foo/index.html"), and the value is the source filename that it was built
 from (eg, "foo.mdwn"). Note that a single source file may create multiple
 destination files. Do not modify this hash directly; call `will_render()`.
+	
+	$destsources{"foo/index.html"} = "foo.mdwn";
 
 ### %pagesources
 
@@ -583,6 +587,8 @@ The `%pagesources` has can be used to look up the source filename
 of a page. So the key is the page name, and the value is the source
 filename. Do not modify this hash.
 
+	$pagesources{"foo"} = "foo.mdwn";
+
 ## Library functions
 
 ### `hook(@)`
-- 
cgit v1.2.3


From 4a7558539cd9d0f1ed5c586c29811035f7c14d14 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 15:38:07 -0500
Subject: add highlevel view of when hooks are called during compile and cgi
 phases

---
 doc/plugins/write.mdwn | 97 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 78 insertions(+), 19 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index f2b96b6d9..d94216e17 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -9,16 +9,73 @@ Ikiwiki is a compiler
 One thing to keep in mind when writing a plugin is that ikiwiki is a wiki
 *compiler*. So plugins influence pages when they are built, not when they
 are loaded. A plugin that inserts the current time into a page, for
-example, will insert the build time. Also, as a compiler, ikiwiki avoids
-rebuilding pages unless they have changed, so a plugin that prints some
-random or changing thing on a page will generate a static page that won't
-change until ikiwiki rebuilds the page for some other reason, like the page
-being edited. The [[tutorial]] has some other examples of ways that ikiwiki
-being a compiler may trip up the unwary.
+example, will insert the build time.
+
+Also, as a compiler, ikiwiki avoids rebuilding pages unless they have
+changed, so a plugin that prints some random or changing thing on a page
+will generate a static page that won't change until ikiwiki rebuilds the
+page for some other reason, like the page being edited.
+
+The [[tutorial]] has some other examples of ways that ikiwiki being a
+compiler may trip up the unwary.
 """]]
 
 [[!toc levels=2]]
 
+## Highlevel view of ikiwiki
+
+Ikiwiki mostly has two modes of operation. It can either be running
+as a compiler, building or updating a wiki; or as a cgi program, providing
+user interface for editing pages, etc. Almost everything ikiwiki does
+is accomplished by calling various hooks provided by plugins.
+
+### compiler
+
+As a compiler, starts by calling the `refresh` hook. Then it checks
+the wiki's source to find new or changed pages. The `needsbuild` hook is
+then called to allow manipulation of the list of pages that need to be
+built. 
+
+Now that it knows what pages it needs to build, ikiwiki runs two
+compile passes. First, it runs `scan` hooks, which collect metadata about
+the pages. Then it runs a page rendering pipeline, by calling in turn these
+hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `postscan`,
+`pagetemplate`, `sanitize`, `format`.
+
+After all necessary pages are built, it calls the `change` hook. Finally,
+if a page is was deleted, the `delete` hook is called, and the files that
+page had previously produced are removed.
+
+### cgi
+
+The flow between hooks when ikiwiki is run as a cgi is best illistrated by
+an example.
+
+* *Alice browses to a page and clicks Edit.*
+* Ikiwiki is run as a cgi. It assigns Alice a session cookie, and,
+  by calling the `auth` hooks, sees that she is not yet logged in.
+* The `sessioncgi` hooks are then called, and one of them,
+  from the [[editpage]] plugin, notices that the cgi has been told "do=edit".
+* The [[editpage]] plugin calls the `canedit` hook to check if this
+  page edit is allowed. The [[signinedit]] plugin has a hook that says not:
+  Alice is not signed in.
+* The [[signinedit]] plugin then launches the signin process. A signin
+  page is built by calling the `formbuilder_setup` hook.
+* *Alice signs in with her openid.*
+* The [[openid]] plugin's `formbuilder` hook sees that an openid was
+  entered in the signin form, and redirects to Alice's openid provider.
+* Alice's openid provider calls back to ikiwiki. The [[openid]] plugin
+  has an `auth` hook that finishes the openid signin process.
+* Signin complete, ikiwiki returns to what Alice was doing before; editing
+  a page.
+* Now all the `canedit` hooks are happy. The [[editpage]] plugin calls
+  `formbuilder_setup` to display the page editing form.
+* *Alice saves her change to the page.*
+* The [[editpage]] plugin's `formbuilder` hook sees that the Save button
+  was pressed, and calls the `checkcontent` and `editcontent` hooks.
+  Then it saves the page to disk, and branches into the compiler part
+  of ikiwiki to refresh the wiki.
+
 ## Types of plugins
 
 Most ikiwiki [[plugins]] are written in perl, like ikiwiki. This gives the
@@ -530,13 +587,13 @@ function of the ikiwiki wrapper when it is being generated.
 
 Several variables are exported to your plugin when you `use IkiWiki;`
 
-### %config
+### `%config`
 
 A plugin can access the wiki's configuration via the `%config`
 hash. The best way to understand the contents of the hash is to look at
 your ikiwiki setup file, which sets the hash content to configure the wiki.
 
-### %pagestate
+### `%pagestate`
 
 The `%pagestate` hash can be used by plugins to save state that they will need
 next time ikiwiki is run. The hash holds per-page state, so to set a value,
@@ -554,7 +611,7 @@ When pages are deleted, ikiwiki automatically deletes their pagestate too.
 Note that page state does not persist across wiki rebuilds, only across
 wiki updates.
 
-### %wikistate
+### `%wikistate`
 
 The `%wikistate` hash can be used by a plugin to store persistant state
 that is not bound to any one page. To set a value, use
@@ -563,7 +620,7 @@ serialize, `$key` is any string you like, and `$id` must be the same as the
 "id" parameter passed to `hook()` when registering the plugin, so that the
 state can be dropped if the plugin is no longer used.
 
-### %links
+### `%links`
 
 The `%links` hash can be used to look up the names of each page that
 a page links to. The name of the page is the key; the value is an array
@@ -571,7 +628,15 @@ reference. Do not modify this hash directly; call `add_link()`.
 
 	$links{"foo"} = ["bar", "baz"];
 
-### %destsources
+### `%pagesources`
+
+The `%pagesources` has can be used to look up the source filename
+of a page. So the key is the page name, and the value is the source
+filename. Do not modify this hash.
+
+	$pagesources{"foo"} = "foo.mdwn";
+
+### `%destsources`
 
 The `%destsources` hash records the name of the source file used to
 create each destination file. The key is the output filename (ie,
@@ -581,16 +646,10 @@ destination files. Do not modify this hash directly; call `will_render()`.
 	
 	$destsources{"foo/index.html"} = "foo.mdwn";
 
-### %pagesources
-
-The `%pagesources` has can be used to look up the source filename
-of a page. So the key is the page name, and the value is the source
-filename. Do not modify this hash.
-
-	$pagesources{"foo"} = "foo.mdwn";
-
 ## Library functions
 
+Several functions are exported to your plugin when you `use IkiWiki;`
+
 ### `hook(@)`
 
 Hook into ikiwiki's processing. See the discussion of hooks above.
-- 
cgit v1.2.3


From 7b07286a6f4a9903d5a346205b8eaaf93dbb9d0d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 15:41:19 -0500
Subject: layout

---
 doc/plugins/write.mdwn | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index d94216e17..4fd9c4369 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -31,7 +31,7 @@ is accomplished by calling various hooks provided by plugins.
 
 ### compiler
 
-As a compiler, starts by calling the `refresh` hook. Then it checks
+As a compiler, ikiwiki starts by calling the `refresh` hook. Then it checks
 the wiki's source to find new or changed pages. The `needsbuild` hook is
 then called to allow manipulation of the list of pages that need to be
 built. 
@@ -48,10 +48,11 @@ page had previously produced are removed.
 
 ### cgi
 
-The flow between hooks when ikiwiki is run as a cgi is best illistrated by
+The flow between hooks when ikiwiki is run as a cgi is best illustrated by
 an example.
 
-* *Alice browses to a page and clicks Edit.*
+Alice browses to a page and clicks Edit.
+
 * Ikiwiki is run as a cgi. It assigns Alice a session cookie, and,
   by calling the `auth` hooks, sees that she is not yet logged in.
 * The `sessioncgi` hooks are then called, and one of them,
@@ -61,7 +62,9 @@ an example.
   Alice is not signed in.
 * The [[signinedit]] plugin then launches the signin process. A signin
   page is built by calling the `formbuilder_setup` hook.
-* *Alice signs in with her openid.*
+
+Alice signs in with her openid.
+
 * The [[openid]] plugin's `formbuilder` hook sees that an openid was
   entered in the signin form, and redirects to Alice's openid provider.
 * Alice's openid provider calls back to ikiwiki. The [[openid]] plugin
@@ -70,7 +73,9 @@ an example.
   a page.
 * Now all the `canedit` hooks are happy. The [[editpage]] plugin calls
   `formbuilder_setup` to display the page editing form.
-* *Alice saves her change to the page.*
+
+Alice saves her change to the page.
+
 * The [[editpage]] plugin's `formbuilder` hook sees that the Save button
   was pressed, and calls the `checkcontent` and `editcontent` hooks.
   Then it saves the page to disk, and branches into the compiler part
-- 
cgit v1.2.3


From f4c517110e1bc1ab9bf6e931073959cdcff1302b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 15:52:03 -0500
Subject: formatting

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

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 4fd9c4369..a8c9de2d3 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -536,7 +536,7 @@ The data returned is a list of `%config` options, followed by a hash
 describing the option. There can also be an item named "plugin", which
 describes the plugin as a whole. For example:
 
-                return
+		return
 			plugin => {
 				description => "description of this plugin",
 				safe => 1,
@@ -736,7 +736,7 @@ By default, dependencies are full content dependencies, meaning that the
 page will be updated whenever anything matching the PageSpec is modified.
 This can be overridden by passing a `deptype` value as the third parameter.
 
-#### `pagespec_match($$;@)`
+### `pagespec_match($$;@)`
 
 Passed a page name, and [[ikiwiki/PageSpec]], returns a true value if the
 [[ikiwiki/PageSpec]] matches the page.
@@ -766,7 +766,7 @@ dependency type from one or more of these keywords:
 
 If multiple types are specified, they are combined.
 
-#### `bestlink($$)`
+### `bestlink($$)`
 
 Given a page and the text of a link on the page, determine which
 existing page that link best points to. Prefers pages under a
@@ -774,7 +774,7 @@ subdirectory with the same name as the source page, failing that
 goes down the directory tree to the base looking for matching
 pages, as described in [[ikiwiki/SubPage/LinkingRules]].
 
-#### `htmllink($$$;@)`
+### `htmllink($$$;@)`
 
 Many plugins need to generate html links and add them to a page. This is
 done by using the `htmllink` function. The usual way to call
-- 
cgit v1.2.3


From 6e8fd3890e96d3b0fdbf1ad91fc84628d2e1aa47 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 17:09:40 -0500
Subject: add news item for ikiwiki 3.20100212

---
 doc/news/version_3.20091113.mdwn | 18 ------------------
 doc/news/version_3.20100212.mdwn | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 18 deletions(-)
 delete mode 100644 doc/news/version_3.20091113.mdwn
 create mode 100644 doc/news/version_3.20100212.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20091113.mdwn b/doc/news/version_3.20091113.mdwn
deleted file mode 100644
index 579174011..000000000
--- a/doc/news/version_3.20091113.mdwn
+++ /dev/null
@@ -1,18 +0,0 @@
-ikiwiki 3.20091113 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * underlay: Fix example values put in setup file to be array
-     references.
-   * underlay: Avoid crashing if lists of underlays (or template
-     directories) are not configured.
-   * Moved the postscan hook to run on the raw html of a page, before
-     the template is filled out. This improves the search plugin's indexing,
-     since it will not include navigational elements from the page template
-     or sidebar.
-   * localstyle: New plugin, allows overrding the toplevel local.css
-     with one that is closer to a page.
-   * httpauth: Add cgiauthurl setting that can be used to do http basic auth
-     only when ikiwiki needs authentication, rather than for any access to
-     the cgi/wiki.
-   * inline: Do not generate feeds for nested inlines.
-   * inline: Allow direct inclusion of non-page files in raw mode.
-   * inline: Fix display of all pages when archive=yes or show=0 are used."""]]
diff --git a/doc/news/version_3.20100212.mdwn b/doc/news/version_3.20100212.mdwn
new file mode 100644
index 000000000..3dcfe5f84
--- /dev/null
+++ b/doc/news/version_3.20100212.mdwn
@@ -0,0 +1,26 @@
+ikiwiki 3.20100212 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * template: Preprocess parameters before htmlizing.
+   * img: Fix a bug that could taint @links with undef values.
+   * setup automator: Configure Term::Readline to use bold for prompt, rather
+     than default underline. Closes: #[517656](http://bugs.debian.org/517656)
+   * Allow jumping directly into account registration process by going to
+     ikiwiki.cgi?do=register
+   * Improve display of openid in preferences page.
+   * Add link to userpage (or creation link) to top of preferences page.
+   * opendiscussion: This plugin will also now allow posting comments
+     to otherwise locked-down sites.
+   * auto-blog.setup: Lock all pages, so only admin can post to the blog
+     by default, and enable opendiscussion so others can comment.
+   * Fix color and format plugins to appear in the websetup interface.
+   * amazon\_s3: Fix to support the EU S3 datacenter, which is more picky
+     about attempts to create already existing buckets.
+   * httpauth: When cgiauthurl is configured, httpauth can now be used
+     alongside other authentication methods (like openid or anonok). Rather
+     than always redirect to the cgiauthurl for authentication, there is now
+     a button on the login form to use it.
+   * httpauth: Add httpauth\_pagespec setting that can be used to limit
+     pages to only being edited via users authed with httpauth.
+   * Allow globs to be used in user() pagespecs.
+   * Group related plugins into sections in the setup file, and drop
+     unused rcs plugins from the setup file."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 172dfa9f64b5a248042af7c4b741fdd4c71813ec Mon Sep 17 00:00:00 2001
From: "http://seeitcoming.myopenid.com/"
 <http://seeitcoming.myopenid.com/@web>
Date: Sat, 13 Feb 2010 15:16:09 +0000
Subject: Added information about python implementation for reference

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

(limited to 'doc')

diff --git a/doc/todo/abbreviation.mdwn b/doc/todo/abbreviation.mdwn
index d24166710..f2880091c 100644
--- a/doc/todo/abbreviation.mdwn
+++ b/doc/todo/abbreviation.mdwn
@@ -2,4 +2,6 @@ We might want some kind of abbreviation and acronym plugin. --[[JoshTriplett]]
 
  * Not sure if this is what you mean, but I'd love a way to make works which match existing page names automatically like (eg. if there is a page called "MySQL" then any time the word MySQL is mentioned it should become a link to that page).  -- [[AdamShand]]
 
+ * The python-markdown-extras package has support for [abbreviations](http://www.freewisdom.org/projects/python-markdown/Abbreviations), with the syntax that you just use the abbreviation in text (e.g. HTML) and then define the abbreviations at the end (like "footnote-style" links). For consistency, it might be good to use the same syntax, which apparently derives from [PHP-markdown-extra](http://michelf.com/projects/php-markdown/extra/#abbr).
+
 [[wishlist]]
-- 
cgit v1.2.3


From a38418a8a3652bad60c83a0dd7502f7afb991512 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Feb 2010 14:07:56 -0500
Subject: close

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

(limited to 'doc')

diff --git a/doc/todo/openid_user_filtering.mdwn b/doc/todo/openid_user_filtering.mdwn
index 8b2d0082e..7f8b2a55e 100644
--- a/doc/todo/openid_user_filtering.mdwn
+++ b/doc/todo/openid_user_filtering.mdwn
@@ -7,3 +7,7 @@ So I suggest an ikiwiki configuration like:
      users => ["*.webvm.net"],
 
 Would only allow edits from openIDs of that form.
+
+> This kind of thing can be [[done]] now: --[[Joey]] 
+> 
+>	locked_pages => "user(http://*.webvm.net/)"
-- 
cgit v1.2.3


From 6fc25c8df79c4ce9afde256be5d377ee82562c31 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Feb 2010 14:13:30 -0500
Subject: clarify

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

(limited to 'doc')

diff --git a/doc/todo/openid_user_filtering.mdwn b/doc/todo/openid_user_filtering.mdwn
index 7f8b2a55e..6a318c4c0 100644
--- a/doc/todo/openid_user_filtering.mdwn
+++ b/doc/todo/openid_user_filtering.mdwn
@@ -10,4 +10,4 @@ Would only allow edits from openIDs of that form.
 
 > This kind of thing can be [[done]] now: --[[Joey]] 
 > 
->	locked_pages => "user(http://*.webvm.net/)"
+>	locked_pages => "* and !user(http://*.webvm.net/)"
-- 
cgit v1.2.3


From 0cc5ed592db082a815d2588d378dd9a3995dcd9f Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Sun, 14 Feb 2010 12:40:03 +0000
Subject: new thread

---
 ...ine_774__44_____60____36__in__62___chunk_1.__39__.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn

(limited to 'doc')

diff --git a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
new file mode 100644
index 000000000..56ac4b894
--- /dev/null
+++ b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
@@ -0,0 +1,15 @@
+# getting Warnings about UTF8-Chars.
+
+I'm  getting multiple warnings:
+
+      utf8 "\xAB" does not map to Unicode at /usr/share/perl5/IkiWiki.pm line 774, <$in> chunk 1.
+
+
+I'm assuming this is once per File, but even in verbose mode, it doesn't tell me which file is a problem.
+It first reads all the files, and afterwards when parsing/compiling them, it outputs the warning, so I can't
+deduce the offending files.
+
+Is there a way to have ikiwiki output the position, where it encounters the character?
+
+Probably all this has to do with locale-settings, and usage of mixed locales in a distributed setup ...
+I'd rather cleanup some of the file(name)s  of unexpected characters. --[[jwalzer]]
-- 
cgit v1.2.3


From 5107530344ca728fc73418a4032a41f22a172a3a Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Sun, 14 Feb 2010 14:21:55 +0000
Subject: Update - trying to debug it

---
 ...4__44_____60____36__in__62___chunk_1.__39__.mdwn | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
index 56ac4b894..931e339e2 100644
--- a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
+++ b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
@@ -13,3 +13,24 @@ Is there a way to have ikiwiki output the position, where it encounters the char
 
 Probably all this has to do with locale-settings, and usage of mixed locales in a distributed setup ...
 I'd rather cleanup some of the file(name)s  of unexpected characters. --[[jwalzer]]
+
+--------
+
+**Update** : So I took the chance to insert debug into ikiwiki.pm:
+
+     root@novalis:/usr/share/perl5# diff -p /tmp/IkiWiki.orig.pm IkiWiki.pm 
+     *** /tmp/IkiWiki.orig.pm        Sun Feb 14 15:16:08 2010
+     --- IkiWiki.pm  Sun Feb 14 15:16:28 2010
+     *************** sub readfile ($;$$) {
+     *** 768,773 ****
+     --- 768,774 ----
+             }
+       
+             local $/=undef;
+     +       debug("opening File: $file:");
+             open (my $in, "<", $file) || error("failed to read $file: $!");
+             binmode($in) if ($binary);
+             return \*$in if $wantfd;
+
+
+But what I see now is not quite helpful, as it seems, STDERR and DEBUG are asyncronous, so they mix up in a way, that I can't really see, whats the problem ...  Maybe I'm better off for troubleshooting, to insert an printf to strerr to have it in the same stream.. --[[jwalzer]]
-- 
cgit v1.2.3


From 693fb3b18654abae84efeccd046a358f56dc2be7 Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Sun, 14 Feb 2010 14:50:51 +0000
Subject:

---
 ...pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
index 931e339e2..72f2d38e0 100644
--- a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
+++ b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
@@ -34,3 +34,14 @@ I'd rather cleanup some of the file(name)s  of unexpected characters. --[[jwalze
 
 
 But what I see now is not quite helpful, as it seems, STDERR and DEBUG are asyncronous, so they mix up in a way, that I can't really see, whats the problem ...  Maybe I'm better off for troubleshooting, to insert an printf to strerr to have it in the same stream.. --[[jwalzer]]
+
+
+----
+
+**Update:** The "print STDERR $file;"-Trick did it .. I was able to find a mdwn-file, that (was generated by a script of me) had \0xAB in it.
+
+Nevertheless I still wonder if this should be a problem. This character happend to be in an *\[\[meta title='$CHAR'\]\]-tag* and an *\[$CHAR\]http://foo)-Link*
+
+Should this throw an warning? Maybe this warning could be catched an reported inclusively the containing filename? maybe even with an override, if one knows that it is correct that way? --[[jwalzer]]
+
+[[!tag solved]]
-- 
cgit v1.2.3


From f1183cbf0c9c09725192dcc8384381f9112ae222 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Feb 2010 17:25:30 -0500
Subject: add ngettext support & optimize gettext handling

As I was adding ngettext support, I realized I could optimize the gettext
functions by memoizing the creation of the gettext object. Note that
the object creation is still deferred until a gettext function is called,
to avoid unnecessary startup penalties on code paths that do not need
gettext.

A side benefit is that separate stub functions are no longer needed to
handle the C language case.
---
 IkiWiki.pm             | 44 ++++++++++++++++++++++++++++++--------------
 doc/plugins/write.mdwn |  4 ++++
 2 files changed, 34 insertions(+), 14 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a96ff1236..b9a419d1d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -20,7 +20,7 @@ use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
                  add_depends pagespec_match pagespec_match_list bestlink
 		 htmllink readfile writefile pagetype srcfile pagename
-		 displaytime will_render gettext urlto targetpage
+		 displaytime will_render gettext ngettext urlto targetpage
 		 add_underlay pagetitle titlepage linkpage newpagefile
 		 inject add_link
                  %config %links %pagestate %wikistate %renderedfiles
@@ -1820,27 +1820,38 @@ sub file_pruned ($;$) {
 sub define_gettext () {
 	# If translation is needed, redefine the gettext function to do it.
 	# Otherwise, it becomes a quick no-op.
-	no warnings 'redefine';
+	my $gettext_obj;
+	my $getobj;
 	if ((exists $ENV{LANG} && length $ENV{LANG}) ||
 	    (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||
 	    (exists $ENV{LC_MESSAGES} && length $ENV{LC_MESSAGES})) {
-	    	*gettext=sub {
-			my $gettext_obj=eval q{
+	    	$getobj=sub {
+			$gettext_obj=eval q{
 				use Locale::gettext q{textdomain};
 				Locale::gettext->domain('ikiwiki')
 			};
-
-			if ($gettext_obj) {
-				$gettext_obj->get(shift);
-			}
-			else {
-				return shift;
-			}
 		};
 	}
-	else {
-		*gettext=sub { return shift };
-	}
+
+	no warnings 'redefine';
+	*gettext=sub {
+		$getobj->() if $getobj;
+		if ($gettext_obj) {
+			$gettext_obj->get(shift);
+		}
+		else {
+			return shift;
+		}
+	};
+  	*ngettext=sub {
+		$getobj->() if $getobj;
+		if ($gettext_obj) {
+			$gettext_obj->nget(@_);
+		}
+		else {
+			return ($_[2] == 1 ? $_[0] : $_[1])
+		}
+	};
 }
 
 sub gettext {
@@ -1848,6 +1859,11 @@ sub gettext {
 	gettext(@_);
 }
 
+sub ngettext {
+	define_gettext();
+	ngettext(@_);
+}
+
 sub yesno ($) {
 	my $val=shift;
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index a8c9de2d3..96a2aa16d 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -911,6 +911,10 @@ time.
 
 This is the standard gettext function, although slightly optimised.
 
+### `ngettext`
+
+This is the standard ngettext function, although slightly optimised.
+
 ### `urlto($$;$)`
 
 Construct a relative url to the first parameter from the page named by the
-- 
cgit v1.2.3


From 427720a21fb202f83c9e8df912cd464a2f5011aa Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Mon, 15 Feb 2010 02:10:23 +0000
Subject: + ipol.im

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 469fc0f6d..4502b589b 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -50,6 +50,7 @@ Projects & Organizations
 * [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/)
 * [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/)
 * [Wetknee Books](http://www.wetknee.com/)
+* [IPOL Image Processing On Line](http://www.ipol.im)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 079377427fbddb20b2b5e7d4e687c6b9631c90ab Mon Sep 17 00:00:00 2001
From: aghitza <aghitza@web>
Date: Mon, 15 Feb 2010 10:58:40 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4502b589b..ee060e063 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -135,6 +135,7 @@ Personal sites and blogs
 * [Avian Aqua Miser](http://www.avianaquamiser.com/)
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
 * [Backyard Deer](http://www.backyarddeer.com/)
+* [Alex Ghitza homepage and blog](http://aghitza.org/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From bf33edc573952a8e21b41c8aaf35c66ee5073a12 Mon Sep 17 00:00:00 2001
From: "http://mem.myopenid.com/" <http://mem.myopenid.com/@web>
Date: Mon, 15 Feb 2010 22:38:06 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index ee060e063..df2d6b68b 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -51,6 +51,7 @@ Projects & Organizations
 * [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/)
 * [Wetknee Books](http://www.wetknee.com/)
 * [IPOL Image Processing On Line](http://www.ipol.im)
+* [Debian Costa Rica](http://cr.debian.net/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From b12f65d4dcee8063de5252a407491a1dc212cb9a Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:32:39 +0000
Subject: redirect

---
 doc/users/NicolasLimare.mdwn | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'doc')

diff --git a/doc/users/NicolasLimare.mdwn b/doc/users/NicolasLimare.mdwn
index 003449d40..602d28ba2 100644
--- a/doc/users/NicolasLimare.mdwn
+++ b/doc/users/NicolasLimare.mdwn
@@ -1,9 +1 @@
-Nicolas (nil) uses ikiwiki on a site/wiki/blog/something... and feels this approach much more comfortable than the usual web-only ones.
-
-He didn't touch any perl code before using ikiwiki, ant that was the first opportunity to propose tiny patches.
-
-Actualy, he would have felt much more comfortable with a python ikiwiki... :)
-
-Can be reached at nicolas at limare.net
-
-By the way, I can make translations to french if needed. And maybe to japanese.
\ No newline at end of file
+[[meta redirect="nil"]]
-- 
cgit v1.2.3


From 1ae028d4fa92d2f6e7a7ec9e2bccabe28ca496b7 Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:33:11 +0000
Subject: fix

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

(limited to 'doc')

diff --git a/doc/users/NicolasLimare.mdwn b/doc/users/NicolasLimare.mdwn
index 602d28ba2..c409e3a2d 100644
--- a/doc/users/NicolasLimare.mdwn
+++ b/doc/users/NicolasLimare.mdwn
@@ -1 +1 @@
-[[meta redirect="nil"]]
+[[!meta redirect="nil"]]
-- 
cgit v1.2.3


From 8df6055f4cb95b3d8f541acfccc6b0ba2d88f7b6 Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:36:36 +0000
Subject: import

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

(limited to 'doc')

diff --git a/doc/users/nil.mdwn b/doc/users/nil.mdwn
new file mode 100644
index 000000000..e1826cec6
--- /dev/null
+++ b/doc/users/nil.mdwn
@@ -0,0 +1,8 @@
+nil first used ikiwiki on a site/wiki/blog/something... and felt this approach much more comfortable than the usual web-only ones.
+Since then, ikiwiki is a kind of swiss army knife when it comes to build anything for the web.
+
+Can be reached at nicolas at limare.net
+
+The current big ikiwiki-powered project is <http://www.ipol.im> 
+
+TODO: document "how to split public/edition interfaces"
-- 
cgit v1.2.3


From ce8bb219586332032110da8835fde8dd5f0ed91f Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:42:11 +0000
Subject: whishlist

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

(limited to 'doc')

diff --git a/doc/todo/cdate_and_mdate_available_for_templates.mdwn b/doc/todo/cdate_and_mdate_available_for_templates.mdwn
new file mode 100644
index 000000000..29c36b9f7
--- /dev/null
+++ b/doc/todo/cdate_and_mdate_available_for_templates.mdwn
@@ -0,0 +1,15 @@
+[[!tag whishlist]]
+
+`CDATE_3339`, `CDATE_822`, `MDATE_3339` and `MDATE_822` template variables would be useful for evey page, at least for my templates with Dublin Core metadata.
+
+I tried to pick the relevant lines of the [[inline|plugins/inline]] plugin and hack it into a custom plugin, but it failed miserably because of my obvious lack of perl litteracy...
+
+Anyway, I'm sure this is almost nothing...
+
+* `sub date_822 ($) {}`
+* `sub date_3339 ($) {}`
+* and something like `$template->param('cdate_822' => date_822($IkiWiki::pagectime{$page}));`
+
+Anyone can fill the missing lines?
+
+-- [[nil]]
-- 
cgit v1.2.3


From d4bc6e25e43f0cb2f12d7e9d954cbfc227c1686d Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:43:10 +0000
Subject: typo

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

(limited to 'doc')

diff --git a/doc/todo/cdate_and_mdate_available_for_templates.mdwn b/doc/todo/cdate_and_mdate_available_for_templates.mdwn
index 29c36b9f7..70d8fc8c9 100644
--- a/doc/todo/cdate_and_mdate_available_for_templates.mdwn
+++ b/doc/todo/cdate_and_mdate_available_for_templates.mdwn
@@ -1,4 +1,4 @@
-[[!tag whishlist]]
+[[!tag wishlist]]
 
 `CDATE_3339`, `CDATE_822`, `MDATE_3339` and `MDATE_822` template variables would be useful for evey page, at least for my templates with Dublin Core metadata.
 
-- 
cgit v1.2.3


From f02b87433b271b6229686d1494fbe419c6eca149 Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Tue, 16 Feb 2010 18:44:28 +0000
Subject: s/redirect/redir/

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

(limited to 'doc')

diff --git a/doc/users/NicolasLimare.mdwn b/doc/users/NicolasLimare.mdwn
index c409e3a2d..56a950f7e 100644
--- a/doc/users/NicolasLimare.mdwn
+++ b/doc/users/NicolasLimare.mdwn
@@ -1 +1 @@
-[[!meta redirect="nil"]]
+[[!meta redir="nil"]]
-- 
cgit v1.2.3


From 34d6403a4b12c9578e7b0ea3fb765e1c5e72520f Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Wed, 17 Feb 2010 11:54:26 +0000
Subject: new feature request: identifying trivial edits

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

(limited to 'doc')

diff --git a/doc/todo/mark_edit_as_trivial__44___identify__47__filter_on_trivial_changes.mdwn b/doc/todo/mark_edit_as_trivial__44___identify__47__filter_on_trivial_changes.mdwn
new file mode 100644
index 000000000..2b2b0242e
--- /dev/null
+++ b/doc/todo/mark_edit_as_trivial__44___identify__47__filter_on_trivial_changes.mdwn
@@ -0,0 +1,11 @@
+One feature of mediawiki which I quite like is the ability to mark a change as 'minor', or 'trivial'. This can then be used to filter the 'recentchanges' page, to only show substantial edits.
+
+The utility of this depends entirely on whether the editors use it properly.
+
+I currently use an inline on the front page of my personal homepage to show the most recent pages (by creation date) within a subsection of my site (a blog). Blog posts are rarely modified much after they are 'created' (or published - I bodge the creation time via meta when I publish a post. It might sit in draft form indefinitely), so this effectively shows only non-trivial changes.
+
+I would like to have a short list of the most recent modifications to the site on the front page. I therefore want to sort by modified time rather than creation time, but exclude edits that I self-identify as minor. I also only want to take a short number of items, the top 5, and display only their titles (which may be derived from filename, or set via meta again).
+
+I'm still thinking through how this might be achieved in an ikiwiki-suitable fashion, but I think I need a scheme to identify certain edits as trivial. This would have to work via web edits (easier: could add a check box to the edit form) and plain changes in the VCS (harder: scan for keywords in a commit message? in a VCS-agnostic fashion?)
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From 995e247f42e88eeefa47e62d1fada49edaa953a3 Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" <https://mukund.startssl.com/@web>
Date: Thu, 18 Feb 2010 11:43:11 +0000
Subject: Add my homepage generated by Ikiwiki

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index df2d6b68b..c9dea83a8 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -137,6 +137,7 @@ Personal sites and blogs
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
 * [Backyard Deer](http://www.backyarddeer.com/)
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
+* [Mukund's homepage](http://www.mukund.org/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 3200be56e5fc6c89115277f9f842a3f417f8d7db Mon Sep 17 00:00:00 2001
From: prosper <prosper@web>
Date: Fri, 19 Feb 2010 10:23:26 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn b/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn
new file mode 100644
index 000000000..8cc97a032
--- /dev/null
+++ b/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn
@@ -0,0 +1,7 @@
+It seems that rebuild a wiki (`ikiwiki --rebuild`) after changing the `underlaydir` config option doesn't remove the pages coming from the previous underlaydir. 
+
+I've noticed this with the debian package version 3.20100102.3~bpo50+1.
+
+Perhaps it is possible to improve this or mention it in the manual page?
+
+--prosper
-- 
cgit v1.2.3


From 598fdfd1aa1180e296af42f5b15f6b3add716be7 Mon Sep 17 00:00:00 2001
From: Jogo <Jogo@web>
Date: Fri, 19 Feb 2010 10:56:31 +0000
Subject: Correct broken links

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

(limited to 'doc')

diff --git a/doc/users/jogo.mdwn b/doc/users/jogo.mdwn
index 6f87cbc45..e8068a10f 100644
--- a/doc/users/jogo.mdwn
+++ b/doc/users/jogo.mdwn
@@ -1,5 +1,5 @@
  * An [economic game](http://sef.matabio.net/) in french, which [use](http://sef.matabio.net/wiki/) IkiWiki.
- * Some [plugins](http://kimya.matabio.net/tcgi/hg/IkiPlugins/file/).
- * An alternative [base wiki](http://kimya.matabio.net/tcgi/hg/FrIkiWiki/file/) in french.
+ * Some [plugins](http://www.matabio.net/tcgi/hg/IkiPlugins/file/).
+ * An alternative [base wiki](http://www.matabio.net/tcgi/hg/FrIkiWiki/file/) in french.
 
 email: `jogo matabio net`.
-- 
cgit v1.2.3


From d1137697a80ca5e90bfc9d1c1f00b455871b99c5 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 19 Feb 2010 14:00:52 +0000
Subject: fix 'done' link

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

(limited to 'doc')

diff --git a/doc/todo/conflict_free_comment_merges.mdwn b/doc/todo/conflict_free_comment_merges.mdwn
index 2cef0ee8c..e84400c17 100644
--- a/doc/todo/conflict_free_comment_merges.mdwn
+++ b/doc/todo/conflict_free_comment_merges.mdwn
@@ -20,4 +20,4 @@ What do you think [[smcv]]? --[[Joey]]
 > are quite low since it modifies the input text and adds a date stamp to
 > it.
 >
-> Anyway, I think it's good, [[[done]] --[[Joey]] 
+> Anyway, I think it's good, [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 59017c6ae19f661761d0ae3f143fbda643ca1e8d Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Fri, 19 Feb 2010 14:02:29 +0000
Subject: prevent keyboard mashing

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

(limited to 'doc')

diff --git a/doc/todo/double-click_protection_for_form_buttons.mdwn b/doc/todo/double-click_protection_for_form_buttons.mdwn
new file mode 100644
index 000000000..4c0d95bd6
--- /dev/null
+++ b/doc/todo/double-click_protection_for_form_buttons.mdwn
@@ -0,0 +1 @@
+A small piece of JS to prevent double-submitting forms would be quite nice. I seem to have developed a habit of doing this and having to resolve a merge conflict for two initial commits. -- [[Jon]]
-- 
cgit v1.2.3


From d01e7248bf4c9f6a7ec6920a0fe4cda4d776e171 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Feb 2010 13:33:48 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn b/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn
index 8cc97a032..8613ef03c 100644
--- a/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn
+++ b/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn
@@ -5,3 +5,8 @@ I've noticed this with the debian package version 3.20100102.3~bpo50+1.
 Perhaps it is possible to improve this or mention it in the manual page?
 
 --prosper
+
+> --rebuild causes ikiwiki to throw away all its info about what it built
+> before, so it will never clean up pages that have been removed, by any
+> means. Suggest you do a --refresh, possibly followed by a --rebuild
+> if that is really necessary. --[[Joey]]
-- 
cgit v1.2.3


From ef537ed3553c590abbc302a97299ae5082471fea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Feb 2010 13:38:37 -0500
Subject: response

---
 doc/todo/double-click_protection_for_form_buttons.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/double-click_protection_for_form_buttons.mdwn b/doc/todo/double-click_protection_for_form_buttons.mdwn
index 4c0d95bd6..501be4498 100644
--- a/doc/todo/double-click_protection_for_form_buttons.mdwn
+++ b/doc/todo/double-click_protection_for_form_buttons.mdwn
@@ -1 +1,5 @@
 A small piece of JS to prevent double-submitting forms would be quite nice. I seem to have developed a habit of doing this and having to resolve a merge conflict for two initial commits. -- [[Jon]]
+
+> By the time you see that merge conflict, the first commit has
+> already successfully happened, so you can just hit cancel
+> and throw away the second submit. --[[Joey]] 
-- 
cgit v1.2.3


From f0b0bb5894e056eeb67c50cf096f950f1fbc718a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Feb 2010 14:27:42 -0500
Subject: ctime idea

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

(limited to 'doc')

diff --git a/doc/todo/auto_getctime_on_fresh_build.mdwn b/doc/todo/auto_getctime_on_fresh_build.mdwn
new file mode 100644
index 000000000..ea95fb8c9
--- /dev/null
+++ b/doc/todo/auto_getctime_on_fresh_build.mdwn
@@ -0,0 +1,9 @@
+[[!tag wishlist]]
+
+It might be a good idea to enable --getctime when `.ikiwiki` does not
+exist. This way a new checkout of a `srcdir` would automatically get
+ctimes right. (Running --getctime whenever a rebuild is done would be too
+slow.) --[[Joey]] 
+
+Could this be too annoying in some cases, eg, checking out a large wiki
+that needs to get set up right away? --[[Joey]] 
-- 
cgit v1.2.3


From d83c4b91576131e1f1815357387e1505e6b59fc1 Mon Sep 17 00:00:00 2001
From: ThomasAdam <ThomasAdam@web>
Date: Sun, 21 Feb 2010 13:43:26 +0000
Subject: The Fvwmwiki uses ikiwiki

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index c9dea83a8..958bd54ff 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -138,6 +138,7 @@ Personal sites and blogs
 * [Backyard Deer](http://www.backyarddeer.com/)
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
 * [Mukund's homepage](http://www.mukund.org/)
+* [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From c67f96752642d4f01895f8ab135f2c5c6892b8be Mon Sep 17 00:00:00 2001
From: ThomasAdam <ThomasAdam@web>
Date: Sun, 21 Feb 2010 13:44:29 +0000
Subject: The Fvwm Wiki not a personal site or blog.

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 958bd54ff..62064e024 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -52,6 +52,7 @@ Projects & Organizations
 * [Wetknee Books](http://www.wetknee.com/)
 * [IPOL Image Processing On Line](http://www.ipol.im)
 * [Debian Costa Rica](http://cr.debian.net/)
+* [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 
 Personal sites and blogs
 ========================
@@ -138,7 +139,6 @@ Personal sites and blogs
 * [Backyard Deer](http://www.backyarddeer.com/)
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
 * [Mukund's homepage](http://www.mukund.org/)
-* [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 9d8ae8a483d8fc32de95d7855202d00f85250794 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Wed, 24 Feb 2010 12:30:40 +0000
Subject: add a backlink-style map to the bottom of my page

---
 doc/users/jon.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index f08076c2a..35bdb5d7c 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -45,9 +45,14 @@ The following I have been looking at, but are on the back-burner:
   bugs such as [[bugs/tagged() matching wikilinks]]. Code for this lives
   in my github `tag2` branch: <http://github.com/jmtd/ikiwiki>
 
-Finally, the following are merely half-formed thoughts:
+Penultimately, the following are merely half-formed thoughts:
 
  * adding and removing tags to pages via the edit form by ticking and
    unticking checkboxes next to a tag name (rather than entering the 
    directive into the text of the page directly)
  * perhaps the same for meta
+
+Finally, backlinks (since I have issues with the current backlinks
+implementation, see [[bugs/backlinks onhover thing can go weird]]):
+
+[[!map pages="link(users/Jon)"]]
-- 
cgit v1.2.3


From cd1c861b151621f76fece06899500f0dac2fec57 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Wed, 24 Feb 2010 12:32:32 +0000
Subject: switch to inline, instead of map

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

(limited to 'doc')

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 35bdb5d7c..d5593dcbf 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -55,4 +55,4 @@ Penultimately, the following are merely half-formed thoughts:
 Finally, backlinks (since I have issues with the current backlinks
 implementation, see [[bugs/backlinks onhover thing can go weird]]):
 
-[[!map pages="link(users/Jon)"]]
+[[!inline pages="link(users/Jon)" archive="yes" feeds="no"]]
-- 
cgit v1.2.3


From b9aca496920ffd0edfcaba5d003bb68aa47dcb6a Mon Sep 17 00:00:00 2001
From: "http://people.ee.ethz.ch/~andrmuel/openid/"
 <http://people.ee.ethz.ch/~andrmuel/openid/@web>
Date: Wed, 24 Feb 2010 14:59:31 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 62064e024..12d692979 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -139,6 +139,7 @@ Personal sites and blogs
 * [Backyard Deer](http://www.backyarddeer.com/)
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
 * [Mukund's homepage](http://www.mukund.org/)
+* [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From feeacaba028afe2e0b8835e2ebedc930de0f33a5 Mon Sep 17 00:00:00 2001
From: martin <martin@web>
Date: Wed, 24 Feb 2010 15:12:40 +0000
Subject:

---
 ...by_pagename_and_not_title_when_show__61__title_is_used.mdwn | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
index f8e257daf..bc19e7d87 100644
--- a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
+++ b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
@@ -1,4 +1,4 @@
-The [[directive/map]] directive sorty by pagename. That looks kind of odd, when used together with show=title. I would expect it to sort by title then.
+The [[ikiwiki/directive/map]] directive sort by pagename. That looks kind of odd, when used together with show=title. I would expect it to sort by title then.
 
 > This would be quite hard to fix. Map sorts the pages it displays by page
 > name, which has the happy effect of making "foo/bar" come after "foo";
@@ -6,3 +6,11 @@ The [[directive/map]] directive sorty by pagename. That looks kind of odd, when
 > it's located in. If sorting by title, that wouldn't hold. So, map
 > would have to be effectively totally rewritten, to build up each group
 > of child pages, and then re-sort those. --[[Joey]] 
+
+>> Ok, you are right, that does would break the tree. This made me think that I do not
+>> need to generate a tree for my particular use case just a list, so i thought i could use [[ikiwiki/directive/inline]] instead.
+>> This created two new issues:
+>>
+>> 1. inline also does sort by pagename even when explicitly told to sort by title.
+>>
+>> 2. I cannot get inline to create a list when the htmltidy plugin is switched on. I have a template which is enclosed in an li tag, and i put the ul tag around the inline manually, but htmltidy breaks this. --martin
-- 
cgit v1.2.3


From 983ecb0915b27f33e14e4b2e20090df69419f374 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Feb 2010 06:37:42 +0000
Subject: made a suggestion

---
 ...ap_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
index bc19e7d87..de178d415 100644
--- a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
+++ b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
@@ -14,3 +14,5 @@ The [[ikiwiki/directive/map]] directive sort by pagename. That looks kind of odd
 >> 1. inline also does sort by pagename even when explicitly told to sort by title.
 >>
 >> 2. I cannot get inline to create a list when the htmltidy plugin is switched on. I have a template which is enclosed in an li tag, and i put the ul tag around the inline manually, but htmltidy breaks this. --martin
+
+>>>> You might want to check if the [[plugins/contrib/report]] plugin solves your problem.  It can sort by title, among other things. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 7bf28731d767e1d9b1b69df3927c27bd85974fdf Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/will.uther"
 <http://www.google.com/profiles/will.uther@web>
Date: Sat, 27 Feb 2010 02:38:58 +0000
Subject: disable some inlines that I don't use much.

---
 doc/users/Will.mdwn | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/users/Will.mdwn b/doc/users/Will.mdwn
index f5effdbe3..1956263e0 100644
--- a/doc/users/Will.mdwn
+++ b/doc/users/Will.mdwn
@@ -13,14 +13,16 @@ Unless otherwise specified, any code that I post to this wiki I release under th
 
 ------
 
+Disabling these as I'm not using them much any more...
+
 ### Open Bugs:
 
-[[!inline pages="link(users/Will) and bugs/* and !bugs/done and !bugs/discussion and !link(patch) and !link(bugs/done) and !bugs/*/*" archive="yes" feeds="no" ]]
+\[[!inline pages="link(users/Will) and bugs/* and !bugs/done and !bugs/discussion and !link(patch) and !link(bugs/done) and !bugs/*/*" archive="yes" feeds="no" ]]
 
 ### Open ToDos:
 
-[[!inline pages="link(users/Will) and todo/* and !todo/done and !todo/discussion and !link(patch) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]]
+\[[!inline pages="link(users/Will) and todo/* and !todo/done and !todo/discussion and !link(patch) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]]
 
 ### Unapplied Patches:
 
-[[!inline pages="link(users/Will) and (todo/* or bugs/*) and !bugs/done and !bugs/discussion and !todo/done and !todo/discussion and link(patch) and !link(bugs/done) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]]
+\[[!inline pages="link(users/Will) and (todo/* or bugs/*) and !bugs/done and !bugs/discussion and !todo/done and !todo/discussion and link(patch) and !link(bugs/done) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]]
-- 
cgit v1.2.3


From 100636afa253c9808654b5db45feabc4ca1c6f8c Mon Sep 17 00:00:00 2001
From: "http://privat.myopenid.com/" <http://privat.myopenid.com/@web>
Date: Sat, 27 Feb 2010 15:12:39 +0000
Subject: patch for multiple sidebars

---
 ..._up_sidebar_to_allow_for_multiple_sidebars.mdwn | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index fb942a495..02b83244e 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -13,5 +13,57 @@ those contents instead.
 
 > In mine I just copied sidebar out and made some extra "sidebars", but they go elsewhere. Ugly hack, but it works. --[[simonraven]]
 
+>> Here a simple [[patch]] for multiple sidebars. Not too fancy but better than having multiple copies of the sidebar plugin. --[[jeanprivat]]
+
+<pre>
+--- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
++++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
+@@ -19,12 +19,20 @@
+ 			safe => 1,
+ 			rebuild => 1,
+ 		},
++		active_sidebars => {
++			type => "string",
++			example => qw(sidebar banner footer),
++			description => "Which sidebars must be activated and processed.",
++			safe => 1,
++			rebuild => 1
++		},
+ }
+ 
+-sub sidebar_content ($) {
++sub sidebar_content ($$) {
+ 	my $page=shift;
++	my $sidebar=shift;
+ 	
+-	my $sidebar_page=bestlink($page, "sidebar") || return;
++	my $sidebar_page=bestlink($page, $sidebar) || return;
+ 	my $sidebar_file=$pagesources{$sidebar_page} || return;
+ 	my $sidebar_type=pagetype($sidebar_file);
+ 	
+@@ -49,11 +57,17 @@
+ 
+ 	my $page=$params{page};
+ 	my $template=$params{template};
+-	
+-	if ($template->query(name => "sidebar")) {
+-		my $content=sidebar_content($page);
+-		if (defined $content && length $content) {
+-		        $template->param(sidebar => $content);
++
++	my @sidebars;
++	if (defined $config{active_sidebars} && length $config{active_sidebars}) { @sidebars = @{$config{active_sidebars}}; }
++	else { @sidebars = qw(sidebar); }
++
++	foreach my $sidebar (@sidebars) {
++		if ($template->query(name => $sidebar)) {
++			my $content=sidebar_content($page, $sidebar);
++			if (defined $content && length $content) {
++				$template->param($sidebar => $content);
++			}
+ 		}
+ 	}
+ }
+</pre>
 
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 7e2a22e0bf48ba58677b68d0950e18d2517b7bb3 Mon Sep 17 00:00:00 2001
From: "http://privat.myopenid.com/" <http://privat.myopenid.com/@web>
Date: Sat, 27 Feb 2010 15:16:25 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/users/jeanprivat.mdwn b/doc/users/jeanprivat.mdwn
new file mode 100644
index 000000000..4d75a9867
--- /dev/null
+++ b/doc/users/jeanprivat.mdwn
@@ -0,0 +1 @@
+Jean Privat is <jean@pryen.org>.
-- 
cgit v1.2.3


From 60d2dd318f66563c3ee3bde950d7f53426530acc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Feb 2010 00:12:47 -0500
Subject: Add new --clean option; this makes ikiwiki remove all built files in
 the destdir, as well as wrappers and the .ikiwiki directory.

---
 IkiWiki.pm        |  7 +++++++
 IkiWiki/Render.pm | 11 +++++++++++
 Makefile.PL       |  2 +-
 debian/changelog  |  4 +++-
 doc/usage.mdwn    |  8 ++++++++
 ikiwiki.in        | 12 +++++++++++-
 ikiwiki.spec      |  2 +-
 7 files changed, 42 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 9df6c90d6..00eadfd98 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -409,6 +409,13 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
+	clean => {
+		type => "internal",
+		default => 0,
+		description => "running in clean mode",
+		safe => 0,
+		rebuild => 0,
+	},
 	refresh => {
 		type => "internal",
 		default => 0,
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 3ebb1a324..af24df155 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -683,6 +683,17 @@ sub refresh () {
 	}
 }
 
+sub clean_rendered {
+	lockwiki();
+	loadindex();
+	remove_unrendered();
+	foreach my $page (keys %oldrenderedfiles) {
+		foreach my $file (@{$oldrenderedfiles{$page}}) {
+			prune($config{destdir}."/".$file);
+		}
+	}
+}
+
 sub commandline_render () {
 	lockwiki();
 	loadindex();
diff --git a/Makefile.PL b/Makefile.PL
index 462f7364d..52421a711 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -51,7 +51,7 @@ docwiki: ikiwiki.out
 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
 
 extra_clean:
-	rm -rf html doc/.ikiwiki
+	$(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean
 	rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
diff --git a/debian/changelog b/debian/changelog
index 832bbaa85..3b92c598d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100213) UNRELEASED; urgency=low
+ikiwiki (3.20100228) UNRELEASED; urgency=low
 
   * comments: Display number of comments in comment action link.
   * Rebuild wikis on upgrade to this version to get the comment counts
@@ -8,6 +8,8 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low
     files/directories.
   * Fix admin openid detection in setup automator, and avoid prompting
     for a password.
+  * Add new --clean option; this makes ikiwiki remove all built
+    files in the destdir, as well as wrappers and the .ikiwiki directory.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 14 Feb 2010 17:02:10 -0500
 
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index e4808d4c2..a105d7e59 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -50,6 +50,14 @@ These options control the mode that ikiwiki operates in.
   If used with --setup --refresh, this makes it also update any configured
   wrappers.
 
+* --clean
+
+  This makes ikiwiki clean up by removing any files it denerated in the 
+  `destination` directory, as well as any configured wrappers, and the
+  `.ikiwiki` state directory. This is mostly useful if you're running
+  ikiwiki in a Makefile to build documentation and want a corresponding
+  `clean` target.
+
 * --cgi
 
   Enable [[CGI]] mode. In cgi mode ikiwiki runs as a cgi script, and
diff --git a/ikiwiki.in b/ikiwiki.in
index b8581d880..ae1251ff6 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -37,6 +37,7 @@ sub getconfig () {
 			"syslog!" => \$config{syslog},
 			"rebuild!" => \$config{rebuild},
 			"refresh!" => \$config{refresh},
+			"clean!" => \$config{clean},
 			"post-commit" => \$config{post_commit},
 			"render=s" => \$config{render},
 			"wrappers!" => \$config{genwrappers},
@@ -135,6 +136,7 @@ sub main () {
 
 		if (@{$config{wrappers}} && 
 		    ! $config{render} && ! $config{dumpsetup} &&
+		    ! $config{clean} &&
 		    ((! $config{refresh} && ! $config{post_commit})
 		     || $config{genwrappers})) {
 			debug(gettext("generating wrappers.."));
@@ -159,7 +161,7 @@ sub main () {
 		
 		# setup implies a wiki rebuild by default
 		if (! $config{refresh} && ! $config{render} &&
-		    ! $config{post_commit}) {
+		    ! $config{post_commit} && ! $config{clean}) {
 			$config{rebuild}=1;
 		}
 	}
@@ -190,6 +192,14 @@ sub main () {
 	elsif ($config{post_commit} && ! commit_hook_enabled()) {
 		# do nothing
 	}
+	elsif ($config{clean}) {
+		require IkiWiki::Render;
+		foreach my $wrapper (@{$config{wrappers}}) {
+			prune($wrapper->{wrapper});
+		}
+		clean_rendered();
+		system("rm", "-rf", $config{wikistatedir});
+	}
 	else {
 		if ($config{rebuild}) {
 			debug(gettext("rebuilding wiki.."));
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 865c9a325..1dba9f463 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100212
+Version: 3.20100228
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
-- 
cgit v1.2.3


From 4be426ab1ad01a2a90151d741f737d41a12a6cbe Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 1 Mar 2010 10:28:59 +0000
Subject: wl from report to field plugin pages

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/report.mdwn b/doc/plugins/contrib/report.mdwn
index 7130bcb5f..e8cbd0486 100644
--- a/doc/plugins/contrib/report.mdwn
+++ b/doc/plugins/contrib/report.mdwn
@@ -18,7 +18,7 @@ IkiWiki::Plugin::report - Produce templated reports from page field data.
 
 This plugin provides the **report** directive.  This enables one to report on
 the structured data ("field" values) of multiple pages; the output is formatted
-via a template.  This depends on the "field" plugin.
+via a template.  This depends on the [[plugins/contrib/field]] plugin.
 
 The pages to report on are selected by a PageSpec given by the "pages"
 parameter.  The template is given by the "template" parameter.
-- 
cgit v1.2.3


From a982b9cf193445dccec0e9ba87eeed324825c2cc Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 1 Mar 2010 13:14:48 +0000
Subject: new tip: spam and software sites

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

(limited to 'doc')

diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn
new file mode 100644
index 000000000..fe73518ef
--- /dev/null
+++ b/doc/tips/spam_and_softwaresites.mdwn
@@ -0,0 +1,86 @@
+Any wiki with a form of web-editing enabled will have to deal with
+spam. (See the [[plugins/blogspam]] plugin for one defensive tool you
+can deploy).
+
+If:
+
+ * you are using ikiwiki to manage the website for a [[examples/softwaresite]]
+ * you allow web-based commits, to let people correct documentation, or report
+   bugs, etc.
+ * the documentation is stored in the same revision control repository as your
+   software
+
+It is undesirable to have your software's VCS history tainted by spam and spam
+clean-up commits. Here is one approach you can use to prevent this. This
+example is for the [[git]] version control system, but the principles should
+apply to others.
+
+## Isolate web commits to a specific branch
+
+Create a separate branch to contain web-originated edits (named `doc` in this
+example):
+
+    $ git checkout -b doc
+
+Adjust your setup file accordingly:
+
+    gitmaster_branch => 'doc',
+
+## merging good web commits into the master branch
+
+You will want to periodically merge legitimate web-based commits back into
+your master branch. Ensure that there is no spam in the documentation
+branch. If there is, see 'erase spam from the commit history', below, first.
+
+Once you are confident it's clean:
+
+    # ensure you are on the doc branch
+    $ git branch
+      doc
+    * master
+    $ git merge --ff doc
+
+## removing spam
+
+### short term
+
+In the short term, just revert the spammy commit.
+
+If the spammy commit was the top-most:
+
+    $ git revert HEAD
+
+This will clean the spam out of the files, but it will leave both the spam
+commit and the revert commit in the history.
+
+### erase spam from the commit history
+
+Git allows you to rewrite your commit history.  We will take advantage of this
+to eradicate spam from the history of the doc branch.
+
+This is a useful tool, but it is considered bad practise to rewrite the
+history of public repositories. If your software's repository is public, you
+should make it clear that the history of the `doc` branch in your repository
+is unstable.
+
+Once you have been spammed, use `git rebase` to remove the spam commits from
+the history.  Assuming that your `doc` branch was split off from a branch
+called `master`:
+
+    # ensure you are on the doc branch
+    $ git branch
+    * doc
+      master
+    $ git rebase --interactive master
+
+In your editor session, you will see a series of lines for each commit made to
+the `doc` branch since it was branched from `master` (or since the last merge
+back into `master`). Delete the lines corresponding to spammy commits, then
+save and exit your editor.
+
+Caveat: if there are no commits you want to keep (i.e. all the commits since
+the last merge into master are either spam or spam reverts) then `git rebase`
+will abort. Therefore, this approach only works if you have at least one
+non-spam commit to the documentation since the last merge into `master`. For
+this reason, it's best to tackle spam with reverts until you have at least one
+commit you want merged back into the main history.
-- 
cgit v1.2.3


From 397fc5b2a3dff0ff3a105573f3b1fa5ea8169dfe Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 1 Mar 2010 13:16:54 +0000
Subject: ref new tip from softwaresite page

---
 doc/examples/softwaresite.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/examples/softwaresite.mdwn b/doc/examples/softwaresite.mdwn
index e43a9d116..99f791177 100644
--- a/doc/examples/softwaresite.mdwn
+++ b/doc/examples/softwaresite.mdwn
@@ -14,3 +14,6 @@ Some additional configuration you might want to do:
 
 * Read the [[tips/integrated_issue_tracking_with_ikiwiki]] article for tips
   about how to use ikiwiki as a BTS.
+
+* Read [[tips/spam_and_softwaresites]] for information on how to keep spam
+  and spam-fighting commits out of your main version control history.
-- 
cgit v1.2.3


From 0284ccf5eb6163d4fe49ac829a1f976336bc5908 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Mon, 1 Mar 2010 14:43:55 +0000
Subject: fixed typo

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/report.mdwn b/doc/plugins/contrib/report.mdwn
index e8cbd0486..c364d4a3a 100644
--- a/doc/plugins/contrib/report.mdwn
+++ b/doc/plugins/contrib/report.mdwn
@@ -89,7 +89,7 @@ The "mood_summary" template might be like this:
     ## <TMPL_VAR NAME="HEADER1">
     </TMPL_IF>
     ### <TMPL_VAR NAME="TITLE">
-    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE"]]
+    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]]
     <TMPL_VAR NAME="DESCRIPTION">
     
 ### Advanced Options
-- 
cgit v1.2.3


From fe571e959007e7e4f895869c980b474f5ee6e995 Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" <http://liw.fi/@web>
Date: Mon, 1 Mar 2010 21:12:48 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/rename.mdwn b/doc/plugins/rename.mdwn
index ddaede8b0..abb361329 100644
--- a/doc/plugins/rename.mdwn
+++ b/doc/plugins/rename.mdwn
@@ -2,7 +2,8 @@
 [[!tag type/web]]
 
 This plugin allows pages or other files to be renamed using the web
-interface.
+interface. Following Unix tradition, renaming also allows moving to a
+different directory.
 
 Users can only rename things that they are allowed to edit or upload.
 
-- 
cgit v1.2.3


From 7495d30a6ab00d09ea142cfdc599c8abfb64340e Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Mon, 1 Mar 2010 21:15:29 +0000
Subject:

---
 doc/ikiwiki/directive/inline/discussion.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn
index 998ba642b..6a186cd93 100644
--- a/doc/ikiwiki/directive/inline/discussion.mdwn
+++ b/doc/ikiwiki/directive/inline/discussion.mdwn
@@ -1,3 +1,10 @@
+## Combine inline and toggle
+
+Is it possible to combine the behaviour of toggle and inline? ie, have it present of list of 'headlines' which are created from seperate subpages which can be clicked to expand to the body of the inlined page. Thanks.
+
+-- Thiana
+
+---
 ## How do you provide the per post discussion links in your own blog?
 
 > That's configured by the "actions" parameter to the inline directive. See
-- 
cgit v1.2.3


From 837b04759c0895d6341a6a51fc05be1c3e5ef2ca Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Mon, 1 Mar 2010 21:17:09 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/creole/discussion.mdwn b/doc/plugins/creole/discussion.mdwn
index 38ee2bd78..eab41349a 100644
--- a/doc/plugins/creole/discussion.mdwn
+++ b/doc/plugins/creole/discussion.mdwn
@@ -12,4 +12,9 @@ I've installed Text::WikiCreole 0.05 and enabled the plugin, but I get an error
 
 >>> forgot, done now --[[Joey]] 
 
+---
+## External Links
+
 I'm moving over a really stinkingly old UseMod and creole seems the nearest match. I've worked out that Bare /Subpage links need to become \[\[Subpage\]\], and Top/Sub links need to be \[\[Top/Sub\]\] (or \[\[Top/Sub|Top/Sub\]\], to display in exactly the same way), but I'm stuck on generic hyperlinks. The creole cheat sheet says I should be able to do \[\[http://url.path/foo|LinkText\]\], but that comes out as a link to create the "linktext" page, and Markdown-style \[Link Text\](http://url.path/foo) just gets rendered as is. Any suggestions? --[[schmonz]]
+
+> Was this problem ever solved? -- Thiana
-- 
cgit v1.2.3


From 159471c92359c2da77bd0025f1718acbe7ff2a0c Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Mon, 1 Mar 2010 21:23:00 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/plugins/creole/discussion.mdwn b/doc/plugins/creole/discussion.mdwn
index eab41349a..7f47c2c97 100644
--- a/doc/plugins/creole/discussion.mdwn
+++ b/doc/plugins/creole/discussion.mdwn
@@ -18,3 +18,5 @@ I've installed Text::WikiCreole 0.05 and enabled the plugin, but I get an error
 I'm moving over a really stinkingly old UseMod and creole seems the nearest match. I've worked out that Bare /Subpage links need to become \[\[Subpage\]\], and Top/Sub links need to be \[\[Top/Sub\]\] (or \[\[Top/Sub|Top/Sub\]\], to display in exactly the same way), but I'm stuck on generic hyperlinks. The creole cheat sheet says I should be able to do \[\[http://url.path/foo|LinkText\]\], but that comes out as a link to create the "linktext" page, and Markdown-style \[Link Text\](http://url.path/foo) just gets rendered as is. Any suggestions? --[[schmonz]]
 
 > Was this problem ever solved? -- Thiana
+
+>> Not by me. If I were looking at the problem now, with fresh eyes, I'd probably bite the bullet and just convert everything to Markdown. --[[schmonz]]
-- 
cgit v1.2.3


From b3df992552b2a608fd46740252b8fd76bf3c09bb Mon Sep 17 00:00:00 2001
From: "http://cdombroski.myopenid.com/" <http://cdombroski.myopenid.com/@web>
Date: Tue, 2 Mar 2010 02:19:51 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/External_links_with_Creole.mdwn b/doc/bugs/External_links_with_Creole.mdwn
new file mode 100644
index 000000000..3d800b04e
--- /dev/null
+++ b/doc/bugs/External_links_with_Creole.mdwn
@@ -0,0 +1,3 @@
+When using Creole for markup, creating an external link appears to be impossible. Neither \[[Outside URL|http://example.com]] nor <<http://example.com>> nor \[Outside URL]\(http://example.com) work. The first gets rendered as a broken WikiLink, the second get eaten and the last is not parsed in anyway so you end up with that exact text in your page. 
+
+I'd have made this as a Creole page as a practical demonstration, but that doesn't seem possible here. Here's a page with an example: <https://www.icanttype.org//demo/CreoleExternalLinks>
-- 
cgit v1.2.3


From d469a410eaad03553cb5ef41a69c772c6d50bf76 Mon Sep 17 00:00:00 2001
From: "http://cdombroski.myopenid.com/" <http://cdombroski.myopenid.com/@web>
Date: Tue, 2 Mar 2010 15:47:23 +0000
Subject: Bug: 404 plugin & lighttpd

---
 doc/bugs/404_plugin_and_lighttpd.mdwn | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/bugs/404_plugin_and_lighttpd.mdwn

(limited to 'doc')

diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn
new file mode 100644
index 000000000..e60fd209a
--- /dev/null
+++ b/doc/bugs/404_plugin_and_lighttpd.mdwn
@@ -0,0 +1,5 @@
+Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 page. This breaks the 404 plugin which checks this variable for 404 before processing the URI. It also doesn't seem to set REDIRECT_URL.
+
+I was able to fix my server to check the REQUEST_URI for ikiwiki.cgi and to continue processing if it was not found, passing $ENV{SEVER_NAME} . $ENV{REQUEST_URI} as the first parameter to cgi_page_from_404. However, my perl is terrible and I just made it work rather than figuring out exactly what to do to get it to work on both lighttpd and apache.
+
+This is with lighttpd 1.4.19 on Debian.
-- 
cgit v1.2.3


From 8aae08aafda8be4d17dd45bd04318b40e276878a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 2 Mar 2010 19:56:53 +0000
Subject:

---
 doc/bugs/404_plugin_and_lighttpd.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn
index e60fd209a..29ca107dc 100644
--- a/doc/bugs/404_plugin_and_lighttpd.mdwn
+++ b/doc/bugs/404_plugin_and_lighttpd.mdwn
@@ -3,3 +3,11 @@ Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 pa
 I was able to fix my server to check the REQUEST_URI for ikiwiki.cgi and to continue processing if it was not found, passing $ENV{SEVER_NAME} . $ENV{REQUEST_URI} as the first parameter to cgi_page_from_404. However, my perl is terrible and I just made it work rather than figuring out exactly what to do to get it to work on both lighttpd and apache.
 
 This is with lighttpd 1.4.19 on Debian.
+
+> /cgi-bin/ikiwiki.cgi?do=goto also provides redirection in the same way,
+> if that's any help? You might need to set the lighttpd 404 handler to
+> that, then compose REDIRECT_URL from other variables if necessary.
+>
+> I originally wrote the plugin for Apache; [[weakish]] contributed the
+> lighttpd docs and might know more about how to make it work there.
+> --[[smcv]]
-- 
cgit v1.2.3


From 8b6fb02ab5482c46ea53ee08eff4f8b65ef99a0d Mon Sep 17 00:00:00 2001
From: "http://cdombroski.myopenid.com/" <http://cdombroski.myopenid.com/@web>
Date: Tue, 2 Mar 2010 21:00:28 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 12d692979..345604c36 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -140,6 +140,7 @@ Personal sites and blogs
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
 * [Mukund's homepage](http://www.mukund.org/)
 * [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
+* [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 4a7fb67ee6c32b1d66e19f345998b98b169100f0 Mon Sep 17 00:00:00 2001
From: "http://cdombroski.myopenid.com/" <http://cdombroski.myopenid.com/@web>
Date: Wed, 3 Mar 2010 00:14:47 +0000
Subject: Posting my change to the 404 module

---
 doc/bugs/404_plugin_and_lighttpd.mdwn | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn
index 29ca107dc..ffbad8add 100644
--- a/doc/bugs/404_plugin_and_lighttpd.mdwn
+++ b/doc/bugs/404_plugin_and_lighttpd.mdwn
@@ -11,3 +11,25 @@ This is with lighttpd 1.4.19 on Debian.
 > I originally wrote the plugin for Apache; [[weakish]] contributed the
 > lighttpd docs and might know more about how to make it work there.
 > --[[smcv]]
+
+>> As I said, I got it working for me, but somebody who knows perl should probably look at it with the aim of making it work for everyone.
+>> I considered having lighttpd construct a proper url for the 404 redirect itself, but I don't know if it can do something like that or not.
+>> For what it's worth, here's the change I made to the module:
+
+    sub cgi ($) {
+            my $cgi=shift;
+            if ($ENV{REQUEST_URI} !~ /ikiwiki\.cgi/) {
+                    my $page = cgi_page_from_404(
+                            Encode::decode_utf8($ENV{SERVER_NAME} . $ENV{REQUEST_URI}),
+                            $config{url}, $config{usedirs});
+                    IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
+            }
+    
+    #       if (exists $ENV{REDIRECT_STATUS} &&
+    #           $ENV{REDIRECT_STATUS} eq '404') {
+    #               my $page = cgi_page_from_404(
+    #                       Encode::decode_utf8($ENV{REDIRECT_URL}),
+    #                       $config{url}, $config{usedirs});
+    #               IkiWiki::Plugin::goto::cgi_goto($cgi, $page);
+    #       }
+    }
-- 
cgit v1.2.3


From 7265dbe4149642fff28ad296fc6a65d692f16be1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 2 Mar 2010 22:23:29 -0500
Subject: add news item for ikiwiki 3.20100302

---
 doc/news/version_3.20091202.mdwn | 17 -----------------
 doc/news/version_3.20100302.mdwn | 12 ++++++++++++
 2 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 doc/news/version_3.20091202.mdwn
 create mode 100644 doc/news/version_3.20100302.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20091202.mdwn b/doc/news/version_3.20091202.mdwn
deleted file mode 100644
index 60f17fe63..000000000
--- a/doc/news/version_3.20091202.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-ikiwiki 3.20091202 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * meta: Generate meta description tags even when the html scrubber is
-     enabled.
-   * meta: Allow use of DESCRIPTION in templates to get at the meta description
-     value. (Thanks, NicolasLimare)
-   * inline: Use caching of inlined pages to speed up builds of inlines that
-     include feeds. Speedup of about 25% for small inlines; could be much
-     larger for inlines of many, or complex pages.
-   * Added (incomplete) Turkish po file. Closes: #[556744](http://bugs.debian.org/556744)
-     Thanks, Recai Oktaş
-   * date: New plugin that allows inserting date directives that expand to
-     pretty-printed dates, using the same formatting as used for page
-     modification date display, etc.
-   * htmllink: Allow a title attribute to be specified.
-   * calendar: Add title attributes for all links in the calendars.
-   * calendar: Fix month wraparound error that broke in December."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100302.mdwn b/doc/news/version_3.20100302.mdwn
new file mode 100644
index 000000000..f439b1b23
--- /dev/null
+++ b/doc/news/version_3.20100302.mdwn
@@ -0,0 +1,12 @@
+ikiwiki 3.20100302 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * comments: Display number of comments in comment action link.
+   * Rebuild wikis on upgrade to this version to get the comment counts
+     added to existing pages.
+   * Loosen regexp, to allow empty quoted parameters in directives.
+   * Add force\_overwrite setting to make setup automator overwrite existing
+     files/directories.
+   * Fix admin openid detection in setup automator, and avoid prompting
+     for a password.
+   * Add new --clean option; this makes ikiwiki remove all built
+     files in the destdir, as well as wrappers and the .ikiwiki directory."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From b849c63ce337f988fcbb08b39d197583e6fa6012 Mon Sep 17 00:00:00 2001
From: "http://dmarti.myopenid.com/" <http://dmarti.myopenid.com/@web>
Date: Thu, 4 Mar 2010 00:15:00 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/todo/salmon_protocol_for_comment_sharing.mdwn b/doc/todo/salmon_protocol_for_comment_sharing.mdwn
new file mode 100644
index 000000000..f4fa0c535
--- /dev/null
+++ b/doc/todo/salmon_protocol_for_comment_sharing.mdwn
@@ -0,0 +1,3 @@
+The <a href="http://www.salmon-protocol.org/home">Salmon protocol</a> provides for aggregating comments across sites.  If a site that syndicates a feed receives a comment on an item in that feed, it can re-post the comment to the original source.
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From d72603534e677a4fbc0547ca3e5c9273d0d502ca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 3 Mar 2010 19:48:23 -0500
Subject: comments

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

(limited to 'doc')

diff --git a/doc/todo/salmon_protocol_for_comment_sharing.mdwn b/doc/todo/salmon_protocol_for_comment_sharing.mdwn
index f4fa0c535..1e56b0a8b 100644
--- a/doc/todo/salmon_protocol_for_comment_sharing.mdwn
+++ b/doc/todo/salmon_protocol_for_comment_sharing.mdwn
@@ -1,3 +1,21 @@
-The <a href="http://www.salmon-protocol.org/home">Salmon protocol</a> provides for aggregating comments across sites.  If a site that syndicates a feed receives a comment on an item in that feed, it can re-post the comment to the original source.
+The <a href="http://www.salmon-protocol.org/home">Salmon protocol</a>
+provides for aggregating comments across sites.  If a site that syndicates
+a feed receives a comment on an item in that feed, it can re-post the
+comment to the original source.
+
+> Ikiwiki does not allow comments to be posted on items it aggregates.
+> So salmon protocol support would only need to handle the comment
+> receiving side of the protocol.
+> 
+> The current draft protocol document confuses me when it starts talking
+> about using OAuth in the abuse prevention section, since their example
+> does not show use of OAuth, and it's not at all clear to me where the
+> OAuth relationship between aggregator and original source is supposed
+> to come from.
+> 
+> Their security model, which goes on to include Webfinger,
+> thirdparty validation services, XRD, and Magic Signatures, looks sorta
+> like they kept throwing technology,  at it, hoping something will stick. :-P
+> --[[Joey]]
 
 [[!tag wishlist]]
-- 
cgit v1.2.3


From cb4833742739ebaa2e875b97ae0035285f5b27b6 Mon Sep 17 00:00:00 2001
From: testerer <testerer@web>
Date: Thu, 4 Mar 2010 09:15:41 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..b1ef36b2e 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -19,6 +19,8 @@ ikiwiki [[!version ]].
 
 ## developer resources
 
+[jup](http://www.google.de)
+
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
@@ -26,3 +28,5 @@ can be submitted and tracked using this wiki.
 
 ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
+
+
-- 
cgit v1.2.3


From dd438d3a62615908adfe92868b95151b8c60506a Mon Sep 17 00:00:00 2001
From: testerer <testerer@web>
Date: Thu, 4 Mar 2010 09:19:22 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index b1ef36b2e..88eafa114 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -19,7 +19,6 @@ ikiwiki [[!version ]].
 
 ## developer resources
 
-[jup](http://www.google.de)
 
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
-- 
cgit v1.2.3


From 54f03304b13aa961d433a2e590ae5108bd4e21b3 Mon Sep 17 00:00:00 2001
From: testerer <testerer@web>
Date: Thu, 4 Mar 2010 09:21:26 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/TourBusStop.mdwn b/doc/TourBusStop.mdwn
index 8e382bd77..5317c6718 100644
--- a/doc/TourBusStop.mdwn
+++ b/doc/TourBusStop.mdwn
@@ -9,7 +9,7 @@ This wiki serves as the home for the ikiwiki wiki engine, providing collaborativ
 * You can turn any set of pages into a [[blog]] or similar news feed,
 * complete with RSS and Atom support.  You can run your weblog on ikiwiki (and [[many_people_do|ikiwikiusers]]), run a Planet-like [[aggregator|plugins/aggregate]] for external feeds, or keep a [[TODO]] and [[bug|bugs]] list with tags for completed items.
 
-* ikiwiki provides a wiki compiler, designed to transform your wiki content into a set of static pages.  You can then serve these pages as static content.  ikiwiki will not fall over during a Slashdotting, because page views don't require the ikiwiki CGI; as long as your web server can keep up, your site will survive.  Furthermore, you can choose whether you want to run the ikiwiki CGI for web edits or only handle commits to the underlying version control system; you can even run ikiwiki privately and just manually copy the content to another server.  So if you want to put a wiki up on a server without installing any software on that server, try ikiwiki.
+* ikiwiki provides a wiki compiler, designed to transform your wiki content into a set of static pages.  You can then serve these pages as static content.  ikiwiki will not fall over during a Slashdotting, because page views don't require the ikiwiki CGI; as long as your web server can keep up, your [site](http://dessouse.net) will survive.  Furthermore, you can choose whether you want to run the ikiwiki CGI for web edits or only handle commits to the underlying version control system; you can even run ikiwiki privately and just manually copy the content to another server.  So if you want to put a wiki up on a server without installing any software on that server, try ikiwiki.
 
 ![Picture of the TourBus](http://www.wikiservice.at/image/wikibus.gif)
 
-- 
cgit v1.2.3


From 07253bb25049eaed06564021accaba1b8cab210c Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Thu, 4 Mar 2010 09:30:24 +0000
Subject: revert spam

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

(limited to 'doc')

diff --git a/doc/TourBusStop.mdwn b/doc/TourBusStop.mdwn
index 5317c6718..8e382bd77 100644
--- a/doc/TourBusStop.mdwn
+++ b/doc/TourBusStop.mdwn
@@ -9,7 +9,7 @@ This wiki serves as the home for the ikiwiki wiki engine, providing collaborativ
 * You can turn any set of pages into a [[blog]] or similar news feed,
 * complete with RSS and Atom support.  You can run your weblog on ikiwiki (and [[many_people_do|ikiwikiusers]]), run a Planet-like [[aggregator|plugins/aggregate]] for external feeds, or keep a [[TODO]] and [[bug|bugs]] list with tags for completed items.
 
-* ikiwiki provides a wiki compiler, designed to transform your wiki content into a set of static pages.  You can then serve these pages as static content.  ikiwiki will not fall over during a Slashdotting, because page views don't require the ikiwiki CGI; as long as your web server can keep up, your [site](http://dessouse.net) will survive.  Furthermore, you can choose whether you want to run the ikiwiki CGI for web edits or only handle commits to the underlying version control system; you can even run ikiwiki privately and just manually copy the content to another server.  So if you want to put a wiki up on a server without installing any software on that server, try ikiwiki.
+* ikiwiki provides a wiki compiler, designed to transform your wiki content into a set of static pages.  You can then serve these pages as static content.  ikiwiki will not fall over during a Slashdotting, because page views don't require the ikiwiki CGI; as long as your web server can keep up, your site will survive.  Furthermore, you can choose whether you want to run the ikiwiki CGI for web edits or only handle commits to the underlying version control system; you can even run ikiwiki privately and just manually copy the content to another server.  So if you want to put a wiki up on a server without installing any software on that server, try ikiwiki.
 
 ![Picture of the TourBus](http://www.wikiservice.at/image/wikibus.gif)
 
-- 
cgit v1.2.3


From 070026f12a1e75d4f86ec224abf01fe566f739c9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 4 Mar 2010 12:37:12 -0500
Subject: Revert spammer's whitespace changes

(PS, you're banned.)
---
 doc/index.mdwn | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'doc')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 88eafa114..732cf7a89 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -19,7 +19,6 @@ ikiwiki [[!version ]].
 
 ## developer resources
 
-
 The [[RoadMap]] describes where the project is going.
 The [[forum]] is open for discussions.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
@@ -27,5 +26,3 @@ can be submitted and tracked using this wiki.
 
 ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
-
-
-- 
cgit v1.2.3


From 48e64aa567fd5e1f997f9a6c201e4e6007057c04 Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Sun, 7 Mar 2010 08:31:57 +0000
Subject:

---
 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn

(limited to 'doc')

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
new file mode 100644
index 000000000..05d4e3a0a
--- /dev/null
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -0,0 +1,3 @@
+I'm very excited to try out ikiwiki, since it should fit my purposes extremely well, but I'm having trouble with the search plugin. I'm pretty sure that right after I installed ikiwiki and needed dependencies, the search plugin was working fine. However, now when I try to use search, I get "Exception: Unknown function `this'" error on a blank page. I'm not sure how I should go about debugging this issue - my server's (I use Lighttpd 1.4.22) error log has no mention of the exception and there's nothing in /var/log/syslog either.
+
+What might be causing this exception and how I might go about debugging exceptions?
-- 
cgit v1.2.3


From 8026c09b346c760b3f1ec4a5d1fedc71dc2843df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 7 Mar 2010 11:40:53 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 05d4e3a0a..628276b3c 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -1,3 +1,12 @@
 I'm very excited to try out ikiwiki, since it should fit my purposes extremely well, but I'm having trouble with the search plugin. I'm pretty sure that right after I installed ikiwiki and needed dependencies, the search plugin was working fine. However, now when I try to use search, I get "Exception: Unknown function `this'" error on a blank page. I'm not sure how I should go about debugging this issue - my server's (I use Lighttpd 1.4.22) error log has no mention of the exception and there's nothing in /var/log/syslog either.
 
 What might be causing this exception and how I might go about debugging exceptions?
+
+> Appears to be coming from your xapian omega cgi binary. If you
+> run `strings /usr/lib/cgi-bin/omega/omega` you can see it has
+> "Exception: " in it.
+> 
+> I don´t know what to suggest, other than upgrade/downgrade/reinstall
+> xapian-omega. You could try rebuilding your wiki in case it is somehow
+> caused by a problem with the xapian database. Failing everything, you
+> could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
-- 
cgit v1.2.3


From 9ba3035ebcbd17888009189131cb34033baf4c3b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 7 Mar 2010 11:44:07 -0500
Subject: update

---
 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 628276b3c..3cbcdc485 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -4,9 +4,11 @@ What might be causing this exception and how I might go about debugging exceptio
 
 > Appears to be coming from your xapian omega cgi binary. If you
 > run `strings /usr/lib/cgi-bin/omega/omega` you can see it has
-> "Exception: " in it.
+> "Exception: " in it, and I have found some similar (but not identical)
+> error messages from xapian in a web search.
 > 
 > I don´t know what to suggest, other than upgrade/downgrade/reinstall
-> xapian-omega. You could try rebuilding your wiki in case it is somehow
+> xapian-omega, and contacting the xapian developers for debugging.
+> You could try rebuilding your wiki in case it is somehow
 > caused by a problem with the xapian database. Failing everything, you
 > could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
-- 
cgit v1.2.3


From 904e2c2d1e3eace5f208073d424209bcd5826504 Mon Sep 17 00:00:00 2001
From: danc <danc@web>
Date: Sun, 7 Mar 2010 22:21:35 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox/danc.mdwn b/doc/sandbox/danc.mdwn
new file mode 100644
index 000000000..9766475a4
--- /dev/null
+++ b/doc/sandbox/danc.mdwn
@@ -0,0 +1 @@
+ok
-- 
cgit v1.2.3


From b44e42baf13a1798e723cdd5d19ffdfe2c751a4b Mon Sep 17 00:00:00 2001
From: danc <danc@web>
Date: Sun, 7 Mar 2010 22:23:26 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index afd7dbeab..1a1b128e6 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -77,3 +77,4 @@ bar
 Hmm, can I dig it?
 
 Test
+pop
-- 
cgit v1.2.3


From 7559c7b3ae382191e8d4acde8ddd9e2323edb9a2 Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Mon, 8 Mar 2010 02:09:00 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 3cbcdc485..94de18ceb 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -12,3 +12,5 @@ What might be causing this exception and how I might go about debugging exceptio
 > You could try rebuilding your wiki in case it is somehow
 > caused by a problem with the xapian database. Failing everything, you
 > could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
+
+>> Thanks, Joey. With your help I was able to figure out what was wrong. It's a fun little bug (or feature): the title of my wiki had string `$this` in title and that's what was causing the omega binary to choke. My wiki's title was inserted without escaping into the query template used by omega. Omega treated `$this` in the title as a function name and threw an exception because no such function was defined. To avoid this behavior, I used an html entity in the title, so `$this` became `&#36;this`. I don't think that the wiki title should be inserted into the template without escaping - it can produce an error that's not trivial to debug. If users want to modify the html in the title, they should be editing respective templates, not typing html in the wiki title input. What do you think? --[[dkobozev]]
-- 
cgit v1.2.3


From 12b5aec2985ece32ee640f7d90feaaac464f795d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 7 Mar 2010 22:47:32 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 94de18ceb..7db12c34a 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -14,3 +14,10 @@ What might be causing this exception and how I might go about debugging exceptio
 > could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
 
 >> Thanks, Joey. With your help I was able to figure out what was wrong. It's a fun little bug (or feature): the title of my wiki had string `$this` in title and that's what was causing the omega binary to choke. My wiki's title was inserted without escaping into the query template used by omega. Omega treated `$this` in the title as a function name and threw an exception because no such function was defined. To avoid this behavior, I used an html entity in the title, so `$this` became `&#36;this`. I don't think that the wiki title should be inserted into the template without escaping - it can produce an error that's not trivial to debug. If users want to modify the html in the title, they should be editing respective templates, not typing html in the wiki title input. What do you think? --[[dkobozev]]
+
+>>> Sounds like a bug in omega, and one that probably would affect other
+>>> users of omega too. Ikiwiki could work around it by pre-escaping
+>>> data before passing it to xapian. I have not quite managed to reproduce it though;
+>>> tried setting a page title to '$this' and 'foo $this'.
+>>> That's with version 1.0.18 of omega.
+>>> --[[Joey]]
-- 
cgit v1.2.3


From e7755506d10dfd03cc615d74aeaa3cec156631ac Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Mon, 8 Mar 2010 04:53:05 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 7db12c34a..cb75895c8 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -21,3 +21,5 @@ What might be causing this exception and how I might go about debugging exceptio
 >>> tried setting a page title to '$this' and 'foo $this'.
 >>> That's with version 1.0.18 of omega.
 >>> --[[Joey]]
+
+>>>> I tried it with both omega 1.0.13 and omega 1.0.18 and the issue is present in both. If I view the contents of {$srcdir}/.ikiwiki/xapian/templates/query, I can see that the wiki title is inserted verbatim and there are calls to `$setmap`, `$set` and `$def` etc in the template. --[[dkobozev]]
-- 
cgit v1.2.3


From 84d41fb86707890ae3bebe5f82fd438715f88c44 Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Tue, 9 Mar 2010 00:07:17 +0000
Subject:

---
 doc/ikiwiki/directive/map/discussion.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn
index 062b4267a..075b91b4d 100644
--- a/doc/ikiwiki/directive/map/discussion.mdwn
+++ b/doc/ikiwiki/directive/map/discussion.mdwn
@@ -1,3 +1,12 @@
+### Sorting
+
+Is there a way to have the generated maps sorted by *title* instead of *filename* when show=title is used?
+Thanks 
+
+-- Thiana
+
+----
+
 Question: Is there a way to generate a listing that shows *both* title and description meta information? Currently, a \[\[!map ...]] shows only one of the two, but I'd like to generate a navigation that looks like a description list. For example:
 
  * This is the title meta information.
-- 
cgit v1.2.3


From b9e7064f70980b58b1bae754bee7fe3eff5fc84d Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Tue, 9 Mar 2010 00:42:38 +0000
Subject: Added use of tag directive so I can play with tags in the sandbox.

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

(limited to 'doc')

diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn
index c1d1974d6..d62c87924 100644
--- a/doc/templates/plugin.mdwn
+++ b/doc/templates/plugin.mdwn
@@ -6,6 +6,7 @@ Enabled by default: <TMPL_IF core>yes<TMPL_ELSE>no</TMPL_IF><br />
 Included in [[/plugins/goodstuff]]: [[!if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]<br />
 Currently enabled: [[!if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br />
 </span>
+[[!tag plugin <TMPL_VAR name>]]
 [[!if test="sourcepage(plugins/contrib/*)" then="""[[!meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
 <TMPL_IF core>[[!tag plugins/type/core]]</TMPL_IF>
 <TMPL_UNLESS NAME="name">
-- 
cgit v1.2.3


From 9d6a755d3983d1d7cd1c67c923c8907e09108a70 Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Tue, 9 Mar 2010 00:50:45 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn
index 629d05940..e34df70a1 100644
--- a/doc/plugins/conditional/discussion.mdwn
+++ b/doc/plugins/conditional/discussion.mdwn
@@ -1,3 +1,11 @@
+## Conditional broken?
+
+Using \[\[!if test="tagged(plugin)" then="= Tagged as plugin =" else="*No plugins found*"]] on this wiki *should* present the 'Tagged as plugin' heading, instead it emits 'no plugins found'. Is the conditional plugin currently broken for tags or am I misusing it? Thanks.
+
+-- Thiana
+
+----
+
 Would there be a way for this plugin to emit fewer blank lines (i.e. *none at all*)?
 
 For example, having a look at [this page](http://www.bddebian.com/~wiki/Hurd/)'s sidebar.
-- 
cgit v1.2.3


From 2af6a32aba4a7f96f63b3dfc176e1d4b40488a34 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Mar 2010 20:24:02 -0500
Subject: add link

---
 doc/ikiwiki/directive/map/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn
index 075b91b4d..f6eaa6b80 100644
--- a/doc/ikiwiki/directive/map/discussion.mdwn
+++ b/doc/ikiwiki/directive/map/discussion.mdwn
@@ -5,6 +5,8 @@ Thanks
 
 -- Thiana
 
+> [[bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used]] --[[Joey]] 
+
 ----
 
 Question: Is there a way to generate a listing that shows *both* title and description meta information? Currently, a \[\[!map ...]] shows only one of the two, but I'd like to generate a navigation that looks like a description list. For example:
-- 
cgit v1.2.3


From 8f13e52a0d9458470753d8fde13e1e19bb872384 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Mar 2010 20:24:43 -0500
Subject: Revert "Added use of tag directive so I can play with tags in the
 sandbox."

This reverts commit b9e7064f70980b58b1bae754bee7fe3eff5fc84d.

Er, no, I don't want a broken tag link on every plugin page, really.
---
 doc/templates/plugin.mdwn | 1 -
 1 file changed, 1 deletion(-)

(limited to 'doc')

diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn
index d62c87924..c1d1974d6 100644
--- a/doc/templates/plugin.mdwn
+++ b/doc/templates/plugin.mdwn
@@ -6,7 +6,6 @@ Enabled by default: <TMPL_IF core>yes<TMPL_ELSE>no</TMPL_IF><br />
 Included in [[/plugins/goodstuff]]: [[!if test="backlink(plugins/goodstuff)" all=no then="""yes""" else="""no"""]]<br />
 Currently enabled: [[!if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<br />
 </span>
-[[!tag plugin <TMPL_VAR name>]]
 [[!if test="sourcepage(plugins/contrib/*)" then="""[[!meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
 <TMPL_IF core>[[!tag plugins/type/core]]</TMPL_IF>
 <TMPL_UNLESS NAME="name">
-- 
cgit v1.2.3


From 376d0dc9b76a384bc505b4ebc8c70dde4134c220 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Mar 2010 20:27:30 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn
index e34df70a1..09e3df923 100644
--- a/doc/plugins/conditional/discussion.mdwn
+++ b/doc/plugins/conditional/discussion.mdwn
@@ -4,6 +4,10 @@ Using \[\[!if test="tagged(plugin)" then="= Tagged as plugin =" else="*No plugin
 
 -- Thiana
 
+> This wiki has no page named "plugin", so nothing links to it; tags are a species of link
+> so tagging a large number of pages with a tag that doesn't exist (which change has
+> been reverted) doesn't make the pagespec match. It would if the tag's page existed. --[[Joey]]
+
 ----
 
 Would there be a way for this plugin to emit fewer blank lines (i.e. *none at all*)?
-- 
cgit v1.2.3


From 857bcb33eeaa2bc503630646e5a01376f0e8b5b5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 8 Mar 2010 20:30:29 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index cb75895c8..ac4d7ed12 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -23,3 +23,7 @@ What might be causing this exception and how I might go about debugging exceptio
 >>> --[[Joey]]
 
 >>>> I tried it with both omega 1.0.13 and omega 1.0.18 and the issue is present in both. If I view the contents of {$srcdir}/.ikiwiki/xapian/templates/query, I can see that the wiki title is inserted verbatim and there are calls to `$setmap`, `$set` and `$def` etc in the template. --[[dkobozev]]
+
+>>>>> I don't see how that's relevant. It would help if you showed me
+>>>>> exactly something that could be inserted into a page to cause the
+>>>>> problem. --[[Joey]] 
-- 
cgit v1.2.3


From 20635d3610619814e3c36bec913d53cb83d41640 Mon Sep 17 00:00:00 2001
From: Thiana <Thiana@web>
Date: Tue, 9 Mar 2010 03:55:28 +0000
Subject: Clarification request

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

(limited to 'doc')

diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn
index 09e3df923..6e84fdfc1 100644
--- a/doc/plugins/conditional/discussion.mdwn
+++ b/doc/plugins/conditional/discussion.mdwn
@@ -8,6 +8,19 @@ Using \[\[!if test="tagged(plugin)" then="= Tagged as plugin =" else="*No plugin
 > so tagging a large number of pages with a tag that doesn't exist (which change has
 > been reverted) doesn't make the pagespec match. It would if the tag's page existed. --[[Joey]]
 
+>> So if I understand this correctly... Assuming the tags Tag_A and Tag_B, the existence of 
+>> @wiki-home@/tags/Tag_A.creole, and a number of files with a \[\[!tag Tag_A Tag_B]] the 
+>> following is correct?
+>>
+>> * \[\[!if test="tagged(Tag_A)" then="OK" else="Fail"]] => OK
+>> * \[\[!if test="tagged(Tag_B)" then="OK" else="Fail"]] => Fail
+>> * \[\[!if test="tagged(Tag_A) and tagged(Tag_B)" then="OK" else="Fail"]] => Fail
+>>
+>> Is that the expected behaviour? If so, that's not what I'm seeing here since they all result 
+>> in a Fail. If not, what exactly is wrong with those conditionals? Thanks.
+>>
+>> -- Thiana 
+
 ----
 
 Would there be a way for this plugin to emit fewer blank lines (i.e. *none at all*)?
-- 
cgit v1.2.3


From 9e603d2640758d8b4c0420f2984ffe21bd78c7d6 Mon Sep 17 00:00:00 2001
From: capitaine <capitaine@web>
Date: Tue, 9 Mar 2010 05:30:53 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/bestlink_returns_deleted_pages.mdwn b/doc/bugs/bestlink_returns_deleted_pages.mdwn
index 874f18ead..d3c5c8012 100644
--- a/doc/bugs/bestlink_returns_deleted_pages.mdwn
+++ b/doc/bugs/bestlink_returns_deleted_pages.mdwn
@@ -28,7 +28,7 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
 > maybe by keeping a copy of the old backlinks info, then that fix could be
 > applied here too. --[[Joey]]
 
->> Cool that was fast! Well at least half the bug is solved :) For now I'll
+>> Cool that was fast! Well at least half the <a href="http://www.college-paper.org/custom-essay.html college essay">college essay</a> bug is solved :) For now I'll
 >> probably try using a workaround if using bestlink within the needsbuild
 >> or scan hooks. Maybe by testing if pagemtime equals zero. --[[harishcm]]
 
@@ -48,8 +48,8 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
     use IkiWiki 3.00;
     
     sub import {
-    	hook(type => "getsetup", id => "bestlinkbug", call => \&getsetup);
-    	hook(type => "needsbuild", id => "bestlinkbug", call => \&needsbuild);
+    	hook(type => "getsetup", id => "bestlinkbug", call => &getsetup);
+    	hook(type => "needsbuild", id => "bestlinkbug", call => &needsbuild);
     }
     
     sub getsetup () {
-- 
cgit v1.2.3


From 9ac58f4b88654846e2ffdba5190a1785c3ae6c88 Mon Sep 17 00:00:00 2001
From: capitaine <capitaine@web>
Date: Tue, 9 Mar 2010 05:34:52 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
index f634b6e78..f44cfdca2 100644
--- a/doc/bugs.mdwn
+++ b/doc/bugs.mdwn
@@ -1,5 +1,5 @@
 If you've found a bug in ikiwiki, post about it here. [[TODO]] items go
-elsewhere. Link items to [[bugs/done]] when done.
+elsewhere. Link <a href="http://www.college-paper.org/custom-essay.html">college essay</a> items to [[bugs/done]] when done.
 
 Also see the [Debian bugs](http://bugs.debian.org/ikiwiki).
 
-- 
cgit v1.2.3


From 312b7d05f82045f400931c8e110efb7d76b69eed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 9 Mar 2010 00:40:51 -0500
Subject: Revert spam

---
 doc/bugs.mdwn                                | 2 +-
 doc/bugs/bestlink_returns_deleted_pages.mdwn | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
index f44cfdca2..f634b6e78 100644
--- a/doc/bugs.mdwn
+++ b/doc/bugs.mdwn
@@ -1,5 +1,5 @@
 If you've found a bug in ikiwiki, post about it here. [[TODO]] items go
-elsewhere. Link <a href="http://www.college-paper.org/custom-essay.html">college essay</a> items to [[bugs/done]] when done.
+elsewhere. Link items to [[bugs/done]] when done.
 
 Also see the [Debian bugs](http://bugs.debian.org/ikiwiki).
 
diff --git a/doc/bugs/bestlink_returns_deleted_pages.mdwn b/doc/bugs/bestlink_returns_deleted_pages.mdwn
index d3c5c8012..874f18ead 100644
--- a/doc/bugs/bestlink_returns_deleted_pages.mdwn
+++ b/doc/bugs/bestlink_returns_deleted_pages.mdwn
@@ -28,7 +28,7 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
 > maybe by keeping a copy of the old backlinks info, then that fix could be
 > applied here too. --[[Joey]]
 
->> Cool that was fast! Well at least half the <a href="http://www.college-paper.org/custom-essay.html college essay">college essay</a> bug is solved :) For now I'll
+>> Cool that was fast! Well at least half the bug is solved :) For now I'll
 >> probably try using a workaround if using bestlink within the needsbuild
 >> or scan hooks. Maybe by testing if pagemtime equals zero. --[[harishcm]]
 
@@ -48,8 +48,8 @@ won't it make sense for bestlink() to check %pagesources first? --[[harishcm]]
     use IkiWiki 3.00;
     
     sub import {
-    	hook(type => "getsetup", id => "bestlinkbug", call => &getsetup);
-    	hook(type => "needsbuild", id => "bestlinkbug", call => &needsbuild);
+    	hook(type => "getsetup", id => "bestlinkbug", call => \&getsetup);
+    	hook(type => "needsbuild", id => "bestlinkbug", call => \&needsbuild);
     }
     
     sub getsetup () {
-- 
cgit v1.2.3


From fa6d082955dbc75de62839e285c0d441cd83acb1 Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Tue, 9 Mar 2010 10:50:03 +0000
Subject:

---
 ...eption:_Unknown_function___96__this__39___.mdwn | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index ac4d7ed12..4f94b77bd 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -27,3 +27,26 @@ What might be causing this exception and how I might go about debugging exceptio
 >>>>> I don't see how that's relevant. It would help if you showed me
 >>>>> exactly something that could be inserted into a page to cause the
 >>>>> problem. --[[Joey]] 
+
+>>>>>> Correct me if I'm wrong: ikiwiki generates an Omega template from its own templates, such as searchquery.tmpl and puts it into {$srcdir}/.ikiwiki/xapian/templates/query. Omega has its own template syntax, where function names are prefixed with dollar signs (`$`). So, when I call my wiki `$foobar`, ikiwiki generates an Omega template that looks like this snippet:
+
+    <div id="container">
+        <div class="pageheader">
+            <div class="header">
+            <span>
+            <a href="http://example.com">$foobar</    a>/search
+            </span>
+            </div>
+        </div> <!-- .pageheader -->
+    
+        <div id="content">
+            $setmap{prefix,title,S}
+    $setmap{prefix,link,XLINK}
+    $set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France}
+    ${
+    $def{PREV,
+    $if{$ne{$topdoc,0},<INPUT TYPE=image NAME="&lt;" ALT="&lt;"
+    SRC="/images/xapian-omega/prev.png" BORDER=0 HEIGHT=30 WIDTH=30>,
+    <IMG ALT="" SRC="/images/xapian-omega/prevoff.png" HEIGHT=30 WIDTH=30>}
+
+>>>>>> So `$foobar` clashes with Omega's template tags. Does this help?
-- 
cgit v1.2.3


From f64c04040717baf89f0583b59ded4819c5be29c6 Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Wed, 10 Mar 2010 15:26:27 +0000
Subject: suggesting List of tags when editing content (wishlist)

---
 ...shlist-discussion:_Editformular_showing_existing_tags.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn

(limited to 'doc')

diff --git a/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn b/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn
new file mode 100644
index 000000000..98e4280cd
--- /dev/null
+++ b/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn
@@ -0,0 +1,11 @@
+# How about:
+
+having a list of all existing tags in the Edit-Formular as a selectionbox?
+
+Assume I have tagbase=/tags/ and for every tag I have given to articles an existing page there.
+
+Would it be possible to list all these tags together with the Formular, as selectionbox.
+Maybe even with parsing of the content and preselecting the tags, that are given in the article and vice-versa when selecting the fields then also generating the \[\[\!tag\]\]-sourcecode ?
+
+this would need a bit JS-work and somehow on compiletime we need to put the list of tags somewhere, where the cgi could read them from.
+This way, even a pagespec would suffice to determine the usable list of tags and not only the tagbase-variable.
-- 
cgit v1.2.3


From 2f2fbdf3a32ae7c7132441ad90c67553f80c306d Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Wed, 10 Mar 2010 16:07:55 +0000
Subject: tag2

---
 .../wishlist-discussion:_Editformular_showing_existing_tags.mdwn      | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn b/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn
index 98e4280cd..49c55e20e 100644
--- a/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn
+++ b/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn
@@ -9,3 +9,7 @@ Maybe even with parsing of the content and preselecting the tags, that are given
 
 this would need a bit JS-work and somehow on compiletime we need to put the list of tags somewhere, where the cgi could read them from.
 This way, even a pagespec would suffice to determine the usable list of tags and not only the tagbase-variable.
+
+> I think this would be very hard to achieve with the current tag plugin, due to the nature of its implementation.
+> 
+> I've had a "tag2" plugin on the go for a while which supports this. It's in a very rough stage but I'll try to find it and upload it somewhere. -- [[Jon]]
-- 
cgit v1.2.3


From 9f82e93fca0da9c325ebf907d7dab00bd5baa3b1 Mon Sep 17 00:00:00 2001
From: dkowis <dkowis@web>
Date: Wed, 10 Mar 2010 19:13:50 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
new file mode 100644
index 000000000..4c819816e
--- /dev/null
+++ b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
@@ -0,0 +1,16 @@
+In the template for ikiwiki's recent changes page
+
+     /usr/share/ikiwiki/templates/change.tmpl
+
+there is a missing </span> tag after the
+
+     <span class="changedate"><TMPL_VAR COMMITDATE>
+
+This results in the recentchanges/ page being invalid and rendering quite horrifyingly in Internet Exploder.
+
+[I'm running](http://wiki.shlrm.org) (linked so you can see the one I'm running if you need to) the latest version of ikiwiki, and I note that it's broken on [ikiwiki.info](http://validator.w3.org/check?uri=http%3A%2F%2Fikiwiki.info%2Frecentchanges%2F&charset=%28detect+automatically%29&doctype=Inline&group=0&user-agent=W3C_Validator%2F1.767) too :)
+
+[This one on debian](https://www.icanttype.org/recentchanges/) is somehow [valid](http://validator.w3.org/check?uri=https%3A%2F%2Fwww.icanttype.org%2F%2Frecentchanges%2F&charset=%28detect+automatically%29&doctype=Inline&group=0&user-agent=W3C_Validator%2F1.767), although it's using the same template. Perhaps there's an additional scrubbing going on his end.
+
+Thanks,
+David
-- 
cgit v1.2.3


From 1c03cf9ba2aaa4ac6d28eb1d13c0015809fad2c1 Mon Sep 17 00:00:00 2001
From: dkowis <dkowis@web>
Date: Wed, 10 Mar 2010 19:27:26 +0000
Subject: noted that I fixed the template on my box

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

(limited to 'doc')

diff --git a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
index 4c819816e..007d763b5 100644
--- a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
+++ b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
@@ -14,3 +14,5 @@ This results in the recentchanges/ page being invalid and rendering quite horrif
 
 Thanks,
 David
+
+PS: I have fixed the template by hand on my server, so it will validate, however ikiwiki.info will not.
-- 
cgit v1.2.3


From 03c2cf94e28ac8b90e92dbd18181d52f2338385c Mon Sep 17 00:00:00 2001
From: "http://adam.shand.net/" <http://adam.shand.net/@web>
Date: Thu, 11 Mar 2010 05:32:00 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/getsource/discussion.mdwn b/doc/plugins/getsource/discussion.mdwn
new file mode 100644
index 000000000..45a1d62b5
--- /dev/null
+++ b/doc/plugins/getsource/discussion.mdwn
@@ -0,0 +1 @@
+It would be very cool if this plugin was enabled by default.  One of the best ways to learn how to do various advanced things is to be able to "view source" on other wiki's which do things you like.  -- [[AdamShand]]
-- 
cgit v1.2.3


From 9b656e27ea4045d72698949f19fae120c51b7e3c Mon Sep 17 00:00:00 2001
From: JoshTriplett <JoshTriplett@web>
Date: Thu, 11 Mar 2010 07:42:07 +0000
Subject: Add my homepage.

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 345604c36..bd9bee3ab 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -141,6 +141,7 @@ Personal sites and blogs
 * [Mukund's homepage](http://www.mukund.org/)
 * [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
+* [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From d021a1ddbc1890dbeb904711a581ac4fc084545b Mon Sep 17 00:00:00 2001
From: JoshTriplett <JoshTriplett@web>
Date: Thu, 11 Mar 2010 07:44:56 +0000
Subject: Add Serialist, and the amusing/frightening way it uses ikiwiki.

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index bd9bee3ab..8e567ec0d 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -53,6 +53,7 @@ Projects & Organizations
 * [IPOL Image Processing On Line](http://www.ipol.im)
 * [Debian Costa Rica](http://cr.debian.net/)
 * [Fvwm Wiki](http://fvwmwiki.xteddy.org)
+* [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From e4ed8a51c1eb7bd80f416dcc59231a13e3d1255e Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 11 Mar 2010 18:20:10 +0000
Subject: fix in a branch

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

(limited to 'doc')

diff --git a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
index 007d763b5..536af3473 100644
--- a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
+++ b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
@@ -16,3 +16,9 @@ Thanks,
 David
 
 PS: I have fixed the template by hand on my server, so it will validate, however ikiwiki.info will not.
+
+> [[!template id="gitbranch" branch=smcv/trivia author="[[smcv]]"]] [[!tag patch]]
+> Enabling either [[plugins/htmltidy]] or [[plugins/htmlbalance]] will automatically fix unbalanced
+> markup like this; using [[plugins/comments]] without having one or other of those is a bad idea
+> from the point of view of avoiding comment forgery, which is probably why icanttype.org works
+> correctly. Anyway, I've fixed this in a branch: Joey, care to review smcv/trivia? --[[smcv]]
-- 
cgit v1.2.3


From ac3aac560f74457ded48ba3b5a14d0bbbf9b6d92 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Mar 2010 15:44:10 -0500
Subject: moderatedcomments: Added moderate_pagespec

* moderatedcomments: Added moderate_pagespec that can be used
  to control which users or comment locations are moderated.
  This can be used, just for example, to moderate http://myopenid.com/*
  if you're getting a lot of spammers from one particular openid
  provider (who should perhaps answer your emails about them),
  while not moderating other users.
* moderatedcomments: The moderate_users setting is deprecated. Instead,
  set moderate_pagespec to "!admin()" or "user(*)" instead.
---
 IkiWiki/Plugin/moderatedcomments.pm | 37 ++++++++++++++++++++++++++++---------
 debian/changelog                    |  8 ++++++++
 doc/plugins/moderatedcomments.mdwn  |  8 +++++---
 3 files changed, 41 insertions(+), 12 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
index afe1ceedf..b0a328a06 100644
--- a/IkiWiki/Plugin/moderatedcomments.pm
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -17,10 +17,11 @@ sub getsetup () {
 			rebuild => 0,
 			section => "auth",
 		},
-		moderate_users => {
-			type => 'boolean',
-			example => 1,
-			description => 'Moderate comments of logged-in users?',
+		moderate_pagespec => {
+			type => 'pagespec',
+			example => 'user(http://*)',
+			description => 'PageSpec matching users or comment locations to moderate',
+			link => 'ikiwiki/PageSpec',
 			safe => 1,
 			rebuild => 0,
 		},
@@ -32,14 +33,32 @@ sub checkcontent (@) {
 	# only handle comments	
 	return undef unless pagespec_match($params{page}, "postcomment(*)",
 	                	location => $params{page});
+	
+	# backwards compatability
+	if (exists $config{moderate_users} &&
+	    ! exists $config{moderate_pagespec}) {
+		$config{moderate_pagespec} = $config{moderate_users}
+			? "!admin()"
+			: "!user(*)";
+	}
+
+	# default is to moderate all except admins
+	if (! exists $config{moderate_pagespec}) {
+		$config{moderate_pagespec}="!admin()";
+	}
 
-	# admins and maybe users can comment w/o moderation
 	my $session=$params{session};
 	my $user=$session->param("name") if $session;
-	return undef if defined $user && (IkiWiki::is_admin($user) ||
-		(exists $config{moderate_users} && ! $config{moderate_users}));
-
-	return gettext("comment needs moderation");
+	if (pagespec_match($params{page}, $config{moderate_pagespec},
+			location => $params{page},
+			(defined $user ? (user => $user) : ()),
+			(defined $ENV{REMOTE_ADDR} ? (ip => $ENV{REMOTE_ADDR}) : ()),
+	)) {
+		return gettext("comment needs moderation");
+	}
+	else {
+		return undef;
+	}
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index d1253c079..c58e612db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
 ikiwiki (3.20100303) UNRELEASED; urgency=low
 
   * Fix utf8 issues in calls to md5_hex.
+  * moderatedcomments: Added moderate_pagespec that can be used
+    to control which users or comment locations are moderated.
+    This can be used, just for example, to moderate http://myopenid.com/*
+    if you're getting a lot of spammers from one particular openid
+    provider (who should perhaps answer your emails about them),
+    while not moderating other users.
+  * moderatedcomments: The moderate_users setting is deprecated. Instead,
+    set moderate_pagespec to "!admin()" or "user(*)" instead.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 09 Mar 2010 19:46:35 -0500
 
diff --git a/doc/plugins/moderatedcomments.mdwn b/doc/plugins/moderatedcomments.mdwn
index 97924d742..c29b0b052 100644
--- a/doc/plugins/moderatedcomments.mdwn
+++ b/doc/plugins/moderatedcomments.mdwn
@@ -5,6 +5,8 @@ This plugin causes [[comments]] to be held for manual moderation.
 Admins can access the comment moderation queue via their preferences page.
 
 By default, all comments made by anyone who is not an admin will be held
-for moderation. The `moderate_users` setting can be set to false to avoid
-moderating comments of logged-in users, while still moderating anonymous
-comments.
+for moderation. The `moderate_pagespec` setting can be used to specify a
+[[ikiwiki/PageSpec]] to match comments and users who should be moderated.
+For example, to avoid moderating comments from logged-in users, set
+`moderate_pagespec` to "!user(*)". Or to moderate everyone except for
+admins, set it to "!admin(*)".
-- 
cgit v1.2.3


From f259f33a0ad4858ce33f458148f1733351b91d92 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Mar 2010 15:49:48 -0500
Subject: Fix missing span on recentchanges page template.

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

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index c58e612db..6b5671e3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low
     while not moderating other users.
   * moderatedcomments: The moderate_users setting is deprecated. Instead,
     set moderate_pagespec to "!admin()" or "user(*)" instead.
+  * Fix missing span on recentchanges page template.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 09 Mar 2010 19:46:35 -0500
 
diff --git a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
index 536af3473..5c322991a 100644
--- a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
+++ b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn
@@ -22,3 +22,5 @@ PS: I have fixed the template by hand on my server, so it will validate, however
 > markup like this; using [[plugins/comments]] without having one or other of those is a bad idea
 > from the point of view of avoiding comment forgery, which is probably why icanttype.org works
 > correctly. Anyway, I've fixed this in a branch: Joey, care to review smcv/trivia? --[[smcv]]
+
+[[done]], thanks guys --[[Joey]]
-- 
cgit v1.2.3


From 45dfdcb2571953be6815342510b9bb2a73ce59e7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Mar 2010 16:10:04 -0500
Subject: search: Avoid '$' in the wikiname appearing unescaped on omega's
 query template, where it might crash omega.

Really, a more general fix, this deals with any $ that might appear on the
misctemplate.
---
 IkiWiki/Plugin/search.pm                                  | 15 +++++++++++++--
 debian/changelog                                          |  2 ++
 .../Exception:_Unknown_function___96__this__39___.mdwn    |  6 ++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index fb68396a1..c0e8703d8 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -110,6 +110,7 @@ sub index (@) {
 	# data used by omega
 	# Decode html entities in it, since omega re-encodes them.
 	eval q{use HTML::Entities};
+	error $@ if $@;
 	$doc->set_data(
 		"url=".urlto($params{page}, "")."\n".
 		"sample=".decode_entities($sample)."\n".
@@ -214,9 +215,19 @@ sub setupfiles () {
 		writefile("omega.conf", $config{wikistatedir}."/xapian",
 			"database_dir .\n".
 			"template_dir ./templates\n");
+		
+		# Avoid omega interpreting anything in the misctemplate
+		# as an omegascript command.
+		my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0");
+		eval q{use HTML::Entities};
+		error $@ if $@;
+		$misctemplate=encode_entities($misctemplate, '\$');
+
+		my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl"));
+		$misctemplate=~s/\0/$querytemplate/;
+
 		writefile("query", $config{wikistatedir}."/xapian/templates",
-			IkiWiki::misctemplate(gettext("search"),
-				readfile(IkiWiki::template_file("searchquery.tmpl"))));
+			$misctemplate);
 		$setup=1;
 	}
 }
diff --git a/debian/changelog b/debian/changelog
index 6b5671e3e..6828e6b3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low
   * moderatedcomments: The moderate_users setting is deprecated. Instead,
     set moderate_pagespec to "!admin()" or "user(*)" instead.
   * Fix missing span on recentchanges page template.
+  * search: Avoid '$' in the wikiname appearing unescaped on omega's
+    query template, where it might crash omega.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 09 Mar 2010 19:46:35 -0500
 
diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
index 4f94b77bd..035247100 100644
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
@@ -50,3 +50,9 @@ What might be causing this exception and how I might go about debugging exceptio
     <IMG ALT="" SRC="/images/xapian-omega/prevoff.png" HEIGHT=30 WIDTH=30>}
 
 >>>>>> So `$foobar` clashes with Omega's template tags. Does this help?
+
+>>>>>>> Ahh. I had somehow gotten it into my head that you were talking
+>>>>>>> about the title of a single page, not of the whole wiki. But
+>>>>>>> you were clear all along it was the wiki title. Sorry for
+>>>>>>> misunderstanding. I've put in a complete fix for this problem.
+>>>>>>> if this was in [[bugs]], I'd close it. :) --[[Joey]] 
-- 
cgit v1.2.3


From 98facfc958fedf459c838269cd2b6cdf67bbac80 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Fri, 12 Mar 2010 17:50:16 +0000
Subject: Added a page for myself.

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

(limited to 'doc')

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
new file mode 100644
index 000000000..41bf9b09a
--- /dev/null
+++ b/doc/users/ivan_shmakov.mdwn
@@ -0,0 +1,3 @@
+&hellip; To put it short: an Ikiwiki newbie.
+
+I run an Ikiwiki instance at <http://gray.am-1.org/~ivan/lhc/> (though the DNS servers seem to be temporarily out of smoke as of 2010-03-12Z.)
-- 
cgit v1.2.3


From 58a6847cfb445dbb87716e4064f8151cc44a233a Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Fri, 12 Mar 2010 17:51:17 +0000
Subject: Note that, actually, SVG could be embedded into an Ikiwiki page,
 albeit in a somewhat crude manner.

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

(limited to 'doc')

diff --git a/doc/todo/svg.mdwn b/doc/todo/svg.mdwn
index 89b183db6..2099751e3 100644
--- a/doc/todo/svg.mdwn
+++ b/doc/todo/svg.mdwn
@@ -57,3 +57,11 @@ in the trunk if other people think it's useful.
 
 [htmlscrubber.pm]:http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blob;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hb=fe333c8e5b4a5f374a059596ee698dacd755182d
 [diff]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blobdiff;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hp=3bdaccea119ec0e1b289a0da2f6d90e2219b8d66;hb=fe333c8e5b4a5f374a059596ee698dacd755182d;hpb=be0b4f603f918444b906e42825908ddac78b7073
+
+* * *
+
+Actually, there's a way to embed SVG into MarkDown sources using the [data: URI scheme][rfc2397], [like this](data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8c3ZnIHdpZHRoPSIxOTIiIGhlaWdodD0iMTkyIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KIDwhLS0gQ3JlYXRlZCB3aXRoIFNWRy1lZGl0IC0gaHR0cDovL3N2Zy1lZGl0Lmdvb2dsZWNvZGUuY29tLyAtLT4KIDx0aXRsZT5IZWxsbywgd29ybGQhPC90aXRsZT4KIDxnPgogIDx0aXRsZT5MYXllciAxPC90aXRsZT4KICA8ZyB0cmFuc2Zvcm09InJvdGF0ZSgtNDUsIDk3LjY3MTksIDk3LjY2OCkiIGlkPSJzdmdfNyI+CiAgIDxyZWN0IHN0cm9rZS13aWR0aD0iNSIgc3Ryb2tlPSIjMDAwMDAwIiBmaWxsPSIjRkYwMDAwIiBpZD0ic3ZnXzUiIGhlaWdodD0iNTYuMDAwMDAzIiB3aWR0aD0iMTc1IiB5PSI2OS42Njc5NjkiIHg9IjEwLjE3MTg3NSIvPgogICA8dGV4dCB4bWw6c3BhY2U9InByZXNlcnZlIiB0ZXh0LWFuY2hvcj0ibWlkZGxlIiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iMjQiIHN0cm9rZS13aWR0aD0iMCIgc3Ryb2tlPSIjMDAwMDAwIiBmaWxsPSIjZmZmZjAwIiBpZD0ic3ZnXzYiIHk9IjEwNS42NjgiIHg9Ijk5LjY3MTkiPkhlbGxvLCB3b3JsZCE8L3RleHQ+CiAgPC9nPgogPC9nPgo8L3N2Zz4=).
+Of course, this way to display an image one needs to click a link, but it may be considered a feature.
+&mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
+[rfc2397]: http://tools.ietf.org/html/rfc2397
-- 
cgit v1.2.3


From 844bb8134b5ff6e3d73dc3c8b91ed516fa618c41 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Fri, 12 Mar 2010 18:33:10 +0000
Subject: Added an <object /> wishlist item.

---
 ...er_control_over___60__object___47____62__s.mdwn | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 doc/todo/finer_control_over___60__object___47____62__s.mdwn

(limited to 'doc')

diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
new file mode 100644
index 000000000..714f5ae50
--- /dev/null
+++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
@@ -0,0 +1,41 @@
+IIUC, the current version of [HTML::Scrubber][] allows for the `object` tags to be either enabled or disabled entirely.  However, while `object` can be used to add *code* (which is indeed a potential security hole) to a document, reading [Objects, Images, and Applets in HTML documents][objects-html] reveals that the &ldquo;dangerous&rdquo; are not all the `object`s, but rather those having the following attributes:
+
+    classid     %URI;          #IMPLIED  -- identifies an implementation --
+    codebase    %URI;          #IMPLIED  -- base URI for classid, data, archive--
+    codetype    %ContentType;  #IMPLIED  -- content type for code --
+    archive     CDATA          #IMPLIED  -- space-separated list of URIs --
+
+It seems that the following attributes are, OTOH, safe:
+
+    declare     (declare)      #IMPLIED  -- declare but don't instantiate flag --
+    data        %URI;          #IMPLIED  -- reference to object's data --
+    type        %ContentType;  #IMPLIED  -- content type for data --
+    standby     %Text;         #IMPLIED  -- message to show while loading --
+    height      %Length;       #IMPLIED  -- override height --
+    width       %Length;       #IMPLIED  -- override width --
+    usemap      %URI;          #IMPLIED  -- use client-side image map --
+    name        CDATA          #IMPLIED  -- submit as part of form --
+    tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
+
+Should the former attributes be *scrubbed* while the latter left intact, the use of the `object` tag would seemingly become safe.
+
+Note also that allowing `object` (either restricted in such a way or not) automatically solves the [[/todo/svg]] issue.
+
+For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by the `data` and `usemap` attributes) to, say, relative and `data:` (as per [RFC 2397][]) ones as well, though it requires some more consideration.
+
+&mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
+[[wishlist]]
+
+## See also
+
+* [Objects, Images, and Applets in HTML documents][objects-html]
+* [[plugins/htmlscrubber|/plugins/htmlscrubber]]
+* [[todo/svg|/todo/svg]]
+* [RFC 2397: The &ldquo;data&rdquo; URL scheme. L.&nbsp;Masinter. August 1998.][RFC 2397]
+* [Uniform Resource Identifier &mdash; the free encyclopedia][URI]
+
+[HTML::Scrubber]: http://search.cpan.org/~podmaster/HTML-Scrubber-0.08/Scrubber.pm
+[objects-html]: http://www.w3.org/TR/1999/REC-html401-19991224/struct/objects.html
+[RFC 2397]: http://tools.ietf.org/html/rfc2397
+[URI]: http://en.wikipedia.org/wiki/Uniform_Resource_Identifier
-- 
cgit v1.2.3


From 556181d417e3461de56c43445ec9b2b0aefc7141 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 14:29:54 -0500
Subject: data:image/svg is a security hole as javascript can presumably be
 inserted

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

(limited to 'doc')

diff --git a/doc/todo/svg.mdwn b/doc/todo/svg.mdwn
index 2099751e3..274ebf3e3 100644
--- a/doc/todo/svg.mdwn
+++ b/doc/todo/svg.mdwn
@@ -58,6 +58,8 @@ in the trunk if other people think it's useful.
 [htmlscrubber.pm]:http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blob;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hb=fe333c8e5b4a5f374a059596ee698dacd755182d
 [diff]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blobdiff;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hp=3bdaccea119ec0e1b289a0da2f6d90e2219b8d66;hb=fe333c8e5b4a5f374a059596ee698dacd755182d;hpb=be0b4f603f918444b906e42825908ddac78b7073
 
+> Unfortuantly these links are broken. --[[Joey]]
+
 * * *
 
 Actually, there's a way to embed SVG into MarkDown sources using the [data: URI scheme][rfc2397], [like this](data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8c3ZnIHdpZHRoPSIxOTIiIGhlaWdodD0iMTkyIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KIDwhLS0gQ3JlYXRlZCB3aXRoIFNWRy1lZGl0IC0gaHR0cDovL3N2Zy1lZGl0Lmdvb2dsZWNvZGUuY29tLyAtLT4KIDx0aXRsZT5IZWxsbywgd29ybGQhPC90aXRsZT4KIDxnPgogIDx0aXRsZT5MYXllciAxPC90aXRsZT4KICA8ZyB0cmFuc2Zvcm09InJvdGF0ZSgtNDUsIDk3LjY3MTksIDk3LjY2OCkiIGlkPSJzdmdfNyI+CiAgIDxyZWN0IHN0cm9rZS13aWR0aD0iNSIgc3Ryb2tlPSIjMDAwMDAwIiBmaWxsPSIjRkYwMDAwIiBpZD0ic3ZnXzUiIGhlaWdodD0iNTYuMDAwMDAzIiB3aWR0aD0iMTc1IiB5PSI2OS42Njc5NjkiIHg9IjEwLjE3MTg3NSIvPgogICA8dGV4dCB4bWw6c3BhY2U9InByZXNlcnZlIiB0ZXh0LWFuY2hvcj0ibWlkZGxlIiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iMjQiIHN0cm9rZS13aWR0aD0iMCIgc3Ryb2tlPSIjMDAwMDAwIiBmaWxsPSIjZmZmZjAwIiBpZD0ic3ZnXzYiIHk9IjEwNS42NjgiIHg9Ijk5LjY3MTkiPkhlbGxvLCB3b3JsZCE8L3RleHQ+CiAgPC9nPgogPC9nPgo8L3N2Zz4=).
@@ -65,3 +67,11 @@ Of course, this way to display an image one needs to click a link, but it may be
 &mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
 
 [rfc2397]: http://tools.ietf.org/html/rfc2397
+
+> You can do the same with img src actually.
+> 
+> If svg markup allows unsafe elements (ie, javascript),
+> which it appears to, 
+> then this is a security hole, and the htmlscrubber
+> needs to lock it down more. Darn, now I have to spend my afternoon making
+> security releases! --[[Joey]] 
-- 
cgit v1.2.3


From 2ad3e60ee8272b7cccfd83ae02d5b45e2cec003d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 14:49:13 -0500
Subject: htmlscrubber: Security fix: In data:image/* uris, only allow a few
 whitelisted image types. No svg.

---
 IkiWiki/Plugin/htmlscrubber.pm |  6 +++---
 debian/changelog               |  4 +++-
 doc/security.mdwn              | 12 ++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index ee284a45c..26e18ffc7 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -30,9 +30,9 @@ sub import {
 		"msnim", "notes", "rsync", "secondlife", "skype", "ssh",
 		"sftp", "smb", "sms", "snews", "webcal", "ymsgr",
 	);
-	# data is a special case. Allow data:image/*, but
-	# disallow data:text/javascript and everything else.
-	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/|[^:]+(?:$|\/))/i;
+	# data is a special case. Allow a few data:image/ types,
+	# but disallow data:text/javascript and everything else.
+	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|\/))/i;
 }
 
 sub getsetup () {
diff --git a/debian/changelog b/debian/changelog
index bae0e7ee0..7fdbbcb63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100303) UNRELEASED; urgency=low
+ikiwiki (3.20100312) unstable; urgency=HIGH
 
   * Fix utf8 issues in calls to md5_hex.
   * moderatedcomments: Added moderate_pagespec that can be used
@@ -12,6 +12,8 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low
   * Fix missing span on recentchanges page template.
   * search: Avoid '$' in the wikiname appearing unescaped on omega's
     query template, where it might crash omega.
+  * htmlscrubber: Security fix: In data:image/* uris, only allow a few
+    whitelisted image types. No svg.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 09 Mar 2010 19:46:35 -0500
 
diff --git a/doc/security.mdwn b/doc/security.mdwn
index 3924186c2..21aef316b 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -427,3 +427,15 @@ enabling TeX configuration options that disallow unsafe TeX commands.
 The fix was released on 30 Aug 2009 in version 3.1415926, and was
 backported to stable in version 2.53.4. If you use the teximg plugin,
 I recommend upgrading. ([[!cve CVE-2009-2944]])
+
+## javascript insertion via svg uris
+
+Ivan Shmakov pointed out that the htmlscrubber allowed `data:image/*` urls,
+including `data:image/svg+xml`. But svg can contain javascript, so that is
+unsafe.
+
+This hole was discovered on 12 March 2010 and fixed the same day
+with the release of ikiwiki 3.20100312.
+A fix was also backported to Debian etch, as version 2.53.5. I recommend
+upgrading to one of these versions if your wiki can be edited by third
+parties.
-- 
cgit v1.2.3


From 4711076fad54ff8152f03a7e4bdd4b5c2df1916c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 15:00:39 -0500
Subject: clarify

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

(limited to 'doc')

diff --git a/doc/todo/mercurial.mdwn b/doc/todo/mercurial.mdwn
index e71c8106a..de1f148e5 100644
--- a/doc/todo/mercurial.mdwn
+++ b/doc/todo/mercurial.mdwn
@@ -119,3 +119,11 @@ I have a few notes on mercurial usage after trying it out for a while:
 >> I think the ideal solution would be to build `$destdir/recentchanges/*` directly from the output of `hg log`. --[[buo]]
 
 >>>> That would be 100 times as slow, so I chose not to do that. --[[Joey]]
+
+>>>> Since this is confusing people, allow me to clarify: Ikiwiki's
+>>>> recentchanges generation pulls log information directly out of the VCS as
+>>>> needed. It caches it in recentchanges/* in the `scrdir`. These cache
+>>>> files need not be preserved, should never be checked into VCS, and if
+>>>> you want to you can configure your VCSignore file to ignore them,
+>>>> just as you can configure it to ignore the `.ikiwiki` directory in the
+>>>> `scrdir`. --[[Joey]] 
-- 
cgit v1.2.3


From afa930a9c4ada59ea840d626f583f8b4fb3c3f20 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 15:22:32 -0500
Subject: add news item for ikiwiki 3.20100312

---
 doc/news/version_3.20091218.mdwn | 11 -----------
 doc/news/version_3.20100312.mdwn | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 100644 doc/news/version_3.20091218.mdwn
 create mode 100644 doc/news/version_3.20100312.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20091218.mdwn b/doc/news/version_3.20091218.mdwn
deleted file mode 100644
index 224e81c4e..000000000
--- a/doc/news/version_3.20091218.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-ikiwiki 3.20091218 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add complete Spanish basewiki translation done by Fernando Gonzalez de
-     Requena.
-   * Improve javascript onload handling.
-   * monotone: Deal with format change in version 0.45.
-     (Thanks, Richard Levitte)
-   * cvs: Add missing bit to Automator.
-   * attachment: Fix reversion in attachment sorting by age.
-   * Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and
-     goto."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100312.mdwn b/doc/news/version_3.20100312.mdwn
new file mode 100644
index 000000000..10c34425d
--- /dev/null
+++ b/doc/news/version_3.20100312.mdwn
@@ -0,0 +1,16 @@
+ikiwiki 3.20100312 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix utf8 issues in calls to md5\_hex.
+   * moderatedcomments: Added moderate\_pagespec that can be used
+     to control which users or comment locations are moderated.
+     This can be used, just for example, to moderate "user(http://myopenid.com/*)"
+     if you're getting a lot of spammers from one particular openid
+     provider (who should perhaps answer your emails about them),
+     while not moderating other users.
+   * moderatedcomments: The moderate\_users setting is deprecated. Instead,
+     set moderate\_pagespec to "!admin()" or "user(*)".
+   * Fix missing span on recentchanges page template.
+   * search: Avoid '$' in the wikiname appearing unescaped on omega's
+     query template, where it might crash omega.
+   * htmlscrubber: Security fix: In data:image/* uris, only allow a few
+     whitelisted image types. No svg."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 08485ec444cf81015e39c52e6ce8e7b933a036f6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 15:40:47 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
index 714f5ae50..ac4b55568 100644
--- a/doc/todo/finer_control_over___60__object___47____62__s.mdwn
+++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
@@ -27,6 +27,13 @@ For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by
 
 [[wishlist]]
 
+> SVG can contain embedded javascript. The spec that you link to contains
+> examples of objects that contain python scripts, Microsoft OLE 
+> objects, and Java. And then there's flash. I don't think ikiwiki can
+> assume all the possibilities are handled securely, particularly WRT XSS
+> attacks.
+> --[[Joey]]
+
 ## See also
 
 * [Objects, Images, and Applets in HTML documents][objects-html]
-- 
cgit v1.2.3


From 0c3f59d33aa6af6c327d863a4110337ac9cae898 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 16:16:47 -0500
Subject: move bug report to bugs and close

---
 ...eption:_Unknown_function___96__this__39___.mdwn | 60 ++++++++++++++++++++++
 ...eption:_Unknown_function___96__this__39___.mdwn | 58 ---------------------
 2 files changed, 60 insertions(+), 58 deletions(-)
 create mode 100644 doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
 delete mode 100644 doc/forum/Exception:_Unknown_function___96__this__39___.mdwn

(limited to 'doc')

diff --git a/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn b/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
new file mode 100644
index 000000000..9eac8eae5
--- /dev/null
+++ b/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
@@ -0,0 +1,60 @@
+I'm very excited to try out ikiwiki, since it should fit my purposes extremely well, but I'm having trouble with the search plugin. I'm pretty sure that right after I installed ikiwiki and needed dependencies, the search plugin was working fine. However, now when I try to use search, I get "Exception: Unknown function `this'" error on a blank page. I'm not sure how I should go about debugging this issue - my server's (I use Lighttpd 1.4.22) error log has no mention of the exception and there's nothing in /var/log/syslog either.
+
+What might be causing this exception and how I might go about debugging exceptions?
+
+> Appears to be coming from your xapian omega cgi binary. If you
+> run `strings /usr/lib/cgi-bin/omega/omega` you can see it has
+> "Exception: " in it, and I have found some similar (but not identical)
+> error messages from xapian in a web search.
+> 
+> I don´t know what to suggest, other than upgrade/downgrade/reinstall
+> xapian-omega, and contacting the xapian developers for debugging.
+> You could try rebuilding your wiki in case it is somehow
+> caused by a problem with the xapian database. Failing everything, you
+> could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
+
+>> Thanks, Joey. With your help I was able to figure out what was wrong. It's a fun little bug (or feature): the title of my wiki had string `$this` in title and that's what was causing the omega binary to choke. My wiki's title was inserted without escaping into the query template used by omega. Omega treated `$this` in the title as a function name and threw an exception because no such function was defined. To avoid this behavior, I used an html entity in the title, so `$this` became `&#36;this`. I don't think that the wiki title should be inserted into the template without escaping - it can produce an error that's not trivial to debug. If users want to modify the html in the title, they should be editing respective templates, not typing html in the wiki title input. What do you think? --[[dkobozev]]
+
+>>> Sounds like a bug in omega, and one that probably would affect other
+>>> users of omega too. Ikiwiki could work around it by pre-escaping
+>>> data before passing it to xapian. I have not quite managed to reproduce it though;
+>>> tried setting a page title to '$this' and 'foo $this'.
+>>> That's with version 1.0.18 of omega.
+>>> --[[Joey]]
+
+>>>> I tried it with both omega 1.0.13 and omega 1.0.18 and the issue is present in both. If I view the contents of {$srcdir}/.ikiwiki/xapian/templates/query, I can see that the wiki title is inserted verbatim and there are calls to `$setmap`, `$set` and `$def` etc in the template. --[[dkobozev]]
+
+>>>>> I don't see how that's relevant. It would help if you showed me
+>>>>> exactly something that could be inserted into a page to cause the
+>>>>> problem. --[[Joey]] 
+
+>>>>>> Correct me if I'm wrong: ikiwiki generates an Omega template from its own templates, such as searchquery.tmpl and puts it into {$srcdir}/.ikiwiki/xapian/templates/query. Omega has its own template syntax, where function names are prefixed with dollar signs (`$`). So, when I call my wiki `$foobar`, ikiwiki generates an Omega template that looks like this snippet:
+
+    <div id="container">
+        <div class="pageheader">
+            <div class="header">
+            <span>
+            <a href="http://example.com">$foobar</    a>/search
+            </span>
+            </div>
+        </div> <!-- .pageheader -->
+    
+        <div id="content">
+            $setmap{prefix,title,S}
+    $setmap{prefix,link,XLINK}
+    $set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France}
+    ${
+    $def{PREV,
+    $if{$ne{$topdoc,0},<INPUT TYPE=image NAME="&lt;" ALT="&lt;"
+    SRC="/images/xapian-omega/prev.png" BORDER=0 HEIGHT=30 WIDTH=30>,
+    <IMG ALT="" SRC="/images/xapian-omega/prevoff.png" HEIGHT=30 WIDTH=30>}
+
+>>>>>> So `$foobar` clashes with Omega's template tags. Does this help?
+
+>>>>>>> Ahh. I had somehow gotten it into my head that you were talking
+>>>>>>> about the title of a single page, not of the whole wiki. But
+>>>>>>> you were clear all along it was the wiki title. Sorry for
+>>>>>>> misunderstanding. I've put in a complete fix for this problem.
+>>>>>>> if this was in [[bugs]], I'd close it. :) --[[Joey]] 
+
+[[done]]
diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
deleted file mode 100644
index 035247100..000000000
--- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn
+++ /dev/null
@@ -1,58 +0,0 @@
-I'm very excited to try out ikiwiki, since it should fit my purposes extremely well, but I'm having trouble with the search plugin. I'm pretty sure that right after I installed ikiwiki and needed dependencies, the search plugin was working fine. However, now when I try to use search, I get "Exception: Unknown function `this'" error on a blank page. I'm not sure how I should go about debugging this issue - my server's (I use Lighttpd 1.4.22) error log has no mention of the exception and there's nothing in /var/log/syslog either.
-
-What might be causing this exception and how I might go about debugging exceptions?
-
-> Appears to be coming from your xapian omega cgi binary. If you
-> run `strings /usr/lib/cgi-bin/omega/omega` you can see it has
-> "Exception: " in it, and I have found some similar (but not identical)
-> error messages from xapian in a web search.
-> 
-> I don´t know what to suggest, other than upgrade/downgrade/reinstall
-> xapian-omega, and contacting the xapian developers for debugging.
-> You could try rebuilding your wiki in case it is somehow
-> caused by a problem with the xapian database. Failing everything, you
-> could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] 
-
->> Thanks, Joey. With your help I was able to figure out what was wrong. It's a fun little bug (or feature): the title of my wiki had string `$this` in title and that's what was causing the omega binary to choke. My wiki's title was inserted without escaping into the query template used by omega. Omega treated `$this` in the title as a function name and threw an exception because no such function was defined. To avoid this behavior, I used an html entity in the title, so `$this` became `&#36;this`. I don't think that the wiki title should be inserted into the template without escaping - it can produce an error that's not trivial to debug. If users want to modify the html in the title, they should be editing respective templates, not typing html in the wiki title input. What do you think? --[[dkobozev]]
-
->>> Sounds like a bug in omega, and one that probably would affect other
->>> users of omega too. Ikiwiki could work around it by pre-escaping
->>> data before passing it to xapian. I have not quite managed to reproduce it though;
->>> tried setting a page title to '$this' and 'foo $this'.
->>> That's with version 1.0.18 of omega.
->>> --[[Joey]]
-
->>>> I tried it with both omega 1.0.13 and omega 1.0.18 and the issue is present in both. If I view the contents of {$srcdir}/.ikiwiki/xapian/templates/query, I can see that the wiki title is inserted verbatim and there are calls to `$setmap`, `$set` and `$def` etc in the template. --[[dkobozev]]
-
->>>>> I don't see how that's relevant. It would help if you showed me
->>>>> exactly something that could be inserted into a page to cause the
->>>>> problem. --[[Joey]] 
-
->>>>>> Correct me if I'm wrong: ikiwiki generates an Omega template from its own templates, such as searchquery.tmpl and puts it into {$srcdir}/.ikiwiki/xapian/templates/query. Omega has its own template syntax, where function names are prefixed with dollar signs (`$`). So, when I call my wiki `$foobar`, ikiwiki generates an Omega template that looks like this snippet:
-
-    <div id="container">
-        <div class="pageheader">
-            <div class="header">
-            <span>
-            <a href="http://example.com">$foobar</    a>/search
-            </span>
-            </div>
-        </div> <!-- .pageheader -->
-    
-        <div id="content">
-            $setmap{prefix,title,S}
-    $setmap{prefix,link,XLINK}
-    $set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France}
-    ${
-    $def{PREV,
-    $if{$ne{$topdoc,0},<INPUT TYPE=image NAME="&lt;" ALT="&lt;"
-    SRC="/images/xapian-omega/prev.png" BORDER=0 HEIGHT=30 WIDTH=30>,
-    <IMG ALT="" SRC="/images/xapian-omega/prevoff.png" HEIGHT=30 WIDTH=30>}
-
->>>>>> So `$foobar` clashes with Omega's template tags. Does this help?
-
->>>>>>> Ahh. I had somehow gotten it into my head that you were talking
->>>>>>> about the title of a single page, not of the whole wiki. But
->>>>>>> you were clear all along it was the wiki title. Sorry for
->>>>>>> misunderstanding. I've put in a complete fix for this problem.
->>>>>>> if this was in [[bugs]], I'd close it. :) --[[Joey]] 
-- 
cgit v1.2.3


From b5e27e60ba38365f3e252df80c2a22503f00eb06 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Fri, 12 Mar 2010 21:24:53 +0000
Subject: Note that <object /> still may be allowed, although in a form not
 suitable for, say, SVG inclusion.

---
 ...er_control_over___60__object___47____62__s.mdwn | 34 +++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
index ac4b55568..c37d052db 100644
--- a/doc/todo/finer_control_over___60__object___47____62__s.mdwn
+++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
@@ -27,13 +27,43 @@ For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by
 
 [[wishlist]]
 
-> SVG can contain embedded javascript. The spec that you link to contains
+> SVG can contain embedded javascript.
+
+>> Indeed.
+
+>> So, a more general tool (`XML::Scrubber`?) will be necessary to
+>> refine both [XHTML][] and SVG.
+
+>> &hellip; And to leave [MathML][] as is (?.)
+
+>> &mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
+> The spec that you link to contains
 > examples of objects that contain python scripts, Microsoft OLE 
 > objects, and Java. And then there's flash. I don't think ikiwiki can
 > assume all the possibilities are handled securely, particularly WRT XSS
 > attacks.
 > --[[Joey]]
 
+>> I've scanned over all the `object` examples in the specification and
+>> all of those that hold references to code (as opposed to data) have a
+>> distinguishing `classid` attribute.
+
+>> While I won't assert that it's impossible to reference code with
+>> `data` (and, thanks to `text/xhtml+xml` and `image/svg+xml`, it is
+>> *not* impossible), throwing away any of the &ldquo;insecure&rdquo;
+>> attributes listed above together with limiting the possible URI's
+>> (i.&nbsp;e., only *local* and certain `data:` ones for `data` and
+>> `usemap`) should make `object` almost as harmless as, say, `img`.
+
+>> (Though it certainly won't solve the [[SVG_problem|/todo/SVG]] being
+>> restricted in such a way.)
+
+>> Of the remaining issues I could only think of recursive
+>> `object` &mdash; the one that references its container document.
+
+>> &mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
 ## See also
 
 * [Objects, Images, and Applets in HTML documents][objects-html]
@@ -43,6 +73,8 @@ For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by
 * [Uniform Resource Identifier &mdash; the free encyclopedia][URI]
 
 [HTML::Scrubber]: http://search.cpan.org/~podmaster/HTML-Scrubber-0.08/Scrubber.pm
+[MathML]: http://en.wikipedia.org/wiki/MathML
 [objects-html]: http://www.w3.org/TR/1999/REC-html401-19991224/struct/objects.html
 [RFC 2397]: http://tools.ietf.org/html/rfc2397
 [URI]: http://en.wikipedia.org/wiki/Uniform_Resource_Identifier
+[XHTML]: http://en.wikipedia.org/wiki/XHTML
-- 
cgit v1.2.3


From 29ca20b87c565412fa603127425ccdaf4ca58b79 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 16:50:04 -0500
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
index c37d052db..0ca949954 100644
--- a/doc/todo/finer_control_over___60__object___47____62__s.mdwn
+++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
@@ -56,6 +56,11 @@ For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by
 >> (i.&nbsp;e., only *local* and certain `data:` ones for `data` and
 >> `usemap`) should make `object` almost as harmless as, say, `img`.
 
+>>> But with local data, one could not embed youtube videos, which surely
+>>> is the most obvious use case? Note that youtube embedding uses an
+>>> object element with no classid. The swf file is provided via an
+>>> enclosed param element. --[[Joey]]
+
 >> (Though it certainly won't solve the [[SVG_problem|/todo/SVG]] being
 >> restricted in such a way.)
 
-- 
cgit v1.2.3


From c26b6c3be864aaf49fe0b0fc15c0af59323b7dde Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Fri, 12 Mar 2010 22:12:41 +0000
Subject: Note the use of <embed /> on YouTube.

---
 .../finer_control_over___60__object___47____62__s.mdwn    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
index 0ca949954..50c4d43bf 100644
--- a/doc/todo/finer_control_over___60__object___47____62__s.mdwn
+++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn
@@ -57,10 +57,23 @@ For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by
 >> `usemap`) should make `object` almost as harmless as, say, `img`.
 
 >>> But with local data, one could not embed youtube videos, which surely
->>> is the most obvious use case? Note that youtube embedding uses an
+>>> is the most obvious use case?
+
+>>>> Allowing a &ldquo;remote&rdquo; object to render on one's page is a
+     security issue by itself.
+     Though, of course, having an explicit whitelist of URI's may make
+     this issue more tolerable.
+     &mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
+>>> Note that youtube embedding uses an
 >>> object element with no classid. The swf file is provided via an
 >>> enclosed param element. --[[Joey]]
 
+>>>> I've just checked a random video on YouTube and I see that the
+     `.swf` file is provided via an enclosed `embed` element.  Whether
+     to allow those or not is a different issue.
+     &mdash;&nbsp;[[Ivan_Shmakov]], 2010-03-12Z.
+
 >> (Though it certainly won't solve the [[SVG_problem|/todo/SVG]] being
 >> restricted in such a way.)
 
-- 
cgit v1.2.3


From e56ec7a96c3a2064941a82619bf6cb0d2e8392e0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 15:08:00 -0500
Subject: websetup: Add websetup_unsafe to allow marking other settings as
 unsafe.

---
 IkiWiki/Plugin/websetup.pm | 22 ++++++++++++++++++----
 debian/changelog           |  7 +++++++
 doc/plugins/websetup.mdwn  |  3 ++-
 3 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 5c19c9b63..d444c0a3d 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -27,6 +27,13 @@ sub getsetup () {
 			safe => 0,
 			rebuild => 0,
 		},
+		websetup_unsafe => {
+			type => "string",
+			example => [],
+			description => "list of additional setup field keys to treat as unsafe",
+			safe => 0,
+			rebuild => 0,
+		},
 		websetup_show_unsafe => {
 			type => "boolean",
 			example => 1,
@@ -57,6 +64,12 @@ sub formatexample ($$) {
 	}
 }
 
+sub issafe ($) {
+	my $key=shift;
+
+	return ! grep { $_ eq $key } @{$config{websetup_unsafe}};
+}
+
 sub showfields ($$$@) {
 	my $form=shift;
 	my $plugin=shift;
@@ -78,7 +91,8 @@ sub showfields ($$$@) {
 		# XXX hashes not handled yet
 		next if ref $config{$key} && ref $config{$key} eq 'HASH' || ref $info{example} eq 'HASH';
 		# maybe skip unsafe settings
-		next if ! $info{safe} && ! ($config{websetup_show_unsafe} && $config{websetup_advanced});
+		next if ! ($config{websetup_show_unsafe} && $config{websetup_advanced}) &&
+			(! $info{safe} || ! issafe($key));
 		# maybe skip advanced settings
 		next if $info{advanced} && ! $config{websetup_advanced};
 		# these are handled specially, so don't show
@@ -156,7 +170,7 @@ sub showfields ($$$@) {
 
 		if (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY') {
 			$value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) }  @{$value} : "")];
-			push @$value, "", "" if $info{safe}; # blank items for expansion
+			push @$value, "", "" if $info{safe} && issafe($key); # blank items for expansion
 		}
 		else {
 			$value=Encode::encode_utf8($value);
@@ -210,7 +224,7 @@ sub showfields ($$$@) {
 			}
 		}
 		
-		if (! $info{safe}) {
+		if (! $info{safe} || ! issafe($key)) {
 			$form->field(name => $name, disabled => 1);
 		}
 		else {
@@ -346,7 +360,7 @@ sub showform ($$) {
 				@value=0;
 			}
 		
-			if (! $info{safe}) {
+			if (! $info{safe} || ! issafe($key)) {
 	 			error("unsafe field $key"); # should never happen
 			}
 		
diff --git a/debian/changelog b/debian/changelog
index 7fdbbcb63..9e779bb18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100313) UNRELEASED; urgency=low
+
+  * websetup: Add websetup_unsafe to allow marking other settings
+    as unsafe.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
+
 ikiwiki (3.20100312) unstable; urgency=HIGH
 
   * Fix utf8 issues in calls to md5_hex.
diff --git a/doc/plugins/websetup.mdwn b/doc/plugins/websetup.mdwn
index f1756ba8f..b4d23ba9c 100644
--- a/doc/plugins/websetup.mdwn
+++ b/doc/plugins/websetup.mdwn
@@ -16,7 +16,8 @@ enabled and disabled using it too. Some settings are not considered safe
 enough to be manipulated over the web; these are still shown, by default,
 but cannot be modified. To hide them, set `websetup_show_unsafe` to false
 in the setup file. A few settings have too complex a data type to be
-configured via the web.
+configured via the web. To mark additional settings as unsafe, you can
+list them in `websetup_unsafe`.
 
 Plugins that should not be enabled/disabled via the web interface can be
 listed in `websetup_force_plugins` in the setup file.
-- 
cgit v1.2.3


From 4da6e94305c2c7f4adab057b362d9e58a7494439 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawm-ebiIfxbKD3KNa-Cu9LvvD9edMLW7BAo"
 <https://www.google.com/accounts/o8/id?id=AItOawm-ebiIfxbKD3KNa-Cu9LvvD9edMLW7BAo@web>
Date: Sat, 13 Mar 2010 21:14:35 +0000
Subject: Google's OpenID and discovery protocol

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

(limited to 'doc')

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 68b44f2c1..0e41d4ced 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -50,3 +50,11 @@ The openid is
 <https://www.google.com/accounts/o8/id?id=AItOawltlTwUCL_Fr1siQn94GV65-XwQH5XSku4>
 (what a mouthfull!), and I don't know who that is or how to use it since it
 points to a fairly useless xml document, rather than a web page. --[[Joey]]
+
+> That string is what's received via the discovery protocol. The user logging in with a Google account is not supposed to write that when logging in, but rather <https://www.google.com/accounts/o8/id>. The OpenID client library will accept that and redirect the user to a sign in page, which will return that string as the OpenID. It's not really usable as an identifier for edits and whatnots, but an alternative would be to use the attribute exchange extension to get the email address and display that. See <http://code.google.com/apis/accounts/docs/OpenID.html#Parameters>.
+
+> Yahoo's OpenID implementation works alike, but I haven't looked at it as much. It uses <https://me.yahoo.com/> to receive the endpoint.
+
+> I've added buttons that submit the two above URLs for logging in with a Google and Yahoo OpenID, respectively, to my locally changed OpenID login plugin.
+
+> Using the Google profile page as the OpenID is really orthogonal to the above. --[[kaol]]
-- 
cgit v1.2.3


From e8f6c06ca81e4ebd8d244e3863d21517d87b6620 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 17:29:06 -0500
Subject: update; openid email addresses now available so this is unblocked

---
 doc/todo/avatar.mdwn | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/avatar.mdwn b/doc/todo/avatar.mdwn
index b8aa2327f..4409e7b14 100644
--- a/doc/todo/avatar.mdwn
+++ b/doc/todo/avatar.mdwn
@@ -1,35 +1,24 @@
 [[!tag wishlist]]
 
 It would be nice if ikiwiki, particularly [[plugins/comments]]
-supported user avatar icons. I was considering adding a directive for this,
-as designed below.
+supported user avatar icons.
 
-However, there is no *good* service for mapping openids to avatars --
-openavatar has many issues, including not supporting delegated openids, and
-after trying it, I don't trust it to push users toward. 
-Perhaps instead ikiwiki could get the email address from the openid
-provider, though I think the perl openid modules don't support the openid
-2.x feature that allows that.
-
-At the moment, working on this doesn't feel like a good use of my time.
---[[Joey]]
-
-Hmm.. unless is just always used a single provider (gravatar) and hashed
-the openid. Then wavatars could be used to get a unique avatar per openid
-at least. --[[Joey]] 
-
-----
-
-The directive displays a small avatar image for a user. Pass it the
-email address, openid, or wiki username of the user.
+Idea is to add a directive that displays a small avatar image for a user.
+Pass it the email address, openid, or wiki username of the user.
 
 	\[[!avatar user@example.com]]
 	\[[!avatar http://joey.kitenet.net/]]
 	\[[!avatar user]]
 
+These directives can then be hand-inserted onto pages, or more likely,
+included in eg, a comment post via a template. Possibly included in a
+recentchanges page item via that template too?
+
 The avatars are provided by various sites. For email addresses, it uses a
 [gravatar](http://gravatar.com/). For openid,
-[openavatar](http://www.openvatar.com/) is used. For a wiki username, the
+[openavatar](http://www.openvatar.com/) could used, but I am not very happy
+with it; probably better to just get the email via SREG (as is done now for
+openid), and use that. For a wiki username, the
 user's email address is looked up and the gravatar for that user is
 displayed. (Of course, the user has to have filled in their email address
 on their Preferences page for that to work.)
-- 
cgit v1.2.3


From e2c9b425415a00012b2c579c40c369da4ac7c98b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 17:46:28 -0500
Subject: thoughts

---
 doc/todo/Separate_OpenIDs_and_usernames.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index 2cd52e8c4..ae427d540 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -6,6 +6,25 @@ I see this being implemented in one of two possible ways. The easiest seems like
 
 A slightly more complex next step would be to request sreg from the provider and, if provided, automatically set the identity's username and email address from the provided persona. If username login to accounts with blank passwords is disabled, then you have the best of both worlds. Passwordless signin, human-friendly attribution, automatic setting of preferences.
 
+> Given that openids are a global user identifier, that can look as pretty
+> as the user cares to make it look via delegation, I am not a fan of 
+> having a site-local identifier that layered on top of that. Perhaps
+> partly because every site that I have seen that does that has openid
+> implemented as a badly-done wart on the side of their regular login
+> system.
+> 
+> Openid Simple Registration is now used to populate the userdb with the
+> email address for openid users.
+> 
+> I am considering displaying the userid or fullname, if available,
+> instead of the munged openid url in recentchanges. It would be nice
+> for those nasty [[google_openids|forum/google_openid_broken?]]. But,
+> I first have to find a way to encode the name in the VCS commit log,
+> while still keeping the openid of the committer in there too.
+> Perhaps something like this (for git): --[[Joey]] 
+> 
+>	Author: Joey Hess <http://joey.kitenet.net/@web>
+
 Unfortunately I don't speak Perl, so hopefully someone thinks these suggestions are good enough to code up. I've hacked on openid code in Ruby before, so hopefully these changes aren't all that difficult to implement. Even if you don't get any data via sreg, you're no worse off than where you are now, so I don't think there'd need to be much in the way of error/sanity-checking of returned data. If it's null or not available then no big deal, typing in a username is no sweat.
 
 [[!tag wishlist]]
-- 
cgit v1.2.3


From 4f6c544fa8e7dd21450952f0a9fc3918ee600705 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 19:12:52 -0500
Subject: munge to avoid markdown eating email addresses

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

(limited to 'doc')

diff --git a/doc/todo/git_attribution/discussion.mdwn b/doc/todo/git_attribution/discussion.mdwn
index dfb490bc2..6905d9b4b 100644
--- a/doc/todo/git_attribution/discussion.mdwn
+++ b/doc/todo/git_attribution/discussion.mdwn
@@ -72,7 +72,7 @@ no determination of uniqueness)
 > GIT_AUTHOR_EMAIL can also be set.
 > 
 > There is one thing yet to be solved, and that is how to tell the
-> difference between a web commit by 'Joey Hess <joey@kitenet.net>',
+> difference between a web commit by 'Joey Hess <joey\@kitenet.net>',
 > and a git commit by the same. I think we do want to differentiate these,
 > and the best way to do it seems to be to add a line to the end of the
 > commit message. Something like: "\n\nWeb-commit: true"
@@ -94,5 +94,5 @@ no determination of uniqueness)
 > * github pushes to twitter ;-)
 > 
 > So while I tried that way at first, I'm now leaning toward encoding the
-> username in the email address. Like "user <user@web>", or
-> "joey <http://joey.kitenet.net/@web>".
+> username in the email address. Like "user <user\@web>", or
+> "joey <http://joey.kitenet.net/\@web>".
-- 
cgit v1.2.3


From 8f4f81cdfdcb68be5efb385dc07e4a0a04352a9d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 19:24:51 -0500
Subject: wrinkles

---
 doc/todo/Separate_OpenIDs_and_usernames.mdwn |  9 ++++++---
 doc/todo/avatar.mdwn                         | 14 ++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index ae427d540..3fb952f96 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -13,8 +13,9 @@ A slightly more complex next step would be to request sreg from the provider and
 > implemented as a badly-done wart on the side of their regular login
 > system.
 > 
-> Openid Simple Registration is now used to populate the userdb with the
-> email address for openid users.
+> The openid plugin now attempts to get an email and a username, and stores
+> them in the session database for later use (ie, when the user edits a
+> page).
 > 
 > I am considering displaying the userid or fullname, if available,
 > instead of the munged openid url in recentchanges. It would be nice
@@ -23,7 +24,9 @@ A slightly more complex next step would be to request sreg from the provider and
 > while still keeping the openid of the committer in there too.
 > Perhaps something like this (for git): --[[Joey]] 
 > 
->	Author: Joey Hess <http://joey.kitenet.net/@web>
+>	Author: Joey Hess &lt;http://joey.kitenet.net/@web&gt;
+> 
+> 
 
 Unfortunately I don't speak Perl, so hopefully someone thinks these suggestions are good enough to code up. I've hacked on openid code in Ruby before, so hopefully these changes aren't all that difficult to implement. Even if you don't get any data via sreg, you're no worse off than where you are now, so I don't think there'd need to be much in the way of error/sanity-checking of returned data. If it's null or not available then no big deal, typing in a username is no sweat.
 
diff --git a/doc/todo/avatar.mdwn b/doc/todo/avatar.mdwn
index 4409e7b14..3a4e64b95 100644
--- a/doc/todo/avatar.mdwn
+++ b/doc/todo/avatar.mdwn
@@ -15,14 +15,20 @@ included in eg, a comment post via a template. Possibly included in a
 recentchanges page item via that template too?
 
 The avatars are provided by various sites. For email addresses, it uses a
-[gravatar](http://gravatar.com/). For openid,
-[openavatar](http://www.openvatar.com/) could used, but I am not very happy
-with it; probably better to just get the email via SREG (as is done now for
-openid), and use that. For a wiki username, the
+[gravatar](http://gravatar.com/). For a wiki username, the
 user's email address is looked up and the gravatar for that user is
 displayed. (Of course, the user has to have filled in their email address
 on their Preferences page for that to work.)
 
+For openid, openavatar sucked and is now dead. So we need to use an email
+address instead, I guess. Problem is that the email address of a given
+openid is only known when that user is logged in and making a change.
+And we don't want to leak an openid user's email into a page either.
+Hmm. Suppose the gravatar hash could be calculated from the email address
+and embedded instead of the openid?
+
+Or, for openid, could use <http://paulisageek.com/openidavatar>.
+
 An optional second parameter can be included, containing additional
 options to pass in the 
 [gravatar url](http://en.gravatar.com/site/implement/url).
-- 
cgit v1.2.3


From 702c097ac29f1b208158936a99317ebad3e4116f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 19:40:20 -0500
Subject: update

---
 doc/todo/Separate_OpenIDs_and_usernames.mdwn | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index 3fb952f96..7cfe49a5a 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -18,15 +18,25 @@ A slightly more complex next step would be to request sreg from the provider and
 > page).
 > 
 > I am considering displaying the userid or fullname, if available,
-> instead of the munged openid url in recentchanges. It would be nice
-> for those nasty [[google_openids|forum/google_openid_broken?]]. But,
-> I first have to find a way to encode the name in the VCS commit log,
+> instead of the munged openid url in recentchanges and comments.
+> It would be nice for those nasty [[google_openids|forum/google_openid_broken?]].
+> But, I first have to find a way to encode the name in the VCS commit log,
 > while still keeping the openid of the committer in there too.
 > Perhaps something like this (for git): --[[Joey]] 
 > 
 >	Author: Joey Hess &lt;http://joey.kitenet.net/@web&gt;
 > 
+> So, what needs to be done:
 > 
+> * Change `rcs_commit` and `rcs_commit_staged` to take a session object,
+>   instead of just a userid. (For back-compat, if the parameter is 
+>   not an object, it's a userid.) Bump ikiwiki plugin interface version.
+> * Modify all RCS plugins to include the session username somewhere
+>   in the commit, and parse it back out in `rcs_recentchanges`.
+> * Modify recentchanges plugin to display the username instead of the
+>   `openiduser`.
+> * Modify comment plugin to put the session username in the comment
+>   template instead of the `openiduser`.
 
 Unfortunately I don't speak Perl, so hopefully someone thinks these suggestions are good enough to code up. I've hacked on openid code in Ruby before, so hopefully these changes aren't all that difficult to implement. Even if you don't get any data via sreg, you're no worse off than where you are now, so I don't think there'd need to be much in the way of error/sanity-checking of returned data. If it's null or not available then no big deal, typing in a username is no sweat.
 
-- 
cgit v1.2.3


From fd43e83fcf7bf24493ecfff54111c1c5f1cab573 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 19:56:54 -0500
Subject: update

---
 doc/forum/google_openid_broken__63__.mdwn    | 13 +++++++++++++
 doc/todo/Separate_OpenIDs_and_usernames.mdwn |  7 +++++++
 2 files changed, 20 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 0e41d4ced..4ca5cac93 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -58,3 +58,16 @@ points to a fairly useless xml document, rather than a web page. --[[Joey]]
 > I've added buttons that submit the two above URLs for logging in with a Google and Yahoo OpenID, respectively, to my locally changed OpenID login plugin.
 
 > Using the Google profile page as the OpenID is really orthogonal to the above. --[[kaol]]
+
+>> Displaying email addresses is not really an option, because ikiwiki
+>> can't leak user email addresses like that. Displaying nicknames or
+>> usernames is, see [[todo/Separate_OpenIDs_and_usernames]].
+>>
+>> It would probably be good if the openid plugin could be configured with
+>> a list of generic openid urls, so it can add quick login buttons using
+>> those urls.
+>>
+>> The ugly google url will still be exposed here and there where
+>> a unique user id is needed. That can be avoided by not using the generic
+>> <https://www.google.com/accounts/o8/id>, but instead your own profile
+>> like <http://www.google.com/profiles/joeyhess>. --[[Joey]] 
diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index 7cfe49a5a..fcdb49f6d 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -26,6 +26,13 @@ A slightly more complex next step would be to request sreg from the provider and
 > 
 >	Author: Joey Hess &lt;http://joey.kitenet.net/@web&gt;
 > 
+> Only problem with the above is that the openid will still be displayed
+> by CIA. Other option is this, which solves that, but at the expense of
+> having to munge the username to fit inside the email address,
+> and generally seems backwards: --[[Joey]] 
+> 
+>	Author: http://joey.kitenet.net/ &lt;Joey_Hess@web&gt;
+> 
 > So, what needs to be done:
 > 
 > * Change `rcs_commit` and `rcs_commit_staged` to take a session object,
-- 
cgit v1.2.3


From c0ad4929deb455804ddfc6451820c6c67a298ea1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 20:10:50 -0500
Subject: Improve openid url munging; do not display anchors and cgi
 parameters, as used by yahoo and google urls.

---
 IkiWiki.pm                                | 2 +-
 debian/changelog                          | 2 ++
 doc/forum/google_openid_broken__63__.mdwn | 6 ++++++
 t/openiduser.t                            | 7 ++++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 00eadfd98..251ed8cc8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1131,7 +1131,7 @@ sub openiduser ($) {
 		# Convert "http://somehost.com/user" to "user [somehost.com]".
 		# (also "https://somehost.com/user/")
 		if ($display !~ /\[/) {
-			$display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/;
+			$display=~s/^https?:\/\/(.+)\/([^\/#?]+)\/?(?:[#?].*)?$/$2 [$1]/;
 		}
 		$display=~s!^https?://!!; # make sure this is removed
 		eval q{use CGI 'escapeHTML'};
diff --git a/debian/changelog b/debian/changelog
index 854d83130..0a9679618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low
     as unsafe.
   * openid: Use Openid Simple Registration or OpenID Attribute Exchange
     to get the user's email address and username.
+  * Improve openid url munging; do not display anchors and cgi parameters,
+    as used by yahoo and google urls.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn
index 4ca5cac93..96ba2d791 100644
--- a/doc/forum/google_openid_broken__63__.mdwn
+++ b/doc/forum/google_openid_broken__63__.mdwn
@@ -59,6 +59,12 @@ points to a fairly useless xml document, rather than a web page. --[[Joey]]
 
 > Using the Google profile page as the OpenID is really orthogonal to the above. --[[kaol]]
 
+>> First, I don't accept that the openid google returns from their 
+>> generic signin url *has* to be so freaking ugly. For contrast, 
+>> look at the openid you log in as if you use the yahoo url.
+>> <https://me.yahoo.com/joeyhess#35f22>. Nice and clean, now
+>> munged by ikiwiki to "joeyhess [me.yahoo.com]".
+>> 
 >> Displaying email addresses is not really an option, because ikiwiki
 >> can't leak user email addresses like that. Displaying nicknames or
 >> usernames is, see [[todo/Separate_OpenIDs_and_usernames]].
diff --git a/t/openiduser.t b/t/openiduser.t
index 52d879484..caabbcefc 100755
--- a/t/openiduser.t
+++ b/t/openiduser.t
@@ -10,7 +10,7 @@ BEGIN {
 		eval q{use Test::More skip_all => "Net::OpenID::VerifiedIdentity not available"};
 	}
 	else {
-		eval q{use Test::More tests => 9};
+		eval q{use Test::More tests => 11};
 	}
 	use_ok("IkiWiki::Plugin::openid");
 }
@@ -28,6 +28,11 @@ $^W=1;
 is(IkiWiki::openiduser('http://yam655.livejournal.com/'), 'yam655 [livejournal.com]');
 is(IkiWiki::openiduser('http://id.mayfirst.org/jamie/'), 'jamie [id.mayfirst.org]');
 
+# yahoo has an anchor in the url
+is(IkiWiki::openiduser('https://me.yahoo.com/joeyhess#35f22'), 'joeyhess [me.yahoo.com]');
+# google urls are horrendous, but the worst bit is after a ?, so can be dropped
+is(IkiWiki::openiduser('https://www.google.com/accounts/o8/id?id=AItOawm-ebiIfxbKD3KNa-Cu9LvvD9edMLW7BAo'), 'id [www.google.com/accounts/o8]');
+
 # and some less typical ones taken from the ikiwiki commit history
 
 is(IkiWiki::openiduser('http://thm.id.fedoraproject.org/'), 'thm [id.fedoraproject.org]');
-- 
cgit v1.2.3


From 725a1cf0e8d1fbdb7f449b632ee1fa3cb84835c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Mar 2010 20:45:44 -0500
Subject: update; bleargh

---
 doc/todo/avatar.mdwn | 50 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 16 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/avatar.mdwn b/doc/todo/avatar.mdwn
index 3a4e64b95..f0599e4ed 100644
--- a/doc/todo/avatar.mdwn
+++ b/doc/todo/avatar.mdwn
@@ -1,42 +1,60 @@
 [[!tag wishlist]]
 
 It would be nice if ikiwiki, particularly [[plugins/comments]]
-supported user avatar icons.
+(but also, ideally, recentchanges) supported user avatar icons.
 
 Idea is to add a directive that displays a small avatar image for a user.
-Pass it the email address, openid, or wiki username of the user.
+Pass it a user's the email address, openid, username, or the md5 hash
+of their email address:
 
 	\[[!avatar user@example.com]]
 	\[[!avatar http://joey.kitenet.net/]]
 	\[[!avatar user]]
+	\[[!avatar hash]]
 
 These directives can then be hand-inserted onto pages, or more likely,
-included in eg, a comment post via a template. Possibly included in a
-recentchanges page item via that template too?
+included in eg, a comment post via a template.
+
+An optional second parameter can be included, containing additional
+options to pass in the 
+[gravatar url](http://en.gravatar.com/site/implement/url).
+For example, this asks for a smaller gravatar, and if a user does
+not have a gravatar, uses a cute auto-generated "wavatar" avatar.
+
+	\[[!gravatar user@example.com "size=40&default=wavatar"]]
+
+The `gravitar_options` setting in the setup file can be used to
+specify additional options to pass. So for example if you want
+to use wavatars everywhere, set it to "default=wavatar".
 
 The avatars are provided by various sites. For email addresses, it uses a
 [gravatar](http://gravatar.com/). For a wiki username, the
 user's email address is looked up and the gravatar for that user is
 displayed. (Of course, the user has to have filled in their email address
-on their Preferences page for that to work.)
+on their Preferences page for that to work. Also, when the user changes
+their email address in Preferences, the gravatar won't change until the
+wiki is rebuilt.)
 
 For openid, openavatar sucked and is now dead. So we need to use an email
 address instead, I guess. Problem is that the email address of a given
 openid is only known when that user is logged in and making a change.
 And we don't want to leak an openid user's email into a page either.
 Hmm. Suppose the gravatar hash could be calculated from the email address
-and embedded instead of the openid?
+and embedded instead of the openid? That would work for comments,
+but not if the directive were used elsewhere.
 
-Or, for openid, could use <http://paulisageek.com/openidavatar>.
+Or, for openid, could use <http://paulisageek.com/openidavatar>. Which
+works fine, but users are not likely to figure out what they need to do to
+get an avatar associated with their openid.
 
-An optional second parameter can be included, containing additional
-options to pass in the 
-[gravatar url](http://en.gravatar.com/site/implement/url).
-For example, this asks for a smaller gravatar, and if a user does
-not have a gravatar, uses a cute auto-generated "wavatar" avatar.
+---
 
-	\[[!gravatar user@example.com "size=40&default=wavatar"]]
+Alternative, not overdesigned approach:
 
-The `gravitar_options` setting in the setup file can be used to
-specify additional options to pass. So for example if you want
-to use wavatars everywhere, set it to "default=wavatar".
+Modify comments plugin to have an option to display avatars.
+
+When posting a comment, fill in the avatarhash field in the template.
+The hash is calculated from the user's email address. If the user's email
+is not known, skip it. 
+
+End. :P
-- 
cgit v1.2.3


From 7bca48f5ce8233cada3a4d87a4c93c1fed8aae80 Mon Sep 17 00:00:00 2001
From: "https://launchpad.net/~ojwb" <https://launchpad.net/~ojwb@web>
Date: Sun, 14 Mar 2010 04:56:13 +0000
Subject:

---
 doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn b/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
index 9eac8eae5..189ba740f 100644
--- a/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
+++ b/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn
@@ -57,4 +57,14 @@ What might be causing this exception and how I might go about debugging exceptio
 >>>>>>> misunderstanding. I've put in a complete fix for this problem.
 >>>>>>> if this was in [[bugs]], I'd close it. :) --[[Joey]] 
 
+>>>>>>>> Rather than escaping `$` as an HTML entity, it would be more natural
+>>>>>>>> to escape it as `$$` (since you are escaping it for Omega, not for
+>>>>>>>> the web browser.
+>>>>>>>>
+>>>>>>>> Also if ikiwiki can put arbitrary text inside the parameters of an
+>>>>>>>> OmegaScript command, you should also escape `{`, `}` and `,` as
+>>>>>>>> `$(`, `$)` and `$.`.  It's only necessary to do so inside the
+>>>>>>>> parameters of a command, but it will work and be easier to escape
+>>>>>>>> them in any substituted text. --OllyBetts
+
 [[done]]
-- 
cgit v1.2.3


From 7c5bfbe2b614b1cadc13fcab2a427abc711579b0 Mon Sep 17 00:00:00 2001
From: "http://pmate.myopenid.com/" <http://pmate.myopenid.com/@web>
Date: Sun, 14 Mar 2010 12:19:34 +0000
Subject:

---
 doc/sandbox/prova_blog.html | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/sandbox/prova_blog.html

(limited to 'doc')

diff --git a/doc/sandbox/prova_blog.html b/doc/sandbox/prova_blog.html
new file mode 100644
index 000000000..d69937ea8
--- /dev/null
+++ b/doc/sandbox/prova_blog.html
@@ -0,0 +1,8 @@
+Questa è una prova.
+Vediamo se funziona
+
+<pre>
+#!/bin/bash
+
+echo "ciao"
+</pre>
-- 
cgit v1.2.3


From 823ec815d4fc9625d6fa3553ad03e9f2ff737659 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 14:58:13 -0400
Subject: Add a include setting, which can be used to make ikiwiki process wiki
 source files, such as .htaccess, that would normally be skipped for security
 or other reasons. Closes: #447267 (Thanks to Aaron Wilson for the original
 patch.)

---
 IkiWiki.pm                          | 13 +++++++++++++
 debian/changelog                    |  4 ++++
 doc/tips/htaccess_file.mdwn         | 30 ++++++++++++++++++++++++++++++
 doc/todo/enable-htaccess-files.mdwn |  5 +++++
 doc/usage.mdwn                      |  6 ++++++
 ikiwiki.in                          |  3 +++
 6 files changed, 61 insertions(+)
 create mode 100644 doc/tips/htaccess_file.mdwn

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 251ed8cc8..ee94ce659 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -334,6 +334,15 @@ sub getsetup () {
 		safe => 0, # paranoia
 		rebuild => 0,
 	},
+	include => {
+		type => "string",
+		default => undef,
+		example => '^\.htaccess$',
+		description => "regexp of normally ignored source files to include",
+		advanced => 1,
+		safe => 0, # regexp
+		rebuild => 1,
+	},
 	exclude => {
 		type => "string",
 		default => undef,
@@ -1820,6 +1829,10 @@ sub file_pruned ($;$) {
 		$file =~ s#^\Q$base\E/+##;
 	}
 
+	if (defined $config{include} && length $config{include}) {
+		return 0 if $file =~ m/$config{include}/;
+	}
+
 	my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
 	return $file =~ m/$regexp/;
 }
diff --git a/debian/changelog b/debian/changelog
index 92afe661f..e5347e2a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low
     as used by yahoo and google urls.
   * Add complete German basewiki and directives translation done by
     Sebastian Kuhnert.
+  * Add a include setting, which can be used to make ikiwiki process
+    wiki source files, such as .htaccess, that would normally be skipped
+    for security or other reasons. Closes: #447267
+    (Thanks to Aaron Wilson for the original patch.)
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/tips/htaccess_file.mdwn b/doc/tips/htaccess_file.mdwn
new file mode 100644
index 000000000..5266eba41
--- /dev/null
+++ b/doc/tips/htaccess_file.mdwn
@@ -0,0 +1,30 @@
+If you try to include a `.htaccess` file in your wiki's source, in order to
+configure the web server, you'll find that ikiwiki excludes it from
+processing. In fact, ikiwiki excludes any file starting with a dot, as well
+as a lot of other files, for good security reasons.
+
+You can tell ikiwiki not to exclude the .htaccess file by adding this to
+your setup file:
+
+	include => '^\.htaccess$',
+
+Caution! Before you do that, please think for a minute about who can edit
+your wiki. Are attachment uploads enabled? Can users commit changes
+directly to the version control system? Do you trust everyone who can
+make a change to not do Bad Things with the htaccess file? Do you trust
+everyone who *might* be able to make a change in the future? Note that a
+determined attacker who can write to the htaccess file can probably get a
+shell on your web server.
+
+If any of these questions have given you pause, I suggest you find a
+different way to configure the web server. One way is to not put the
+`.htaccess` file under ikiwiki's control, and just manually install it
+in the destdir.
+
+[Apache's documentation](http://httpd.apache.org/docs/1.3/howto/htaccess.html)
+says
+> In general, you should never use .htaccess files unless you don't have
+> access to the main server configuration file.
+This is good advice -- if you can edit apache's main configuration files,
+then you should not use a htaccess file.
+--[[Joey]]
diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index 412cb5eba..c895db75d 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -61,3 +61,8 @@ It should be off by default of course. --Max
 +1 for various purposes (but sometimes the filename isn't `.htaccess`, so please make it configurable) --[[schmonz]]
 
 > I've described a workaround for one use case at the [[plugins/rsync]] [[plugins/rsync/discussion]] page. --[[schmonz]]
+
+---
+
+[[done]], you can use the `include` setting to override the default
+excludes now. Please use extreme caution when doing so. --[[Joey]] 
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index a105d7e59..f735170f0 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -234,6 +234,12 @@ also be configured using a setup file.
   Specifies a rexexp of source files to exclude from processing.
   May be specified multiple times to add to exclude list.
 
+* --include regexp
+
+  Specifies a rexexp of source files, that would normally be excluded,
+  but that you wish to include in processing.
+  May be specified multiple times to add to include list.
+
 * --adminuser name
 
   Specifies a username of a user (or, if openid is enabled, an openid) 
diff --git a/ikiwiki.in b/ikiwiki.in
index ae1251ff6..da5555629 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -65,6 +65,9 @@ sub getconfig () {
 			"exclude=s@" => sub {
 				push @{$config{wiki_file_prune_regexps}}, $_[1];
 			},
+			"include=s@" => sub {
+				$config{include}=defined $config{include} && length $config{include} ? "$config{include}|$_[1]" : $_[1];
+			},
 			"adminuser=s@" => sub {
 				push @{$config{adminuser}}, $_[1]
 			},
-- 
cgit v1.2.3


From a5ee40104481ba06eaaf277ed2f6c363dd326608 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:08:41 -0400
Subject: note that the patch on this page is complely broken, and allows any
 file starting with a dot to be included

If you applied that patch to your site, you should remove it right away!
---
 doc/todo/enable-htaccess-files.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index c895db75d..c08502bdd 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -12,6 +12,13 @@
                     qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//],
            wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]#]+)(?:#([^\s\]]+))?\]\]/,
 
+> Note that the above patch is **completely broken**. 
+> It removes the crucial excludes of all files starting with a dot.
+> The negative regexps for htaccess have no effect, so the whole
+> thing only "works" because it allows *any* file starting with a dot.
+> If you applied this patch to your ikiwiki, you opened a huge security
+> hole. --[[Joey]] 
+
 [[!tag patch patch/core]]
 
 This lets the site administrator have a `.htaccess` file in their underlay
-- 
cgit v1.2.3


From 223b8efab0a55075bd53d03fe3cb2df07f13d9c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:12:59 -0400
Subject: update

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

(limited to 'doc')

diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn
index c08502bdd..3b9721d50 100644
--- a/doc/todo/enable-htaccess-files.mdwn
+++ b/doc/todo/enable-htaccess-files.mdwn
@@ -64,6 +64,11 @@ It should be off by default of course. --Max
 ---
 +1 I want `.htaccess` so I can rewrite some old Wordpress URLs to make feeds work again. --[[hendry]]
 
+> Unless you cannot modify apache's configuration, you do not need htaccess
+> to do that. Apache's documentation recommends against using htaccess
+> unless you're a user who cannot modify the main server configuration.
+> --[[Joey]] 
+
 ---
 +1 for various purposes (but sometimes the filename isn't `.htaccess`, so please make it configurable) --[[schmonz]]
 
-- 
cgit v1.2.3


From ceadd862930411fed21eab16c428227fdcdc10ba Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:26:24 -0400
Subject: update

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

(limited to 'doc')

diff --git a/doc/tips/htaccess_file.mdwn b/doc/tips/htaccess_file.mdwn
index 5266eba41..7b4b0901a 100644
--- a/doc/tips/htaccess_file.mdwn
+++ b/doc/tips/htaccess_file.mdwn
@@ -22,9 +22,7 @@ different way to configure the web server. One way is to not put the
 in the destdir.
 
 [Apache's documentation](http://httpd.apache.org/docs/1.3/howto/htaccess.html)
-says
+says:
 > In general, you should never use .htaccess files unless you don't have
 > access to the main server configuration file.
-This is good advice -- if you can edit apache's main configuration files,
-then you should not use a htaccess file.
 --[[Joey]]
-- 
cgit v1.2.3


From d958e96b01ca459055b2c34f140f7c6ec7168f92 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:28:50 -0400
Subject: update

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

(limited to 'doc')

diff --git a/doc/tips/htaccess_file.mdwn b/doc/tips/htaccess_file.mdwn
index 7b4b0901a..0c1b0f2f7 100644
--- a/doc/tips/htaccess_file.mdwn
+++ b/doc/tips/htaccess_file.mdwn
@@ -19,10 +19,9 @@ shell on your web server.
 If any of these questions have given you pause, I suggest you find a
 different way to configure the web server. One way is to not put the
 `.htaccess` file under ikiwiki's control, and just manually install it
-in the destdir.
+in the destdir. --[[Joey]]
 
 [Apache's documentation](http://httpd.apache.org/docs/1.3/howto/htaccess.html)
 says:
 > In general, you should never use .htaccess files unless you don't have
 > access to the main server configuration file.
---[[Joey]]
-- 
cgit v1.2.3


From aa36cd66baeca85ca4bca1c35c43b7a01c8a5cf7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 15:30:18 -0400
Subject: update

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

(limited to 'doc')

diff --git a/doc/tips/htaccess_file.mdwn b/doc/tips/htaccess_file.mdwn
index 0c1b0f2f7..6964cf24e 100644
--- a/doc/tips/htaccess_file.mdwn
+++ b/doc/tips/htaccess_file.mdwn
@@ -21,7 +21,7 @@ different way to configure the web server. One way is to not put the
 `.htaccess` file under ikiwiki's control, and just manually install it
 in the destdir. --[[Joey]]
 
-[Apache's documentation](http://httpd.apache.org/docs/1.3/howto/htaccess.html)
+[Apache's documentation](http://httpd.apache.org/docs/2.2/howto/htaccess.html)
 says:
 > In general, you should never use .htaccess files unless you don't have
 > access to the main server configuration file.
-- 
cgit v1.2.3


From 4cff2b62332fc4e62ae64937567f84658055bce3 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Mon, 15 Mar 2010 08:55:37 +0000
Subject: No more Discussion Pages of Discussion Pages of...

---
 doc/users/tschwinge.mdwn | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'doc')

diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn
index 20d8d16a8..414612aff 100644
--- a/doc/users/tschwinge.mdwn
+++ b/doc/users/tschwinge.mdwn
@@ -99,12 +99,6 @@ page that uses \[[!meta redir]].
 
 ## [[bugs/Broken Parentlinks]]
 
-## Discussion Pages of Discussion Pages of...
-
-Is it useful to have Discussion pages of Discussion pages (etc.)?  -- On
-<http://www.gnu.org/software/hurd/hurd/building/cross-compiling/discussion.html>,
-this possibility is offered.
-
 ## Modifying [[plugins/inline]] for showing only an *appetizer*
 
 Currently ikiwiki's inline plugin will either show the full page or nothing of
-- 
cgit v1.2.3


From c4e46dfeba11aee2feec7475970cfdb7591c1943 Mon Sep 17 00:00:00 2001
From: moy <moy@web>
Date: Tue, 16 Mar 2010 08:57:27 +0000
Subject: Removed pop

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1a1b128e6..aef928d8e 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -77,4 +77,4 @@ bar
 Hmm, can I dig it?
 
 Test
-pop
+
-- 
cgit v1.2.3


From 0f433ed01c58978ba6d7845d5aaebb1ec8cefc9e Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 17 Mar 2010 00:42:38 +0000
Subject: link to highlight

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/highlightcode.mdwn b/doc/plugins/contrib/highlightcode.mdwn
index 8abb76583..f1df204bb 100644
--- a/doc/plugins/contrib/highlightcode.mdwn
+++ b/doc/plugins/contrib/highlightcode.mdwn
@@ -1,6 +1,8 @@
 [[!template id=plugin name=highlightcode author="[[sabr]]"]]
 [[!tag type/format]]
 
+(An alternative to this plugin, [[plugins/highlight]], is now provided with IkiWiki. --[[smcv]])
+
 A small plugin to allow Ikiwiki to display source files complete with syntax highlighting. Files with recognized extensions (i.e. my-file.cpp) are be rendered just like any other Ikiwiki page. You can even edit your source files with Ikiwiki's editor.
 
 It uses the Syntax::Highlight::Engine::Kate Perl module to do the highlighting.
-- 
cgit v1.2.3


From 4054f8d8ce0802b43e1c2c6f9cb71badbbcaf919 Mon Sep 17 00:00:00 2001
From: kierun <kierun@web>
Date: Wed, 17 Mar 2010 09:14:46 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index d40701d60..57979385d 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -76,3 +76,12 @@ Any idea when this is going to be finished?  If you want, I am happy to beta tes
 > Example of use to only allow two users to edit the tipjar page:
 >	locked_pages => 'tipjar and !(user(joey) or user(bob))',
 > --[[Joey]] 
+
+> > Thank you for the hint but I am being still confused (read: dense)...  What I am trying to do is this:
+
+> >  * No anonymous access.
+> >  * Logged in users can edit and create pages.
+> >  * Users can set who can edit their pages. 
+> >  * Some pages are only viewable by admins. 
+
+> > Is it possible?  If so how?...
-- 
cgit v1.2.3


From a78212be3364887b5ff9f9902cfb65eb211b269b Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Thu, 18 Mar 2010 07:21:09 +0000
Subject:

---
 .../post-update_hook_can__39__t_be_compiled_with_tcc.mdwn  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn

(limited to 'doc')

diff --git a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
new file mode 100644
index 000000000..1594036dc
--- /dev/null
+++ b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
@@ -0,0 +1,14 @@
+Thinking that any c compiler would do the job, I tried to use tcc with ikiwiki, as explicitely allowed by the Debian package dependencies.
+
+I installed `tcc` and `libc6-dev` (for `libcrt1`). The wrapper compilation was OK, but the wrapper fails to run correctly and dies with
+
+    usage: ikiwiki [options] source dest
+       ikiwiki --setup configfile
+
+Everything works fine with gcc.
+
+versions: Debian etch+backports
+
+
+
+
-- 
cgit v1.2.3


From 7b7d1cfcb75451bf9f8fc7efb3814c47deef0059 Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Thu, 18 Mar 2010 07:56:15 +0000
Subject: distro confusion

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

(limited to 'doc')

diff --git a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
index 1594036dc..4226c026a 100644
--- a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
+++ b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
@@ -7,7 +7,7 @@ I installed `tcc` and `libc6-dev` (for `libcrt1`). The wrapper compilation was O
 
 Everything works fine with gcc.
 
-versions: Debian etch+backports
+versions: Debian lenny + backports
 
 
 
-- 
cgit v1.2.3


From 73c2551dd482b29e65b697376708a25ad8e85fbb Mon Sep 17 00:00:00 2001
From: p4f <p4f@web>
Date: Thu, 18 Mar 2010 12:03:34 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
new file mode 100644
index 000000000..9f3f0cddd
--- /dev/null
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -0,0 +1,9 @@
+Hi all!
+I really like ikiwiki and i tested it on my local machine but i have one question that i can't answer reading documentation (my fault of course)...
+I have an account and some space on a free hosting service.
+Now, i want to put my ikiwiki on this remote web space so that i can browse it from wherever i want.
+I have my source dir and my git dir on my local machine.
+How can i upload my ikiwiki on the remote host and manage it via git as i can do when i test it locally?
+Where is specified? Where can i find documentation about it?
+
+Thanks in advance! 
-- 
cgit v1.2.3


From a02a06cb9dc0a82dd4028c9f4b506dcf899c9a41 Mon Sep 17 00:00:00 2001
From: p4f <p4f@web>
Date: Thu, 18 Mar 2010 12:05:33 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 9f3f0cddd..862694d4b 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -6,4 +6,6 @@ I have my source dir and my git dir on my local machine.
 How can i upload my ikiwiki on the remote host and manage it via git as i can do when i test it locally?
 Where is specified? Where can i find documentation about it?
 
-Thanks in advance! 
+Thanks in advance!
+
+Pab
-- 
cgit v1.2.3


From ea07442e7ac6ef80cd98625b32f66bafc6af26b5 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Thu, 18 Mar 2010 15:21:38 +0000
Subject: comment

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

(limited to 'doc')

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index 57979385d..c1f5d86f0 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -21,6 +21,11 @@ something, that I think is very valuable.
 >>>> Which would rule out openid, or other fun forms of auth. And routing all access
 >>>> through the CGI sort of defeats the purpose of ikiwiki. --[[Ethan]]
 
+>>>>> I think what Joey is suggesting is to use apache ACLs in conjunction
+>>>>> with basic HTTP auth to control read access, and ikiwiki can use the
+>>>>> information via the httpauth plugin for other ACLs (write, admin). But
+>>>>> yes, that would rule out non-httpauth mechanisms. -- [[Jon]]
+
 Also see [[!debbug 443346]].
 
 > Just a few quick thoughts about this:
-- 
cgit v1.2.3


From 760c315589dc0e3fa0ba5380113f4e86a989a7d9 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Thu, 18 Mar 2010 15:23:18 +0000
Subject: comment

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

(limited to 'doc')

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index c1f5d86f0..cac6c9f18 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -90,3 +90,6 @@ Any idea when this is going to be finished?  If you want, I am happy to beta tes
 > >  * Some pages are only viewable by admins. 
 
 > > Is it possible?  If so how?...
+
+>>> I don't believe this is currently possible. What is missing is the concept
+>>> of page 'ownership'. -- [[Jon]]
-- 
cgit v1.2.3


From fed7383903c402d68ff2fc2d3734c55b35d520a4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Mar 2010 13:37:35 -0400
Subject: update

---
 doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 862694d4b..0b370473e 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -9,3 +9,18 @@ Where is specified? Where can i find documentation about it?
 Thanks in advance!
 
 Pab
+
+> There are several ways to accomplish this, depending on what you really
+> want to do.
+> 
+> If your goal is to continue generating the site locally, but then
+> transfer it to the remote host for serving, you could use the 
+> [[plugins/rsync]] plugin.
+> 
+> If your goal is to install and run the ikiwiki software on the remote host,
+> then you would follow a similar path to the ones described in these tips:
+> [[tips/nearlyfreespeech]] [[tips/DreamHost]]. Or even [[install]] ikiwiki
+> from a regular package if you have that kind of access. Then you could
+> push changes from your local git to git on the remote host to update the
+> wiki. [[tips/Laptop_wiki_with_git]] explains one way to do that.
+> --[[Joey]] 
-- 
cgit v1.2.3


From dddd6aa99055d8505f73e39b12f049633d9cb4c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 18 Mar 2010 17:44:46 -0400
Subject: Allow wrappers to be built using tcc.

---
 IkiWiki/Wrapper.pm                                            | 10 +++++++---
 debian/changelog                                              |  1 +
 .../post-update_hook_can__39__t_be_compiled_with_tcc.mdwn     | 11 ++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 830b04877..f175b4a0b 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -101,7 +101,6 @@ EOF
 #include <string.h>
 #include <sys/file.h>
 
-extern char **environ;
 char *newenviron[$#envsave+6];
 int i=0;
 
@@ -121,8 +120,13 @@ $check_commit_hook
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
-	newenviron[i]=NULL;
-	environ=newenviron;
+
+	if (clearenv() != 0) {
+		perror("clearenv");
+		exit(1);
+	}
+	for (; i>0; i--)
+		putenv(newenviron[i-1]);
 
 	if (setregid(getegid(), -1) != 0 &&
 	    setregid(getegid(), -1) != 0) {
diff --git a/debian/changelog b/debian/changelog
index e5347e2a1..73f6fcff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low
     wiki source files, such as .htaccess, that would normally be skipped
     for security or other reasons. Closes: #447267
     (Thanks to Aaron Wilson for the original patch.)
+  * Allow wrappers to be built using tcc.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
index 4226c026a..a8fb19888 100644
--- a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
+++ b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn
@@ -9,6 +9,11 @@ Everything works fine with gcc.
 
 versions: Debian lenny + backports
 
-
-
-
+> Seems that tcc does not respect changing where `environ` points as a way
+> to change the environment seen after `exec`
+> 
+> Given that the man page for `clearenv` suggests using `environ=NULL`
+> if `clearenv` is not available, I would be lerry or using tcc to compile
+> stuff, since that could easily lead to a security compromise of code that
+> expects that to work. However, I have fixed ikiwiki to use `clearenv`.
+> --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 9a6a28512025c91b7518d8c9b69678e124c44128 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 18 Mar 2010 22:33:18 +0000
Subject: corrected the update-the-laptop-from-the-server section

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

(limited to 'doc')

diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn
index 85e26c729..857083325 100644
--- a/doc/tips/laptop_wiki_with_git.mdwn
+++ b/doc/tips/laptop_wiki_with_git.mdwn
@@ -68,5 +68,12 @@ used by the ikiwiki CGI, and another which you can use for updating via
 git).
 
 When you want to update the server from the laptop, do a `git push` from
-within the laptop's bare repository, and likewise do a `git pull` to update
-the laptop from the server.
+within the laptop's bare repository.
+
+To update the laptop from the server, add a section for the laptop to the config file of the server's bare repository:
+
+	[remote "laptop"]
+        	fetch = +refs/*:refs/*
+        	url = me@laptop:/path/to/bare/repository
+
+Then do a `git push laptop` from within the server's bare repository.
-- 
cgit v1.2.3


From deb3cd8c490f1a6b615366beaa1b5d736f825c59 Mon Sep 17 00:00:00 2001
From: haho <haho@web>
Date: Thu, 18 Mar 2010 23:39:42 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index aef928d8e..8a6780741 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -77,4 +77,5 @@ bar
 Hmm, can I dig it?
 
 Test
+test2
 
-- 
cgit v1.2.3


From fe86a91ffe4e26d59e1e64ae8a00285d1bf09d4a Mon Sep 17 00:00:00 2001
From: haho <haho@web>
Date: Thu, 18 Mar 2010 23:43:04 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8a6780741..8cba8973f 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -3,7 +3,7 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v
 
 # Header
 
-## Subheader
+## Subheader2
 
 > This is a blockquote.
 >
-- 
cgit v1.2.3


From 4f4e09f925344940876c2e62de1e89e55ea1650e Mon Sep 17 00:00:00 2001
From: p4f <p4f@web>
Date: Fri, 19 Mar 2010 00:56:27 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 0b370473e..036fe0d44 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -24,3 +24,9 @@ Pab
 > push changes from your local git to git on the remote host to update the
 > wiki. [[tips/Laptop_wiki_with_git]] explains one way to do that.
 > --[[Joey]] 
+
+Thanks a lot for your answer.
+rsync plugin would be perfect but... how would i manage blog post?
+I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me?
+
+Pab
-- 
cgit v1.2.3


From f54b5f583dfcb1f908b33d1687782ce8a2bfb30d Mon Sep 17 00:00:00 2001
From: p4f <p4f@web>
Date: Fri, 19 Mar 2010 00:57:03 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 036fe0d44..5dcd01619 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -27,6 +27,4 @@ Pab
 
 Thanks a lot for your answer.
 rsync plugin would be perfect but... how would i manage blog post?
-I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me?
-
-Pab
+I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? --Pab
-- 
cgit v1.2.3


From 2c310f8349182ca155a8cad1d8454f9937e87527 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 19 Mar 2010 01:09:44 +0000
Subject: comment about comments

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

(limited to 'doc')

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 5dcd01619..473b06b39 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -28,3 +28,5 @@ Pab
 Thanks a lot for your answer.
 rsync plugin would be perfect but... how would i manage blog post?
 I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? --Pab
+
+> If you want to allow people to make comments on your blog, no, the rsync plugin will not help, since it will upload a completely static site where nobody can make comments.  Comments require a full IkiWiki setup with CGI enabled, so that people add content (comments) from the web. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From eef4768d2d277925b42de8efda576b00cf64bee8 Mon Sep 17 00:00:00 2001
From: p4f <p4f@web>
Date: Fri, 19 Mar 2010 07:57:40 +0000
Subject:

---
 doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
index 473b06b39..1c0f8f561 100644
--- a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
+++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn
@@ -30,3 +30,6 @@ rsync plugin would be perfect but... how would i manage blog post?
 I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? --Pab
 
 > If you want to allow people to make comments on your blog, no, the rsync plugin will not help, since it will upload a completely static site where nobody can make comments.  Comments require a full IkiWiki setup with CGI enabled, so that people add content (comments) from the web. --[[KathrynAndersen]]
+
+Ok, i understand, thanks.
+Is there any hosting service that permits to have a full installation of iwkiwiki or i am forced to get a vps or to mantain a personal server for that? --Pab
-- 
cgit v1.2.3


From 96a54b35fe2cdcdc1450b5d38c80e7b27b428c14 Mon Sep 17 00:00:00 2001
From: kierun <kierun@web>
Date: Fri, 19 Mar 2010 15:45:26 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index cac6c9f18..dd9793233 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -93,3 +93,6 @@ Any idea when this is going to be finished?  If you want, I am happy to beta tes
 
 >>> I don't believe this is currently possible. What is missing is the concept
 >>> of page 'ownership'. -- [[Jon]]
+
+>>>> GAH! That is really a shame... Any chance of adding that?  No, I do not really expect it to be added, after all my requirements are pushing the boundary of what a wikiwiki
+ should be.  Nonetheless, thanks for your help! 
-- 
cgit v1.2.3


From af83b4c5f576633c03c157a67994af6bfaff617a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 13:40:02 -0400
Subject: Revert "corrected the update-the-laptop-from-the-server section"

No, we don't normally push from servers to laptops. Because
most laptops do not have publicly accessible IP addresses,
for one thing. Also because there's really no reason to ssh to
the server from your laptop in order to update the laptop when you
can just pull.
---
 doc/tips/laptop_wiki_with_git.mdwn | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn
index 857083325..85e26c729 100644
--- a/doc/tips/laptop_wiki_with_git.mdwn
+++ b/doc/tips/laptop_wiki_with_git.mdwn
@@ -68,12 +68,5 @@ used by the ikiwiki CGI, and another which you can use for updating via
 git).
 
 When you want to update the server from the laptop, do a `git push` from
-within the laptop's bare repository.
-
-To update the laptop from the server, add a section for the laptop to the config file of the server's bare repository:
-
-	[remote "laptop"]
-        	fetch = +refs/*:refs/*
-        	url = me@laptop:/path/to/bare/repository
-
-Then do a `git push laptop` from within the server's bare repository.
+within the laptop's bare repository, and likewise do a `git pull` to update
+the laptop from the server.
-- 
cgit v1.2.3


From 6dc6fe2f9bc6bcd532291c703a637d24dfe58956 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 13:45:43 -0400
Subject: fix apparently confusing wording

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

(limited to 'doc')

diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn
index 85e26c729..cfa565d1a 100644
--- a/doc/tips/laptop_wiki_with_git.mdwn
+++ b/doc/tips/laptop_wiki_with_git.mdwn
@@ -67,6 +67,5 @@ as many times as you want (thus being able to have a repository which is
 used by the ikiwiki CGI, and another which you can use for updating via
 git).
 
-When you want to update the server from the laptop, do a `git push` from
-within the laptop's bare repository, and likewise do a `git pull` to update
-the laptop from the server.
+Use standard git commands, run in the laptop's bare git repository
+to handle pulling from and pushing to the server.
-- 
cgit v1.2.3


From 9fb3409613d32e447ababb99bc963867b80340e9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 19 Mar 2010 17:58:40 -0400
Subject: new tip

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

(limited to 'doc')

diff --git a/doc/tips/yaml_setup_files.mdwn b/doc/tips/yaml_setup_files.mdwn
new file mode 100644
index 000000000..4ae0de4aa
--- /dev/null
+++ b/doc/tips/yaml_setup_files.mdwn
@@ -0,0 +1,10 @@
+Here's how to convert your existing standard format ikiwiki setup file into
+the new YAML format recently added to ikiwiki.
+
+1. First, make sure you have the [[!cpan YAML]] perl module installed.
+   (Run: `apt-get install libyaml-perl`)
+2. Run: `ikiwiki -setup my.setup -dumpsetup my.setup --set setuptype=Yaml`
+
+The format of the YAML setup file should be fairly self-explanatory.
+
+--[[Joey]]
-- 
cgit v1.2.3


From cc9621a6811dde5e1d28eb152133bcd448a125d8 Mon Sep 17 00:00:00 2001
From: "http://jcftang.myopenid.com/" <http://jcftang.myopenid.com/@web>
Date: Mon, 22 Mar 2010 20:57:27 +0000
Subject: sadly we moved to using drupal for most of our site

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 8e567ec0d..b40fd461d 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -40,7 +40,6 @@ Projects & Organizations
 * [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de)
 * [monkeysphere](http://web.monkeysphere.info/)
 * [The Walden Effect](http://www.waldeneffect.org/)
-* The support pages for [Trinity Centre for High Performance Computing](http://www.tchpc.tcd.ie/support/)
 * [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/)
 * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
-- 
cgit v1.2.3


From e74a85c671cf9fe1e445ad183d66e059beaec2f9 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 22 Mar 2010 23:01:00 +0000
Subject: rename
 forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
 to forum/utf8_warnings_for___34____92__xAB__34__.mdwn

---
 ...__44_____60____36__in__62___chunk_1.__39__.mdwn | 47 ----------------------
 .../utf8_warnings_for___34____92__xAB__34__.mdwn   | 47 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
 create mode 100644 doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn

(limited to 'doc')

diff --git a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn b/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
deleted file mode 100644
index 72f2d38e0..000000000
--- a/doc/forum/Warnings:___39__utf8___34____92__xAB__34___does_not_map_to_Unicode_at___47__usr__47__share__47__perl5__47__IkiWiki.pm_line_774__44_____60____36__in__62___chunk_1.__39__.mdwn
+++ /dev/null
@@ -1,47 +0,0 @@
-# getting Warnings about UTF8-Chars.
-
-I'm  getting multiple warnings:
-
-      utf8 "\xAB" does not map to Unicode at /usr/share/perl5/IkiWiki.pm line 774, <$in> chunk 1.
-
-
-I'm assuming this is once per File, but even in verbose mode, it doesn't tell me which file is a problem.
-It first reads all the files, and afterwards when parsing/compiling them, it outputs the warning, so I can't
-deduce the offending files.
-
-Is there a way to have ikiwiki output the position, where it encounters the character?
-
-Probably all this has to do with locale-settings, and usage of mixed locales in a distributed setup ...
-I'd rather cleanup some of the file(name)s  of unexpected characters. --[[jwalzer]]
-
---------
-
-**Update** : So I took the chance to insert debug into ikiwiki.pm:
-
-     root@novalis:/usr/share/perl5# diff -p /tmp/IkiWiki.orig.pm IkiWiki.pm 
-     *** /tmp/IkiWiki.orig.pm        Sun Feb 14 15:16:08 2010
-     --- IkiWiki.pm  Sun Feb 14 15:16:28 2010
-     *************** sub readfile ($;$$) {
-     *** 768,773 ****
-     --- 768,774 ----
-             }
-       
-             local $/=undef;
-     +       debug("opening File: $file:");
-             open (my $in, "<", $file) || error("failed to read $file: $!");
-             binmode($in) if ($binary);
-             return \*$in if $wantfd;
-
-
-But what I see now is not quite helpful, as it seems, STDERR and DEBUG are asyncronous, so they mix up in a way, that I can't really see, whats the problem ...  Maybe I'm better off for troubleshooting, to insert an printf to strerr to have it in the same stream.. --[[jwalzer]]
-
-
-----
-
-**Update:** The "print STDERR $file;"-Trick did it .. I was able to find a mdwn-file, that (was generated by a script of me) had \0xAB in it.
-
-Nevertheless I still wonder if this should be a problem. This character happend to be in an *\[\[meta title='$CHAR'\]\]-tag* and an *\[$CHAR\]http://foo)-Link*
-
-Should this throw an warning? Maybe this warning could be catched an reported inclusively the containing filename? maybe even with an override, if one knows that it is correct that way? --[[jwalzer]]
-
-[[!tag solved]]
diff --git a/doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn b/doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn
new file mode 100644
index 000000000..72f2d38e0
--- /dev/null
+++ b/doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn
@@ -0,0 +1,47 @@
+# getting Warnings about UTF8-Chars.
+
+I'm  getting multiple warnings:
+
+      utf8 "\xAB" does not map to Unicode at /usr/share/perl5/IkiWiki.pm line 774, <$in> chunk 1.
+
+
+I'm assuming this is once per File, but even in verbose mode, it doesn't tell me which file is a problem.
+It first reads all the files, and afterwards when parsing/compiling them, it outputs the warning, so I can't
+deduce the offending files.
+
+Is there a way to have ikiwiki output the position, where it encounters the character?
+
+Probably all this has to do with locale-settings, and usage of mixed locales in a distributed setup ...
+I'd rather cleanup some of the file(name)s  of unexpected characters. --[[jwalzer]]
+
+--------
+
+**Update** : So I took the chance to insert debug into ikiwiki.pm:
+
+     root@novalis:/usr/share/perl5# diff -p /tmp/IkiWiki.orig.pm IkiWiki.pm 
+     *** /tmp/IkiWiki.orig.pm        Sun Feb 14 15:16:08 2010
+     --- IkiWiki.pm  Sun Feb 14 15:16:28 2010
+     *************** sub readfile ($;$$) {
+     *** 768,773 ****
+     --- 768,774 ----
+             }
+       
+             local $/=undef;
+     +       debug("opening File: $file:");
+             open (my $in, "<", $file) || error("failed to read $file: $!");
+             binmode($in) if ($binary);
+             return \*$in if $wantfd;
+
+
+But what I see now is not quite helpful, as it seems, STDERR and DEBUG are asyncronous, so they mix up in a way, that I can't really see, whats the problem ...  Maybe I'm better off for troubleshooting, to insert an printf to strerr to have it in the same stream.. --[[jwalzer]]
+
+
+----
+
+**Update:** The "print STDERR $file;"-Trick did it .. I was able to find a mdwn-file, that (was generated by a script of me) had \0xAB in it.
+
+Nevertheless I still wonder if this should be a problem. This character happend to be in an *\[\[meta title='$CHAR'\]\]-tag* and an *\[$CHAR\]http://foo)-Link*
+
+Should this throw an warning? Maybe this warning could be catched an reported inclusively the containing filename? maybe even with an override, if one knows that it is correct that way? --[[jwalzer]]
+
+[[!tag solved]]
-- 
cgit v1.2.3


From e67a9382f67e745af3be7d367fe7a0d36c1777e6 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 24 Mar 2010 00:29:10 +0000
Subject: Allow hooks to add sorting functions to pagespec_match_list

---
 IkiWiki.pm                        |  6 +++++-
 doc/ikiwiki/pagespec/sorting.mdwn |  2 ++
 doc/plugins/write.mdwn            | 15 +++++++++++++++
 t/pagespec_match_list.t           |  6 +++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 022bfe3bd..1a4dc47dd 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2035,7 +2035,11 @@ sub pagespec_match_list ($$;@) {
 
 	if (defined $params{sort}) {
 		my $f;
-		if ($params{sort} eq 'title') {
+
+		if (exists $hooks{sort}{$params{sort}}{call}) {
+			$f = sub { $hooks{sort}{$params{sort}}{call}($a, $b) };
+		}
+		elsif ($params{sort} eq 'title') {
 			$f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) };
 		}
 		elsif ($params{sort} eq 'title_natural') {
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 697818a2a..9007c23bf 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -10,4 +10,6 @@ orders can be specified.
   installed. Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
 
+Plugins can add additional sort orders.
+
 [[!meta robots="noindex, follow"]]
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 96a2aa16d..bfa6617bd 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -588,6 +588,21 @@ describes the plugin as a whole. For example:
 This hook is used to inject C code (which it returns) into the `main`
 function of the ikiwiki wrapper when it is being generated.
 
+### sort
+
+	hook(type => "sort", id => "foo", call => \&sort_by_foo);
+
+This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
+an existing one. The callback is given two page names as arguments, and
+returns negative, zero or positive if the first page should come before,
+close to (i.e. undefined order), or after the second page.
+
+For instance, the built-in `title` sort order could be reimplemented as
+
+	sub sort_by_title {
+		pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
+	}
+
 ## Exported variables
 
 Several variables are exported to your plugin when you `use IkiWiki;`
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index dd5dcc5b0..b34ee769f 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 88;
+use Test::More tests => 89;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -9,6 +9,8 @@ BEGIN { use_ok("IkiWiki"); }
 $config{srcdir}=$config{destdir}="/dev/null";
 IkiWiki::checkconfig();
 
+hook(type => "sort", id => "path", call => sub { $_[0] cmp $_[1] });
+
 %pagesources=(
 	foo => "foo.mdwn",
 	foo2 => "foo2.mdwn",
@@ -34,6 +36,8 @@ is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50)],
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
                          filter => sub { $_[0] =~ /3/}) ],
 	["post/1", "post/2"]);
+is_deeply([pagespec_match_list("foo", "*", sort => "path", num => 2)],
+	["bar", "foo"]);
 my $r=eval { pagespec_match_list("foo", "beep") };
 ok(eval { pagespec_match_list("foo", "beep") } == 0);
 ok(! $@, "does not fail with error when unable to match anything");
-- 
cgit v1.2.3


From 4fd05df4d4cd64905c13ceb4c9d8821f4f26d0bc Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 03:04:16 +0000
Subject: cross-reference

---
 ...ap_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
index de178d415..d12414d55 100644
--- a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
+++ b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn
@@ -16,3 +16,5 @@ The [[ikiwiki/directive/map]] directive sort by pagename. That looks kind of odd
 >> 2. I cannot get inline to create a list when the htmltidy plugin is switched on. I have a template which is enclosed in an li tag, and i put the ul tag around the inline manually, but htmltidy breaks this. --martin
 
 >>>> You might want to check if the [[plugins/contrib/report]] plugin solves your problem.  It can sort by title, among other things. --[[KathrynAndersen]]
+
+>> See also: [[todo/sort_parameter_for_map_plugin_and_directive]] --[[smcv]]
-- 
cgit v1.2.3


From 0618f099dab8bd4f7f47e2695db01eabe49e3316 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 24 Mar 2010 00:59:01 +0000
Subject: Have the meta plugin add a meta_title sort order

---
 IkiWiki/Plugin/meta.pm            | 15 +++++++++++++++
 doc/ikiwiki/pagespec/sorting.mdwn |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 5f046cb2a..bf8159814 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -13,6 +13,7 @@ sub import {
 	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
 	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
 	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
+	hook(type => "sort", id => "meta_title", call => \&sort_meta_title);
 }
 
 sub getsetup () {
@@ -282,6 +283,20 @@ sub pagetemplate (@) {
 	}
 }
 
+sub title {
+	my $title = $pagestate{$_[0]}{meta}{title};
+
+	if (defined $title) {
+		return $title;
+	}
+
+	return pagetitle(IkiWiki::basename($_[0]));
+}
+
+sub sort_meta_title {
+	return title($_[0]) cmp title($_[1]);
+}
+
 sub match {
 	my $field=shift;
 	my $page=shift;
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 9007c23bf..3a9fef9b6 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -9,7 +9,12 @@ orders can be specified.
 * `title_natural` - Only available if [[!cpan Sort::Naturally]] is
   installed. Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+[[!if test="enabled(meta)" then="""
+* `meta_title` - Order by the full title set by the `\[[!meta title="foo"]]`
+  [[ikiwiki/directive]].
+"""]]
 
-Plugins can add additional sort orders.
+Plugins can add additional sort orders, so more might be available on this
+wiki.
 
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From b0ae19872d443860aeaab7069255e3a68a520887 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 24 Mar 2010 03:18:24 +0000
Subject: Add an optional "sort" argument to meta titles, defaulting to the
 title

This allows correct sorting of titles, names, etc., with:

    [[!meta title="David Bowie" sort="Bowie, David"]]
    [[!meta title="The Beatles" sort="Beatles, The"]]
---
 IkiWiki/Plugin/meta.pm            | 16 +++++++++++-----
 doc/ikiwiki/directive/meta.mdwn   |  7 +++++++
 doc/ikiwiki/pagespec/sorting.mdwn |  7 ++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index bf8159814..a470041c9 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -90,6 +90,12 @@ sub preprocess (@) {
 	# Metadata collection that needs to happen during the scan pass.
 	if ($key eq 'title') {
 		$pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
+		if (exists $params{sort}) {
+			$pagestate{$page}{meta}{titlesort}=$params{sort};
+		}
+		else {
+			$pagestate{$page}{meta}{titlesort}=$value;
+		}
 		return "";
 	}
 	elsif ($key eq 'description') {
@@ -283,18 +289,18 @@ sub pagetemplate (@) {
 	}
 }
 
-sub title {
-	my $title = $pagestate{$_[0]}{meta}{title};
+sub titlesort {
+	my $key = $pagestate{$_[0]}{meta}{titlesort};
 
-	if (defined $title) {
-		return $title;
+	if (defined $key) {
+		return $key;
 	}
 
 	return pagetitle(IkiWiki::basename($_[0]));
 }
 
 sub sort_meta_title {
-	return title($_[0]) cmp title($_[1]);
+	return titlesort($_[0]) cmp titlesort($_[1]);
 }
 
 sub match {
diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index 557441c0b..8d2a5b1ad 100644
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -23,6 +23,13 @@ Supported fields:
   be set to a true value in the template; this can be used to format things
   differently in this case.
 
+  An optional `sort` parameter will be used preferentially when
+  [[ikiwiki/pagespec/sorting]] by `meta_title`:
+
+	\[[!meta title="The Beatles" sort="Beatles, The"]]
+
+	\[[!meta title="David Bowie" sort="Bowie, David"]]
+
 * license
 
   Specifies a license for the page, for example, "GPL". Can contain
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 3a9fef9b6..61516bec5 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -5,13 +5,14 @@ orders can be specified.
 
 * `age` - List pages from the most recently created to the oldest.
 * `mtime` - List pages with the most recently modified first.
-* `title` - Order by title.
+* `title` - Order by title (page name).
 * `title_natural` - Only available if [[!cpan Sort::Naturally]] is
   installed. Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
 [[!if test="enabled(meta)" then="""
-* `meta_title` - Order by the full title set by the `\[[!meta title="foo"]]`
-  [[ikiwiki/directive]].
+* `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
+  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
+  full title was set.
 """]]
 
 Plugins can add additional sort orders, so more might be available on this
-- 
cgit v1.2.3


From 1c7d5eabd7c9e94498af7f89a005311a850d742c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 03:24:15 +0000
Subject: propsed branch

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
new file mode 100644
index 000000000..3aa1d94a6
--- /dev/null
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -0,0 +1,47 @@
+[[!template id=gitbranch branch=smcv/sort-hooks author="[[Simon_McVittie|smcv]]"]]
+[[!tag patch]]
+
+The available [[ikiwiki/pagespec/sorting]] methods are currently hard-coded in
+IkiWiki.pm, making it difficult to add any extra sorting mechanisms. I've
+prepared a branch which adds 'sort' as a hook type and uses it to implement a
+new `meta_title` sort type.
+
+Someone could use this hook to make `\[[!inline sort=title]]` prefer the meta
+title over the page name, but for compatibility, I'm not going to (I do wonder
+whether it would be worth making sort=name an alias for the current sort=title,
+and changing the meaning of sort=title in 4.0, though).
+
+Gitweb:
+<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks>
+
+## Documentation extracted from the branch
+
+### sort hook (added to [[plugins/write]])
+
+       hook(type => "sort", id => "foo", call => \&sort_by_foo);
+
+This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
+an existing one. The callback is given two page names as arguments, and
+returns negative, zero or positive if the first page should come before,
+close to (i.e. undefined order), or after the second page.
+
+For instance, the built-in `title` sort order could be reimplemented as
+
+       sub sort_by_title {
+               pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
+       }
+
+### meta_title sort order (conditionally added to [[ikiwiki/pagespec/sorting]])
+
+* `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
+  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
+  full title was set.
+
+### meta title sort parameter (added to [[ikiwiki/directive/meta]])
+
+An optional `sort` parameter will be used preferentially when
+[[ikiwiki/pagespec/sorting]] by `meta_title`:
+
+       \[[!meta title="The Beatles" sort="Beatles, The"]]
+
+       \[[!meta title="David Bowie" sort="Bowie, David"]]
-- 
cgit v1.2.3


From 7fbddb032ee952c6d0b1ee290568ea4f42ef181f Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 03:27:11 +0000
Subject: link to an alternative approach that I decided against

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 3aa1d94a6..1533b6c44 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -14,6 +14,12 @@ and changing the meaning of sort=title in 4.0, though).
 Gitweb:
 <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks>
 
+I briefly tried to turn *all* the current sort types into hook functions, and
+have some of them pre-registered, but decided that probably wasn't a good idea.
+That earlier version of the branch is also available for comparison:
+
+<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks-excessive>
+
 ## Documentation extracted from the branch
 
 ### sort hook (added to [[plugins/write]])
-- 
cgit v1.2.3


From 48c09d44637dd724d084b1d06e2277f11e80d489 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 03:30:06 +0000
Subject: note: old version untested

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 1533b6c44..99f256fbe 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -20,6 +20,11 @@ That earlier version of the branch is also available for comparison:
 
 <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks-excessive>
 
+(The older version is untested, and probably doesn't really work as-is - I
+misunderstood the details of how the built-in function `sort` works when using
+`$a` and `$b`. The newer version has been tested, and has a regression test for
+its core functionality.)
+
 ## Documentation extracted from the branch
 
 ### sort hook (added to [[plugins/write]])
-- 
cgit v1.2.3


From 8108a7f4ba315bf93fd2f5acb233ae9cc6a33393 Mon Sep 17 00:00:00 2001
From: cian <cian@web>
Date: Wed, 24 Mar 2010 13:36:59 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8cba8973f..c323153c8 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,6 +1,6 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-
+[[Testing 1 2 3| test]]
 # Header
 
 ## Subheader2
-- 
cgit v1.2.3


From 9d4bedf760fbbbdba28986c01c3e429f67386217 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 17:11:17 +0000
Subject: relationship with [[plugins/contrib/report]]

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 99f256fbe..21800f4de 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -25,6 +25,21 @@ misunderstood the details of how the built-in function `sort` works when using
 `$a` and `$b`. The newer version has been tested, and has a regression test for
 its core functionality.)
 
+This hook *isn't* (yet) sufficient to implement [[plugins/contrib/report]]'s
+NIH'd sorting mechanisms:
+
+* `report` can sort by any [[plugins/contrib/field]], whereas this one has a
+  finite number of hooks: if the `field` plugin's functionality is desirable,
+  perhaps parameterized sort mechanisms similar to pagespec match functions
+  would be useful? Then the `field` plugin could register
+  `hook(type => "sort", id => "field")` and you could have
+  `\[[!inline ... sort="field(Mood)"]]` or something?
+
+* `report` can sort by multiple criteria, with independent direction-changing:
+  if this is desirable, perhaps `pagespec_match_list` could be enhanced to
+  interpret `sort="x -y z(w)"` as sorting by (pseudocode)
+  `{ $cmp_x->($a, $b) || (-$cmp_y->($a, $b)) || $cmp_z->($a, $b, "w") }`?
+
 ## Documentation extracted from the branch
 
 ### sort hook (added to [[plugins/write]])
-- 
cgit v1.2.3


From 27f1e77bc6ff74f1760a4fdb9e174c77ea4698ea Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 17:26:46 +0000
Subject: thoughts

---
 ...an_alternative_approach_to_structured_data.mdwn | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index eb6ee4445..188e627f0 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -27,3 +27,27 @@ I have written additional plugins which integrate with the [[plugins/contrib/fie
 * [[plugins/contrib/ymlfront]] - looks for YAML-format data at the front of a page; this is just one possible back-end for the structured data
 
 --[[KathrynAndersen]]
+
+> I'm not an IkiWiki committer ([[Joey]] is the only one I think)
+> but I really like the look of this scheme. In particular,
+> having `getfield` interop with `field` without being *part of*
+> `field` makes me happy, since I'm not very keen on `getfield`'s
+> syntax (i.e. "ugh, yet another mini-markup-language without a
+> proper escaping mechanism"), but this way people can experiment
+> with different syntaxes while keeping `field` for the
+> behind-the-scenes bits.
+>
+> My [[plugins/contrib/album]] plugin could benefit from
+> integration with [[field]] for photos' captions and so on,
+> probably... I'll try to work on that at some point.
+>
+> [[plugins/contrib/report]] may be doing too much, though:
+> it seems to be an variation on `\[[inline archive="yes"]]`,
+> with an enhanced version of sorting, a mini version of
+> [[todo/wikitrails]], and some other misc. I suspect it could
+> usefully be divided up into discrete features? One good way
+> to do that might be to shuffle bits of its functionality into
+> the IkiWiki distribution and/or separate plugins, until there's
+> nothing left in `report` itself and it can just go away.
+>
+> --[[smcv]]
-- 
cgit v1.2.3


From c64c4b99626286ee08f67999a18c43c769e21e6a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 24 Mar 2010 14:39:50 -0400
Subject: Add --set-yaml switch for setting more complex config file options.

---
 debian/changelog |  1 +
 doc/usage.mdwn   | 10 +++++++---
 ikiwiki.in       |  9 +++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 4d0639a58..e7499b6f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20100320) UNRELEASED; urgency=low
     (Thanks to Aaron Wilson for the original patch.)
   * Allow wrappers to be built using tcc.
   * Add support for setup files written in YAML.
+  * Add --set-yaml switch for setting more complex config file options.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index f735170f0..db1e36a10 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -331,9 +331,13 @@ also be configured using a setup file.
 * --set var=value
   
   This allows setting an arbitrary configuration variable, the same as if it
-  were set via a setup file. Since most options can be configured
-  using command-line switches, you will rarely need to use this, but it can be
-  useful for the odd option that lacks a command-line switch.
+  were set via a setup file. Since most options commonly used options can be
+  configured using command-line switches, you will rarely need to use this.
+
+* --set-yaml var=value
+
+  This is like --set, but it allows setting configuration variables that
+  use complex data structures, by passing in a YAML document.
 
 # EXAMPLES
 
diff --git a/ikiwiki.in b/ikiwiki.in
index da5555629..7028bdb7d 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -96,6 +96,15 @@ sub getconfig () {
 				}
 				$config{$var}=$val;
 			},
+			"set-yaml=s" => sub {
+				my ($var, $val)=split('=', $_[1], 2);
+				if (! defined $var || ! defined $val) {
+					die gettext("usage: --set-yaml var=value"), "\n";
+				}
+				eval q{use YAML::Any};
+				die $@ if $@;
+				$config{$var}=Load($val);
+			},
 			"version" => sub {
 				print "ikiwiki version $IkiWiki::version\n";
 				exit;
-- 
cgit v1.2.3


From 3b08b19b4e36f82864c73ca035cfdec83b3a43aa Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 24 Mar 2010 21:33:03 +0000
Subject: use `` to avoid markdown eating example pagespecs

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

(limited to 'doc')

diff --git a/doc/plugins/moderatedcomments.mdwn b/doc/plugins/moderatedcomments.mdwn
index c29b0b052..f9466e833 100644
--- a/doc/plugins/moderatedcomments.mdwn
+++ b/doc/plugins/moderatedcomments.mdwn
@@ -8,5 +8,5 @@ By default, all comments made by anyone who is not an admin will be held
 for moderation. The `moderate_pagespec` setting can be used to specify a
 [[ikiwiki/PageSpec]] to match comments and users who should be moderated.
 For example, to avoid moderating comments from logged-in users, set
-`moderate_pagespec` to "!user(*)". Or to moderate everyone except for
-admins, set it to "!admin(*)".
+`moderate_pagespec` to "`!user(*)`". Or to moderate everyone except for
+admins, set it to "`!admin(*)`".
-- 
cgit v1.2.3


From 1a587504e949bf0584acdf7737597c8332467332 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 24 Mar 2010 22:48:47 +0000
Subject: what about a SortSpec rather than a sort-hook?

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 21800f4de..5bfe102ac 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -40,6 +40,8 @@ NIH'd sorting mechanisms:
   interpret `sort="x -y z(w)"` as sorting by (pseudocode)
   `{ $cmp_x->($a, $b) || (-$cmp_y->($a, $b)) || $cmp_z->($a, $b, "w") }`?
 
+>> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages?  Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]]
+
 ## Documentation extracted from the branch
 
 ### sort hook (added to [[plugins/write]])
-- 
cgit v1.2.3


From 60edd2dc3157f756f4f7a213ee15836fe7bbb769 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 24 Mar 2010 23:51:48 +0000
Subject: Allow sorting to be combined and/or reversed

---
 IkiWiki.pm                        | 84 ++++++++++++++++++++++++++++-----------
 doc/ikiwiki/pagespec/sorting.mdwn |  4 ++
 doc/plugins/write.mdwn            | 17 +++++++-
 t/pagespec_match_list.t           | 12 +++++-
 4 files changed, 91 insertions(+), 26 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1a4dc47dd..ce8fdd454 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2005,6 +2005,64 @@ sub pagespec_match ($$;@) {
 	return $sub->($page, @params);
 }
 
+sub get_sort_function {
+	my $method = $_[0];
+
+	if ($method =~ m/\s/) {
+		my @methods = map { get_sort_function($_) } split(' ', $method);
+
+		return sub {
+			foreach my $method (@methods) {
+				my $answer = $method->($_[0], $_[1]);
+				return $answer if $answer;
+			}
+
+			return 0;
+		};
+	}
+
+	my $sense = 1;
+
+	if ($method =~ s/^-//) {
+		$sense = -1;
+	}
+
+	my $token = $method;
+	my $parameter = undef;
+
+	if ($method =~ m/^(\w+)\((.*)\)$/) {
+		$token = $1;
+		$parameter = $2;
+	}
+
+	if (exists $hooks{sort}{$token}{call}) {
+		my $callback = $hooks{sort}{$token}{call};
+		return sub { $sense * $callback->($_[0], $_[1], $parameter) };
+	}
+
+	if ($method eq 'title') {
+		return sub { $sense * (pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]))) };
+	}
+
+	if ($method eq 'title_natural') {
+		eval q{use Sort::Naturally};
+		if ($@) {
+			error(gettext("Sort::Naturally needed for title_natural sort"));
+		}
+		return sub { $sense * Sort::Naturally::ncmp(pagetitle(basename($_[0])), pagetitle(basename($_[1]))) };
+	}
+
+	if ($method eq 'mtime') {
+		return sub { $sense * ($pagemtime{$_[1]} <=> $pagemtime{$_[0]}) };
+	}
+
+	if ($method eq 'age') {
+		return sub { $sense * ($pagectime{$_[1]} <=> $pagectime{$_[0]}) };
+	}
+
+	error sprintf(gettext("unknown sort type %s"), $method);
+}
+
 sub pagespec_match_list ($$;@) {
 	my $page=shift;
 	my $pagespec=shift;
@@ -2034,31 +2092,9 @@ sub pagespec_match_list ($$;@) {
 	}
 
 	if (defined $params{sort}) {
-		my $f;
+		my $f = get_sort_function($params{sort});
 
-		if (exists $hooks{sort}{$params{sort}}{call}) {
-			$f = sub { $hooks{sort}{$params{sort}}{call}($a, $b) };
-		}
-		elsif ($params{sort} eq 'title') {
-			$f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) };
-		}
-		elsif ($params{sort} eq 'title_natural') {
-			eval q{use Sort::Naturally};
-			if ($@) {
-				error(gettext("Sort::Naturally needed for title_natural sort"));
-			}
-			$f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) };
-                }
-		elsif ($params{sort} eq 'mtime') {
-			$f=sub { $pagemtime{$b} <=> $pagemtime{$a} };
-		}
-		elsif ($params{sort} eq 'age') {
-			$f=sub { $pagectime{$b} <=> $pagectime{$a} };
-		}
-		else {
-			error sprintf(gettext("unknown sort type %s"), $params{sort});
-		}
-		@candidates = sort { &$f } @candidates;
+		@candidates = sort { $f->($a, $b) } @candidates;
 	}
 
 	@candidates=reverse(@candidates) if $params{reverse};
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 61516bec5..f27972d4e 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -15,6 +15,10 @@ orders can be specified.
   full title was set.
 """]]
 
+In addition, you can combine several sort orders and/or reverse the order of
+sorting, with a string like `age -title` (which would sort by age, then by
+title in reverse order if two pages have the same age).
+
 Plugins can add additional sort orders, so more might be available on this
 wiki.
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index bfa6617bd..1010e76e4 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -593,7 +593,9 @@ function of the ikiwiki wrapper when it is being generated.
 	hook(type => "sort", id => "foo", call => \&sort_by_foo);
 
 This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
-an existing one. The callback is given two page names as arguments, and
+an existing one.
+
+The callback is given two page names followed by the parameter as arguments, and
 returns negative, zero or positive if the first page should come before,
 close to (i.e. undefined order), or after the second page.
 
@@ -603,6 +605,19 @@ For instance, the built-in `title` sort order could be reimplemented as
 		pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
 	}
 
+and to sort by an arbitrary `meta` value, you could use:
+
+	# usage: sort="meta(description)"
+	sub sort_by_meta {
+		my $param = $_[2];
+		error "sort=meta requires a parameter" unless defined $param;
+		my $left = $pagestate{$_[0]}{meta}{$param};
+		$left = "" unless defined $left;
+		my $right = $pagestate{$_[1]}{meta}{$param};
+		$right = "" unless defined $right;
+		return $left cmp $right;
+	}
+
 ## Exported variables
 
 Several variables are exported to your plugin when you `use IkiWiki;`
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index b34ee769f..309961f1c 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 89;
+use Test::More tests => 90;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -20,6 +20,13 @@ hook(type => "sort", id => "path", call => sub { $_[0] cmp $_[1] });
 	"post/2" => "post/2.mdwn",
 	"post/3" => "post/3.mdwn",
 );
+$IkiWiki::pagectime{foo} = 2;
+$IkiWiki::pagectime{foo2} = 2;
+$IkiWiki::pagectime{foo3} = 1;
+$IkiWiki::pagectime{bar} = 3;
+$IkiWiki::pagectime{"post/1"} = 6;
+$IkiWiki::pagectime{"post/2"} = 6;
+$IkiWiki::pagectime{"post/3"} = 6;
 $links{foo}=[qw{post/1 post/2}];
 $links{foo2}=[qw{bar}];
 $links{foo3}=[qw{bar}];
@@ -38,6 +45,9 @@ is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
 	["post/1", "post/2"]);
 is_deeply([pagespec_match_list("foo", "*", sort => "path", num => 2)],
 	["bar", "foo"]);
+is_deeply([pagespec_match_list("foo", "foo* or bar*",
+		sort => "-age title")], # oldest first, break ties by title
+	["foo3", "foo", "foo2", "bar"]);
 my $r=eval { pagespec_match_list("foo", "beep") };
 ok(eval { pagespec_match_list("foo", "beep") } == 0);
 ok(! $@, "does not fail with error when unable to match anything");
-- 
cgit v1.2.3


From 81cd30690024db1fc0b300e3a09504f1c613be21 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 25 Mar 2010 00:05:58 +0000
Subject: an updated branch

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 29 +++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 5bfe102ac..419a73419 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -40,8 +40,13 @@ NIH'd sorting mechanisms:
   interpret `sort="x -y z(w)"` as sorting by (pseudocode)
   `{ $cmp_x->($a, $b) || (-$cmp_y->($a, $b)) || $cmp_z->($a, $b, "w") }`?
 
+> I've now added both of these features to the sort-hooks branch. --[[smcv]]
+
 >> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages?  Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]]
 
+>>> I'd be inclined to think that's overkill, but it probably wouldn't be
+>>> all that hard to implement... Joey? Any thoughts? --s
+
 ## Documentation extracted from the branch
 
 ### sort hook (added to [[plugins/write]])
@@ -49,7 +54,9 @@ NIH'd sorting mechanisms:
        hook(type => "sort", id => "foo", call => \&sort_by_foo);
 
 This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
-an existing one. The callback is given two page names as arguments, and
+an existing one.
+
+The callback is given two page names followed by the parameter as arguments, and
 returns negative, zero or positive if the first page should come before,
 close to (i.e. undefined order), or after the second page.
 
@@ -59,12 +66,32 @@ For instance, the built-in `title` sort order could be reimplemented as
                pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
        }
 
+and to sort by an arbitrary `meta` value, you could use:
+
+       # usage: sort="meta(description)"
+       sub sort_by_meta {
+               my $param = $_[2];
+               error "sort=meta requires a parameter" unless defined $param;
+               my $left = $pagestate{$_[0]}{meta}{$param};
+               $left = "" unless defined $left;
+               my $right = $pagestate{$_[1]}{meta}{$param};
+               $right = "" unless defined $right;
+               return $left cmp $right;
+       }
+
+
 ### meta_title sort order (conditionally added to [[ikiwiki/pagespec/sorting]])
 
 * `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
   or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
   full title was set.
 
+### Multiple sort orders (added to [[ikiwiki/pagespec/sorting]])
+
+In addition, you can combine several sort orders and/or reverse the order of
+sorting, with a string like `age -title` (which would sort by age, then by
+title in reverse order if two pages have the same age).
+
 ### meta title sort parameter (added to [[ikiwiki/directive/meta]])
 
 An optional `sort` parameter will be used preferentially when
-- 
cgit v1.2.3


From dc966032129e07b9a6002a97bc9e6b86c712b4d2 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 25 Mar 2010 03:35:14 +0000
Subject: bug and fix

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

(limited to 'doc')

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
new file mode 100644
index 000000000..95ea5c763
--- /dev/null
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -0,0 +1,23 @@
+Using the attachment plugin, when filecheck was checking the mime-type of the attachment before allowing the attachment to be removed, it was returning with an error saying that the mime-type of the file was "unknown" (when the mime-type definitely was known!)
+
+It turns out that the filecheck plugin couldn't find the file, because it was merely using the $pagesources hash, rather than finding the absolute path of the file in question.
+
+The following patch fixes the problem:
+
+	diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
+	index 01d4909..1cec0cf 100644
+	--- a/IkiWiki/Plugin/filecheck.pm
+	+++ b/IkiWiki/Plugin/filecheck.pm
+	@@ -118,6 +118,10 @@ sub match_mimetype ($$;@) {
+	 	if (! defined $file) {
+	 		return IkiWiki::ErrorReason->new("no file specified");
+	 	}
+	+	if (! -e $file) {
+	+	    # get the absolute path of the file if you can't find it
+	+	    $file = IkiWiki::srcfile($file);
+	+	}
+	 
+	 	# Use ::magic to get the mime type, the idea is to only trust
+	 	# data obtained by examining the actual file contents.
+
+[[!tag patch]]
-- 
cgit v1.2.3


From c757cfa64f56fc17b2c3e4b2c36279f3fcf0f812 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 25 Mar 2010 03:38:14 +0000
Subject: I'm not sure if I'm supposed to tag this as patch, so I removed the
 tag.

---
 doc/bugs/filecheck_failing_to_find_files.mdwn | 2 --
 1 file changed, 2 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index 95ea5c763..49de3d435 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -19,5 +19,3 @@ The following patch fixes the problem:
 	 
 	 	# Use ::magic to get the mime type, the idea is to only trust
 	 	# data obtained by examining the actual file contents.
-
-[[!tag patch]]
-- 
cgit v1.2.3


From 1030d23a2ca1be2680a6fac8366f880a1d1760c6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Mar 2010 00:11:39 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index 49de3d435..e41793ee8 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -2,6 +2,9 @@ Using the attachment plugin, when filecheck was checking the mime-type of the at
 
 It turns out that the filecheck plugin couldn't find the file, because it was merely using the $pagesources hash, rather than finding the absolute path of the file in question.
 
+> I don't understand why the file was not in `%pagesources`. Do you?
+> --[[Joey]] 
+
 The following patch fixes the problem:
 
 	diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
-- 
cgit v1.2.3


From 46f8f72793e23b56d3deb1ed0ed6b1a0fbd56ad6 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 25 Mar 2010 04:43:16 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index e41793ee8..be6cdbb20 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -3,7 +3,12 @@ Using the attachment plugin, when filecheck was checking the mime-type of the at
 It turns out that the filecheck plugin couldn't find the file, because it was merely using the $pagesources hash, rather than finding the absolute path of the file in question.
 
 > I don't understand why the file was not in `%pagesources`. Do you?
-> --[[Joey]] 
+> --[[Joey]]
+
+>> The file *was* in `%pagesources`, but what returns from that is the filename relative to the `srcdir` directory; for example, `foo/bar.gif`.
+>> When File::MimeInfo::Magic::magic is given that, it can't find the file.
+>> But if it is given `/path/to/srcdir/foo/bar.gif` instead, then it *can* find the file, and returns the mime-type correctly.
+>> --[[KathrynAndersen]]
 
 The following patch fixes the problem:
 
-- 
cgit v1.2.3


From 3d671ea8c1df4534d8ffa59b235dd6ded99bb13f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Mar 2010 14:39:09 -0400
Subject: filecheck: Fix bug that prevented the pagespecs from matching when
 not called by attachment plugin.

---
 IkiWiki/Plugin/filecheck.pm                   | 16 ++++++++--------
 debian/changelog                              |  2 ++
 doc/bugs/filecheck_failing_to_find_files.mdwn |  5 +++++
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 0501ba99c..1549b82db 100644
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -75,9 +75,9 @@ sub match_maxsize ($$;@) {
 	}
 
 	my %params=@_;
-	my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page};
+	my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page});
 	if (! defined $file) {
-		return IkiWiki::ErrorReason->new("no file specified");
+		return IkiWiki::ErrorReason->new("file does not exist");
 	}
 
 	if (-s $file > $maxsize) {
@@ -96,9 +96,9 @@ sub match_minsize ($$;@) {
 	}
 
 	my %params=@_;
-	my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page};
+	my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page});
 	if (! defined $file) {
-		return IkiWiki::ErrorReason->new("no file specified");
+		return IkiWiki::ErrorReason->new("file does not exist");
 	}
 
 	if (-s $file < $minsize) {
@@ -114,9 +114,9 @@ sub match_mimetype ($$;@) {
 	my $wanted=shift;
 
 	my %params=@_;
-	my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page};
+	my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page});
 	if (! defined $file) {
-		return IkiWiki::ErrorReason->new("no file specified");
+		return IkiWiki::ErrorReason->new("file does not exist");
 	}
 
 	# Use ::magic to get the mime type, the idea is to only trust
@@ -147,9 +147,9 @@ sub match_virusfree ($$;@) {
 	my $wanted=shift;
 
 	my %params=@_;
-	my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page};
+	my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page});
 	if (! defined $file) {
-		return IkiWiki::ErrorReason->new("no file specified");
+		return IkiWiki::ErrorReason->new("file does not exist");
 	}
 
 	if (! exists $IkiWiki::config{virus_checker} ||
diff --git a/debian/changelog b/debian/changelog
index 12dd0dc02..7249cdfa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * Allow wrappers to be built using tcc.
   * Add support for setup files written in YAML.
   * Add --set-yaml switch for setting more complex config file options.
+  * filecheck: Fix bug that prevented the pagespecs from matching when
+    not called by attachment plugin.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index be6cdbb20..e896f2129 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -10,6 +10,11 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 >> But if it is given `/path/to/srcdir/foo/bar.gif` instead, then it *can* find the file, and returns the mime-type correctly.
 >> --[[KathrynAndersen]]
 
+>>> Ok, so it's not removal specific, can in fact be triggered by using
+>>> testpagespec (or really anything besides attachment, which passes
+>>> the filename parameter). Nor is it limited to mimetype, all the tests in 
+>>> filecheck have the problem. [[Fixed|done]] --[[Joey]] 
+
 The following patch fixes the problem:
 
 	diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
-- 
cgit v1.2.3


From b86276ffed7ee001b35cd610e5d56e5afb4088cf Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 25 Mar 2010 23:31:53 +0000
Subject: Reimplement extensible sorting mechanisms, in the same way as
 pagespecs

---
 IkiWiki.pm              | 145 ++++++++++++++++++++++++++++--------------------
 IkiWiki/Plugin/meta.pm  |  11 ++--
 doc/plugins/write.mdwn  |  53 ++++++++----------
 t/pagespec_match_list.t |   6 +-
 4 files changed, 120 insertions(+), 95 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ce8fdd454..a89c14058 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -37,6 +37,7 @@ our $DEPEND_LINKS=4;
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
+memoize("cmpspec_translate");
 memoize("pagespec_translate");
 memoize("template_file");
 
@@ -1934,6 +1935,70 @@ sub add_link ($$) {
 		unless grep { $_ eq $link } @{$links{$page}};
 }
 
+sub cmpspec_translate ($) {
+	my $spec = shift;
+
+	my $code = "";
+	my @data;
+	while ($spec =~ m{
+		\s*
+		(-?)		# group 1: perhaps negated
+		\s*
+		(		# group 2: a word
+			\w+\([^\)]*\)	# command(params)
+			|
+			[^\s]+		# or anything else
+		)
+		\s*
+	}gx) {
+		my $negated = $1;
+		my $word = $2;
+		my $params = undef;
+
+		if ($word =~ m/^(\w+)\((.*)\)$/) {
+			# command with parameters
+			$params = $2;
+			$word = $1;
+		}
+		elsif ($word !~ m/^\w+$/) {
+			error(sprintf(gettext("invalid sort type %s"), $word));
+		}
+
+		if (length $code) {
+			$code .= " || ";
+		}
+
+		if ($negated) {
+			$code .= "-";
+		}
+
+		if (exists $IkiWiki::PageSpec::{"cmp_$word"}) {
+			if (exists $IkiWiki::PageSpec::{"check_cmp_$word"}) {
+				$IkiWiki::PageSpec::{"check_cmp_$word"}->($params);
+			}
+
+			if (defined $params) {
+				push @data, $params;
+				$code .= "IkiWiki::PageSpec::cmp_$word(\@_, \$data[$#data])";
+			}
+			else {
+				$code .= "IkiWiki::PageSpec::cmp_$word(\@_, undef)";
+			}
+		}
+		else {
+			error(sprintf(gettext("unknown sort type %s"), $word));
+		}
+	}
+
+	if (! length $code) {
+		# undefined sorting method... sort arbitrarily
+		return sub { 0 };
+	}
+
+	no warnings;
+	return eval 'sub { '.$code.' }';
+}
+
 sub pagespec_translate ($) {
 	my $spec=shift;
 
@@ -2005,64 +2070,6 @@ sub pagespec_match ($$;@) {
 	return $sub->($page, @params);
 }
 
-sub get_sort_function {
-	my $method = $_[0];
-
-	if ($method =~ m/\s/) {
-		my @methods = map { get_sort_function($_) } split(' ', $method);
-
-		return sub {
-			foreach my $method (@methods) {
-				my $answer = $method->($_[0], $_[1]);
-				return $answer if $answer;
-			}
-
-			return 0;
-		};
-	}
-
-	my $sense = 1;
-
-	if ($method =~ s/^-//) {
-		$sense = -1;
-	}
-
-	my $token = $method;
-	my $parameter = undef;
-
-	if ($method =~ m/^(\w+)\((.*)\)$/) {
-		$token = $1;
-		$parameter = $2;
-	}
-
-	if (exists $hooks{sort}{$token}{call}) {
-		my $callback = $hooks{sort}{$token}{call};
-		return sub { $sense * $callback->($_[0], $_[1], $parameter) };
-	}
-
-	if ($method eq 'title') {
-		return sub { $sense * (pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]))) };
-	}
-
-	if ($method eq 'title_natural') {
-		eval q{use Sort::Naturally};
-		if ($@) {
-			error(gettext("Sort::Naturally needed for title_natural sort"));
-		}
-		return sub { $sense * Sort::Naturally::ncmp(pagetitle(basename($_[0])), pagetitle(basename($_[1]))) };
-	}
-
-	if ($method eq 'mtime') {
-		return sub { $sense * ($pagemtime{$_[1]} <=> $pagemtime{$_[0]}) };
-	}
-
-	if ($method eq 'age') {
-		return sub { $sense * ($pagectime{$_[1]} <=> $pagectime{$_[0]}) };
-	}
-
-	error sprintf(gettext("unknown sort type %s"), $method);
-}
-
 sub pagespec_match_list ($$;@) {
 	my $page=shift;
 	my $pagespec=shift;
@@ -2092,7 +2099,7 @@ sub pagespec_match_list ($$;@) {
 	}
 
 	if (defined $params{sort}) {
-		my $f = get_sort_function($params{sort});
+		my $f = cmpspec_translate($params{sort});
 
 		@candidates = sort { $f->($a, $b) } @candidates;
 	}
@@ -2407,4 +2414,24 @@ sub match_ip ($$;@) {
 	}
 }
 
+sub cmp_title {
+	IkiWiki::pagetitle(IkiWiki::basename($_[0]))
+	cmp
+	IkiWiki::pagetitle(IkiWiki::basename($_[1]))
+}
+
+sub cmp_mtime { $IkiWiki::pagemtime{$_[1]} <=> $IkiWiki::pagemtime{$_[0]} }
+sub cmp_age { $IkiWiki::pagectime{$_[1]} <=> $IkiWiki::pagectime{$_[0]} }
+
+sub check_cmp_title_natural {
+	eval q{use Sort::Naturally};
+	if ($@) {
+		error(gettext("Sort::Naturally needed for title_natural sort"));
+	}
+}
+sub cmp_title_natural {
+	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
+		IkiWiki::pagetitle(IkiWiki::basename($_[1])))
+}
+
 1
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index a470041c9..e8cc1e392 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -13,7 +13,6 @@ sub import {
 	hook(type => "needsbuild", id => "meta", call => \&needsbuild);
 	hook(type => "preprocess", id => "meta", call => \&preprocess, scan => 1);
 	hook(type => "pagetemplate", id => "meta", call => \&pagetemplate);
-	hook(type => "sort", id => "meta_title", call => \&sort_meta_title);
 }
 
 sub getsetup () {
@@ -299,10 +298,6 @@ sub titlesort {
 	return pagetitle(IkiWiki::basename($_[0]));
 }
 
-sub sort_meta_title {
-	return titlesort($_[0]) cmp titlesort($_[1]);
-}
-
 sub match {
 	my $field=shift;
 	my $page=shift;
@@ -353,4 +348,10 @@ sub match_copyright ($$;@) {
 	IkiWiki::Plugin::meta::match("copyright", @_);
 }
 
+sub cmp_meta_title {
+	IkiWiki::Plugin::meta::titlesort($_[0])
+	cmp
+	IkiWiki::Plugin::meta::titlesort($_[1])
+}
+
 1
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 1010e76e4..de2b47015 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -588,36 +588,6 @@ describes the plugin as a whole. For example:
 This hook is used to inject C code (which it returns) into the `main`
 function of the ikiwiki wrapper when it is being generated.
 
-### sort
-
-	hook(type => "sort", id => "foo", call => \&sort_by_foo);
-
-This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
-an existing one.
-
-The callback is given two page names followed by the parameter as arguments, and
-returns negative, zero or positive if the first page should come before,
-close to (i.e. undefined order), or after the second page.
-
-For instance, the built-in `title` sort order could be reimplemented as
-
-	sub sort_by_title {
-		pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
-	}
-
-and to sort by an arbitrary `meta` value, you could use:
-
-	# usage: sort="meta(description)"
-	sub sort_by_meta {
-		my $param = $_[2];
-		error "sort=meta requires a parameter" unless defined $param;
-		my $left = $pagestate{$_[0]}{meta}{$param};
-		$left = "" unless defined $left;
-		my $right = $pagestate{$_[1]}{meta}{$param};
-		$right = "" unless defined $right;
-		return $left cmp $right;
-	}
-
 ## Exported variables
 
 Several variables are exported to your plugin when you `use IkiWiki;`
@@ -1140,6 +1110,29 @@ For example, "backlink(foo)" is influenced by the contents of page foo;
 they match; "created_before(foo)" is influenced by the metadata of foo;
 while "glob(*)" is not influenced by the contents of any page.
 
+### Sorting plugins
+
+Similarly, it's possible to write plugins that add new functions as
+[[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to
+the IkiWiki::PageSpec package named `cmp_foo`, which will be used when sorting
+by `foo` or `foo(...)` is requested.
+
+The function will be passed three or more parameters. The first two are
+page names, and the third is `undef` if invoked as `foo`, or the parameter
+`"bar"` if invoked as `foo(bar)`. It may also be passed additional, named
+parameters.
+
+It should return the same thing as Perl's `cmp` and `<=>` operators: negative
+if the first argument is less than the second, positive if the first argument
+is greater, or zero if they are considered equal. It may also raise an
+error using `error`, for instance if it needs a parameter but one isn't
+provided.
+
+You can also define a function called `check_cmp_foo` in the same package.
+If you do, it will be called while preparing to sort by `foo` or `foo(bar)`,
+with argument `undef` or `"bar"` respectively; it may raise an error using
+`error`, if sorting like that isn't going to work.
+
 ### Setup plugins
 
 The ikiwiki setup file is loaded using a pluggable mechanism. If you look
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 309961f1c..743ae4637 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -9,7 +9,11 @@ BEGIN { use_ok("IkiWiki"); }
 $config{srcdir}=$config{destdir}="/dev/null";
 IkiWiki::checkconfig();
 
-hook(type => "sort", id => "path", call => sub { $_[0] cmp $_[1] });
+{
+	package IkiWiki::PageSpec;
+
+	sub cmp_path { $_[0] cmp $_[1] }
+}
 
 %pagesources=(
 	foo => "foo.mdwn",
-- 
cgit v1.2.3


From 959d5b197d842e494076034f89d7bca84e531a45 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 25 Mar 2010 23:39:45 +0000
Subject: an alternative way to do plugins, as rubykat suggested

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 37 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 419a73419..f37a0758e 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -44,10 +44,13 @@ NIH'd sorting mechanisms:
 
 >> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages?  Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]]
 
->>> I'd be inclined to think that's overkill, but it probably wouldn't be
->>> all that hard to implement... Joey? Any thoughts? --s
+>>> [[!template id=gitbranch branch=smcv/sort-package author="[[Simon_McVittie|smcv]]"]]
+>>> I'd be inclined to think that's overkill, but it wasn't very hard to
+>>> implement, and in a way is more elegant. I set it up so sort mechanisms
+>>> share the `IkiWiki::PageSpec` package, but with a `cmp_` prefix. Gitweb:
+>>> <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-package>
 
-## Documentation extracted from the branch
+## Documentation from sort-hooks branch
 
 ### sort hook (added to [[plugins/write]])
 
@@ -100,3 +103,31 @@ An optional `sort` parameter will be used preferentially when
        \[[!meta title="The Beatles" sort="Beatles, The"]]
 
        \[[!meta title="David Bowie" sort="Bowie, David"]]
+
+## Documentation from sort-hooks branch
+
+The changes to [[ikiwiki/pagespec/sorting]] are the same.
+The changes to [[plugins/write]] are replaced by:
+
+### Sorting plugins
+
+Similarly, it's possible to write plugins that add new functions as
+[[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to
+the IkiWiki::PageSpec package named `cmp_foo`, which will be used when sorting
+by `foo` or `foo(...)` is requested.
+
+The function will be passed three or more parameters. The first two are
+page names, and the third is `undef` if invoked as `foo`, or the parameter
+`"bar"` if invoked as `foo(bar)`. It may also be passed additional, named
+parameters.
+
+It should return the same thing as Perl's `cmp` and `<=>` operators: negative
+if the first argument is less than the second, positive if the first argument
+is greater, or zero if they are considered equal. It may also raise an
+error using `error`, for instance if it needs a parameter but one isn't
+provided.
+
+You can also define a function called `check_cmp_foo` in the same package.
+If you do, it will be called while preparing to sort by `foo` or `foo(bar)`,
+with argument `undef` or `"bar"` respectively; it may raise an error using
+`error`, if sorting like that isn't going to work.
-- 
cgit v1.2.3


From b68aa11732a1782886793e426f06652656c155cb Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Mar 2010 01:40:32 +0000
Subject: oh dear not fixed after all

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

(limited to 'doc')

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index e896f2129..33975f05c 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -13,7 +13,13 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 >>> Ok, so it's not removal specific, can in fact be triggered by using
 >>> testpagespec (or really anything besides attachment, which passes
 >>> the filename parameter). Nor is it limited to mimetype, all the tests in 
->>> filecheck have the problem. [[Fixed|done]] --[[Joey]] 
+>>> filecheck have the problem. --[[Joey]] 
+
+>>>> Alas, not fixed.  It seems I was mistaken in some of my assumptions.
+>>>> It still happens when attempting to remove attachments.
+>>>> With your fix, the `IkiWiki::srcfile` function is only called when the filename is not passed in, but it appears that in the case of removing attachments, the filename IS passed in, but it is the relative filename as mentioned above.  Thus, the file is still not found, and the mime-type comes back as unknown.
+>>>> The reason my patch worked is because, rather than checking whether a filename was passed in before applying IkiWiki::srcfile to the filename, it checks whether the file can be found, and if it cannot be found, then it applies IkiWiki::srcfile to the filename.
+>>>> --[[KathrynAndersen]]
 
 The following patch fixes the problem:
 
-- 
cgit v1.2.3


From 5dd8c9e99911b112ddffc163d5cca9d7257adc6a Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Mar 2010 01:44:52 +0000
Subject: now my main site uses IkiWiki fully

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

(limited to 'doc')

diff --git a/doc/users/KathrynAndersen.mdwn b/doc/users/KathrynAndersen.mdwn
index 16cb390c4..8e827b0da 100644
--- a/doc/users/KathrynAndersen.mdwn
+++ b/doc/users/KathrynAndersen.mdwn
@@ -1,8 +1,8 @@
 * aka [[rubykat]]
-* Currently an active [PmWiki](http://www.pmwiki.org) user, but investigating changing over to ikiwiki (if I can write the plugins I need).
 * <http://kerravonsen.dreamwidth.org>
-* <http://www.katspace.org>
+* <http://www.katspace.org> (uses IkiWiki!)
 * <http://github.com/rubykat>
+* Also an active [PmWiki](http://www.pmwiki.org) user, interested in having the best of both worlds.
 
 Has written the following plugins:
 [[!map pages="!*/Discussion and ((link(users/KathrynAndersen) or link(users/rubykat)) and plugins/*) "]]
-- 
cgit v1.2.3


From fb39dc5f5f3e0dc4b5006b2cf7c85ce0e895ebfa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Mar 2010 23:40:38 -0400
Subject: patch

---
 doc/bugs/filecheck_failing_to_find_files.mdwn | 53 +++++++++++++++++++--------
 1 file changed, 37 insertions(+), 16 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index 33975f05c..3209c8f53 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -21,20 +21,41 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 >>>> The reason my patch worked is because, rather than checking whether a filename was passed in before applying IkiWiki::srcfile to the filename, it checks whether the file can be found, and if it cannot be found, then it applies IkiWiki::srcfile to the filename.
 >>>> --[[KathrynAndersen]]
 
-The following patch fixes the problem:
+>>>>> Can you test if this patch fixes that? --[[Joey]] 
 
-	diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
-	index 01d4909..1cec0cf 100644
-	--- a/IkiWiki/Plugin/filecheck.pm
-	+++ b/IkiWiki/Plugin/filecheck.pm
-	@@ -118,6 +118,10 @@ sub match_mimetype ($$;@) {
-	 	if (! defined $file) {
-	 		return IkiWiki::ErrorReason->new("no file specified");
-	 	}
-	+	if (! -e $file) {
-	+	    # get the absolute path of the file if you can't find it
-	+	    $file = IkiWiki::srcfile($file);
-	+	}
-	 
-	 	# Use ::magic to get the mime type, the idea is to only trust
-	 	# data obtained by examining the actual file contents.
+<pre>
+diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
+index f59d026..0fc180f 100644
+--- a/IkiWiki/Plugin/remove.pm
++++ b/IkiWiki/Plugin/remove.pm
+@@ -49,7 +49,7 @@ sub check_canremove ($$$) {
+ 	# This is sorta overkill, but better safe than sorry.
+ 	if (! defined pagetype($pagesources{$page})) {
+ 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+-			IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
++			IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file");
+ 		}
+ 		else {
+ 			error("removal of attachments is not allowed");
+diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
+index 3908443..1a9da63 100644
+--- a/IkiWiki/Plugin/rename.pm
++++ b/IkiWiki/Plugin/rename.pm
+@@ -50,7 +50,7 @@ sub check_canrename ($$$$$$) {
+ 	IkiWiki::check_canedit($src, $q, $session);
+ 	if ($attachment) {
+ 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+-			IkiWiki::Plugin::attachment::check_canattach($session, $src, $srcfile);
++			IkiWiki::Plugin::attachment::check_canattach($session, $src, "$config{srcdir}/$srcfile");
+ 		}
+ 		else {
+ 			error("renaming of attachments is not allowed");
+@@ -85,7 +85,7 @@ sub check_canrename ($$$$$$) {
+ 		if ($attachment) {
+ 			# Note that $srcfile is used here, not $destfile,
+ 			# because it wants the current file, to check it.
+-			IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile);
++			IkiWiki::Plugin::attachment::check_canattach($session, $dest, "$config{srcdir}/$srcfile");
+ 		}
+ 	}
+</pre>
-- 
cgit v1.2.3


From 62306d85f998b5bbd64d213e8c591809dbc07cb8 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Mar 2010 04:06:31 +0000
Subject: It works!

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

(limited to 'doc')

diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index 3209c8f53..f8d8e83e6 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -21,7 +21,9 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 >>>> The reason my patch worked is because, rather than checking whether a filename was passed in before applying IkiWiki::srcfile to the filename, it checks whether the file can be found, and if it cannot be found, then it applies IkiWiki::srcfile to the filename.
 >>>> --[[KathrynAndersen]]
 
->>>>> Can you test if this patch fixes that? --[[Joey]] 
+>>>>> Can you test if this patch fixes that? --[[Joey]]
+
+>>>>>> Yes, it works! --[[KathrynAndersen]]
 
 <pre>
 diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
-- 
cgit v1.2.3


From 0f28f310472a333134af63a18b73372f044b8278 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 00:12:22 -0400
Subject: security?

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/pod/discussion.mdwn b/doc/plugins/contrib/pod/discussion.mdwn
new file mode 100644
index 000000000..8f4b625ee
--- /dev/null
+++ b/doc/plugins/contrib/pod/discussion.mdwn
@@ -0,0 +1,8 @@
+My one concern about this plugin is the `=for` markup in POD.
+
+> Some format names that formatters currently are known to
+> accept include "roff", "man", "latex", "tex", "text", and "html".
+
+I don't know which of these [[!cpan Pod::Xml]] supports. If it currently
+supports, or later support latex, that could be problimatic since that
+could maybe be used to include files or run code. --[[Joey]]
-- 
cgit v1.2.3


From 6693b3eafed5edb061ac31e046a441189660cd77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 00:15:15 -0400
Subject: on plugins and stuff

---
 doc/users/KathrynAndersen/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/users/KathrynAndersen/discussion.mdwn

(limited to 'doc')

diff --git a/doc/users/KathrynAndersen/discussion.mdwn b/doc/users/KathrynAndersen/discussion.mdwn
new file mode 100644
index 000000000..c44b28a93
--- /dev/null
+++ b/doc/users/KathrynAndersen/discussion.mdwn
@@ -0,0 +1,6 @@
+Had a look at your site. Sprawling, individualistic, using ikiwiki in lots of
+ways. Makes me happy. :) I see that I have let a lot of contrib plugins
+pile up. I will try to get to these. I'm particularly interested in
+your use of yaml+fields. Encourage you to go ahead with any others you
+have not submitted here, like pmap. (Unless it makes more sense to submit
+that as a patch to the existing map plugin.) --[[Joey]] 
-- 
cgit v1.2.3


From 243b0dd082cf4b66dfef55b2c9b459109bee7398 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 00:16:21 -0400
Subject: fix the other half of the filecheck filename bug

---
 IkiWiki/Plugin/remove.pm                      | 2 +-
 IkiWiki/Plugin/rename.pm                      | 4 ++--
 debian/changelog                              | 2 +-
 doc/bugs/filecheck_failing_to_find_files.mdwn | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index f59d0269e..0fc180f69 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -49,7 +49,7 @@ sub check_canremove ($$$) {
 	# This is sorta overkill, but better safe than sorry.
 	if (! defined pagetype($pagesources{$page})) {
 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
-			IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
+			IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file");
 		}
 		else {
 			error("removal of attachments is not allowed");
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 3908443ca..1a9da6363 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -50,7 +50,7 @@ sub check_canrename ($$$$$$) {
 	IkiWiki::check_canedit($src, $q, $session);
 	if ($attachment) {
 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
-			IkiWiki::Plugin::attachment::check_canattach($session, $src, $srcfile);
+			IkiWiki::Plugin::attachment::check_canattach($session, $src, "$config{srcdir}/$srcfile");
 		}
 		else {
 			error("renaming of attachments is not allowed");
@@ -85,7 +85,7 @@ sub check_canrename ($$$$$$) {
 		if ($attachment) {
 			# Note that $srcfile is used here, not $destfile,
 			# because it wants the current file, to check it.
-			IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile);
+			IkiWiki::Plugin::attachment::check_canattach($session, $dest, "$config{srcdir}/$srcfile");
 		}
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 7249cdfa4..da1ab890e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * Allow wrappers to be built using tcc.
   * Add support for setup files written in YAML.
   * Add --set-yaml switch for setting more complex config file options.
-  * filecheck: Fix bug that prevented the pagespecs from matching when
+  * filecheck: Fix bugs that prevented the pagespecs from matching when
     not called by attachment plugin.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn
index f8d8e83e6..6501508e4 100644
--- a/doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/doc/bugs/filecheck_failing_to_find_files.mdwn
@@ -25,6 +25,8 @@ It turns out that the filecheck plugin couldn't find the file, because it was me
 
 >>>>>> Yes, it works! --[[KathrynAndersen]]
 
+applied && [[done]]
+
 <pre>
 diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
 index f59d026..0fc180f 100644
-- 
cgit v1.2.3


From 3cea3eb5da0a8f09a495deea9f2a2c73dc76deab Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Mar 2010 04:30:43 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/pod/discussion.mdwn b/doc/plugins/contrib/pod/discussion.mdwn
index 8f4b625ee..76e858680 100644
--- a/doc/plugins/contrib/pod/discussion.mdwn
+++ b/doc/plugins/contrib/pod/discussion.mdwn
@@ -3,6 +3,8 @@ My one concern about this plugin is the `=for` markup in POD.
 > Some format names that formatters currently are known to
 > accept include "roff", "man", "latex", "tex", "text", and "html".
 
-I don't know which of these [[!cpan Pod::Xml]] supports. If it currently
+I don't know which of these [[!cpan Pod::Xhtml]] supports. If it currently
 supports, or later support latex, that could be problimatic since that
 could maybe be used to include files or run code. --[[Joey]]
+
+> I don't know, either; the documentation for [[!cpan Pod:Xhtml]] is silent on this subject. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 8b09b29735b1dbbfe0ef33ad347ecb9bbdf45b75 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 26 Mar 2010 04:41:37 +0000
Subject: response

---
 doc/users/KathrynAndersen/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/users/KathrynAndersen/discussion.mdwn b/doc/users/KathrynAndersen/discussion.mdwn
index c44b28a93..288ea8c51 100644
--- a/doc/users/KathrynAndersen/discussion.mdwn
+++ b/doc/users/KathrynAndersen/discussion.mdwn
@@ -4,3 +4,11 @@ pile up. I will try to get to these. I'm particularly interested in
 your use of yaml+fields. Encourage you to go ahead with any others you
 have not submitted here, like pmap. (Unless it makes more sense to submit
 that as a patch to the existing map plugin.) --[[Joey]] 
+
+> Thanks.  I would have put more up, but I didn't want to until they were properly documented, and other things have taken a higher priority.
+
+> I think pmap is probably better as a separate plugin, because it has additional dependencies (HTML::LinkList) which people might not want to have to install.
+
+> The "includepage" plugin I'm not sure whether it is worth releasing or not; it's basically a cut-down version of "inline", because the inline plugin is so complicated and has so many options, I felt more at ease to have something simpler.
+
+> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 1093c7e4b2ec5f3b4052ed5c1b5530560864a920 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 00:57:46 -0400
Subject: new bug

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

(limited to 'doc')

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
new file mode 100644
index 000000000..506bef904
--- /dev/null
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -0,0 +1,18 @@
+The [[bugs]] page, at least before I commit this, has a bug at the top that
+has been modified to link to done, and ikiwiki's dependency calculations
+failed to notice and update the bugs page. Looking at the indexdb, I saw
+that the page was not included in the `depends_simple` of the bugs page. 
+
+I was able to replicate the problem locally by starting off with the page
+not marked done (when it did appear in the bugs page `depends_simple`
+(appropriatly as a link dependency, since a change to the page removing the
+link would make it match)), then removing the done link. 
+
+At that point, it vanished from `depends_simple`. Presumably because
+the main (pagespec) depends for the bugs page now matched it, as a content
+dependency. But, it seems to me it should still be listed in
+`depends_simple` here. This, I think, is the cause of the bug.
+
+Then re-add the done link, and the dependency calc code breaks down,
+not noticing that bugs dependeded on the page and needs to be updated.
+--[[Joey]]
-- 
cgit v1.2.3


From 4cb464d6e52344b8a0dfd29e82ede78aef1385d3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 01:05:22 -0400
Subject: typo

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

(limited to 'doc')

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 506bef904..c2845240d 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -4,7 +4,7 @@ failed to notice and update the bugs page. Looking at the indexdb, I saw
 that the page was not included in the `depends_simple` of the bugs page. 
 
 I was able to replicate the problem locally by starting off with the page
-not marked done (when it did appear in the bugs page `depends_simple`
+marked done (when it did appear in the bugs page `depends_simple`
 (appropriatly as a link dependency, since a change to the page removing the
 link would make it match)), then removing the done link. 
 
-- 
cgit v1.2.3


From 0d524ad672333fd0bafa64e81e261fd297c25580 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 01:38:53 -0400
Subject: Fix incorrect influence info returned by a failing link() pagespec,
 that could lead to bad dependency handling in certian situations.

---
 IkiWiki.pm                         | 4 ++--
 debian/changelog                   | 2 ++
 doc/bugs/depends_simple_mixup.mdwn | 5 +++++
 t/pagespec_match.t                 | 8 +++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 022bfe3bd..927d62940 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2215,7 +2215,7 @@ sub match_link ($$;@) {
 	my $from=exists $params{location} ? $params{location} : '';
 
 	my $links = $IkiWiki::links{$page};
-	return IkiWiki::FailReason->new("$page has no links", "" => 1)
+	return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 		unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
@@ -2232,7 +2232,7 @@ sub match_link ($$;@) {
 				if match_glob($p_rel, $link, %params);
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link", "" => 1);
+	return IkiWiki::FailReason->new("$page does not link to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
 }
 
 sub match_backlink ($$;@) {
diff --git a/debian/changelog b/debian/changelog
index da1ab890e..b9a105552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * Add --set-yaml switch for setting more complex config file options.
   * filecheck: Fix bugs that prevented the pagespecs from matching when
     not called by attachment plugin.
+  * Fix incorrect influence info returned by a failing link() pagespec,
+    that could lead to bad dependency handling in certian situations.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index c2845240d..2603ff04c 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -15,4 +15,9 @@ dependency. But, it seems to me it should still be listed in
 
 Then re-add the done link, and the dependency calc code breaks down,
 not noticing that bugs dependeded on the page and needs to be updated.
+
+Ok.. Turns out this was not a problem with the actual influences
+calculation or dependency calculation code. Whew! `match_link`
+just didn't set the influence correctly when failing. [[fixed|done]]
+
 --[[Joey]]
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 8b0be4e8a..ade9bca5a 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 72;
+use Test::More tests => 75;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -54,6 +54,7 @@ $config{userdir}="";
 $links{foo}=[qw{bar baz}];
 $links{bar}=[];
 $links{baz}=[];
+$links{meh}=[];
 $links{"bugs/foo"}=[qw{bugs/done}];
 $links{"bugs/done"}=[];
 $links{"bugs/bar"}=[qw{done}];
@@ -82,6 +83,7 @@ ok(! pagespec_match("bar", ""), "empty pagespec should match nothing");
 ok(! pagespec_match("bar", "    	"), "blank pagespec should match nothing");
 ok(pagespec_match("ook", "link(blog/tags/foo)"), "link internal absolute success");
 ok(pagespec_match("ook", "link(/blog/tags/foo)"), "link explicit absolute success");
+ok(pagespec_match("meh", "!link(done)"), "negated failing match is a success");
 
 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
 $IkiWiki::pagectime{bar}=1154532695; # after
@@ -122,3 +124,7 @@ $i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
 is(join(",", sort keys %$i), 'bar,foo', "influences add up over OR");
 $i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
 is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation");
+$i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
+is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation");
+$i=pagespec_match("meh", "!link(done)")->influences;
+is(join(",", sort keys %$i), 'meh', "a negated, failing link test is successful, so the page is a link influence");
-- 
cgit v1.2.3


From 0dec80ee0cb9a2ac9dd4287645d02e5a216f2d0b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 01:48:37 -0400
Subject: close, unreproducible

---
 ...n_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn b/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn
index 42e6b9e27..c3cbff43e 100644
--- a/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn
+++ b/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn
@@ -39,3 +39,6 @@ a year ago in September 2007.
 > ikiwiki. (Doesn't quite seem to be version 2.53.x either) Try with a current
 > version, and see if you can send me a source tree that can reproduce the
 > problem? --[[Joey]]
+
+Did not hear back, so calling this [[done]], unless I hear differently.
+--[[Joey]]
-- 
cgit v1.2.3


From 22b9582cddfcb0ee073c99f8867537f67d79fc38 Mon Sep 17 00:00:00 2001
From: "http://users.itk.ppke.hu/~cstamas/openid/"
 <http://users.itk.ppke.hu/~cstamas/openid/@web>
Date: Fri, 26 Mar 2010 08:57:20 +0000
Subject: init page bugreport

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

(limited to 'doc')

diff --git a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
new file mode 100644
index 000000000..7f8045164
--- /dev/null
+++ b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
@@ -0,0 +1,13 @@
+When installing ikiwiki the perl module path is setup correctly
+
+    use lib '/usr/local/ikiwiki-3.20100312/share/perl/5.10.0';
+
+This is not true for ikiwiki-transition:
+
+    $ PATH=/usr/local/ikiwiki-3.20100312/bin ikiwiki-transition prefix_directives ikiwiki.setup
+    Can't locate IkiWiki.pm in @INC (@INC contains: /etc/perl /usr/local/lib/perl/5.10.0 /usr/local/share/perl/5.10.0 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4.
+    BEGIN failed--compilation aborted at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4.
+
+The missing line should be added.
+
+Thanks!
-- 
cgit v1.2.3


From 99b402cd622d38cb8337498d8fdb4f135e8be03c Mon Sep 17 00:00:00 2001
From: "http://users.itk.ppke.hu/~cstamas/openid/"
 <http://users.itk.ppke.hu/~cstamas/openid/@web>
Date: Fri, 26 Mar 2010 08:58:41 +0000
Subject: line break for better view

---
 .../ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
index 7f8045164..5dd4bc780 100644
--- a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
+++ b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
@@ -5,7 +5,9 @@ When installing ikiwiki the perl module path is setup correctly
 This is not true for ikiwiki-transition:
 
     $ PATH=/usr/local/ikiwiki-3.20100312/bin ikiwiki-transition prefix_directives ikiwiki.setup
-    Can't locate IkiWiki.pm in @INC (@INC contains: /etc/perl /usr/local/lib/perl/5.10.0 /usr/local/share/perl/5.10.0 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4.
+    Can't locate IkiWiki.pm in @INC (@INC contains: /etc/perl /usr/local/lib/perl/5.10.0
+     /usr/local/share/perl/5.10.0 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .)
+     at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4.
     BEGIN failed--compilation aborted at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4.
 
 The missing line should be added.
-- 
cgit v1.2.3


From d29419ab0bd181beda6971bf622c3ba8bdd2fd8c Mon Sep 17 00:00:00 2001
From: "http://users.itk.ppke.hu/~cstamas/openid/"
 <http://users.itk.ppke.hu/~cstamas/openid/@web>
Date: Fri, 26 Mar 2010 09:43:50 +0000
Subject: me too - thanks

---
 doc/bugs/Error:_Your_login_session_has_expired._.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
index 046d6e10d..b993cd8e7 100644
--- a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
+++ b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn
@@ -41,4 +41,6 @@ Whilst trying to edit http://hugh.vm.bytemark.co.uk/ikiwiki.cgi via OpenID. Any
 
 Thanks for you excellent analysis. The bug was due to old pre-3.0 **templates** laying about. After deleting them, ikiwiki defaults to its own templates. Clever. :-)
 
+Great, this saved me big time! It is a google 1st hit. I had the same with accidentally using old templates. Thanks! --[[cstamas]]
+
 [[bugs/done]]
-- 
cgit v1.2.3


From 087085899f7049434ac19761f27826cec9e458d5 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 13:03:37 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index 188e627f0..045bfd7aa 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -37,8 +37,12 @@ I have written additional plugins which integrate with the [[plugins/contrib/fie
 > with different syntaxes while keeping `field` for the
 > behind-the-scenes bits.
 >
+>> I've started using `field` on a private site and it's working
+>> well for me; I'll try to do some code review on its
+>> [[plugins/contrib/field/discussion]] page. --s
+>
 > My [[plugins/contrib/album]] plugin could benefit from
-> integration with [[field]] for photos' captions and so on,
+> integration with `field` for photos' captions and so on,
 > probably... I'll try to work on that at some point.
 >
 > [[plugins/contrib/report]] may be doing too much, though:
-- 
cgit v1.2.3


From d88af43011193bb0eef79b749ae9a93eda5d266e Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 13:20:33 +0000
Subject: brief review of field; fieldsort plugin

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
new file mode 100644
index 000000000..fc1759fab
--- /dev/null
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -0,0 +1,62 @@
+Having tried out `field`, some comments (from [[smcv]]):
+
+The general concept looks great.
+
+The `pagetemplate` hook seems quite namespace-polluting: on a site containing
+a list of books, I'd like to have an `author` field, but that would collide
+with IkiWiki's use of `<TMPL_VAR AUTHOR>` for the author of the *page*
+(i.e. me). Perhaps it'd be better if the pagetemplate hook was only active for
+`<TMPL_VAR FIELD_AUTHOR>` or something? (For those who want the current
+behaviour, an auxiliary plugin would be easy.)
+
+From a coding style point of view, the `$CamelCase` variable names aren't
+IkiWiki style, and the `match_foo` functions look as though they could benefit
+from being thin wrappers around a common `&IkiWiki::Plugin::field::match`
+function (see `meta` for a similar approach).
+
+I think the documentation would probably be clearer in a less manpage-like
+and more ikiwiki-like style?
+
+If one of my branches from [[todo/allow_plugins_to_add_sorting_methods]] is
+accepted, a `field()` cmp type would mean that [[plugins/contrib/report]] can
+stop reimplementing sorting. Here's the implementation I'm using, with
+your "sortspec" concept (a sort-hook would be very similar): if merged,
+I think it should just be part of `field` rather than a separate plugin.
+
+	# Copyright © 2010 Simon McVittie, released under GNU LGPL >= 2.1
+	package IkiWiki::Plugin::fieldsort;
+	use warnings;
+	use strict;
+	use IkiWiki 3.00;
+	use IkiWiki::Plugin::field;
+
+	sub import {
+		hook(type => "getsetup", id => "fieldsort",  call => \&getsetup);
+	}
+
+	sub getsetup () {
+		return
+			plugin => {
+				safe => 1,
+				rebuild => undef,
+			},
+	}
+
+	package IkiWiki::PageSpec;
+
+	sub check_cmp_field {
+		if (!length $_[0]) {
+			error("sort=field requires a parameter");
+		}
+	}
+
+	sub cmp_field {
+		my $left = IkiWiki::Plugin::field::field_get_value($_[2], $_[0]);
+		my $right = IkiWiki::Plugin::field::field_get_value($_[2], $_[1]);
+
+		$left = "" unless defined $left;
+		$right = "" unless defined $right;
+		return $left cmp $right;
+	}
+
+	1;
-- 
cgit v1.2.3


From bea828a2f6b455c46f2b5d6c16805958a2e3412a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 13:30:52 +0000
Subject: doesn't field+template already cover this?

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
new file mode 100644
index 000000000..851ccf960
--- /dev/null
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -0,0 +1,6 @@
+Is this actually necessary? Doesn't the combination of [[plugins/template]]
+with [[plugins/contrib/field]]'s `pagetemplate` hook provide the same
+functionality? I suppose one missing thing is that `ftemplate` looks in
+the "system" templates directories, not just in the wiki, but that
+seems orthogonal (and might even be a good enhancement to `template`).
+--[[smcv]]
-- 
cgit v1.2.3


From fffd7e7e026f61e03b2fa052acdf7130889f6343 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 13:43:37 +0000
Subject: oh, my mistake... this *is* necessary, but could perhaps be done
 better?

---
 doc/plugins/contrib/ftemplate/discussion.mdwn | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index 851ccf960..eb2ec6f13 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -1,6 +1,13 @@
-Is this actually necessary? Doesn't the combination of [[plugins/template]]
-with [[plugins/contrib/field]]'s `pagetemplate` hook provide the same
-functionality? I suppose one missing thing is that `ftemplate` looks in
+I initially thought this wasn't actually necessary - the combination
+of [[plugins/template]] with [[plugins/contrib/field]]'s `pagetemplate`
+hook ought to provide the same functionality. However, `template`
+doesn't run `pagetemplate` hooks; a more general version of this
+plugin would be to have a variant of `template` that runs `pagetemplate`
+hooks (probably easiest to just patch `template` to implement a
+second directive, or have a special parameter `run_hooks="yes"`,
+or something).
+
+Another missing thing is that `ftemplate` looks in
 the "system" templates directories, not just in the wiki, but that
-seems orthogonal (and might even be a good enhancement to `template`).
+seems orthogonal (and might be a good enhancement to `template` anyway).
 --[[smcv]]
-- 
cgit v1.2.3


From b9958fe3cf1a27b58d3e2bd59c76553eb0046782 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 14:09:04 +0000
Subject: brief review of report

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
new file mode 100644
index 000000000..6b1e28f6a
--- /dev/null
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -0,0 +1,23 @@
+Wow, this plugin does a lot... it seems to be `inline` (but without the feeds
+or the ability to not have `archive="yes"`), plus part of
+[[plugins/contrib/trail]], plus some sorting, plus an ingenious workaround
+for template evaluation being relatively stateless.
+
+A large part of this plugin would just fall off if one of the versions of
+[[todo/allow_add_plugins_to_add_sorting_methods]] was merged, which was a
+large part of the idea of that feature request :-) To make use of that
+you'd have to use `pagespec_match_list` in the trail case too, but that's
+easy enough - just add `list => [@the_trail_pages]` to the arguments.
+
+Another large part would fall off if this plugin required, and internally
+invoked, `inline` (like my `comments` plugin does) - `inline` runs
+`pagetemplate` hooks, and in particular, it'll run the `field` hook.
+Alternatively, this plugin could invoke `pagetemplate` hooks itself,
+removing the special case for `field`.
+
+Perhaps the `headers` thing could migrate into inline somehow? That might
+lead to making inline too big, though.
+
+Is the intention that the `trail` part is a performance hack, or a way
+to select pages? How does it relate to [[todo/wikitrails]] or
+[[plugins/contrib/trail]]? --[[smcv]]
-- 
cgit v1.2.3


From 3c98cf653f6d6950a425620acf0279df902d004b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 26 Mar 2010 15:09:11 +0000
Subject: fix link

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index 6b1e28f6a..918d0779b 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -4,7 +4,7 @@ or the ability to not have `archive="yes"`), plus part of
 for template evaluation being relatively stateless.
 
 A large part of this plugin would just fall off if one of the versions of
-[[todo/allow_add_plugins_to_add_sorting_methods]] was merged, which was a
+"[[todo/allow_plugins_to_add_sorting_methods]]" was merged, which was a
 large part of the idea of that feature request :-) To make use of that
 you'd have to use `pagespec_match_list` in the trail case too, but that's
 easy enough - just add `list => [@the_trail_pages]` to the arguments.
-- 
cgit v1.2.3


From 1273f1de52998cf54afb3445fd8c616bce53e698 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Mar 2010 13:11:02 -0400
Subject: Add preprocessed 'use lib' line to ikiwiki-transition and
 ikiwiki-calendar if necessary for unusual install.

---
 .gitignore                                         |   3 +-
 Makefile.PL                                        |  16 +-
 debian/changelog                                   |   2 +
 ...on_does_not_set_perl_moduels_path_properly.mdwn |   2 +
 ikiwiki-calendar                                   |  57 ----
 ikiwiki-calendar.in                                |  58 ++++
 ikiwiki-transition                                 | 348 --------------------
 ikiwiki-transition.in                              | 349 +++++++++++++++++++++
 ikiwiki.spec                                       |   2 +-
 9 files changed, 423 insertions(+), 414 deletions(-)
 delete mode 100755 ikiwiki-calendar
 create mode 100755 ikiwiki-calendar.in
 delete mode 100755 ikiwiki-transition
 create mode 100755 ikiwiki-transition.in

(limited to 'doc')

diff --git a/.gitignore b/.gitignore
index 8de36e2c8..e9ab152b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,10 @@ blib/*
 doc/.ikiwiki/*
 html/*
 ikiwiki.out
+ikiwiki-transition.out
+ikiwiki-calendar.out
 pm_to_blib
 *.man
-build-stamp
 po/po2wiki_stamp
 po/underlays/*/*.mdwn
 po/underlays/basewiki/*/*.mdwn
diff --git a/Makefile.PL b/Makefile.PL
index 52421a711..5a9028b51 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -28,15 +28,16 @@ W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
 
 tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
 extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
+outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out
 
-ikiwiki.out: ikiwiki.in
-	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
-	chmod +x ikiwiki.out
+%.out: %.in
+	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
+	chmod +x $@
 
 ikiwiki.setup: ikiwiki.out
 	HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
 
-extra_build: ikiwiki.out ikiwiki.setup docwiki
+extra_build: $(outprogs) ikiwiki.setup docwiki
 	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
 	./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
 	./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
@@ -52,7 +53,7 @@ docwiki: ikiwiki.out
 
 extra_clean:
 	$(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean
-	rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
+	rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
 underlay_install:
@@ -115,8 +116,9 @@ extra_install: underlay_install
 	install ikiwiki-w3m.cgi $(DESTDIR)$(W3M_CGI_BIN)
 
 	install -d $(DESTDIR)$(PREFIX)/bin
-	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
-	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist ikiwiki-calendar $(DESTDIR)$(PREFIX)/bin/
+	for prog in $(outprogs); do \
+		install $$prog $(DESTDIR)$(PREFIX)/bin/$$(shell echo $$prog | sed 's/\.out//'); \
+	done
 
 	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
 	
diff --git a/debian/changelog b/debian/changelog
index b9a105552..57406c6d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
     not called by attachment plugin.
   * Fix incorrect influence info returned by a failing link() pagespec,
     that could lead to bad dependency handling in certian situations.
+  * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
+    if necessary for unusual install.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
index 5dd4bc780..b3e87b529 100644
--- a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
+++ b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
@@ -13,3 +13,5 @@ This is not true for ikiwiki-transition:
 The missing line should be added.
 
 Thanks!
+
+[[done]] --[[Joey]] 
diff --git a/ikiwiki-calendar b/ikiwiki-calendar
deleted file mode 100755
index a9548d6ec..000000000
--- a/ikiwiki-calendar
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-use IkiWiki;
-use IkiWiki::Setup;
-use Getopt::Long;
-
-sub usage () {
-	die gettext("usage: ikiwiki-calendar [-f] your.setup [pagespec] [year]"), "\n";
-}
-
-my $force=0;
-GetOptions(
-	"force" => \$force,
-) || usage();
-my $setup=shift		|| usage();
-my $pagespec=shift	|| "*";
-my $startyear=shift	|| 1900+(localtime(time))[5];
-my $endyear=shift	|| $startyear;
-
-%config=IkiWiki::defaultconfig();
-IkiWiki::Setup::load($setup);
-IkiWiki::loadplugins();
-IkiWiki::checkconfig();
-
-my $archivebase = 'archives';
-$archivebase = $config{archivebase} if defined $config{archivebase};
-
-sub writearchive ($$;$) {
-	my $template=template(shift);
-	my $year=shift;
-	my $month=shift;
-
-	my $page=defined $month ? "$year/$month" : $year;
-
-	my $pagefile=newpagefile("$archivebase/$page", $config{default_pageext});
-	$template->param(pagespec => $pagespec);
-	$template->param(year => $year);
-	$template->param(month => $month) if defined $month;
-
-	if ($force || ! -e "$config{srcdir}/$pagefile") {
-		writefile($pagefile, $config{srcdir}, $template->output);
-		IkiWiki::rcs_add($pagefile) if $config{rcs};
-	}
-}
-
-foreach my $y ($startyear..$endyear) {
-	writearchive("calendaryear.tmpl", $y);
-	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
-		writearchive("calendarmonth.tmpl", $y, $m);
-	}
-}
-
-IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
-	if $config{rcs};
-
-system("ikiwiki", "-setup", $setup, "-refresh");
diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
new file mode 100755
index 000000000..9738ea5f7
--- /dev/null
+++ b/ikiwiki-calendar.in
@@ -0,0 +1,58 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use lib '.'; # For use in nonstandard directory, munged by Makefile.
+use IkiWiki;
+use IkiWiki::Setup;
+use Getopt::Long;
+
+sub usage () {
+	die gettext("usage: ikiwiki-calendar [-f] your.setup [pagespec] [year]"), "\n";
+}
+
+my $force=0;
+GetOptions(
+	"force" => \$force,
+) || usage();
+my $setup=shift		|| usage();
+my $pagespec=shift	|| "*";
+my $startyear=shift	|| 1900+(localtime(time))[5];
+my $endyear=shift	|| $startyear;
+
+%config=IkiWiki::defaultconfig();
+IkiWiki::Setup::load($setup);
+IkiWiki::loadplugins();
+IkiWiki::checkconfig();
+
+my $archivebase = 'archives';
+$archivebase = $config{archivebase} if defined $config{archivebase};
+
+sub writearchive ($$;$) {
+	my $template=template(shift);
+	my $year=shift;
+	my $month=shift;
+
+	my $page=defined $month ? "$year/$month" : $year;
+
+	my $pagefile=newpagefile("$archivebase/$page", $config{default_pageext});
+	$template->param(pagespec => $pagespec);
+	$template->param(year => $year);
+	$template->param(month => $month) if defined $month;
+
+	if ($force || ! -e "$config{srcdir}/$pagefile") {
+		writefile($pagefile, $config{srcdir}, $template->output);
+		IkiWiki::rcs_add($pagefile) if $config{rcs};
+	}
+}
+
+foreach my $y ($startyear..$endyear) {
+	writearchive("calendaryear.tmpl", $y);
+	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
+		writearchive("calendarmonth.tmpl", $y, $m);
+	}
+}
+
+IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
+	if $config{rcs};
+
+system("ikiwiki", "-setup", $setup, "-refresh");
diff --git a/ikiwiki-transition b/ikiwiki-transition
deleted file mode 100755
index 1bebb1176..000000000
--- a/ikiwiki-transition
+++ /dev/null
@@ -1,348 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-use IkiWiki;
-use HTML::Entities;
-
-my $regex = qr{
-	(\\?)		# 1: escape?
-	\[\[(!?)	# directive open; 2: optional prefix
-	([-\w]+)	# 3: command
-	(		# 4: the parameters (including initial whitespace)
-	\s+
-		(?:
-			(?:[-\w]+=)?		# named parameter key?
-			(?:
-				""".*?"""	# triple-quoted value
-				|
-				"[^"]+"		# single-quoted value
-				|
-				[^\s\]]+	# unquoted value
-			)
-			\s*			# whitespace or end
-						# of directive
-		)
-	*)		# 0 or more parameters
-	\]\]		# directive closed
-}sx;
-
-sub handle_directive {
-	my $escape = shift;
-	my $prefix = shift;
-	my $directive = shift;
-	my $args = shift;
-
-	if (length $escape) {
-		return "${escape}[[${prefix}${directive}${args}]]"
-	}
-	if ($directive =~ m/^(if|more|table|template|toggleable)$/) {
-		$args =~ s{$regex}{handle_directive($1, $2, $3, $4)}eg;
-	}
-	return "[[!${directive}${args}]]"
-}
-
-sub prefix_directives {
-	loadsetup(shift);
-
-	IkiWiki::loadplugins();
-	IkiWiki::checkconfig();
-	IkiWiki::loadindex();
-
-	if (! %pagesources) {
-		error "ikiwiki has not built this wiki yet, cannot transition";
-	}
-
-	foreach my $page (values %pagesources) {
-		next unless defined pagetype($page) &&
-		            -f $config{srcdir}."/".$page;
-		my $content=readfile($config{srcdir}."/".$page);
-		my $oldcontent=$content;
-		$content=~s{$regex}{handle_directive($1, $2, $3, $4)}eg;
-		if ($oldcontent ne $content) {
-			writefile($page, $config{srcdir}, $content);
-		}
-	}
-}
-
-sub indexdb {
-	setstatedir(shift);
-
-	# Note: No lockwiki here because ikiwiki already locks it
-	# before calling this.	
-	if (! IkiWiki::oldloadindex()) {
-		die "failed to load index\n";
-	}
-	if (! IkiWiki::saveindex()) {
-		die "failed to save indexdb\n"
-	}
-	if (! IkiWiki::loadindex()) {
-		die "transition failed, cannot load new indexdb\n";
-	}
-	if (! unlink("$config{wikistatedir}/index")) {
-		die "unlink failed: $!\n";
-	}
-}
-
-sub hashpassword {
-	setstatedir(shift);
-
-	eval q{use IkiWiki::UserInfo};
-	eval q{use Authen::Passphrase::BlowfishCrypt};
-	if ($@) {
-		error("ikiwiki-transition hashpassword: failed to load Authen::Passphrase, passwords not hashed");
-	}
-
-	IkiWiki::lockwiki();
-	IkiWiki::loadplugin("passwordauth");
-	my $userinfo = IkiWiki::userinfo_retrieve();
-	foreach my $user (keys %{$userinfo}) {
-		if (ref $userinfo->{$user} &&
-		    exists $userinfo->{$user}->{password} &&
-		    length $userinfo->{$user}->{password} &&
-		    ! exists $userinfo->{$user}->{cryptpassword}) {
-			IkiWiki::Plugin::passwordauth::setpassword($user, $userinfo->{$user}->{password});
-		}
-	}
-}
-
-sub aggregateinternal {
-	loadsetup(shift);
-	require IkiWiki::Plugin::aggregate;
-	IkiWiki::checkconfig();
-	IkiWiki::Plugin::aggregate::migrate_to_internal();
-}
-
-sub setupformat {
-	my $setup=shift;
-
-	loadsetup($setup);
-	IkiWiki::checkconfig();
-	
-	# unpack old-format wrappers setting into new fields
-	my $cgi_seen=0;
-	my $rcs_seen=0;
-	foreach my $wrapper (@{$config{wrappers}}) {
-		if ($wrapper->{cgi}) {
-			if ($cgi_seen) {
-				die "don't know what to do with second cgi wrapper ".$wrapper->{wrapper}."\n";
-			}
-			$cgi_seen++;
-			print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n";
-			$config{cgi_wrapper}=$wrapper->{wrapper};
-			$config{cgi_wrappermode}=$wrapper->{wrappermode}
-				if exists $wrapper->{wrappermode};
-		}
-		elsif ($config{rcs}) {
-			if ($rcs_seen) {
-				die "don't know what to do with second rcs wrapper ".$wrapper->{wrapper}."\n";
-			}
-			$rcs_seen++;
-			print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n";
-			$config{$config{rcs}."_wrapper"}=$wrapper->{wrapper};
-			$config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode}
-				if exists $wrapper->{wrappermode};
-		}
-		else {
-			die "don't know what to do with wrapper ".$wrapper->{wrapper}."\n";
-		}
-	}
-
-	IkiWiki::Setup::dump($setup);
-}
-
-sub moveprefs {
-	my $setup=shift;
-
-	loadsetup($setup);
-	IkiWiki::checkconfig();
-
-	eval q{use IkiWiki::UserInfo};
-	error $@ if $@;
-
-	foreach my $field (qw{allowed_attachments locked_pages}) {
-		my $orig=$config{$field};
-		foreach my $admin (@{$config{adminuser}}) {
-			my $a=IkiWiki::userinfo_get($admin, $field);
-			if (defined $a && length $a &&
-			    # might already have been moved
-			    (! defined $orig || $a ne $orig)) {
-			    	if (defined $config{$field} &&
-				    length $config{$field}) {
-					$config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
-				}
-				else {
-					$config{$field}=$a;
-				}
-			}
-		}
-	}
-
-	my %banned=map { $_ => 1 } @{$config{banned_users}}, IkiWiki::get_banned_users();
-	$config{banned_users}=[sort keys %banned];
-
-	IkiWiki::Setup::dump($setup);
-}
-
-sub deduplinks {
-	loadsetup(shift);
-	IkiWiki::loadplugins();
-	IkiWiki::checkconfig();
-	IkiWiki::loadindex();
-	foreach my $page (keys %links) {
-		my %l;
-		$l{$_}=1 foreach @{$links{$page}};
-		$links{$page}=[keys %l]
-	}
-	IkiWiki::saveindex();
-}
-
-sub setstatedir {
-	my $dirorsetup=shift;
-
-	if (! defined $dirorsetup) {
-		usage();		
-	}
-
-	if (-d $dirorsetup) {
-		$config{wikistatedir}=$dirorsetup."/.ikiwiki";
-	}
-	elsif (-f $dirorsetup) {
-		loadsetup($dirorsetup);
-	}
-	else {
-		error("ikiwiki-transition: $dirorsetup does not exist");
-	}
-
-	if (! -d $config{wikistatedir}) {
-		error("ikiwiki-transition: $config{wikistatedir} does not exist");
-	}
-}
-	
-sub loadsetup {
-	my $setup=shift;
-	if (! defined $setup) {
-		usage();
-	}
-
-	require IkiWiki::Setup;
-
-	%config = IkiWiki::defaultconfig();
-	IkiWiki::Setup::load($setup);
-}
-
-sub usage {
-	print STDERR "Usage: ikiwiki-transition type ...\n";
-	print STDERR "Currently supported transition subcommands:\n";
-	print STDERR "\tprefix_directives setupfile ...\n";
-	print STDERR "\taggregateinternal setupfile\n";
-	print STDERR "\tsetupformat setupfile\n";
-	print STDERR "\tmoveprefs setupfile\n";
-	print STDERR "\thashpassword setupfile|srcdir\n";
-	print STDERR "\tindexdb setupfile|srcdir\n";
-	print STDERR "\tdeduplinks setupfile\n";
-	exit 1;
-}
-
-usage() unless @ARGV;
-
-my $mode=shift;
-if ($mode eq 'prefix_directives') {
-	prefix_directives(@ARGV);
-}
-elsif ($mode eq 'hashpassword') {
-	hashpassword(@ARGV);
-}
-elsif ($mode eq 'indexdb') {
-	indexdb(@ARGV);
-}
-elsif ($mode eq 'aggregateinternal') {
-	aggregateinternal(@ARGV);
-}
-elsif ($mode eq 'setupformat') {
-	setupformat(@ARGV);
-}
-elsif ($mode eq 'moveprefs') {
-	moveprefs(@ARGV);
-}
-elsif ($mode eq 'deduplinks') {
-	deduplinks(@ARGV);
-}
-else {
-	usage();
-}
-
-package IkiWiki;
-
-# A slightly modified version of the old loadindex function.
-sub oldloadindex {
-	%oldrenderedfiles=%pagectime=();
-	if (! $config{rebuild}) {
-		%pagesources=%pagemtime=%oldlinks=%links=%depends=
-			%destsources=%renderedfiles=%pagecase=%pagestate=();
-	}
-	open (my $in, "<", "$config{wikistatedir}/index") || return;
-	while (<$in>) {
-		chomp;
-		my %items;
-		$items{link}=[];
-		$items{dest}=[];
-		foreach my $i (split(/ /, $_)) {
-			my ($item, $val)=split(/=/, $i, 2);
-			push @{$items{$item}}, decode_entities($val);
-		}
-
-		next unless exists $items{src}; # skip bad lines for now
-
-		my $page=pagename($items{src}[0]);
-		if (! $config{rebuild}) {
-			$pagesources{$page}=$items{src}[0];
-			$pagemtime{$page}=$items{mtime}[0];
-			$oldlinks{$page}=[@{$items{link}}];
-			$links{$page}=[@{$items{link}}];
-			$depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT } if exists $items{depends};
-			$destsources{$_}=$page foreach @{$items{dest}};
-			$renderedfiles{$page}=[@{$items{dest}}];
-			$pagecase{lc $page}=$page;
-			foreach my $k (grep /_/, keys %items) {
-				my ($id, $key)=split(/_/, $k, 2);
-				$pagestate{$page}{decode_entities($id)}{decode_entities($key)}=$items{$k}[0];
-			}
-		}
-		$oldrenderedfiles{$page}=[@{$items{dest}}];
-		$pagectime{$page}=$items{ctime}[0];
-	}
-
-	# saveindex relies on %hooks being populated, else it won't save
-	# the page state owned by a given hook. But no plugins are loaded
-	# by this program, so populate %hooks with all hook ids that
-	# currently have page state.
-	foreach my $page (keys %pagemtime) {
-		foreach my $id (keys %{$pagestate{$page}}) {
-			$hooks{_dummy}{$id}=1;
-		}
-	}
-	
-	return close($in);
-}
-
-# Used to be in IkiWiki/UserInfo, but only used here now.
-sub get_banned_users () {
-	my @ret;
-	my $userinfo=userinfo_retrieve();
-	foreach my $user (keys %{$userinfo}) {
-		push @ret, $user if $userinfo->{$user}->{banned};
-	}
-	return @ret;
-}
-
-# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
-# setup file) now.
-sub pagespec_merge ($$) {
-	my $a=shift;
-	my $b=shift;
-
-	return $a if $a eq $b;
-	return "($a) or ($b)";
-}
-
-1
diff --git a/ikiwiki-transition.in b/ikiwiki-transition.in
new file mode 100755
index 000000000..e3be645cc
--- /dev/null
+++ b/ikiwiki-transition.in
@@ -0,0 +1,349 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use lib '.'; # For use in nonstandard directory, munged by Makefile.
+use IkiWiki;
+use HTML::Entities;
+
+my $regex = qr{
+	(\\?)		# 1: escape?
+	\[\[(!?)	# directive open; 2: optional prefix
+	([-\w]+)	# 3: command
+	(		# 4: the parameters (including initial whitespace)
+	\s+
+		(?:
+			(?:[-\w]+=)?		# named parameter key?
+			(?:
+				""".*?"""	# triple-quoted value
+				|
+				"[^"]+"		# single-quoted value
+				|
+				[^\s\]]+	# unquoted value
+			)
+			\s*			# whitespace or end
+						# of directive
+		)
+	*)		# 0 or more parameters
+	\]\]		# directive closed
+}sx;
+
+sub handle_directive {
+	my $escape = shift;
+	my $prefix = shift;
+	my $directive = shift;
+	my $args = shift;
+
+	if (length $escape) {
+		return "${escape}[[${prefix}${directive}${args}]]"
+	}
+	if ($directive =~ m/^(if|more|table|template|toggleable)$/) {
+		$args =~ s{$regex}{handle_directive($1, $2, $3, $4)}eg;
+	}
+	return "[[!${directive}${args}]]"
+}
+
+sub prefix_directives {
+	loadsetup(shift);
+
+	IkiWiki::loadplugins();
+	IkiWiki::checkconfig();
+	IkiWiki::loadindex();
+
+	if (! %pagesources) {
+		error "ikiwiki has not built this wiki yet, cannot transition";
+	}
+
+	foreach my $page (values %pagesources) {
+		next unless defined pagetype($page) &&
+		            -f $config{srcdir}."/".$page;
+		my $content=readfile($config{srcdir}."/".$page);
+		my $oldcontent=$content;
+		$content=~s{$regex}{handle_directive($1, $2, $3, $4)}eg;
+		if ($oldcontent ne $content) {
+			writefile($page, $config{srcdir}, $content);
+		}
+	}
+}
+
+sub indexdb {
+	setstatedir(shift);
+
+	# Note: No lockwiki here because ikiwiki already locks it
+	# before calling this.	
+	if (! IkiWiki::oldloadindex()) {
+		die "failed to load index\n";
+	}
+	if (! IkiWiki::saveindex()) {
+		die "failed to save indexdb\n"
+	}
+	if (! IkiWiki::loadindex()) {
+		die "transition failed, cannot load new indexdb\n";
+	}
+	if (! unlink("$config{wikistatedir}/index")) {
+		die "unlink failed: $!\n";
+	}
+}
+
+sub hashpassword {
+	setstatedir(shift);
+
+	eval q{use IkiWiki::UserInfo};
+	eval q{use Authen::Passphrase::BlowfishCrypt};
+	if ($@) {
+		error("ikiwiki-transition hashpassword: failed to load Authen::Passphrase, passwords not hashed");
+	}
+
+	IkiWiki::lockwiki();
+	IkiWiki::loadplugin("passwordauth");
+	my $userinfo = IkiWiki::userinfo_retrieve();
+	foreach my $user (keys %{$userinfo}) {
+		if (ref $userinfo->{$user} &&
+		    exists $userinfo->{$user}->{password} &&
+		    length $userinfo->{$user}->{password} &&
+		    ! exists $userinfo->{$user}->{cryptpassword}) {
+			IkiWiki::Plugin::passwordauth::setpassword($user, $userinfo->{$user}->{password});
+		}
+	}
+}
+
+sub aggregateinternal {
+	loadsetup(shift);
+	require IkiWiki::Plugin::aggregate;
+	IkiWiki::checkconfig();
+	IkiWiki::Plugin::aggregate::migrate_to_internal();
+}
+
+sub setupformat {
+	my $setup=shift;
+
+	loadsetup($setup);
+	IkiWiki::checkconfig();
+	
+	# unpack old-format wrappers setting into new fields
+	my $cgi_seen=0;
+	my $rcs_seen=0;
+	foreach my $wrapper (@{$config{wrappers}}) {
+		if ($wrapper->{cgi}) {
+			if ($cgi_seen) {
+				die "don't know what to do with second cgi wrapper ".$wrapper->{wrapper}."\n";
+			}
+			$cgi_seen++;
+			print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n";
+			$config{cgi_wrapper}=$wrapper->{wrapper};
+			$config{cgi_wrappermode}=$wrapper->{wrappermode}
+				if exists $wrapper->{wrappermode};
+		}
+		elsif ($config{rcs}) {
+			if ($rcs_seen) {
+				die "don't know what to do with second rcs wrapper ".$wrapper->{wrapper}."\n";
+			}
+			$rcs_seen++;
+			print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n";
+			$config{$config{rcs}."_wrapper"}=$wrapper->{wrapper};
+			$config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode}
+				if exists $wrapper->{wrappermode};
+		}
+		else {
+			die "don't know what to do with wrapper ".$wrapper->{wrapper}."\n";
+		}
+	}
+
+	IkiWiki::Setup::dump($setup);
+}
+
+sub moveprefs {
+	my $setup=shift;
+
+	loadsetup($setup);
+	IkiWiki::checkconfig();
+
+	eval q{use IkiWiki::UserInfo};
+	error $@ if $@;
+
+	foreach my $field (qw{allowed_attachments locked_pages}) {
+		my $orig=$config{$field};
+		foreach my $admin (@{$config{adminuser}}) {
+			my $a=IkiWiki::userinfo_get($admin, $field);
+			if (defined $a && length $a &&
+			    # might already have been moved
+			    (! defined $orig || $a ne $orig)) {
+			    	if (defined $config{$field} &&
+				    length $config{$field}) {
+					$config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
+				}
+				else {
+					$config{$field}=$a;
+				}
+			}
+		}
+	}
+
+	my %banned=map { $_ => 1 } @{$config{banned_users}}, IkiWiki::get_banned_users();
+	$config{banned_users}=[sort keys %banned];
+
+	IkiWiki::Setup::dump($setup);
+}
+
+sub deduplinks {
+	loadsetup(shift);
+	IkiWiki::loadplugins();
+	IkiWiki::checkconfig();
+	IkiWiki::loadindex();
+	foreach my $page (keys %links) {
+		my %l;
+		$l{$_}=1 foreach @{$links{$page}};
+		$links{$page}=[keys %l]
+	}
+	IkiWiki::saveindex();
+}
+
+sub setstatedir {
+	my $dirorsetup=shift;
+
+	if (! defined $dirorsetup) {
+		usage();		
+	}
+
+	if (-d $dirorsetup) {
+		$config{wikistatedir}=$dirorsetup."/.ikiwiki";
+	}
+	elsif (-f $dirorsetup) {
+		loadsetup($dirorsetup);
+	}
+	else {
+		error("ikiwiki-transition: $dirorsetup does not exist");
+	}
+
+	if (! -d $config{wikistatedir}) {
+		error("ikiwiki-transition: $config{wikistatedir} does not exist");
+	}
+}
+	
+sub loadsetup {
+	my $setup=shift;
+	if (! defined $setup) {
+		usage();
+	}
+
+	require IkiWiki::Setup;
+
+	%config = IkiWiki::defaultconfig();
+	IkiWiki::Setup::load($setup);
+}
+
+sub usage {
+	print STDERR "Usage: ikiwiki-transition type ...\n";
+	print STDERR "Currently supported transition subcommands:\n";
+	print STDERR "\tprefix_directives setupfile ...\n";
+	print STDERR "\taggregateinternal setupfile\n";
+	print STDERR "\tsetupformat setupfile\n";
+	print STDERR "\tmoveprefs setupfile\n";
+	print STDERR "\thashpassword setupfile|srcdir\n";
+	print STDERR "\tindexdb setupfile|srcdir\n";
+	print STDERR "\tdeduplinks setupfile\n";
+	exit 1;
+}
+
+usage() unless @ARGV;
+
+my $mode=shift;
+if ($mode eq 'prefix_directives') {
+	prefix_directives(@ARGV);
+}
+elsif ($mode eq 'hashpassword') {
+	hashpassword(@ARGV);
+}
+elsif ($mode eq 'indexdb') {
+	indexdb(@ARGV);
+}
+elsif ($mode eq 'aggregateinternal') {
+	aggregateinternal(@ARGV);
+}
+elsif ($mode eq 'setupformat') {
+	setupformat(@ARGV);
+}
+elsif ($mode eq 'moveprefs') {
+	moveprefs(@ARGV);
+}
+elsif ($mode eq 'deduplinks') {
+	deduplinks(@ARGV);
+}
+else {
+	usage();
+}
+
+package IkiWiki;
+
+# A slightly modified version of the old loadindex function.
+sub oldloadindex {
+	%oldrenderedfiles=%pagectime=();
+	if (! $config{rebuild}) {
+		%pagesources=%pagemtime=%oldlinks=%links=%depends=
+			%destsources=%renderedfiles=%pagecase=%pagestate=();
+	}
+	open (my $in, "<", "$config{wikistatedir}/index") || return;
+	while (<$in>) {
+		chomp;
+		my %items;
+		$items{link}=[];
+		$items{dest}=[];
+		foreach my $i (split(/ /, $_)) {
+			my ($item, $val)=split(/=/, $i, 2);
+			push @{$items{$item}}, decode_entities($val);
+		}
+
+		next unless exists $items{src}; # skip bad lines for now
+
+		my $page=pagename($items{src}[0]);
+		if (! $config{rebuild}) {
+			$pagesources{$page}=$items{src}[0];
+			$pagemtime{$page}=$items{mtime}[0];
+			$oldlinks{$page}=[@{$items{link}}];
+			$links{$page}=[@{$items{link}}];
+			$depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT } if exists $items{depends};
+			$destsources{$_}=$page foreach @{$items{dest}};
+			$renderedfiles{$page}=[@{$items{dest}}];
+			$pagecase{lc $page}=$page;
+			foreach my $k (grep /_/, keys %items) {
+				my ($id, $key)=split(/_/, $k, 2);
+				$pagestate{$page}{decode_entities($id)}{decode_entities($key)}=$items{$k}[0];
+			}
+		}
+		$oldrenderedfiles{$page}=[@{$items{dest}}];
+		$pagectime{$page}=$items{ctime}[0];
+	}
+
+	# saveindex relies on %hooks being populated, else it won't save
+	# the page state owned by a given hook. But no plugins are loaded
+	# by this program, so populate %hooks with all hook ids that
+	# currently have page state.
+	foreach my $page (keys %pagemtime) {
+		foreach my $id (keys %{$pagestate{$page}}) {
+			$hooks{_dummy}{$id}=1;
+		}
+	}
+	
+	return close($in);
+}
+
+# Used to be in IkiWiki/UserInfo, but only used here now.
+sub get_banned_users () {
+	my @ret;
+	my $userinfo=userinfo_retrieve();
+	foreach my $user (keys %{$userinfo}) {
+		push @ret, $user if $userinfo->{$user}->{banned};
+	}
+	return @ret;
+}
+
+# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
+# setup file) now.
+sub pagespec_merge ($$) {
+	my $a=shift;
+	my $b=shift;
+
+	return $a if $a eq $b;
+	return "($a) or ($b)";
+}
+
+1
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 2bb87724d..532a91885 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100312
+Version: 3.20100324
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
-- 
cgit v1.2.3


From c4108d58dcef2805deeb1370367d718d9b8f3184 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Sun, 28 Mar 2010 05:06:52 +0000
Subject: Better URL for my Ikiwiki instance; changed the note about DNS.

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

(limited to 'doc')

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index 41bf9b09a..de58cb207 100644
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -1,3 +1,4 @@
 &hellip; To put it short: an Ikiwiki newbie.
 
-I run an Ikiwiki instance at <http://gray.am-1.org/~ivan/lhc/> (though the DNS servers seem to be temporarily out of smoke as of 2010-03-12Z.)
+I run an Ikiwiki instance at <http://gray.siamics.net/~ivan/lhc/>
+(though the DNS servers may be flacky due to transition to Dyn Inc.)
-- 
cgit v1.2.3


From ec110abc6d412db5f65ea5b9311596bbe7799fd4 Mon Sep 17 00:00:00 2001
From: Redtexture <Redtexture@web>
Date: Sun, 28 Mar 2010 12:21:51 +0000
Subject: add "wait"  (best to wait to tackle...)

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

(limited to 'doc')

diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn
index fe73518ef..78a35ff05 100644
--- a/doc/tips/spam_and_softwaresites.mdwn
+++ b/doc/tips/spam_and_softwaresites.mdwn
@@ -82,5 +82,5 @@ Caveat: if there are no commits you want to keep (i.e. all the commits since
 the last merge into master are either spam or spam reverts) then `git rebase`
 will abort. Therefore, this approach only works if you have at least one
 non-spam commit to the documentation since the last merge into `master`. For
-this reason, it's best to tackle spam with reverts until you have at least one
+this reason, it's best wait to tackle spam with reverts until you have at least one
 commit you want merged back into the main history.
-- 
cgit v1.2.3


From 9c6b12fe3de453869be7fa2ae5c1d07e9751a69c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 28 Mar 2010 14:52:03 +0000
Subject: revert misleading clarification, and try to clarify better

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

(limited to 'doc')

diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn
index 78a35ff05..507858c0c 100644
--- a/doc/tips/spam_and_softwaresites.mdwn
+++ b/doc/tips/spam_and_softwaresites.mdwn
@@ -82,5 +82,6 @@ Caveat: if there are no commits you want to keep (i.e. all the commits since
 the last merge into master are either spam or spam reverts) then `git rebase`
 will abort. Therefore, this approach only works if you have at least one
 non-spam commit to the documentation since the last merge into `master`. For
-this reason, it's best wait to tackle spam with reverts until you have at least one
-commit you want merged back into the main history.
+this reason, it's best to wait until you have at least one
+commit you want merged back into the main history before doing a rebase,
+and until then, tackle spam with reverts.
-- 
cgit v1.2.3


From ba05b907e3563f9aa25a4322abd9ab2d5b56b36b Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Sun, 28 Mar 2010 15:58:37 +0000
Subject: More wishlist items for the `xslt` plugin.

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/xslt/discussion.mdwn b/doc/plugins/contrib/xslt/discussion.mdwn
index 9cda02f88..72cce083c 100644
--- a/doc/plugins/contrib/xslt/discussion.mdwn
+++ b/doc/plugins/contrib/xslt/discussion.mdwn
@@ -20,3 +20,30 @@ possible. Can it also read other arbitrary files, run other programs, etc?
 > For the second point, I think the main concern would be resource usage.  XSLT is a pretty limited language; it can read other XML files, but it can't run other programs so far as I know.
 
 > -- [[KathrynAndersen]]
+
+>> XSLT is, indeed, a Turing-complete programming language.
+   However, [XML::LibXSLT][] provides a set of functions to help
+   to minimize the damage that may be caused by running a random
+   program.
+
+>> In particular, `max_depth ()` allows for the maximum
+   recursion depth to be set, while
+   `read_file ()`, `write_file ()`, `create_dir ()`,
+   `read_net ()` and `write_net ()`
+   are the callbacks that allow any of the possible file
+   operations to be denied.
+
+>> To be honest, I'd prefer for the `read_file ()` callback to
+   only grant access to the files below the Ikiwiki source
+   directory, and for all the `write_`&hellip; and
+   &hellip;`_net` callbacks to deny the access unconditionally.
+
+>> One more wishlist item: allow the set of locations to take
+   `.xsl` files from to be preconfigured, so that, e.&nbsp;g.,
+   one could allow (preasumably trusted) system stylesheets,
+   while disallowing any stylesheets that are placed on the Wiki
+   itself.
+
+>> &mdash;&nbsp;Ivan Shmakov, 2010-03-28Z.
+
+[XML::LibXSLT]: http://search.cpan.org/~PAJAS/XML-LibXSLT/LibXSLT.pm
-- 
cgit v1.2.3


From e1eee27fc59dd6126e80ef21e4cc44191119902c Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Sun, 28 Mar 2010 20:01:41 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
new file mode 100644
index 000000000..f71a442b8
--- /dev/null
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -0,0 +1,9 @@
+Although I have comments enabled and I have been using them successfully for ages now, I've come to notice that they have stopped working in the last week or two.
+
+I am running version 3.20100312 with the following configuration:
+
+<http://static.natalian.org/2010-03-27/natalian.txt>
+
+In my (HTML5 modified page.tmpl) it doesn't seem to enter the "TMPL_IF COMMENTS" block anymore. I tried the stock page.tmpl and they didn't seem to work either, so the variable name hasn't changed has it?
+
+Any other ideas? With thanks,
-- 
cgit v1.2.3


From a1f50f6a31d4e9f7acd6f8d445e5fb39edba5138 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 17:37:42 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index f71a442b8..b737d9bef 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -7,3 +7,9 @@ I am running version 3.20100312 with the following configuration:
 In my (HTML5 modified page.tmpl) it doesn't seem to enter the "TMPL_IF COMMENTS" block anymore. I tried the stock page.tmpl and they didn't seem to work either, so the variable name hasn't changed has it?
 
 Any other ideas? With thanks,
+
+	comments_pagespec => 'archives/* and !*/Discussion',
+
+> Your setup file only allows comments to pages under archives. That 
+> seems unlikely to be right, so I guess it is causing your problem.
+> --[[Joey]] 
-- 
cgit v1.2.3


From 7e9d1932a2b90d5092315c18603cf495da28d6da Mon Sep 17 00:00:00 2001
From: "http://schors.livejournal.com/" <http://schors.livejournal.com/@web>
Date: Sun, 28 Mar 2010 22:01:53 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
new file mode 100644
index 000000000..6ad7975eb
--- /dev/null
+++ b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
@@ -0,0 +1,2 @@
+When build wrapper on FreeBSD system, is error occured with clearenv reference. clearenv() das not exists at FreeBSD system, use workaround environ[0]=NULL;
+P.S. new git instalation, FreeBSD 7.x
-- 
cgit v1.2.3


From 0c6e467aa6931ec6bd7720ecaea5e33aeca4d1be Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 18:27:23 -0400
Subject: use __TINYC__ define to avoid tinyc compat fixes breaking FreeBSD

To review, tcc does not really use environ, so you have to use clearenv
there. But POSIX, in their wisdom, didn't standardise clearenv yet,
so on FreeBSD, one still needs to manipulate environ on their own.

(If you use tcc on FreeBSD, this may leave you unsatisfied.)
---
 IkiWiki/Wrapper.pm                             | 6 ++++++
 doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn | 3 +++
 2 files changed, 9 insertions(+)

(limited to 'doc')

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index f175b4a0b..3f3e63ca6 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -101,6 +101,7 @@ EOF
 #include <string.h>
 #include <sys/file.h>
 
+extern char **environ;
 char *newenviron[$#envsave+6];
 int i=0;
 
@@ -121,12 +122,17 @@ $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 
+#ifdef __TINYC__
 	if (clearenv() != 0) {
 		perror("clearenv");
 		exit(1);
 	}
 	for (; i>0; i--)
 		putenv(newenviron[i-1]);
+#else
+	newenviron[i]=NULL;
+	environ=newenviron;
+#endif
 
 	if (setregid(getegid(), -1) != 0 &&
 	    setregid(getegid(), -1) != 0) {
diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
index 6ad7975eb..c2355d6aa 100644
--- a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
+++ b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
@@ -1,2 +1,5 @@
 When build wrapper on FreeBSD system, is error occured with clearenv reference. clearenv() das not exists at FreeBSD system, use workaround environ[0]=NULL;
 P.S. new git instalation, FreeBSD 7.x
+
+> #include <stupid-standards.h> fixed with nasty ifdefs to handle tcc w/o
+> breaking everything else. ||done]] --[[Joey]] 
-- 
cgit v1.2.3


From 6d04e182c4f4f44da37725444a540851fd36ba13 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 18:36:37 -0400
Subject: formatting

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

(limited to 'doc')

diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
index c2355d6aa..ac82541a3 100644
--- a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
+++ b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
@@ -1,5 +1,5 @@
 When build wrapper on FreeBSD system, is error occured with clearenv reference. clearenv() das not exists at FreeBSD system, use workaround environ[0]=NULL;
 P.S. new git instalation, FreeBSD 7.x
 
-> #include <stupid-standards.h> fixed with nasty ifdefs to handle tcc w/o
+> `#include <stupid-standards.h>` fixed with nasty ifdefs to handle tcc w/o
 > breaking everything else. ||done]] --[[Joey]] 
-- 
cgit v1.2.3


From 15164671ceeed70f25cbfe53d81143eb5b13c863 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 18:37:00 -0400
Subject: formatting

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

(limited to 'doc')

diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
index ac82541a3..f38c86e03 100644
--- a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
+++ b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn
@@ -2,4 +2,4 @@ When build wrapper on FreeBSD system, is error occured with clearenv reference.
 P.S. new git instalation, FreeBSD 7.x
 
 > `#include <stupid-standards.h>` fixed with nasty ifdefs to handle tcc w/o
-> breaking everything else. ||done]] --[[Joey]] 
+> breaking everything else. [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 1de069338de86dd6e785d9771140b2b687100451 Mon Sep 17 00:00:00 2001
From: "http://schors.livejournal.com/" <http://schors.livejournal.com/@web>
Date: Sun, 28 Mar 2010 22:43:24 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn b/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn
new file mode 100644
index 000000000..61964539d
--- /dev/null
+++ b/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn
@@ -0,0 +1,5 @@
+If i intsall perl modules in my custom directory, cgi wrapper can't find them. I found clearing enviroment variables in code  of wrapper. But information about custom directories put to perl with PERL5LIB variable.
+
+Workaround: add newenviron variable PERL5LIB
+
+My additional question - what wrapper do? I'am russian hosting provider. I am interesting with ikiwiki.
-- 
cgit v1.2.3


From 02e6ec9dd2c5e1e260a1f18406942059fe3d2064 Mon Sep 17 00:00:00 2001
From: "http://schors.livejournal.com/" <http://schors.livejournal.com/@web>
Date: Sun, 28 Mar 2010 22:47:17 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn
new file mode 100644
index 000000000..713198b61
--- /dev/null
+++ b/doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn
@@ -0,0 +1 @@
+Mmmm... i see. But it not setup under FreeBSD without magic manual passes.
-- 
cgit v1.2.3


From 911533655186f7c43ac229a4cdbc5be3e7f80d49 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 18:49:15 -0400
Subject: response

---
 README                                                 |  2 +-
 doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/README b/README
index a4dc0d641..7efc59a51 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ All other documentation is in the ikiwiki documentation wiki, which is also
 available online at <http://ikiwiki.info/>
 
 
-A few special variables you can set while using the Makefile:
+A few special variables you can set while using the Makefile.PL:
 
   PROFILE=1 turns on profiling for the build of the doc wiki.
   (Uses Devel::NYTProf)
diff --git a/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn b/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn
index 61964539d..9804d86c5 100644
--- a/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn
+++ b/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn
@@ -3,3 +3,14 @@ If i intsall perl modules in my custom directory, cgi wrapper can't find them. I
 Workaround: add newenviron variable PERL5LIB
 
 My additional question - what wrapper do? I'am russian hosting provider. I am interesting with ikiwiki.
+
+> The wrapper allows ikiwiki to run as the user who owns the wiki, which
+> is generally not the same as the user that runs the web server.
+> (It also handles some other things, like some locking.)
+> 
+> As a suid program, the wrapper cannot safely let environment variables
+> pass through.
+> 
+> If you want to install ikiwiki's perl modules in a nonstandard location,
+> you can set `INSTALL_BASE` when running `Makefile.PL`. ikiwiki will then
+> be built to look in that location. --[[Joey]]  [[!tag done]]
-- 
cgit v1.2.3


From 6e7bfbe7bb8ba4b94d0e8c203b2117477b217384 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 19:23:34 -0400
Subject: auto-blog.setup: Set tagbase by default, since most bloggers will
 want it.

Also modified first_post page to use a tag format that will work whether
or not tagbase is set.
---
 auto-blog.setup                         | 1 +
 debian/changelog                        | 1 +
 doc/examples/blog/posts/first_post.mdwn | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/auto-blog.setup b/auto-blog.setup
index 7ff413187..95347167f 100644
--- a/auto-blog.setup
+++ b/auto-blog.setup
@@ -48,4 +48,5 @@ IkiWiki::Setup::Automator->import(
 	blogspam_pagespec => "postcomment(*)",
 	discussion => 0,
 	locked_pages => "*",
+	tagbase => "tags",
 )
diff --git a/debian/changelog b/debian/changelog
index 57406c6d3..2d82c4dba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
     that could lead to bad dependency handling in certian situations.
   * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
     if necessary for unusual install.
+  * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index d49432341..7f814fbb1 100644
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,4 @@
 This is the first post to this example blog. To add new posts, just add
 files to the posts/ subdirectory, or use the web form.
 
-[[!tag tags/tech]]
+[[!tag ./tags/tech]]
-- 
cgit v1.2.3


From b6666f5ac81ef4c8646a6290cf5c885adf0e385f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Mar 2010 19:28:48 -0400
Subject: fix tag

Actually, tags can't be made to work with and w/o tagbase, so just make it
assume tagbase is set. Better example anyway.

(It'll be a broken link on ikiwiki.info though.)
---
 doc/examples/blog/posts/first_post.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index 7f814fbb1..f2729fcef 100644
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,4 @@
 This is the first post to this example blog. To add new posts, just add
 files to the posts/ subdirectory, or use the web form.
 
-[[!tag ./tags/tech]]
+[[!tag tech]]
-- 
cgit v1.2.3


From ae4e9b25b714b02ed7003a21da781fccf9475f38 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Mon, 29 Mar 2010 08:15:43 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index b737d9bef..ad1638236 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -13,3 +13,8 @@ Any other ideas? With thanks,
 > Your setup file only allows comments to pages under archives. That 
 > seems unlikely to be right, so I guess it is causing your problem.
 > --[[Joey]] 
+
+That's the only place where I want comments. <http://natalian.org/archives/>
+Has the pagespec changed? Is it `archives/*/*` or something like that?
+
+It worked just fine with this configuration. I swear I have not modified it. :) -- [[Kai Hendry]]
-- 
cgit v1.2.3


From 263d9548969dcdf9a6add96f46fe03ba7701a1ca Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Mon, 29 Mar 2010 14:58:21 +0100
Subject: ping joey: consider patch for next release?

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

(limited to 'doc')

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 99a9cf1e2..be66db99d 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -183,3 +183,5 @@ definitions essentially.
 >>> ikiwiki for the break, and now I've returned to watching recentchanges.
 >>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have
 >>> you had a chance to look at this yet? -- [[Jon]]
+>>>> Ping :) Hi.  [[Joey]], would you consider this patch for the next
+>>>> ikiwiki release? -- [[Jon]]
-- 
cgit v1.2.3


From 97898ce585b36dbcb0a83356ef3e54c41d369437 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 12:16:53 -0400
Subject: review, multiple concerns

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 46 ++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 99a9cf1e2..e4638f94b 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -36,6 +36,30 @@ definitions essentially.
 >> I've made may not be acceptable, though -- I'd appreciate someone providing
 >> some feedback on that hunk!
 
+>>> Well, re that hunk, taint checking is currently disabled, but
+>>> if the perl bug that disallows it is fixed and it is turned back on,
+>>> the hash values will remain tainted, which will probably lead to
+>>> problems.
+>>>
+>>> I'm also leery of using such a complex data structure in config.
+>>> The websetup plugin would be hard pressed to provide a UI for such a
+>>> data structure. (It lacks even UI for a single hash ref yet, let alone
+>>> a list.)
+>>> 
+>>> Also, it seems sorta wrong to have two so very different syntaxes to 
+>>> represent the same meta data. A user without a lot of experience will
+>>> be hard pressed to map from a directive to this in the setup file.
+>>>
+>>> All of which leads me to think the setup file could just contain
+>>> a text that could hold meta directives. Which generalizes really to
+>>> a text that contains any directives, and is, perhaps appended to the
+>>> top of every page. Which nearly generalizes to the sidebar plugin,
+>>> or perhaps something more general than that... 
+>>>
+>>> However, excessive generalization is the root of all evil, so 
+>>> I'm not necessarily saying that's a good idea. Indeed, my memory
+>>> concerns below invalidate this idea pretty well. --[[Joey]] 
+
     diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
     index 6fe9cda..2f8c098 100644
     --- a/IkiWiki/Plugin/meta.pm
@@ -125,6 +149,10 @@ definitions essentially.
 >> are only relevant to defined fields that you wouldn't want to specify a
 >> global default for anyway.
 >>
+>>> I generally agree with this. It is *possible* that meta would have a new
+>>> field added, that takes parameters and make sense to use globally.
+>>> --[[Joey]] 
+>>
 >> Due to this, and the added complexity of the second patch (having to adjust
 >> `IkiWiki/Setup.pm`), I think the first patch makes more sense. I've thus
 >> reverted to it here.
@@ -183,3 +211,21 @@ definitions essentially.
 >>> ikiwiki for the break, and now I've returned to watching recentchanges.
 >>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have
 >>> you had a chance to look at this yet? -- [[Jon]]
+
+>>> For this to work with websetup and --dumpsetup, it needs to define the
+>>> `meta_*` settings in the getsetup function.
+>>>
+>>> I also have some concerns about both these patches, since both throw
+>>> a lot of redundant data at meta, which then stores it in a very redundant
+>>> way. Specifically, meta populates a per-page `%metaheaders` hash
+>>> as well as storing per-page metadata in `%pagestate`. So, if you have
+>>> a wiki with a thousand pages, and you add a 1k site-wide license text,
+>>> that will bloat the memory usage of ikiwiki by in excess of 2
+>>> megabytes. It will also cause ikiwiki to write a similar amount more data
+>>> to its state file which has to be loaded back in each
+>>> run.
+>>>
+>>> Seems that this could be managed much more efficiently by having
+>>> meta special-case the site-wide settings, not store them in these
+>>> per-page data structures, and just make them be used if no per-page
+>>> metadata of the given type is present. --[[Joey]]
-- 
cgit v1.2.3


From 7a8bcf2a6745d570bf9055df7b0390f9a9ca8a0d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 12:19:22 -0400
Subject: fix bogus math

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

(limited to 'doc')

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 704cb2c64..01cf12c1a 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -222,7 +222,7 @@ definitions essentially.
 >>> a lot of redundant data at meta, which then stores it in a very redundant
 >>> way. Specifically, meta populates a per-page `%metaheaders` hash
 >>> as well as storing per-page metadata in `%pagestate`. So, if you have
->>> a wiki with a thousand pages, and you add a 1k site-wide license text,
+>>> a wiki with 10 thousand pages, and you add a 1k site-wide license text,
 >>> that will bloat the memory usage of ikiwiki by in excess of 2
 >>> megabytes. It will also cause ikiwiki to write a similar amount more data
 >>> to its state file which has to be loaded back in each
-- 
cgit v1.2.3


From 3e192a4c4a2e80ce35ce35d5edc9afd6b2373f83 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 13:17:49 -0400
Subject: add a table summarizing state of each rcs plugin

---
 doc/rcs.mdwn  | 23 ++++++++++++++++++++---
 docwiki.setup |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index f66b85495..cd41e7f49 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -7,10 +7,27 @@ Ikiwiki started out supporting only [[Subversion|svn]], but the interface
 ikiwiki uses to a revision control system is sufficiently simple and
 generic that it can be adapted to work with many systems by writing a
 [[plugin|plugins/write]]. [[Subversion|svn]] is still a recommended choice;
-[[git]] is another well-tested option.
+[[git]] is another well-tested option. 
 
-These are all the supported revision control systems:
-[[!inline pages="rcs/* and !*/Discussion and !rcs/details" archive=yes]]
+While all supported revision control systems work well enough for basic use,
+some advanced or special features are not supported in all of them.
+Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to
+set up a wiki using that revision control system. The `rcs_commit_staged`
+hook is needed to use [[plugins/attachments]] or [[plugins/comments]]. And so
+on. The table below summarises this for each revision control system and links
+to more information about each.
+
+[[!table data="""
+feature             |[[git]]|[[svn]]|[[bzr]]   |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]]   |[[cvs]]
+[[ikiwiki-makerepo]]|yes    |yes    |yes       |yes         |yes          |yes      |no        |yes
+auto.setup          |yes    |yes    |incomplete|yes         |incomplete   |yes      |incomplete|yes
+`rcs_commit_staged` |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
+`rcs_rename`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
+`rcs_remove`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
+`rcs_diff`          |yes    |yes    |yes       |yes         |no           |yes      |yes       |yes
+anonymous push      |yes    |no     |no        |no          |no           |no       |no        |no
+conflict handling   |yes    |yes    |yes       |buggy       |yes          |yes      |yes       |yes
+"""]]
 
 There is a page with [[details]] about how the different systems work with
 ikiwiki, for the curious.
diff --git a/docwiki.setup b/docwiki.setup
index 86f012c50..8278b73ea 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -16,5 +16,5 @@ use IkiWiki::Setup::Standard {
 	userdir => "users",
 	usedirs => 0,
 	prefix_directives => 1,
-	add_plugins => [qw{goodstuff version haiku polygen fortune}],
+	add_plugins => [qw{goodstuff version haiku polygen fortune table}],
 }
-- 
cgit v1.2.3


From 6798a80acab43ce9b6869dea7236887faebc19e1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 13:18:49 -0400
Subject: fix link

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

(limited to 'doc')

diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index cd41e7f49..4e7a8d2a6 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -9,13 +9,13 @@ generic that it can be adapted to work with many systems by writing a
 [[plugin|plugins/write]]. [[Subversion|svn]] is still a recommended choice;
 [[git]] is another well-tested option. 
 
-While all supported revision control systems work well enough for basic use,
-some advanced or special features are not supported in all of them.
+While all supported revision control systems work well enough for basic
+use, some advanced or special features are not supported in all of them.
 Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to
 set up a wiki using that revision control system. The `rcs_commit_staged`
-hook is needed to use [[plugins/attachments]] or [[plugins/comments]]. And so
-on. The table below summarises this for each revision control system and links
-to more information about each.
+hook is needed to use [[attachments|plugins/attachment]] or
+[[plugins/comments]]. And so on. The table below summarises this for each
+revision control system and links to more information about each.
 
 [[!table data="""
 feature             |[[git]]|[[svn]]|[[bzr]]   |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]]   |[[cvs]]
-- 
cgit v1.2.3


From 68c67efeffd0f51e01cd557722632367f0dc3849 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 13:27:50 -0400
Subject: clarify example with whitespace

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

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/table.mdwn b/doc/ikiwiki/directive/table.mdwn
index e27a94b7c..2dac97724 100644
--- a/doc/ikiwiki/directive/table.mdwn
+++ b/doc/ikiwiki/directive/table.mdwn
@@ -6,8 +6,8 @@ or DSV (delimiter-separated values) format.
 ## examples
 
 	\[[!table data="""
-	Customer|Amount
-	Fulanito|134,34
+	Customer |Amount
+	Fulanito |134,34
 	Menganito|234,56
 	Menganito|234,56
 	"""]]
-- 
cgit v1.2.3


From 675e34527f56021ce39e56e4288e8f0e32b36cfa Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Mon, 29 Mar 2010 19:59:40 +0100
Subject: thanks for the review, patch to be revised

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

(limited to 'doc')

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 01cf12c1a..7129a44ac 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -232,3 +232,6 @@ definitions essentially.
 >>> meta special-case the site-wide settings, not store them in these
 >>> per-page data structures, and just make them be used if no per-page
 >>> metadata of the given type is present. --[[Joey]]
+
+>>>> Thanks for the review - these are all valid points. I'll get working
+>>>> on a revised patch. -- [[Jon]]
-- 
cgit v1.2.3


From 0b63800df32fd6e5287a253ca01a099f79b77e6e Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Mon, 29 Mar 2010 20:00:56 +0100
Subject: this sounds like the correct approach

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

(limited to 'doc')

diff --git a/doc/todo/more_flexible_inline_postform.mdwn b/doc/todo/more_flexible_inline_postform.mdwn
index bc8bc0809..414476bd7 100644
--- a/doc/todo/more_flexible_inline_postform.mdwn
+++ b/doc/todo/more_flexible_inline_postform.mdwn
@@ -16,3 +16,8 @@ logical first step towards doing comment-like things with inlined pages).
 > Perhaps what we need is a `postform` plugin/directive that inline depends
 > on (automatically enables); its preprocess method could automatically be
 > invoked from preprocess_inline when needed. --[[smcv]]
+
+>> I've been looking at this stuff again. I think you are right, this would
+>> be the right approach. The comments plugin could use it similarly, allowing
+>> sites which desire it to have an inline comment submission form on all
+>> pages with comments enabled. I'm going to take a look. -- [[Jon]]
-- 
cgit v1.2.3


From b2890b4e8ff0dc0e0fbaed1ffd9848c48dedf611 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 29 Mar 2010 15:25:34 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index ad1638236..ac297028c 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -18,3 +18,13 @@ That's the only place where I want comments. <http://natalian.org/archives/>
 Has the pagespec changed? Is it `archives/*/*` or something like that?
 
 It worked just fine with this configuration. I swear I have not modified it. :) -- [[Kai Hendry]]
+
+> No changes that I can think of. 'archives/*' will match *all* pages under
+> archives. Anyway, I can see in your site's rss feed that comments are
+> enabled for posts, since they have comments tags there. And
+> in fact I see comments on eg
+> <http://natalian.org/archives/2010/03/25/BBC_News_complaints/>.
+> 
+> So I suspect you have simply not rebuilt your wiki after making some
+> change that fixed the comments, and so only newer pages are getting them.
+> --[[Joey]]
-- 
cgit v1.2.3


From 1c751e882ef2fe68bc4601dc5e927c4813f09706 Mon Sep 17 00:00:00 2001
From: "http://gustaf.thorslund.org/" <http://gustaf.thorslund.org/@web>
Date: Mon, 29 Mar 2010 21:54:30 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 289937121..379285a49 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -59,6 +59,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[roktas]] `git://github.com/roktas/ikiwiki.git`
 * [[davrieb|David_Riebenbauer]] `git://git.liegesta.at/git/ikiwiki`
   ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
+* [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 8de983dd07a462eeb997b730c5729c6f598ae452 Mon Sep 17 00:00:00 2001
From: "http://gustaf.thorslund.org/" <http://gustaf.thorslund.org/@web>
Date: Mon, 29 Mar 2010 22:07:27 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index b40fd461d..633400f21 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -142,6 +142,7 @@ Personal sites and blogs
 * [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
+* [Gustaf Thorslund's blog](http://blog.thorslund.org)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 386e464188d817f90e1cb6535da2db6bcfaa3fa0 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 30 Mar 2010 05:31:10 +0000
Subject: quick response

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index fc1759fab..4bb285a50 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -9,6 +9,10 @@ with IkiWiki's use of `<TMPL_VAR AUTHOR>` for the author of the *page*
 `<TMPL_VAR FIELD_AUTHOR>` or something? (For those who want the current
 behaviour, an auxiliary plugin would be easy.)
 
+> No, please.  The idea is to be *able* to override field names if one wishes to, and choose, for yourself, non-colliding field names if one wishes not to.  I don't wish to lose the power of being able to, say, define a page title with YAML format if I want to, or to write a site-specific plugin which calculates a page title, or other nifty things.
+>It's not like one is going to lose the fields defined by the meta plugin; if "author" is defined by \[[!meta author=...]] then that's what will be found by "field" (provided the "meta" plugin is registered; that's what the "field_register" option is for).
+>--[[KathrynAndersen]]
+
 From a coding style point of view, the `$CamelCase` variable names aren't
 IkiWiki style, and the `match_foo` functions look as though they could benefit
 from being thin wrappers around a common `&IkiWiki::Plugin::field::match`
@@ -17,6 +21,8 @@ function (see `meta` for a similar approach).
 I think the documentation would probably be clearer in a less manpage-like
 and more ikiwiki-like style?
 
+> I don't think ikiwiki *has* a "style" for docs, does it?  So I followed the Perl Module style. And I'm rather baffled as to why having the docs laid out in clear sections... make them less clear. --[[KathrynAndersen]]
+
 If one of my branches from [[todo/allow_plugins_to_add_sorting_methods]] is
 accepted, a `field()` cmp type would mean that [[plugins/contrib/report]] can
 stop reimplementing sorting. Here's the implementation I'm using, with
-- 
cgit v1.2.3


From 2d1e4cce45024f6b2c384eaf7b5276c448cb3a05 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 30 Mar 2010 05:38:31 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index eb2ec6f13..adb66ee6a 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -7,7 +7,11 @@ hooks (probably easiest to just patch `template` to implement a
 second directive, or have a special parameter `run_hooks="yes"`,
 or something).
 
+> I got the impression that `pagetemplate` hooks are intended to be completely independent of `template` variables; page-template is for the actual `page.tmpl` template, while `template` is for other templates which are used inside the page content.  So I don't understand why one would need a run_hooks option. --[[KathrynAndersen]]
+
 Another missing thing is that `ftemplate` looks in
 the "system" templates directories, not just in the wiki, but that
 seems orthogonal (and might be a good enhancement to `template` anyway).
 --[[smcv]]
+
+> Yes, I added that because I wanted the option of not having to make all my templates work as wiki pages also. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From a284d5fa0aed7778130f95c9883fe8815ecf37b6 Mon Sep 17 00:00:00 2001
From: "http://www.google.com/profiles/schmonz"
 <http://www.google.com/profiles/schmonz@web>
Date: Tue, 30 Mar 2010 05:48:51 +0000
Subject: update home page URL

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

(limited to 'doc')

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


From 90c444d9f197a5a9b87d3e70248279ac68e351a6 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 30 Mar 2010 06:44:04 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index 918d0779b..42a1009cb 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -18,6 +18,17 @@ removing the special case for `field`.
 Perhaps the `headers` thing could migrate into inline somehow? That might
 lead to making inline too big, though.
 
+> I think inline is *already* too big, honestly. --[[KathrynAndersen]]
+
 Is the intention that the `trail` part is a performance hack, or a way
 to select pages? How does it relate to [[todo/wikitrails]] or
 [[plugins/contrib/trail]]? --[[smcv]]
+
+> The `trail` part is *both* a performance hack, and a way to select pages.  I have over 5000 pages on my site, I need all the performance hacks I can get.
+> For the performance hack, it is a way of reducing the need to iterate through every single page in the wiki in order to find matching pages.
+> For the way-to-select-pages, yes, it is intended to be similar to [[todo/wikitrails]] and [[plugins/contrib/trail]] (and will be more similar with the new release which will be happening soon; it will add prev_* and next_* variables).
+> The idea is that, rather than having to add special "trail" links on PageA to indicate that a page is part of the trail,
+> it takes advantage of the `%links` hash, which already contains, for each page, an array of the links from that page to other pages.  No need for special markup, just use what's there; a trail is defined as "all the pages linked to from page X", and since it's an array, it has an order already.
+> But to avoid that being too limiting, one can use a `pages=...` pagespec to filter that list to a subset; only the pages one is interested in.
+> And one can also sort it, if one so desires.
+> --[[KathrynAndersen]] 
-- 
cgit v1.2.3


From f673ce266c8dadb263c6850cc5f7d3e6e7a68e70 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 30 Mar 2010 12:01:35 +0000
Subject: feature request (part of ftemplate)

---
 doc/todo/user-defined_templates_outside_the_wiki.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/todo/user-defined_templates_outside_the_wiki.mdwn

(limited to 'doc')

diff --git a/doc/todo/user-defined_templates_outside_the_wiki.mdwn b/doc/todo/user-defined_templates_outside_the_wiki.mdwn
new file mode 100644
index 000000000..880ad6493
--- /dev/null
+++ b/doc/todo/user-defined_templates_outside_the_wiki.mdwn
@@ -0,0 +1,8 @@
+[[!tag wishlist]]
+
+The [[plugins/contrib/ftemplate]] plugin looks for templates inside the wiki
+source, but also looks in the system templates directory (the one with
+`page.tmpl`). This means the wiki admin can provide templates that can be
+invoked via `\[[!template]]`, but don't have to "work" as wiki pages in their
+own right. I think the normal [[plugins/template]] plugin could benefit from
+this functionality.
-- 
cgit v1.2.3


From 026355cfa24dc911a247dcafca10c6ea74ae515b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 30 Mar 2010 12:09:59 +0000
Subject: respond and attempt to invoke Joey :-)

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index adb66ee6a..de4b35ef0 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -9,9 +9,24 @@ or something).
 
 > I got the impression that `pagetemplate` hooks are intended to be completely independent of `template` variables; page-template is for the actual `page.tmpl` template, while `template` is for other templates which are used inside the page content.  So I don't understand why one would need a run_hooks option. --[[KathrynAndersen]]
 
+>> `Render`, `inline`, `comments` and `recentchanges` run `pagetemplate`
+>> hooks, as does anything that uses `IkiWiki::misctemplate`. From that
+>> quick survey, it seems as though `template` is the only thing that
+>> uses `HTML::Template` but *doesn't* run `pagetemplate` hooks?
+>>
+>> It just seems strange to me that `field` needs to have its own
+>> of `template` (this), its own variant of `inline` (`report`),
+>> and so on - I'd tend to lean more towards having `field`
+>> enhance the existing plugins. I'm not an ikiwiki committer,
+>> mind... Joey, your opinion would be appreciated! --[[smcv]]
+
 Another missing thing is that `ftemplate` looks in
 the "system" templates directories, not just in the wiki, but that
 seems orthogonal (and might be a good enhancement to `template` anyway).
 --[[smcv]]
 
 > Yes, I added that because I wanted the option of not having to make all my templates work as wiki pages also. --[[KathrynAndersen]]
+
+>> Yeah, that's something that annoys me about `template` too. I've
+>> opened a todo: [[todo/user-defined_templates_outside_the_wiki]].
+>> --s
-- 
cgit v1.2.3


From 0503bf7c8824d941b26da4c91b4ee1f721fcf54c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 30 Mar 2010 12:10:40 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index de4b35ef0..6a1d9f685 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -15,7 +15,7 @@ or something).
 >> uses `HTML::Template` but *doesn't* run `pagetemplate` hooks?
 >>
 >> It just seems strange to me that `field` needs to have its own
->> of `template` (this), its own variant of `inline` (`report`),
+>> variant of `template` (this), its own variant of `inline` (`report`),
 >> and so on - I'd tend to lean more towards having `field`
 >> enhance the existing plugins. I'm not an ikiwiki committer,
 >> mind... Joey, your opinion would be appreciated! --[[smcv]]
-- 
cgit v1.2.3


From edcea2b98100aa1ff18b91038a33e2ea55f13850 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 30 Mar 2010 12:27:18 +0000
Subject: respond

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index 42a1009cb..a6cb6f8bd 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -20,6 +20,13 @@ lead to making inline too big, though.
 
 > I think inline is *already* too big, honestly. --[[KathrynAndersen]]
 
+>> A fair point; perhaps my complaint should be that *inline* does
+>> too many orthogonal things. I suppose the headers feature wouldn't
+>> really make sense in an inline that didn't have `archive="yes"`,
+>> so it'd make sense to recommend this plugin as a replacement
+>> for inlining with archive=yes (for which I now realise "inline"
+>> is the wrong verb anyway :-) ) --s
+
 Is the intention that the `trail` part is a performance hack, or a way
 to select pages? How does it relate to [[todo/wikitrails]] or
 [[plugins/contrib/trail]]? --[[smcv]]
@@ -32,3 +39,18 @@ to select pages? How does it relate to [[todo/wikitrails]] or
 > But to avoid that being too limiting, one can use a `pages=...` pagespec to filter that list to a subset; only the pages one is interested in.
 > And one can also sort it, if one so desires.
 > --[[KathrynAndersen]] 
+
+>> That's an interesting approach to trails; I'd missed the fact that
+>> links are already ordered.
+>>
+>> This does have the same problems as tags, though: see
+>> [[bugs/tagged()_matching_wikilinks]] and
+>> [[todo/matching_different_kinds_of_links]]. I suppose the question
+>> now is whether new code should be consistent with `tag` (and
+>> potentially be fixed at the same time as tag itself), or try to
+>> avoid those problems?
+>>
+>> The combination of `trail` with another pagespec in this plugin
+>> does provide a neat way for it to work around having unwanted
+>> pages in the report, by limiting by a suitable tag or subdirectory
+>> or something. --s
-- 
cgit v1.2.3


From bb8b941bfc3d3564324a23bba14dc8112d8ea6c7 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 30 Mar 2010 12:48:03 +0000
Subject: respond; correct license of fieldsort plugin to match IkiWiki

---
 doc/plugins/contrib/field/discussion.mdwn | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 4bb285a50..7e94a4029 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -13,6 +13,19 @@ behaviour, an auxiliary plugin would be easy.)
 >It's not like one is going to lose the fields defined by the meta plugin; if "author" is defined by \[[!meta author=...]] then that's what will be found by "field" (provided the "meta" plugin is registered; that's what the "field_register" option is for).
 >--[[KathrynAndersen]]
 
+>> Hmm. I suppose if you put the title (or whatever) in the YAML, then
+>> "almost" all the places in IkiWiki that respect titles will do the
+>> right thing due to the pagetemplate hook, with the exception being
+>> anything that has special side-effects inside `meta` (like `date`),
+>> or anything that looks in `$pagestate{foo}{meta}` directly
+>> (like `map`). Is your plan that `meta` should register itself by
+>> default, and `map` and friends should be adapted to
+>> work based on `getfield()` instead of `$pagestate{foo}{meta}`, then?
+>>
+>> (On the site I mentioned, I'm using an unmodified version of `field`,
+>> and currently working around the collision by tagging books' pages
+>> with `bookauthor` instead of `author` in the YAML.) --s
+
 From a coding style point of view, the `$CamelCase` variable names aren't
 IkiWiki style, and the `match_foo` functions look as though they could benefit
 from being thin wrappers around a common `&IkiWiki::Plugin::field::match`
@@ -23,13 +36,20 @@ and more ikiwiki-like style?
 
 > I don't think ikiwiki *has* a "style" for docs, does it?  So I followed the Perl Module style. And I'm rather baffled as to why having the docs laid out in clear sections... make them less clear. --[[KathrynAndersen]]
 
+>> I keep getting distracted by the big shouty headings :-)
+>> I suppose what I was really getting at was that when this plugin
+>> is merged, its docs will end up split between its plugin
+>> page, [[plugins/write]] and [[ikiwiki/PageSpec]]; on some of the
+>> contrib plugins I've added I've tried to separate the docs
+>> according to how they'll hopefully be laid out after merge. --s
+
 If one of my branches from [[todo/allow_plugins_to_add_sorting_methods]] is
 accepted, a `field()` cmp type would mean that [[plugins/contrib/report]] can
 stop reimplementing sorting. Here's the implementation I'm using, with
 your "sortspec" concept (a sort-hook would be very similar): if merged,
 I think it should just be part of `field` rather than a separate plugin.
 
-	# Copyright © 2010 Simon McVittie, released under GNU LGPL >= 2.1
+	# Copyright © 2010 Simon McVittie, released under GNU GPL >= 2
 	package IkiWiki::Plugin::fieldsort;
 	use warnings;
 	use strict;
-- 
cgit v1.2.3


From 35fcc2ec8f1d3a3048d99a568df645607a99fbf1 Mon Sep 17 00:00:00 2001
From: "http://edrex.myopenid.com/" <http://edrex.myopenid.com/@web>
Date: Wed, 31 Mar 2010 00:21:58 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
new file mode 100644
index 000000000..6f742ff70
--- /dev/null
+++ b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
@@ -0,0 +1,4 @@
+[[!table format=dsv delimiter="\t" data="""
+1	2
+2	4
+"""]]
-- 
cgit v1.2.3


From 66ecf1dba5d0aca59affd30029fe14ad5e3efc94 Mon Sep 17 00:00:00 2001
From: "http://edrex.myopenid.com/" <http://edrex.myopenid.com/@web>
Date: Wed, 31 Mar 2010 00:24:22 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
index 6f742ff70..b407255aa 100644
--- a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
+++ b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
@@ -1,3 +1,5 @@
+Table directive should support tab-delimited data, especially important since this is the format you will get if copy/pasting from an HTML table or spreadsheet (Gnumeric, OO Calc, Excel). Test case which fails:
+
 [[!table format=dsv delimiter="\t" data="""
 1	2
 2	4
-- 
cgit v1.2.3


From 7f63763a30e774e9a10bd1416f157dd2b3e2e69b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 31 Mar 2010 02:07:52 +0000
Subject: they do work, with the right syntax (C backslash escapes aren't
 interpreted)

---
 doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
index b407255aa..278826ea0 100644
--- a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
+++ b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
@@ -4,3 +4,17 @@ Table directive should support tab-delimited data, especially important since th
 1	2
 2	4
 """]]
+
+> They do work, but C-style backslash escapes aren't recognised,
+> so the syntax `delimiter="\t"` (as in your test case) looks
+> for the literal string `\t`. Replacing `\t` with a literal
+> tab character makes it work - here's a test (I changed the data
+> to make the table layout more obvious):
+>
+> [[!table format=dsv delimiter="	" data="""
+left	2
+2	right
+alpha	beta
+"""]]
+>
+> So, I think this can be considered [[not_a_bug|done]]? --[[smcv]]
-- 
cgit v1.2.3


From fc5445b90677489642e4ae8d5b2f6c54cdd847c5 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 31 Mar 2010 03:01:41 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index 6a1d9f685..eb84dd09b 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -20,6 +20,8 @@ or something).
 >> enhance the existing plugins. I'm not an ikiwiki committer,
 >> mind... Joey, your opinion would be appreciated! --[[smcv]]
 
+>>> I did it that way basically because I needed the functionality ASAP, and I didn't want to step on anyone's toes, so I made them as separate plugins.  If Joey wants to integrate the functionality into IkiWiki proper, I would be very happy, but I don't want to put pressure on him. --[[KathrynAndersen]]
+
 Another missing thing is that `ftemplate` looks in
 the "system" templates directories, not just in the wiki, but that
 seems orthogonal (and might be a good enhancement to `template` anyway).
-- 
cgit v1.2.3


From 4eed0abc8c181a027fa802d209fd95d8c10ee9f0 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 1 Apr 2010 00:23:31 +0000
Subject: response; thoughts about inline and tags

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index a6cb6f8bd..953509297 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -27,6 +27,8 @@ lead to making inline too big, though.
 >> for inlining with archive=yes (for which I now realise "inline"
 >> is the wrong verb anyway :-) ) --s
 
+>>> I think *inline* would be a bit less unwieldy if there was some way of factoring out the feed stuff into a separate plugin, but I don't know if that's possible. --K.A.
+
 Is the intention that the `trail` part is a performance hack, or a way
 to select pages? How does it relate to [[todo/wikitrails]] or
 [[plugins/contrib/trail]]? --[[smcv]]
@@ -54,3 +56,7 @@ to select pages? How does it relate to [[todo/wikitrails]] or
 >> does provide a neat way for it to work around having unwanted
 >> pages in the report, by limiting by a suitable tag or subdirectory
 >> or something. --s
+
+>>> Either that, or somehow combine tagging with fields, such that one could declare a tag, and it would create both a link and a field with a given value.  (I've been working on something like that, but it still has bugs).
+>>> That way, the test for whether something is tagged would be something like "link(tag/foo) and field(tag foo)".
+>>> --K.A.
-- 
cgit v1.2.3


From 63bc057690d388a81e643d4556c6a001d886b59c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 1 Apr 2010 01:35:35 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index 953509297..a257198c0 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -60,3 +60,10 @@ to select pages? How does it relate to [[todo/wikitrails]] or
 >>> Either that, or somehow combine tagging with fields, such that one could declare a tag, and it would create both a link and a field with a given value.  (I've been working on something like that, but it still has bugs).
 >>> That way, the test for whether something is tagged would be something like "link(tag/foo) and field(tag foo)".
 >>> --K.A.
+
+>>>> I can see that this'd work well for 1:1 relationships like next
+>>>> and previous, but I don't think that'd work for pages with more than
+>>>> one tag - as far as I can see, `field`'s data model is that each
+>>>> page has no more than one value for each field?
+>>>> [[todo/Matching_different_kinds_of_links]] has some thoughts about
+>>>> how it could be implemented, though. --s
-- 
cgit v1.2.3


From a682df9a1f14ea873c7103f80108330840a15cd0 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 1 Apr 2010 07:22:37 +0000
Subject: considering tags and fields

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn
index a257198c0..e23a4ced4 100644
--- a/doc/plugins/contrib/report/discussion.mdwn
+++ b/doc/plugins/contrib/report/discussion.mdwn
@@ -67,3 +67,9 @@ to select pages? How does it relate to [[todo/wikitrails]] or
 >>>> page has no more than one value for each field?
 >>>> [[todo/Matching_different_kinds_of_links]] has some thoughts about
 >>>> how it could be implemented, though. --s
+
+>>>>> You have a point there.  I'm not sure what would be better: to add the concept of arrays/sets to `field`, or to think of tags as a special case.  Problem is, I find tags as they currently exist to be too limiting.  I prefer something that can be used for Faceted Tagging <http://en.wikipedia.org/wiki/Faceted_classification>; that is, things like Author:Fred Nurk, Genre:Historical, Rating:Good, and so on.  Of course, that doesn't mean that each tag is limited to only one value, either; just to take the above examples, something might have more than one author, or have multiple genres (such as Historical + Romance).
+
+>>>>> It might be that adding arrays to the `field` plugin is a good way to go: after all, even though field=value is the most common, with the flexibility of things like YAML, one could define all sorts of things.  What I'm not so sure about is how to return the values when queried, since some things would be expecting scalars all the time.  Ah, perhaps I could use wantarray?
+>>>>> Is there a way of checking a HTML::Template template to see if it expecting an array for a particular value?
+>>>>> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 3c9cd4f156018aea3d10dbf02be529e85c05eb66 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Thu, 1 Apr 2010 18:13:38 +0100
Subject: Explain tab-delimited tables a bit better

---
 doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn | 2 ++
 doc/ikiwiki/directive/table.mdwn                   | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
index 278826ea0..39d57a4fe 100644
--- a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
+++ b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn
@@ -18,3 +18,5 @@ alpha	beta
 """]]
 >
 > So, I think this can be considered [[not_a_bug|done]]? --[[smcv]]
+
+>> I've clarified the documentation. --[[smcv]]
diff --git a/doc/ikiwiki/directive/table.mdwn b/doc/ikiwiki/directive/table.mdwn
index 2dac97724..a6692f92c 100644
--- a/doc/ikiwiki/directive/table.mdwn
+++ b/doc/ikiwiki/directive/table.mdwn
@@ -42,4 +42,9 @@ cells. For example:
   as the table header. Set it to "no" to make a table without a header, or
   "column" to make the first column be the header.
 
+For tab-delimited tables (often obtained by copying and pasting from HTML
+or a spreadsheet), `delimiter` must be set to a literal tab character. These
+are difficult to type in most web browsers - copying and pasting one from
+the table data is likely to be the easiest way.
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From a7ef2204dc36777f847e282f57299d93342a8ad6 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 1 Apr 2010 23:40:37 +0000
Subject: implemented!

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

(limited to 'doc')

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 26c5a072b..0049281fe 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -36,6 +36,11 @@ Besides pagespecs, the `rel=` attribute could be used for styles. --Ivan Z.
 > normal links.) Might be better to go ahead and add the variable to
 > core though. --[[Joey]] 
 
+>> I've implemented this with the data structure you suggested, except that
+>> I called it `%typedlinks` instead of `%linktype` (it seemed to make more
+>> sense that way). I also ported `tag` to it, and added a `tagged_is_strict`
+>> config option. See below! --[[smcv]]
+
 I saw somewhere else here some suggestions for the wiki-syntax for specifying the relation name of a link. One more suggestion---[the syntax used in Semantic MediaWiki](http://en.wikipedia.org/wiki/Semantic_MediaWiki#Basic_usage), like this:
 
 <pre>
@@ -45,3 +50,49 @@ I saw somewhere else here some suggestions for the wiki-syntax for specifying th
 So a part of the effect of [[`\[[!taglink TAG\]\]`|plugins/tag]] could be represented as something like `\[[tag::TAG]]` or (more understandable relation name in what concerns the direction) `\[[tagged::TAG]]`.
 
 I don't have any opinion on this syntax (whether it's good or not)...--Ivan Z.
+
+-------
+
+>> [[!template id=gitbranch author="[[Simon_McVittie|smcv]]" branch=smcv/link-types]]
+>> [[!tag patch]]
+
+## Documentation for smcv's branch
+
+### added to [[ikiwiki/pagespec]]
+
+* "`typedlink(type glob)`" - matches pages that link to a given page (or glob)
+  with a given link type. Plugins can create links with a specific type:
+  for instance, the tag plugin creates links of type `tag`.
+
+### added to [[plugins/tag]]
+
+If the `tagged_is_strict` config option is set, `tagged()` will only match
+tags explicitly set with [[ikiwiki/directive/tag]] or
+[[ikiwiki/directive/taglink]]; if not (the default), it will also match
+any other [[WikiLinks|ikiwiki/WikiLink]] to the tag page.
+
+### added to [[plugins/write]]
+
+#### `%typedlinks`
+
+The `%typedlinks` hash records links of specific types. Do not modify this
+hash directly; call `add_link()`. The keys are page names, and the values
+are hash references. In each page's hash reference, the keys are link types
+defined by plugins, and the values are hash references with link targets
+as keys, and 1 as a dummy value, something like this:
+
+	$typedlinks{"foo"} = {
+		tag => { short_word => 1, metasyntactic_variable => 1 },
+		next_page => { bar => 1 },
+	};
+
+Ordinary [[WikiLinks|ikiwiki/WikiLink]] appear in `%links`, but not in
+`%typedlinks`.
+
+#### `add_link($$;$)`
+ 
+ This adds a link to `%links`, ensuring that duplicate links are not
+ added. Pass it the page that contains the link, and the link text.
+ 
+An optional third parameter sets the link type (`undef` produces an ordinary
+[[ikiwiki/WikiLink]]).
-- 
cgit v1.2.3


From 93024e5193e01904b9e9688a4553d24cee23c490 Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:00:46 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index 19ca9ed0b..f4c8bbee4 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,8 +1,8 @@
 This is a place for questions and discussions that don't have a Discussion
 page fitting enough. Users of ikiwiki can ask questions here.
 
-Note that for more formal bug reports or todo items, you can also edit the
-[[bugs]] and [[todo]] pages.
+Note that for more formal bug reports or todo items, you can also edit [http://custom-paper-writing.com/editing-services service essays] the
+[[bugs]] and [[todo]] [http://essaywritingservices.org/book-report.php book report help] pages.
 
 ## Current topics ##
 
-- 
cgit v1.2.3


From c7bccf3a2a23486fc4a2d0923d95c34554e0b087 Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:01:24 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index f4c8bbee4..958238f8a 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,8 +1,8 @@
 This is a place for questions and discussions that don't have a Discussion
 page fitting enough. Users of ikiwiki can ask questions here.
 
-Note that for more formal bug reports or todo items, you can also edit [http://custom-paper-writing.com/editing-services service essays] the
-[[bugs]] and [[todo]] [http://essaywritingservices.org/book-report.php book report help] pages.
+Note that for more formal bug reports or todo items, you can also edit [[http://custom-paper-writing.com/editing-services service essays]] the
+[[bugs]] and [[todo]] [[http://essaywritingservices.org/book-report.php book report help]] pages.
 
 ## Current topics ##
 
-- 
cgit v1.2.3


From 1587e38fd4c4083a3d25e2c613c74c07530a344c Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:03:58 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index 958238f8a..6febfa374 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,8 +1,8 @@
 This is a place for questions and discussions that don't have a Discussion
 page fitting enough. Users of ikiwiki can ask questions here.
 
-Note that for more formal bug reports or todo items, you can also edit [[http://custom-paper-writing.com/editing-services service essays]] the
-[[bugs]] and [[todo]] [[http://essaywritingservices.org/book-report.php book report help]] pages.
+Note that for more formal bug reports or todo items, you can also edit [[service essays http://custom-paper-writing.com/editing-services]] the
+[[bugs]] and [[todo]] [[ book report help http://essaywritingservices.org/book-report.php]] pages.
 
 ## Current topics ##
 
-- 
cgit v1.2.3


From cad194a2eeeaa2226fb9bd60c3f38861b1d6663e Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:05:18 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index 6febfa374..2e766c4e4 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,8 +1,8 @@
 This is a place for questions and discussions that don't have a Discussion
 page fitting enough. Users of ikiwiki can ask questions here.
 
-Note that for more formal bug reports or todo items, you can also edit [[service essays http://custom-paper-writing.com/editing-services]] the
-[[bugs]] and [[todo]] [[ book report help http://essaywritingservices.org/book-report.php]] pages.
+Note that for more formal bug reports or todo items, you can also edit [service essays](http://custom-paper-writing.com/editing-services) the
+[[bugs]] and [[todo]] [book report help](http://essaywritingservices.org/book-report.php) pages.
 
 ## Current topics ##
 
-- 
cgit v1.2.3


From 7f488c70123890aa7f9ca86184c177f6c037eae1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 2 Apr 2010 13:07:22 +0100
Subject: Despam

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

(limited to 'doc')

diff --git a/doc/forum.mdwn b/doc/forum.mdwn
index 2e766c4e4..19ca9ed0b 100644
--- a/doc/forum.mdwn
+++ b/doc/forum.mdwn
@@ -1,8 +1,8 @@
 This is a place for questions and discussions that don't have a Discussion
 page fitting enough. Users of ikiwiki can ask questions here.
 
-Note that for more formal bug reports or todo items, you can also edit [service essays](http://custom-paper-writing.com/editing-services) the
-[[bugs]] and [[todo]] [book report help](http://essaywritingservices.org/book-report.php) pages.
+Note that for more formal bug reports or todo items, you can also edit the
+[[bugs]] and [[todo]] pages.
 
 ## Current topics ##
 
-- 
cgit v1.2.3


From e71a912f0c64b1eb6ead8242868da6f5a9606c8b Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:07:42 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 54dd0fdb1..179cb89e6 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -49,7 +49,9 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
 * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]]
 * [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
-* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]
+* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]] 
+* [custom writing company](http://essaywritingservices.org/custom-essay-writing.php) 
+* [certified resume writer](http://cvresumewriters.com/onlineresume.php)
 * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
 * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
-- 
cgit v1.2.3


From e0074b91c7d1a44c468bdbf554cbef07434b7dfe Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:18:36 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 179cb89e6..f33dfb6b6 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -49,9 +49,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
 * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]]
 * [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
-* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]] 
-* [custom writing company](http://essaywritingservices.org/custom-essay-writing.php) 
-* [certified resume writer](http://cvresumewriters.com/onlineresume.php)
+* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]  
 * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
 * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
@@ -67,13 +65,13 @@ This page controls what shortcut links the wiki supports.
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
 text passed to the named shortcut, after [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text. The optional
+it, and '%S' is replaced with the raw, non-encoded text [custom writing company](http://essaywritingservices.org/custom-essay-writing.php). The optional
 `desc` parameter controls the description of the link.
 
 Remember that the `name` you give the shortcut will become a new
 [[ikiwiki/directive]].  Avoid using a `name` that conflicts
 with an existing directive.  These directives also accept a `desc`
-parameter that will override the one provided at definition time.
+parameter that will override [certified resume writer](http://cvresumewriters.com/onlineresume.php) the one provided at definition time.
 
 If you come up with a shortcut that you think others might find useful,
 consider contributing it to the [shortcuts page on the ikiwiki
-- 
cgit v1.2.3


From caa397b768c1fa4fda800ae0e86c10ac07b316a3 Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:24:14 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/security.mdwn b/doc/security.mdwn
index 21aef316b..a06f3a37f 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -376,7 +376,7 @@ parties.
 Cross Site Request Forging could be used to constuct a link that would
 change a logged-in user's password or other preferences if they clicked on
 the link. It could also be used to construct a link that would cause a wiki
-page to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
+page [order essay](http://custom-paper-writing.com/order) to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
 
 These holes were discovered on 10 April 2008 and fixed the same day with
 the release of ikiwiki 2.42. A fix was also backported to Debian etch, as
@@ -415,7 +415,7 @@ can cause it to crash. This can potentially be used for a denial of service
 attack.
 
 intrigeri discovered this problem on 12 Nov 2008 and a patch put in place
-later that day, in version 2.70. The fix was backported to testing as version
+later that day, in version 2.70. The fix was backported [write my essay](http://custom-essay-writing-service.org/faq.php) to testing as version
 2.53.3, and to stable as version 1.33.7.
 
 ## Insufficient blacklisting in teximg plugin
-- 
cgit v1.2.3


From bb99202474de4cb655d50a4f82b77b67e8445e5c Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:26:46 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 3925d78ef..c119dae97 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -125,7 +125,7 @@ yours when you commit.
 In the rare cases where automatic merging fails due to the same part of a
 page being concurrently edited, regular commit conflict markers are
 shown in the file to resolve the conflict, so if you're already familiar
-with that there's no new commit marker syntax to learn.
+with that there's no new commit [order essays](http://custom-paper-writing.com/order) marker syntax to learn.
 
 ### [[RecentChanges]], editing pages in a web browser
 
@@ -158,7 +158,7 @@ since page edit controls can be changed via plugins.
 
 ### [[PageHistory]]
 
-Well, sorta. Rather than implementing YA history browser, it can link to
+Well, sorta. Rather than implementing YA history browser [essay writing companies](http://essaywritingservices.org/custom-essay-writing.php), it can link to
 [[ViewVC]] or the like to browse the history of a wiki page.
 
 ### Full text search
-- 
cgit v1.2.3


From 0c1a1185c1957c161adda779d719d7ddca2d5021 Mon Sep 17 00:00:00 2001
From: adrianna <adrianna@web>
Date: Fri, 2 Apr 2010 12:29:22 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 2d4da5536..4ad64d73b 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -105,7 +105,7 @@ After making changes to this file, you need to tell ikiwiki to use it:
 ## Customizing file locations
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,
-and outputs the files to a destination directory. The source directory is
+and outputs the files to a destination directory [write my essay](http://custom-essay-writing-service.org/faq.php). The source directory is
 a working copy checked out from the version control system repository.
 
 When you used `auto.setup`, ikiwiki put the source directory, destination
@@ -118,7 +118,7 @@ First, move the destination directory and repository around.
 	% mv public_html/foo /srv/web/foo.com
 	% mv foo.git /srv/git/foo.git
 
-If you moved the repository to a new location, checkouts pointing at the
+If you moved the repository to a new location [buy reports](http://essaywritingservices.org/book-report.php), checkouts pointing at the
 old location won't work, and the easiest way to deal with this is to delete
 them and re-checkout from the new repository location.
    
-- 
cgit v1.2.3


From 05b6e8ceee2bec4442727e2475abf8a8861d5e0a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 2 Apr 2010 18:28:34 +0100
Subject: Despam, again. Someone ban adrianna please?

---
 doc/features.mdwn  | 4 ++--
 doc/security.mdwn  | 4 ++--
 doc/setup.mdwn     | 4 ++--
 doc/shortcuts.mdwn | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/doc/features.mdwn b/doc/features.mdwn
index c119dae97..3925d78ef 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -125,7 +125,7 @@ yours when you commit.
 In the rare cases where automatic merging fails due to the same part of a
 page being concurrently edited, regular commit conflict markers are
 shown in the file to resolve the conflict, so if you're already familiar
-with that there's no new commit [order essays](http://custom-paper-writing.com/order) marker syntax to learn.
+with that there's no new commit marker syntax to learn.
 
 ### [[RecentChanges]], editing pages in a web browser
 
@@ -158,7 +158,7 @@ since page edit controls can be changed via plugins.
 
 ### [[PageHistory]]
 
-Well, sorta. Rather than implementing YA history browser [essay writing companies](http://essaywritingservices.org/custom-essay-writing.php), it can link to
+Well, sorta. Rather than implementing YA history browser, it can link to
 [[ViewVC]] or the like to browse the history of a wiki page.
 
 ### Full text search
diff --git a/doc/security.mdwn b/doc/security.mdwn
index a06f3a37f..21aef316b 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -376,7 +376,7 @@ parties.
 Cross Site Request Forging could be used to constuct a link that would
 change a logged-in user's password or other preferences if they clicked on
 the link. It could also be used to construct a link that would cause a wiki
-page [order essay](http://custom-paper-writing.com/order) to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
+page to be modified by a logged-in user. ([[!cve CVE-2008-0165]])
 
 These holes were discovered on 10 April 2008 and fixed the same day with
 the release of ikiwiki 2.42. A fix was also backported to Debian etch, as
@@ -415,7 +415,7 @@ can cause it to crash. This can potentially be used for a denial of service
 attack.
 
 intrigeri discovered this problem on 12 Nov 2008 and a patch put in place
-later that day, in version 2.70. The fix was backported [write my essay](http://custom-essay-writing-service.org/faq.php) to testing as version
+later that day, in version 2.70. The fix was backported to testing as version
 2.53.3, and to stable as version 1.33.7.
 
 ## Insufficient blacklisting in teximg plugin
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 4ad64d73b..2d4da5536 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -105,7 +105,7 @@ After making changes to this file, you need to tell ikiwiki to use it:
 ## Customizing file locations
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,
-and outputs the files to a destination directory [write my essay](http://custom-essay-writing-service.org/faq.php). The source directory is
+and outputs the files to a destination directory. The source directory is
 a working copy checked out from the version control system repository.
 
 When you used `auto.setup`, ikiwiki put the source directory, destination
@@ -118,7 +118,7 @@ First, move the destination directory and repository around.
 	% mv public_html/foo /srv/web/foo.com
 	% mv foo.git /srv/git/foo.git
 
-If you moved the repository to a new location [buy reports](http://essaywritingservices.org/book-report.php), checkouts pointing at the
+If you moved the repository to a new location, checkouts pointing at the
 old location won't work, and the easiest way to deal with this is to delete
 them and re-checkout from the new repository location.
    
diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index f33dfb6b6..54dd0fdb1 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -49,7 +49,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
 * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]]
 * [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
-* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]  
+* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]
 * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
 * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
 * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
@@ -65,13 +65,13 @@ This page controls what shortcut links the wiki supports.
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
 text passed to the named shortcut, after [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text [custom writing company](http://essaywritingservices.org/custom-essay-writing.php). The optional
+it, and '%S' is replaced with the raw, non-encoded text. The optional
 `desc` parameter controls the description of the link.
 
 Remember that the `name` you give the shortcut will become a new
 [[ikiwiki/directive]].  Avoid using a `name` that conflicts
 with an existing directive.  These directives also accept a `desc`
-parameter that will override [certified resume writer](http://cvresumewriters.com/onlineresume.php) the one provided at definition time.
+parameter that will override the one provided at definition time.
 
 If you come up with a shortcut that you think others might find useful,
 consider contributing it to the [shortcuts page on the ikiwiki
-- 
cgit v1.2.3


From 1c8ac7d88c5a3d2c63892737e54be8a1b535936c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 16:41:04 -0400
Subject: review from the woods

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

(limited to 'doc')

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 0049281fe..20acdde49 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -96,3 +96,22 @@ Ordinary [[WikiLinks|ikiwiki/WikiLink]] appear in `%links`, but not in
  
 An optional third parameter sets the link type (`undef` produces an ordinary
 [[ikiwiki/WikiLink]]).
+
+> Some code refers to `oldtypedlinks`, and other to `oldlinktypes`.
+> 
+> I'm curious what your reasoning was for adding a new variable
+> rather than using `pagestate`. Was it only because you needed
+> the `old` version to detect change, or was there other complexity?
+> 
+> I have not convinced myself this is a real problem, but..
+> If a page has a typed link, there seems to be no way to tell
+> if it also has a separate, regular link. `add_link` will add
+> to `@links` when adding a typed, or untyped link. If only untyped
+> links were recorded there, one could tell the difference. But then
+> typed links would not show up at all in eg, a linkmap,
+> unless it was changed to check for typed links too.
+> (Or, regular links could be recorded in typedlinks too,
+> with a empty type. (Bloaty.))
+> 
+> I suspect we could get away without having `tagged_is_strict`
+> without too much transitional trouble. --[[Joey]]
-- 
cgit v1.2.3


From 59ba938822ba0752e8d97e769c0d14f2eb0bbeb3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 16:54:06 -0400
Subject: template: Search for templates in the templatedir, if they are not
 found as pages in the wiki.

---
 IkiWiki/Plugin/template.pm                            | 10 ++++++++--
 debian/changelog                                      |  2 ++
 doc/templates.mdwn                                    |  6 ++++++
 doc/todo/user-defined_templates_outside_the_wiki.mdwn |  2 ++
 doc/wikitemplates.mdwn                                |  6 ++++--
 5 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 3e024c5f8..36282055a 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -37,7 +37,13 @@ sub preprocess (@) {
 	my $template_page="templates/$params{id}";
 	add_depends($params{page}, $template_page);
 
-	my $template_file=$pagesources{$template_page};
+	my $template_file;
+	if (exists $pagesources{$template_page}) {
+		$template_file=srcfile($pagesources{$template_page});
+	}
+	else {
+		$template_file=template_file("$params{id}.tmpl")
+	}
 	return sprintf(gettext("template %s not found"),
 		htmllink($params{page}, $params{destpage}, "/".$template_page))
 			unless defined $template_file;
@@ -50,7 +56,7 @@ sub preprocess (@) {
 	                        $$text_ref=&Encode::decode_utf8($$text_ref);
 				chomp $$text_ref;
 	                },
-	                filename => srcfile($template_file),
+	                filename => $template_file,
        			die_on_bad_params => 0,
 			no_includes => 1,
 			blind_cache => 1,
diff --git a/debian/changelog b/debian/changelog
index adf0dfed6..362ba54ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
   * page.tmpl: Add Cache-Control must-revalidate to ensure that users
     (especially of Firefox) see fresh page content.
   * htmlscrubber: Allow colons in urls after '?'
+  * template: Search for templates in the templatedir, if they are not
+    found as pages in the wiki.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
 
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index eff0e15e9..07531ae98 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -43,6 +43,12 @@ page will provide a link that can be used to create the template. The template
 is a regular wiki page, located in the `templates/` subdirectory inside
 the source directory of the wiki.
 
+(Alternatively, templates can be stored in a directory outside the wiki,
+as files with the extension ".tmpl".
+By default, these are searched for in `/usr/share/ikiwiki/templates`;
+the `templatedir` setting can be used to make another directory be searched
+first.)
+
 The template uses the syntax used by the [[!cpan HTML::Template]] perl
 module, which allows for some fairly complex things to be done. Consult its
 documentation for the full syntax, but all you really need to know are a
diff --git a/doc/todo/user-defined_templates_outside_the_wiki.mdwn b/doc/todo/user-defined_templates_outside_the_wiki.mdwn
index 880ad6493..1d72aa6a7 100644
--- a/doc/todo/user-defined_templates_outside_the_wiki.mdwn
+++ b/doc/todo/user-defined_templates_outside_the_wiki.mdwn
@@ -6,3 +6,5 @@ source, but also looks in the system templates directory (the one with
 invoked via `\[[!template]]`, but don't have to "work" as wiki pages in their
 own right. I think the normal [[plugins/template]] plugin could benefit from
 this functionality.
+
+[[done]] --[[Joey]] 
diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index 6c0480cea..6e5a7261d 100644
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -5,7 +5,8 @@ to learn.
 The aim is to keep almost all html out of ikiwiki and in the templates.
 
 It ships with some basic templates which can be customised. These are
-located in /usr/share/ikiwiki/templates by default.
+located in `/usr/share/ikiwiki/templates` by default; the `templatedir`
+setting can be used to make another directory be searched first.
 
 * `page.tmpl` - Used for displaying all regular wiki pages.
 * `misc.tmpl` - Generic template used for any page that doesn't
@@ -43,7 +44,8 @@ The [[plugins/pagetemplate]] plugin can allow individual pages to use a
 different template than `page.tmpl`.
 
 The [[plugins/template]] plugin also uses templates, though those
-[[templates]] are stored in the wiki and inserted into pages.
+[[templates]] are typically stored as pages in the wiki, and are inserted
+into pages.
 
 The [[plugins/edittemplate]] plugin is used to make new pages default to
 containing text from a template, which can be filled as out the page is
-- 
cgit v1.2.3


From de62ea1cc8111dd96bc84b9c839be99c921168e3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 17:03:33 -0400
Subject: fix branch name

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index f37a0758e..8edc95fb9 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -104,7 +104,7 @@ An optional `sort` parameter will be used preferentially when
 
        \[[!meta title="David Bowie" sort="Bowie, David"]]
 
-## Documentation from sort-hooks branch
+## Documentation from sort-package branch
 
 The changes to [[ikiwiki/pagespec/sorting]] are the same.
 The changes to [[plugins/write]] are replaced by:
-- 
cgit v1.2.3


From 1b0d4e8d885ded59ca0ad1b4d1ca1315585cce06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 17:16:12 -0400
Subject: minor comment

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 8edc95fb9..e4e1829dc 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -89,6 +89,9 @@ and to sort by an arbitrary `meta` value, you could use:
   or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
   full title was set.
 
+  > I feel it sould be clearer to call that "sortas", since "sort=" is used
+  > to specify a sort method in other directives. --[[Joey]]
+
 ### Multiple sort orders (added to [[ikiwiki/pagespec/sorting]])
 
 In addition, you can combine several sort orders and/or reverse the order of
-- 
cgit v1.2.3


From 9e7dcefd7ed9424de20706f63c7bab5182c5df78 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 17:26:32 -0400
Subject: comments

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index e4e1829dc..67d85f6f8 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -50,6 +50,21 @@ NIH'd sorting mechanisms:
 >>> share the `IkiWiki::PageSpec` package, but with a `cmp_` prefix. Gitweb:
 >>> <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-package>
 
+>>>> I agree it seems more elegant, so I have focused on it.
+>>>>
+>>>> I don't know about reusing `IkiWiki::PageSpec` for this.
+>>>>
+>>>> I would be inclined to drop the `check_` stuff.
+>>>>
+>>>> Wouldn't it make sense to have `meta(title)` instead
+>>>> of `meta_title`?
+>>>>
+>>>> As I read the regexp in `cmpspec_translate`, the "command"
+>>>> is required to have params. They should be optional, 
+>>>> to match the documentation and because most sort methods
+>>>> do not need parameters.
+>>>> --[[Joey]]
+
 ## Documentation from sort-hooks branch
 
 ### sort hook (added to [[plugins/write]])
-- 
cgit v1.2.3


From 1faf9b08e16bde9b4b0d72620fcef79c715e64de Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 17:37:38 -0400
Subject: idea

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 67d85f6f8..e1e05e81c 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -63,6 +63,14 @@ NIH'd sorting mechanisms:
 >>>> is required to have params. They should be optional, 
 >>>> to match the documentation and because most sort methods
 >>>> do not need parameters.
+>>>>
+>>>> I wonder if it would make sense to add some combining keywords, so
+>>>> a sortspec reads like `sort="age then ascending title"`
+>>>> In a way, this reduces the amount of syntax that needs to be learned.
+>>>> I like the "then" (and it could allow other operations than
+>>>> simple combination, if any others make sense). Not so sure about the
+>>>> "ascending", which could be "reverse" instead, but "descending age" and
+>>>> "ascending age" both seem useful to be able to explicitly specify.
 >>>> --[[Joey]]
 
 ## Documentation from sort-hooks branch
-- 
cgit v1.2.3


From 2c7fe7ae2cf73141eba817d4275d9a6a897df8a8 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 2 Apr 2010 22:25:16 +0000
Subject: respond (also unindent Joey's review to avoid very deep indentation)

---
 doc/todo/matching_different_kinds_of_links.mdwn | 61 +++++++++++++++++--------
 1 file changed, 43 insertions(+), 18 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 20acdde49..f8796652e 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -97,21 +97,46 @@ Ordinary [[WikiLinks|ikiwiki/WikiLink]] appear in `%links`, but not in
 An optional third parameter sets the link type (`undef` produces an ordinary
 [[ikiwiki/WikiLink]]).
 
-> Some code refers to `oldtypedlinks`, and other to `oldlinktypes`.
-> 
-> I'm curious what your reasoning was for adding a new variable
-> rather than using `pagestate`. Was it only because you needed
-> the `old` version to detect change, or was there other complexity?
-> 
-> I have not convinced myself this is a real problem, but..
-> If a page has a typed link, there seems to be no way to tell
-> if it also has a separate, regular link. `add_link` will add
-> to `@links` when adding a typed, or untyped link. If only untyped
-> links were recorded there, one could tell the difference. But then
-> typed links would not show up at all in eg, a linkmap,
-> unless it was changed to check for typed links too.
-> (Or, regular links could be recorded in typedlinks too,
-> with a empty type. (Bloaty.))
-> 
-> I suspect we could get away without having `tagged_is_strict`
-> without too much transitional trouble. --[[Joey]]
+## Review
+
+Some code refers to `oldtypedlinks`, and other to `oldlinktypes`. --[[Joey]]
+
+> Oops, I'll fix that. That must mean missing test coverage, too :-(
+> --s
+
+I'm curious what your reasoning was for adding a new variable
+rather than using `pagestate`. Was it only because you needed
+the `old` version to detect change, or was there other complexity?
+--J
+
+> You seemed to be more in favour of adding it to the core in
+> your proposal above, so I assumed that'd be more likely to be
+> accepted :-) I don't mind one way or the other - `%typedlinks`
+> costs one core variable, but saves one level of hash nesting. If
+> you're not sure either, then I think the decision should come down
+> to which one is easier to document clearly - I'm still unhappy with
+> my docs for `%typedlinks`, so I'll try to write docs for it as
+> `pagestate` and see if they work any better. --s
+
+I have not convinced myself this is a real problem, but..
+If a page has a typed link, there seems to be no way to tell
+if it also has a separate, regular link. `add_link` will add
+to `@links` when adding a typed, or untyped link. If only untyped
+links were recorded there, one could tell the difference. But then
+typed links would not show up at all in eg, a linkmap,
+unless it was changed to check for typed links too.
+(Or, regular links could be recorded in typedlinks too,
+with a empty type. (Bloaty.)) --J
+
+> I think I like the semantics as-is - I can't think of any
+> reason why you'd want to ask the question "does A link to B,
+> not counting tags and other typed links?". A typed link is
+> still a link, in my mind at least. --s
+
+I suspect we could get away without having `tagged_is_strict`
+without too much transitional trouble. --[[Joey]]
+
+> If you think so, I can delete about 5 LoC. I don't particularly
+> care either way; [[Jon]] expressed concern about people relying
+> on the current semantics, on one of the pages requesting this
+> change. --s
-- 
cgit v1.2.3


From 011fe920d162924876170d167be11dc64cf8be2f Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:00:53 +0000
Subject: respond at some length

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 163 ++++++++++++---------
 1 file changed, 94 insertions(+), 69 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index e1e05e81c..156678da7 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -1,4 +1,3 @@
-[[!template id=gitbranch branch=smcv/sort-hooks author="[[Simon_McVittie|smcv]]"]]
 [[!tag patch]]
 
 The available [[ikiwiki/pagespec/sorting]] methods are currently hard-coded in
@@ -11,36 +10,13 @@ title over the page name, but for compatibility, I'm not going to (I do wonder
 whether it would be worth making sort=name an alias for the current sort=title,
 and changing the meaning of sort=title in 4.0, though).
 
-Gitweb:
-<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks>
+*[sort-hooks branch now withdrawn in favour of sort-package --s]*
 
 I briefly tried to turn *all* the current sort types into hook functions, and
 have some of them pre-registered, but decided that probably wasn't a good idea.
 That earlier version of the branch is also available for comparison:
 
-<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-hooks-excessive>
-
-(The older version is untested, and probably doesn't really work as-is - I
-misunderstood the details of how the built-in function `sort` works when using
-`$a` and `$b`. The newer version has been tested, and has a regression test for
-its core functionality.)
-
-This hook *isn't* (yet) sufficient to implement [[plugins/contrib/report]]'s
-NIH'd sorting mechanisms:
-
-* `report` can sort by any [[plugins/contrib/field]], whereas this one has a
-  finite number of hooks: if the `field` plugin's functionality is desirable,
-  perhaps parameterized sort mechanisms similar to pagespec match functions
-  would be useful? Then the `field` plugin could register
-  `hook(type => "sort", id => "field")` and you could have
-  `\[[!inline ... sort="field(Mood)"]]` or something?
-
-* `report` can sort by multiple criteria, with independent direction-changing:
-  if this is desirable, perhaps `pagespec_match_list` could be enhanced to
-  interpret `sort="x -y z(w)"` as sorting by (pseudocode)
-  `{ $cmp_x->($a, $b) || (-$cmp_y->($a, $b)) || $cmp_z->($a, $b, "w") }`?
-
-> I've now added both of these features to the sort-hooks branch. --[[smcv]]
+*[also withdrawn in favour of sort-package --s]*
 
 >> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages?  Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]]
 
@@ -53,17 +29,65 @@ NIH'd sorting mechanisms:
 >>>> I agree it seems more elegant, so I have focused on it.
 >>>>
 >>>> I don't know about reusing `IkiWiki::PageSpec` for this.
->>>>
+>>>> --[[Joey]]
+
+>>>>> Fair enough, `IkiWiki::SortSpec::cmp_foo` would be just
+>>>>> as easy, or `IkiWiki::Sorting::cmp_foo` if you don't like
+>>>>> introducing "sort spec" in the API. I took a cue from
+>>>>> [[ikiwiki/pagespec/sorting]] being a subpage of
+>>>>> [[ikiwiki/pagespec]], and decided that yes, sorting is
+>>>>> a bit like a pagespec :-) --s
+
 >>>> I would be inclined to drop the `check_` stuff.
->>>>
+
+>>>>> It basically exists to support `title_natural`, to avoid
+>>>>> firing up the whole import mechanism on every `cmp`
+>>>>> (although I suppose that could just be a call to a
+>>>>> memoized helper function). It also lets sort specs that
+>>>>> *must* have a parameter, like
+>>>>> [[field|plugins/contrib/field/discussion]], fail early
+>>>>> (again, not so valuable).
+>>>>>
+>>>>> The former function could be achieved at a small
+>>>>> compatibility cost by putting `title_natural` in a new
+>>>>> sortnatural plugin (that fails to load if you don't
+>>>>> have `title_natural`), if you'd prefer - that's what would
+>>>>> have happened if `title_natural` was written after this
+>>>>> code had been merged, I suspect. --s
+
 >>>> Wouldn't it make sense to have `meta(title)` instead
->>>> of `meta_title`?
->>>>
+>>>> of `meta_title`? --J
+
+>>>>> Yes, you're right. I added parameters to support `field`,
+>>>>> and didn't think about making `meta` use them too.
+>>>>> However, `title` does need a special case to make it
+>>>>> default to the basename instead of the empty string.
+>>>>>
+>>>>> Another special case for `title` is to use `titlesort`
+>>>>> first (the name `titlesort` is derived from Ogg/FLAC
+>>>>> tags, which can have `titlesort` and `artistsort`).
+>>>>> I could easily extend that to other metas, though;
+>>>>> in fact, for e.g. book lists it would be nice for
+>>>>> `field(bookauthor)` to behave similarly, so you can
+>>>>> display "Douglas Adams" but sort by "Adams, Douglas".
+>>>>>
+>>>>> `meta_title` is also meant to be a prototype of how
+>>>>> `sort=title` could behave in 4.0 or something - sorting
+>>>>> by page name (which usually sorts in approximately the
+>>>>> same place as the meta-title, but occasionally not), while
+>>>>> displaying meta-titles, does look quite odd. --s
+
 >>>> As I read the regexp in `cmpspec_translate`, the "command"
 >>>> is required to have params. They should be optional, 
 >>>> to match the documentation and because most sort methods
->>>> do not need parameters.
->>>>
+>>>> do not need parameters. --J
+
+>>>>> No, `$2` is either `\w+\([^\)]*\)` or `[^\s]+` (with the
+>>>>> latter causing an error later if it doesn't also match `\w+`).
+>>>>> This branch doesn't add any parameterized sort methods,
+>>>>> in fact, although I did provide one on
+>>>>> [[field's_discussion_page|plugins/contrib/report/discussion]]. --s
+
 >>>> I wonder if it would make sense to add some combining keywords, so
 >>>> a sortspec reads like `sort="age then ascending title"`
 >>>> In a way, this reduces the amount of syntax that needs to be learned.
@@ -73,38 +97,42 @@ NIH'd sorting mechanisms:
 >>>> "ascending age" both seem useful to be able to explicitly specify.
 >>>> --[[Joey]]
 
-## Documentation from sort-hooks branch
-
-### sort hook (added to [[plugins/write]])
-
-       hook(type => "sort", id => "foo", call => \&sort_by_foo);
-
-This hook adds an additional [[ikiwiki/pagespec/sorting]] order or overrides
-an existing one.
-
-The callback is given two page names followed by the parameter as arguments, and
-returns negative, zero or positive if the first page should come before,
-close to (i.e. undefined order), or after the second page.
-
-For instance, the built-in `title` sort order could be reimplemented as
-
-       sub sort_by_title {
-               pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]));
-       }
-
-and to sort by an arbitrary `meta` value, you could use:
-
-       # usage: sort="meta(description)"
-       sub sort_by_meta {
-               my $param = $_[2];
-               error "sort=meta requires a parameter" unless defined $param;
-               my $left = $pagestate{$_[0]}{meta}{$param};
-               $left = "" unless defined $left;
-               my $right = $pagestate{$_[1]}{meta}{$param};
-               $right = "" unless defined $right;
-               return $left cmp $right;
-       }
+>>>>> Perhaps. I do like the simplicity of [[KathyrnAndersen]]'s syntax
+>>>>> from [[plugins/contrib/report]] (which I copied verbatim, except for
+>>>>> turning sort-by-`field` into a parameterized spec), and I can't really
+>>>>> think of any sensible way to combine sort specs other than "sort by a,
+>>>>> break ties by b, ...", possibly with some reversals thrown in.
+>>>>>
+>>>>> If no other combinations do make sense, is your proposal that "then"
+>>>>> is entirely redundant (easy, just make it a predefined sort spec that
+>>>>> returns 0!), or that it's mandatory "punctuation" (add an explicit
+>>>>> check, or make "then" expand to "||" and let Perl fail to compile
+>>>>> the generated code if it's omitted)?
+>>>>>
+>>>>> It is a little unfortunate that reversal has to move into the sort
+>>>>> spec - I prefer `reverse=yes` - but that's necessary for multi-level
+>>>>> sorting. I can see your point about ascending/descending being more
+>>>>> obvious to look at, but they're also considerably more verbose.
+>>>>>
+>>>>> Unfortunately, `sort="ascending mtime"` actually sorts by *descending*
+>>>>> timestamp (but`sort=age` is fine, because `age` could be defined as
+>>>>> now minus `ctime`). `sort=freshness` isn't right either, because
+>>>>> "sort by freshness" seems as though it ought to mean freshest first,
+>>>>> but "sort by ascending freshness" means put the least fresh first. If
+>>>>> we have ascending and descending keywords which are optional, I don't
+>>>>> think we really want different sort types to have different default
+>>>>> directions - it seems clearer to have `ascending` always be a no-op,
+>>>>> and `descending` always negate.
+>>>>>
+>>>>> Perhaps we could borrow from `meta updated` and use `update_age`?
+>>>>> `updateage` would perhaps be a more normal IkiWiki style - but that
+>>>>> makes me think that updateage is a quantity analagous to tonnage or
+>>>>> voltage, with more or less recently updated pages being said to have
+>>>>> more or less updateage. I don't know whether that's good or bad :-)
+>>>>>
+>>>>> I'm sure there's a much better word, but I can't see it. --s
 
+## Documentation from sort-package branch
 
 ### meta_title sort order (conditionally added to [[ikiwiki/pagespec/sorting]])
 
@@ -115,6 +143,8 @@ and to sort by an arbitrary `meta` value, you could use:
   > I feel it sould be clearer to call that "sortas", since "sort=" is used
   > to specify a sort method in other directives. --[[Joey]]
 
+  >> Fair enough, that's easy to do. --[[smcv]]
+
 ### Multiple sort orders (added to [[ikiwiki/pagespec/sorting]])
 
 In addition, you can combine several sort orders and/or reverse the order of
@@ -130,12 +160,7 @@ An optional `sort` parameter will be used preferentially when
 
        \[[!meta title="David Bowie" sort="Bowie, David"]]
 
-## Documentation from sort-package branch
-
-The changes to [[ikiwiki/pagespec/sorting]] are the same.
-The changes to [[plugins/write]] are replaced by:
-
-### Sorting plugins
+### Sorting plugins (added to [[plugins/write]])
 
 Similarly, it's possible to write plugins that add new functions as
 [[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to
-- 
cgit v1.2.3


From aec7dec2795aedfe1f13cff9a888bed83ee760df Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:12:59 +0000
Subject: make questions to Joey more explicit

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 156678da7..36c134a59 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -36,9 +36,9 @@ That earlier version of the branch is also available for comparison:
 >>>>> introducing "sort spec" in the API. I took a cue from
 >>>>> [[ikiwiki/pagespec/sorting]] being a subpage of
 >>>>> [[ikiwiki/pagespec]], and decided that yes, sorting is
->>>>> a bit like a pagespec :-) --s
+>>>>> a bit like a pagespec :-) Which name would you prefer? --s
 
->>>> I would be inclined to drop the `check_` stuff.
+>>>> I would be inclined to drop the `check_` stuff. --J
 
 >>>>> It basically exists to support `title_natural`, to avoid
 >>>>> firing up the whole import mechanism on every `cmp`
@@ -50,10 +50,10 @@ That earlier version of the branch is also available for comparison:
 >>>>>
 >>>>> The former function could be achieved at a small
 >>>>> compatibility cost by putting `title_natural` in a new
->>>>> sortnatural plugin (that fails to load if you don't
+>>>>> `sortnatural` plugin (that fails to load if you don't
 >>>>> have `title_natural`), if you'd prefer - that's what would
 >>>>> have happened if `title_natural` was written after this
->>>>> code had been merged, I suspect. --s
+>>>>> code had been merged, I suspect. Would you prefer this? --s
 
 >>>> Wouldn't it make sense to have `meta(title)` instead
 >>>> of `meta_title`? --J
@@ -97,7 +97,7 @@ That earlier version of the branch is also available for comparison:
 >>>> "ascending age" both seem useful to be able to explicitly specify.
 >>>> --[[Joey]]
 
->>>>> Perhaps. I do like the simplicity of [[KathyrnAndersen]]'s syntax
+>>>>> Perhaps. I do like the simplicity of [[KathrynAndersen]]'s syntax
 >>>>> from [[plugins/contrib/report]] (which I copied verbatim, except for
 >>>>> turning sort-by-`field` into a parameterized spec), and I can't really
 >>>>> think of any sensible way to combine sort specs other than "sort by a,
@@ -130,7 +130,8 @@ That earlier version of the branch is also available for comparison:
 >>>>> voltage, with more or less recently updated pages being said to have
 >>>>> more or less updateage. I don't know whether that's good or bad :-)
 >>>>>
->>>>> I'm sure there's a much better word, but I can't see it. --s
+>>>>> I'm sure there's a much better word, but I can't see it. Do you have
+>>>>> a better idea? --s
 
 ## Documentation from sort-package branch
 
-- 
cgit v1.2.3


From 5f87d5d242b87ce5cfbd7ac5fcb1efcc62fc5582 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:25:28 +0000
Subject: actually I can see a second use for "nonlinear" syntax - but I don't
 think it's worth it

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 36c134a59..1657ca8e9 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -99,20 +99,28 @@ That earlier version of the branch is also available for comparison:
 
 >>>>> Perhaps. I do like the simplicity of [[KathrynAndersen]]'s syntax
 >>>>> from [[plugins/contrib/report]] (which I copied verbatim, except for
->>>>> turning sort-by-`field` into a parameterized spec), and I can't really
->>>>> think of any sensible way to combine sort specs other than "sort by a,
->>>>> break ties by b, ...", possibly with some reversals thrown in.
+>>>>> turning sort-by-`field` into a parameterized spec).
 >>>>>
->>>>> If no other combinations do make sense, is your proposal that "then"
->>>>> is entirely redundant (easy, just make it a predefined sort spec that
->>>>> returns 0!), or that it's mandatory "punctuation" (add an explicit
->>>>> check, or make "then" expand to "||" and let Perl fail to compile
->>>>> the generated code if it's omitted)?
+>>>>> If we're getting into English-like (or at least SQL-like) queries,
+>>>>> it might make sense to change the signature of the hook function
+>>>>> so it's a function to return a key, e.g.
+>>>>> `sub key_age { return -%pagemtime{$_[0]) }`. Then we could sort like
+>>>>> this:
 >>>>>
->>>>> It is a little unfortunate that reversal has to move into the sort
->>>>> spec - I prefer `reverse=yes` - but that's necessary for multi-level
->>>>> sorting. I can see your point about ascending/descending being more
->>>>> obvious to look at, but they're also considerably more verbose.
+>>>>>     field(artistsort) or field(artist) or constant(Various Artists) then meta(titlesort) or meta(title) or title
+>>>>>
+>>>>> with "or" binding more closely than "then". Does this seem valuable?
+>>>>> I think the implementation would be somewhat more difficult. and
+>>>>> it's probably getting too complicated to be worthwhile, though?
+>>>>> (The keys that actually benefit from this could just
+>>>>> have smarter cmp functions, I think.)
+>>>>>
+>>>>> If the hooks return keys rather than cmp results, then we could even
+>>>>> have "lowercase" as an adjective used like "ascending"... maybe.
+>>>>> However, there are two types of adjective here: "lowercase"
+>>>>> really applies to the keys, whereas "ascending" applies to the "cmp"
+>>>>> result. Again, I think this is getting too complex, and could just
+>>>>> be solved with smarter cmp functions.
 >>>>>
 >>>>> Unfortunately, `sort="ascending mtime"` actually sorts by *descending*
 >>>>> timestamp (but`sort=age` is fine, because `age` could be defined as
-- 
cgit v1.2.3


From c2f54ccfb7b401b59f7eda13095e2ba2af69ed7a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:41:31 +0000
Subject: sort-order could usefully be overridden for meta author, too

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 1657ca8e9..e79e52f39 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -169,6 +169,9 @@ An optional `sort` parameter will be used preferentially when
 
        \[[!meta title="David Bowie" sort="Bowie, David"]]
 
+> I now realise that `author` should also have this, again for use
+> with (Western) names. --s
+
 ### Sorting plugins (added to [[plugins/write]])
 
 Similarly, it's possible to write plugins that add new functions as
-- 
cgit v1.2.3


From 0dad28b3530d70830456a3f8d57b0e3f3d52ee2d Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:45:16 +0000
Subject: reduced difference

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn
index eb84dd09b..1e0bca5d8 100644
--- a/doc/plugins/contrib/ftemplate/discussion.mdwn
+++ b/doc/plugins/contrib/ftemplate/discussion.mdwn
@@ -29,6 +29,5 @@ seems orthogonal (and might be a good enhancement to `template` anyway).
 
 > Yes, I added that because I wanted the option of not having to make all my templates work as wiki pages also. --[[KathrynAndersen]]
 
->> Yeah, that's something that annoys me about `template` too. I've
->> opened a todo: [[todo/user-defined_templates_outside_the_wiki]].
->> --s
+>> Joey has added support for
+>> [[todo/user-defined_templates_outside_the_wiki]] now. --s
-- 
cgit v1.2.3


From c4a838b33a34ff61a1dd5c6f65e40df3609e727f Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 00:53:59 +0000
Subject: perhaps the typedlink(tag foo) pagespec isn't so useful

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

(limited to 'doc')

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index f8796652e..4f52ade52 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -140,3 +140,12 @@ without too much transitional trouble. --[[Joey]]
 > care either way; [[Jon]] expressed concern about people relying
 > on the current semantics, on one of the pages requesting this
 > change. --s
+
+I might have been wrong to introduce `typedlink(tag foo)`. It's not
+very user-friendly, and is more useful as a backend for other plugins
+that as a feature in its own right - any plugin introducing a link
+type will probably also want to have its own preprocessor directive
+to set that link type, and its own pagespec function to match it.
+I wonder whether to make a `typedlink` plugin that has the typedlink
+pagespec match function and a new `\[[!typedlink to="foo" type="bar"]]`
+though... --[[smcv]]
-- 
cgit v1.2.3


From 3934759592c35ab475e06501e2e4613d5c1f2e08 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 01:13:08 +0000
Subject: vague musings about wikilinks

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

(limited to 'doc')

diff --git a/doc/todo/link_plugin_perhaps_too_general__63__.mdwn b/doc/todo/link_plugin_perhaps_too_general__63__.mdwn
new file mode 100644
index 000000000..8a5fd50eb
--- /dev/null
+++ b/doc/todo/link_plugin_perhaps_too_general__63__.mdwn
@@ -0,0 +1,25 @@
+[[!tag wishlist blue-sky]]
+(This isn't important to me - I don't use MediaWiki or Creole syntax myself -
+but just thinking out loud...)
+
+The [[ikiwiki/wikilink]] syntax IkiWiki uses sometimes conflicts with page
+languages' syntax (notably, [[plugins/contrib/MediaWiki]] and [[plugins/Creole]]
+want their wikilinks the other way round, like
+`\[[plugins/write|how to write a plugin]]`). It would be nice if there was
+some way for page language plugins to opt in/out of the normal wiki link
+processing - then MediaWiki and Creole could have their own `linkify` hook
+that was only active for *their* page types, and used the appropriate
+syntax.
+
+In [[todo/matching_different_kinds_of_links]] I wondered about adding a
+`\[[!typedlink to="foo" type="bar"]]` directive. This made me wonder whether
+a core `\[[!link]]` directive would be useful; this could be a fallback for
+page types where a normal wikilink can't be done for whatever reason, and
+could also provide extension points more easily than WikiLinks' special
+syntax with extra punctuation, which doesn't really scale?
+
+Straw-man:
+
+    \[[!link to="ikiwiki/wikilink" desc="WikiLinks"]]
+
+--[[smcv]]
-- 
cgit v1.2.3


From 5445fe765777dc6254c7e0e13d4fa5e07810751a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 01:15:28 +0000
Subject: cross-reference

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

(limited to 'doc')

diff --git a/doc/todo/rewrite_ikiwiki_in_haskell.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell.mdwn
index 204c48cd7..48ed744b1 100644
--- a/doc/todo/rewrite_ikiwiki_in_haskell.mdwn
+++ b/doc/todo/rewrite_ikiwiki_in_haskell.mdwn
@@ -29,6 +29,7 @@ It's appealing for a lot of reasons, including:
     edit in html editors currently.
   - This would be a chance to make WikiLinks with link texts read
     "the right way round" (ie, vaguely wiki creole compatably).
+    *[See also [[todo/link_plugin_perhaps_too_general?]] --[[smcv]]]*
   - The data structures would probably be quite different.
   - I might want to drop a lot of the command-line flags, either
     requiring a setup file be used for those things, or leaving the
-- 
cgit v1.2.3


From e4e53d7a18ec18d1ba72b1a4f124e211148e0f12 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 22:23:36 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 4f52ade52..2cd484852 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -104,6 +104,8 @@ Some code refers to `oldtypedlinks`, and other to `oldlinktypes`. --[[Joey]]
 > Oops, I'll fix that. That must mean missing test coverage, too :-(
 > --s
 
+>> A test suite for the dependency resolver *would* be nice. --[[Joey]]
+
 I'm curious what your reasoning was for adding a new variable
 rather than using `pagestate`. Was it only because you needed
 the `old` version to detect change, or was there other complexity?
@@ -133,6 +135,8 @@ with a empty type. (Bloaty.)) --J
 > not counting tags and other typed links?". A typed link is
 > still a link, in my mind at least. --s
 
+>> Me neither, let's not worry about it. --[[Joey]] 
+
 I suspect we could get away without having `tagged_is_strict`
 without too much transitional trouble. --[[Joey]]
 
@@ -149,3 +153,6 @@ to set that link type, and its own pagespec function to match it.
 I wonder whether to make a `typedlink` plugin that has the typedlink
 pagespec match function and a new `\[[!typedlink to="foo" type="bar"]]`
 though... --[[smcv]]
+
+> I agree, per-type matchers are more friendly and I'm not enamored of the
+> multi-parameter pagespec syntax. --[[Joey]]
-- 
cgit v1.2.3


From 931c7b00ccb47371ee6e1d56baf5c52d725a321f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 2 Apr 2010 22:46:31 -0400
Subject: response

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 25 +++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index e79e52f39..c6e18505e 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -38,7 +38,9 @@ That earlier version of the branch is also available for comparison:
 >>>>> [[ikiwiki/pagespec]], and decided that yes, sorting is
 >>>>> a bit like a pagespec :-) Which name would you prefer? --s
 
->>>> I would be inclined to drop the `check_` stuff. --J
+>>>>>> `SortSpec` --[[Joey]] 
+
+>>>> I would be inclined to drop the `check_` stuff. --[[Joey]] 
 
 >>>>> It basically exists to support `title_natural`, to avoid
 >>>>> firing up the whole import mechanism on every `cmp`
@@ -48,6 +50,11 @@ That earlier version of the branch is also available for comparison:
 >>>>> [[field|plugins/contrib/field/discussion]], fail early
 >>>>> (again, not so valuable).
 >>>>>
+>>>>>> AFAIK, `use foo` has very low overhead when the module is already
+>>>>>> loaded. There could be some evalation overhead in `eval q{use foo}`,
+>>>>>> if so it would be worth addressing across the whole codebase.
+>>>>>> --[[Joey]] 
+>>>>>
 >>>>> The former function could be achieved at a small
 >>>>> compatibility cost by putting `title_natural` in a new
 >>>>> `sortnatural` plugin (that fails to load if you don't
@@ -55,8 +62,12 @@ That earlier version of the branch is also available for comparison:
 >>>>> have happened if `title_natural` was written after this
 >>>>> code had been merged, I suspect. Would you prefer this? --s
 
+>>>>>> Yes! (Assuming it does not make sense to support
+>>>>>> natural order sort of other keys than the title, at least..)
+>>>>>>  --[[Joey]]
+
 >>>> Wouldn't it make sense to have `meta(title)` instead
->>>> of `meta_title`? --J
+>>>> of `meta_title`? --[[Joey]]
 
 >>>>> Yes, you're right. I added parameters to support `field`,
 >>>>> and didn't think about making `meta` use them too.
@@ -77,10 +88,12 @@ That earlier version of the branch is also available for comparison:
 >>>>> same place as the meta-title, but occasionally not), while
 >>>>> displaying meta-titles, does look quite odd. --s
 
+>>>>>> Agreed. --[[Joey]]
+
 >>>> As I read the regexp in `cmpspec_translate`, the "command"
 >>>> is required to have params. They should be optional, 
 >>>> to match the documentation and because most sort methods
->>>> do not need parameters. --J
+>>>> do not need parameters. --[[Joey]]
 
 >>>>> No, `$2` is either `\w+\([^\)]*\)` or `[^\s]+` (with the
 >>>>> latter causing an error later if it doesn't also match `\w+`).
@@ -122,6 +135,9 @@ That earlier version of the branch is also available for comparison:
 >>>>> result. Again, I think this is getting too complex, and could just
 >>>>> be solved with smarter cmp functions.
 >>>>>
+>>>>>> I agree. (Also, I think returning keys may make it harder to write
+>>>>>> smarter cmp functions.) --[[Joey]] 
+>>>>>
 >>>>> Unfortunately, `sort="ascending mtime"` actually sorts by *descending*
 >>>>> timestamp (but`sort=age` is fine, because `age` could be defined as
 >>>>> now minus `ctime`). `sort=freshness` isn't right either, because
@@ -132,6 +148,9 @@ That earlier version of the branch is also available for comparison:
 >>>>> directions - it seems clearer to have `ascending` always be a no-op,
 >>>>> and `descending` always negate.
 >>>>>
+>>>>>> I think you've convinced me that ascending/descending impose too
+>>>>>> much semantics on it, so "-" is better. --[[Joey]]
+>>>>>
 >>>>> Perhaps we could borrow from `meta updated` and use `update_age`?
 >>>>> `updateage` would perhaps be a more normal IkiWiki style - but that
 >>>>> makes me think that updateage is a quantity analagous to tonnage or
-- 
cgit v1.2.3


From a875ee8be702bd4575e009dc652015c1157c7c2e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2010 13:48:30 +0100
Subject: Split out sortnaturally into a plugin

---
 IkiWiki.pm                        | 11 -----------
 IkiWiki/Plugin/sortnaturally.pm   | 32 ++++++++++++++++++++++++++++++++
 debian/NEWS                       |  8 ++++++++
 doc/ikiwiki/pagespec/sorting.mdwn |  5 +++--
 doc/plugins/sortnaturally.mdwn    |  5 +++++
 5 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 IkiWiki/Plugin/sortnaturally.pm
 create mode 100644 doc/plugins/sortnaturally.mdwn

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a89c14058..8f36f5818 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2423,15 +2423,4 @@ sub cmp_title {
 sub cmp_mtime { $IkiWiki::pagemtime{$_[1]} <=> $IkiWiki::pagemtime{$_[0]} }
 sub cmp_age { $IkiWiki::pagectime{$_[1]} <=> $IkiWiki::pagectime{$_[0]} }
 
-sub check_cmp_title_natural {
-	eval q{use Sort::Naturally};
-	if ($@) {
-		error(gettext("Sort::Naturally needed for title_natural sort"));
-	}
-}
-sub cmp_title_natural {
-	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
-		IkiWiki::pagetitle(IkiWiki::basename($_[1])))
-}
-
 1
diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm
new file mode 100644
index 000000000..0023f31f9
--- /dev/null
+++ b/IkiWiki/Plugin/sortnaturally.pm
@@ -0,0 +1,32 @@
+#!/usr/bin/perl
+# Sort::Naturally-powered title_natural sort order for IkiWiki
+package IkiWiki::Plugin::sortnaturally;
+
+use IkiWiki 3.00;
+no warnings;
+
+sub import {
+	hook(type => "getsetup", id => "sortnaturally", call => \&getsetup);
+}
+
+sub getsetup {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+		},
+}
+
+sub checkconfig () {
+	eval q{use Sort::Naturally};
+	error $@ if $@;
+}
+
+package IkiWiki::PageSpec;
+
+sub cmp_title_natural {
+	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
+		IkiWiki::pagetitle(IkiWiki::basename($_[1])))
+}
+
+1;
diff --git a/debian/NEWS b/debian/NEWS
index 50332670f..614eb11f8 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,11 @@
+ikiwiki (3.20100320) UNRELEASED; urgency=low
+
+  The sort="title_natural" option on [[!inline]] etc. now requires the
+  new sortnaturally plugin. This is not enabled by default, because it requires
+  the Sort::Naturally module.
+
+ -- Simon McVittie <smcv@debian.org>  Sat, 03 Apr 2010 13:46:08 +0100
+
 ikiwiki (3.20091017) unstable; urgency=low
 
   To take advantage of significant performance improvements, all
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index f27972d4e..ba995a521 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -6,9 +6,10 @@ orders can be specified.
 * `age` - List pages from the most recently created to the oldest.
 * `mtime` - List pages with the most recently modified first.
 * `title` - Order by title (page name).
-* `title_natural` - Only available if [[!cpan Sort::Naturally]] is
-  installed. Orders by title, but numbers in the title are treated
+[[!if test="enabled(sortnaturally)" then="""
+* `title_natural` - Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+"""]]
 [[!if test="enabled(meta)" then="""
 * `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
   or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
diff --git a/doc/plugins/sortnaturally.mdwn b/doc/plugins/sortnaturally.mdwn
new file mode 100644
index 000000000..91f373f6b
--- /dev/null
+++ b/doc/plugins/sortnaturally.mdwn
@@ -0,0 +1,5 @@
+[[!template id=plugin name=sortnaturally core=1 author="[[chrysn]], [[smcv]]"]]
+[[!tag type/meta]]
+
+This plugin provides the `title_natural` [[ikiwiki/pagespec/sorting]] order,
+which uses Sort::Naturally to sort numbered pages in a more natural order.
-- 
cgit v1.2.3


From 75fd08046548940c443c46bcdf9a5b0b6968b175 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2010 13:49:20 +0100
Subject: Remove support for check_cmp_foo (pre-sort checks)

---
 IkiWiki.pm             | 4 ----
 doc/plugins/write.mdwn | 5 -----
 2 files changed, 9 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8f36f5818..7547f1751 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1973,10 +1973,6 @@ sub cmpspec_translate ($) {
 		}
 
 		if (exists $IkiWiki::PageSpec::{"cmp_$word"}) {
-			if (exists $IkiWiki::PageSpec::{"check_cmp_$word"}) {
-				$IkiWiki::PageSpec::{"check_cmp_$word"}->($params);
-			}
-
 			if (defined $params) {
 				push @data, $params;
 				$code .= "IkiWiki::PageSpec::cmp_$word(\@_, \$data[$#data])";
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index de2b47015..06c8f8e44 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1128,11 +1128,6 @@ is greater, or zero if they are considered equal. It may also raise an
 error using `error`, for instance if it needs a parameter but one isn't
 provided.
 
-You can also define a function called `check_cmp_foo` in the same package.
-If you do, it will be called while preparing to sort by `foo` or `foo(bar)`,
-with argument `undef` or `"bar"` respectively; it may raise an error using
-`error`, if sorting like that isn't going to work.
-
 ### Setup plugins
 
 The ikiwiki setup file is loaded using a pluggable mechanism. If you look
-- 
cgit v1.2.3


From 04a59b3c65e8e60805b6ed6d11d448b1d5babe64 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2010 13:57:38 +0100
Subject: Move sort hooks to the IkiWiki::SortSpec namespace

Also rename cmpspec_translate (internal function) to sortspec_translate
for consistency.
---
 IkiWiki.pm                      | 14 ++++++++------
 IkiWiki/Plugin/meta.pm          |  2 ++
 IkiWiki/Plugin/sortnaturally.pm |  2 +-
 doc/plugins/write.mdwn          |  2 +-
 t/pagespec_match_list.t         |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7547f1751..d716e8b39 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -37,7 +37,7 @@ our $DEPEND_LINKS=4;
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
-memoize("cmpspec_translate");
+memoize("sortspec_translate");
 memoize("pagespec_translate");
 memoize("template_file");
 
@@ -1935,7 +1935,7 @@ sub add_link ($$) {
 		unless grep { $_ eq $link } @{$links{$page}};
 }
 
-sub cmpspec_translate ($) {
+sub sortspec_translate ($) {
 	my $spec = shift;
 
 	my $code = "";
@@ -1972,13 +1972,13 @@ sub cmpspec_translate ($) {
 			$code .= "-";
 		}
 
-		if (exists $IkiWiki::PageSpec::{"cmp_$word"}) {
+		if (exists $IkiWiki::SortSpec::{"cmp_$word"}) {
 			if (defined $params) {
 				push @data, $params;
-				$code .= "IkiWiki::PageSpec::cmp_$word(\@_, \$data[$#data])";
+				$code .= "IkiWiki::SortSpec::cmp_$word(\@_, \$data[$#data])";
 			}
 			else {
-				$code .= "IkiWiki::PageSpec::cmp_$word(\@_, undef)";
+				$code .= "IkiWiki::SortSpec::cmp_$word(\@_, undef)";
 			}
 		}
 		else {
@@ -2095,7 +2095,7 @@ sub pagespec_match_list ($$;@) {
 	}
 
 	if (defined $params{sort}) {
-		my $f = cmpspec_translate($params{sort});
+		my $f = sortspec_translate($params{sort});
 
 		@candidates = sort { $f->($a, $b) } @candidates;
 	}
@@ -2410,6 +2410,8 @@ sub match_ip ($$;@) {
 	}
 }
 
+package IkiWiki::SortSpec;
+
 sub cmp_title {
 	IkiWiki::pagetitle(IkiWiki::basename($_[0]))
 	cmp
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index e8cc1e392..cd7d0d127 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -348,6 +348,8 @@ sub match_copyright ($$;@) {
 	IkiWiki::Plugin::meta::match("copyright", @_);
 }
 
+package IkiWiki::SortSpec;
+
 sub cmp_meta_title {
 	IkiWiki::Plugin::meta::titlesort($_[0])
 	cmp
diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm
index 0023f31f9..f498820a5 100644
--- a/IkiWiki/Plugin/sortnaturally.pm
+++ b/IkiWiki/Plugin/sortnaturally.pm
@@ -22,7 +22,7 @@ sub checkconfig () {
 	error $@ if $@;
 }
 
-package IkiWiki::PageSpec;
+package IkiWiki::SortSpec;
 
 sub cmp_title_natural {
 	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 06c8f8e44..b67142230 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1114,7 +1114,7 @@ while "glob(*)" is not influenced by the contents of any page.
 
 Similarly, it's possible to write plugins that add new functions as
 [[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to
-the IkiWiki::PageSpec package named `cmp_foo`, which will be used when sorting
+the IkiWiki::SortSpec package named `cmp_foo`, which will be used when sorting
 by `foo` or `foo(...)` is requested.
 
 The function will be passed three or more parameters. The first two are
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 743ae4637..68112f5c0 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -10,7 +10,7 @@ $config{srcdir}=$config{destdir}="/dev/null";
 IkiWiki::checkconfig();
 
 {
-	package IkiWiki::PageSpec;
+	package IkiWiki::SortSpec;
 
 	sub cmp_path { $_[0] cmp $_[1] }
 }
-- 
cgit v1.2.3


From 56c64ff1963b33da74677f08a0b8c6579bc2d68b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sat, 3 Apr 2010 13:39:44 +0000
Subject: updated branch

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 56 +++++++++++++++-------
 1 file changed, 38 insertions(+), 18 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index c6e18505e..8c6e1df3b 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -40,6 +40,8 @@ That earlier version of the branch is also available for comparison:
 
 >>>>>> `SortSpec` --[[Joey]] 
 
+>>>>>>> Done. --s
+
 >>>> I would be inclined to drop the `check_` stuff. --[[Joey]] 
 
 >>>>> It basically exists to support `title_natural`, to avoid
@@ -54,6 +56,8 @@ That earlier version of the branch is also available for comparison:
 >>>>>> loaded. There could be some evalation overhead in `eval q{use foo}`,
 >>>>>> if so it would be worth addressing across the whole codebase.
 >>>>>> --[[Joey]] 
+>>>>>>
+>>>>>>> check_cmp_foo now dropped. --s
 >>>>>
 >>>>> The former function could be achieved at a small
 >>>>> compatibility cost by putting `title_natural` in a new
@@ -66,6 +70,8 @@ That earlier version of the branch is also available for comparison:
 >>>>>> natural order sort of other keys than the title, at least..)
 >>>>>>  --[[Joey]]
 
+>>>>>>> Done. I added some NEWS.Debian for it, too. --s
+
 >>>> Wouldn't it make sense to have `meta(title)` instead
 >>>> of `meta_title`? --[[Joey]]
 
@@ -90,6 +96,11 @@ That earlier version of the branch is also available for comparison:
 
 >>>>>> Agreed. --[[Joey]]
 
+>>>>>>> I've implemented meta(title). meta(author) also has the
+>>>>>>> `sortas` special case; meta(updated) and meta(date)
+>>>>>>> should also work how you'd expect them to (but they're
+>>>>>>> earliest-first, unlike age). --s
+
 >>>> As I read the regexp in `cmpspec_translate`, the "command"
 >>>> is required to have params. They should be optional, 
 >>>> to match the documentation and because most sort methods
@@ -150,6 +161,10 @@ That earlier version of the branch is also available for comparison:
 >>>>>
 >>>>>> I think you've convinced me that ascending/descending impose too
 >>>>>> much semantics on it, so "-" is better. --[[Joey]]
+
+>>>>>>> I've kept the semantics from `report` as-is, then:
+>>>>>>> e.g. `sort="age -title"`. --s
+
 >>>>>
 >>>>> Perhaps we could borrow from `meta updated` and use `update_age`?
 >>>>> `updateage` would perhaps be a more normal IkiWiki style - but that
@@ -160,18 +175,22 @@ That earlier version of the branch is also available for comparison:
 >>>>> I'm sure there's a much better word, but I can't see it. Do you have
 >>>>> a better idea? --s
 
-## Documentation from sort-package branch
+[Regarding the `meta title=foo sort=bar` special case]
 
-### meta_title sort order (conditionally added to [[ikiwiki/pagespec/sorting]])
+> I feel it sould be clearer to call that "sortas", since "sort=" is used
+> to specify a sort method in other directives. --[[Joey]]
+>> Done. --[[smcv]]
 
-* `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
-  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
-  full title was set.
+## Documentation from sort-package branch
 
-  > I feel it sould be clearer to call that "sortas", since "sort=" is used
-  > to specify a sort method in other directives. --[[Joey]]
+### advanced sort orders (conditionally added to [[ikiwiki/pagespec/sorting]])
 
-  >> Fair enough, that's easy to do. --[[smcv]]
+* `title_natural` - Orders by title, but numbers in the title are treated
+  as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+* `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`
+  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
+  full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc.
+  also work.
 
 ### Multiple sort orders (added to [[ikiwiki/pagespec/sorting]])
 
@@ -179,23 +198,29 @@ In addition, you can combine several sort orders and/or reverse the order of
 sorting, with a string like `age -title` (which would sort by age, then by
 title in reverse order if two pages have the same age).
 
-### meta title sort parameter (added to [[ikiwiki/directive/meta]])
+### meta sortas parameter (added to [[ikiwiki/directive/meta]])
+
+[in title]
 
 An optional `sort` parameter will be used preferentially when
-[[ikiwiki/pagespec/sorting]] by `meta_title`:
+[[ikiwiki/pagespec/sorting]] by `meta(title)`:
 
        \[[!meta title="The Beatles" sort="Beatles, The"]]
 
        \[[!meta title="David Bowie" sort="Bowie, David"]]
 
-> I now realise that `author` should also have this, again for use
-> with (Western) names. --s
+[in author]
+
+  An optional `sortas` parameter will be used preferentially when
+  [[ikiwiki/pagespec/sorting]] by `meta(author)`:
+
+        \[[!meta author="Joey Hess" sortas="Hess, Joey"]]
 
 ### Sorting plugins (added to [[plugins/write]])
 
 Similarly, it's possible to write plugins that add new functions as
 [[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to
-the IkiWiki::PageSpec package named `cmp_foo`, which will be used when sorting
+the IkiWiki::SortSpec package named `cmp_foo`, which will be used when sorting
 by `foo` or `foo(...)` is requested.
 
 The function will be passed three or more parameters. The first two are
@@ -208,8 +233,3 @@ if the first argument is less than the second, positive if the first argument
 is greater, or zero if they are considered equal. It may also raise an
 error using `error`, for instance if it needs a parameter but one isn't
 provided.
-
-You can also define a function called `check_cmp_foo` in the same package.
-If you do, it will be called while preparing to sort by `foo` or `foo(bar)`,
-with argument `undef` or `"bar"` respectively; it may raise an error using
-`error`, if sorting like that isn't going to work.
-- 
cgit v1.2.3


From af2bf285155ea4fc92932ba0b8e9becef57c69e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Apr 2010 15:15:25 -0400
Subject: add news item for ikiwiki 3.20100403

---
 doc/news/version_3.20100102.3.mdwn | 21 ---------------------
 doc/news/version_3.20100403.mdwn   | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 21 deletions(-)
 delete mode 100644 doc/news/version_3.20100102.3.mdwn
 create mode 100644 doc/news/version_3.20100403.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100102.3.mdwn b/doc/news/version_3.20100102.3.mdwn
deleted file mode 100644
index b8f61978c..000000000
--- a/doc/news/version_3.20100102.3.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-ikiwiki 3.20100102.3 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   Happy palindrome day!
-
-   * pagestats: Add show parameter. Closes: #[562129](http://bugs.debian.org/562129) (David Paleino)
-   * toc: Add startlevel parameter. (kerravonsen)
-   * Remove example ikiwiki setup file from the Debian package. This
-     re-enables linking to /usr/share/ikiwiki/examples which has the
-     example sites also used by auto-blog.setup. The example setup file
-     can be generated at any time using ikiwiki --dumpsetup so I do
-     not see a reason to ship it. Closes: #[562183](http://bugs.debian.org/562183)
-   * Use env hack in python scripts.
-   * comments: Add a checksum to the name of comment pages, to
-     avoid merge conflicts when comments are posted to two branches of a
-     site.
-   * linkmap: Add option to omit disconnected pages from the map.
-   * inline: Fix bug that limited displayed pages when feedshow was
-     specified w/o show.
-   * Fix several places that did not properly handle capitalization of
-     the discussionpage setting. Specifically, fixes discussion actions
-     on discussion pages, and unbreaks the opendiscussion plugin."""]]
diff --git a/doc/news/version_3.20100403.mdwn b/doc/news/version_3.20100403.mdwn
new file mode 100644
index 000000000..86d6a0f37
--- /dev/null
+++ b/doc/news/version_3.20100403.mdwn
@@ -0,0 +1,30 @@
+ikiwiki 3.20100403 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * websetup: Add websetup\_unsafe to allow marking other settings
+     as unsafe.
+   * Improve openid url munging; do not display anchors and cgi parameters,
+     as used by yahoo and google urls.
+   * Add complete German basewiki and directives translation done by
+     Sebastian Kuhnert.
+   * Add a include setting, which can be used to make ikiwiki process
+     wiki source files, such as .htaccess, that would normally be skipped
+     for security or other reasons. Closes: #[447267](http://bugs.debian.org/447267)
+     (Thanks to Aaron Wilson for the original patch.)
+   * Add support for setup files written in YAML.
+   * Add --set-yaml switch for setting more complex config file options.
+   * filecheck: Fix bugs that prevented the pagespecs from matching when
+     not called by attachment plugin.
+   * Fix incorrect influence info returned by a failing link() pagespec,
+     that could lead to bad dependency handling in certian situations.
+   * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
+     if necessary for unusual install.
+   * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
+   * Allow wrappers to be built using tcc. (Workaround #452876)
+   * openid: Use Openid Simple Registration or OpenID Attribute Exchange
+     to get the user's email address and username. (Neither is yet
+     used, but they are available in the session object now.)
+   * page.tmpl: Add Cache-Control must-revalidate to ensure that users
+     (especially of Firefox) see fresh page content.
+   * htmlscrubber: Allow colons in urls after '?'
+   * template: Search for templates in the templatedir, if they are not
+     found as pages in the wiki."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 195943e588b8c7b6a3a43d10404d2d40a503c1d5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 3 Apr 2010 16:07:32 -0400
Subject: slightly more consistent capitalisation of ikiwiki

For a while, I was avoiding capitalizing ikiwiki at the beginning of a
sentence. I now think that's a bad idea (unless explicitly referring to
the `ikiwiki` command). Still, I don't go all the way and always cap it,
as a proper noun. That would make the logo look bad. ;)

I also tend to avoid capping it as IkiWiki, except when referring to the
perl internals, which do use that capitalization. (Too late to change
that.) However, it's also reasonable to do so in a WikiLink, as a nod to
historical camelcase wikis.
---
 debian/control                     |  6 +++---
 doc/download.mdwn                  |  2 +-
 doc/features.mdwn                  | 12 ++++++------
 doc/forum/speeding_up_ikiwiki.mdwn |  2 +-
 doc/index.mdwn                     |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'doc')

diff --git a/debian/control b/debian/control
index 24c2c96a5..d7ce9a178 100644
--- a/debian/control
+++ b/debian/control
@@ -42,17 +42,17 @@ Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
 Description: a wiki compiler
- ikiwiki converts a directory full of wiki pages into HTML pages suitable
+ Ikiwiki converts a directory full of wiki pages into HTML pages suitable
  for publishing on a website. Unlike many wikis, ikiwiki does not have its
  own ad-hoc means of storing page history, and instead uses a revision control
  system such as Subversion or Git.
  .
- ikiwiki implements all of the other standard features of a wiki, including
+ Ikiwiki implements all of the other standard features of a wiki, including
  web-based page editing, user registration and logins, a RecentChanges
  page, BackLinks, search, Discussion pages, tags, smart merging and conflict
  resolution, and page locking.
  .
- ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
+ Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
  ikiwiki provides a plugin system which allows many other features to be
  added. Some of the plugins have additional dependencies, found among the
  Recommends and Suggests of this package.
diff --git a/doc/download.mdwn b/doc/download.mdwn
index 45d0d7870..92c8a4f75 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -35,7 +35,7 @@ own RPM.
 
 ## BSD ports
 
-IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
+Ikiwiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
 by running `sudo port install ikiwiki`.
 
 NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 3925d78ef..ab521213d 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -13,7 +13,7 @@ Instead of editing pages in a stupid web form, you can use vim and commit
 changes via [[Subversion|rcs/svn]], [[rcs/git]], or any of a number of other
 [[Revision_Control_Systems|rcs]].
 
-ikiwiki can be run from a [[post-commit]] hook to update your wiki
+Ikiwiki can be run from a [[post-commit]] hook to update your wiki
 immediately whenever you commit a change using the RCS.
 
 It's even possible to securely let
@@ -25,7 +25,7 @@ run a simple wiki without page history, it can do that too.
 
 ## A wiki compiler
 
-ikiwiki is a wiki compiler; it builds a static website for your wiki, and
+Ikiwiki is a wiki compiler; it builds a static website for your wiki, and
 updates it as pages are edited. It is fast and smart about updating a wiki,
 it only builds pages that have changed (and tracks things like creation of
 new pages and links that can indirectly cause a page to need a rebuild)
@@ -45,7 +45,7 @@ easily be added by [[plugins]]. For example it also supports traditional
 [[plugins/HTML]], or pages written in [[reStructuredText|plugins/rst]]
 or [[Textile|plugins/textile]].
 
-ikiwiki also supports files of any other type, including plain text,
+Ikiwiki also supports files of any other type, including plain text,
 images, etc. These are not converted to wiki pages, they are just copied
 unchanged by ikiwiki as it builds your wiki. So you can check in an image,
 program, or other special file and link to it from your wiki pages.
@@ -70,8 +70,8 @@ you would care to syndicate.
 
 ## Valid html and [[css]]
 
-ikiwiki aims to produce 
-[valid XHTML 1.0](http://validator.w3.org/check?url=referer). ikiwiki
+Ikiwiki aims to produce 
+[valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki
 generates html using [[templates|wikitemplates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
 
@@ -163,7 +163,7 @@ Well, sorta. Rather than implementing YA history browser, it can link to
 
 ### Full text search
 
-ikiwiki can use the xapian search engine to add powerful
+Ikiwiki can use the xapian search engine to add powerful
 full text [[plugins/search]] capabilities to your wiki.
 
 ### Translation via po files
diff --git a/doc/forum/speeding_up_ikiwiki.mdwn b/doc/forum/speeding_up_ikiwiki.mdwn
index 2c2ac240e..799186cf8 100644
--- a/doc/forum/speeding_up_ikiwiki.mdwn
+++ b/doc/forum/speeding_up_ikiwiki.mdwn
@@ -56,7 +56,7 @@ number is still too large to really visualize: the graphviz PNG and PDF output
 engines segfault for me, the PS one works but I can't get any PS software to
 render it without exploding.
 
-Now, the relations in the links hash are not the same thing as IkiWiki's notion of dependencies. Can anyone point me at  that data structure / where I might be able to add some debugging foo to generate a graph of it?
+Now, the relations in the links hash are not the same thing as Ikiwiki's notion of dependencies. Can anyone point me at  that data structure / where I might be able to add some debugging foo to generate a graph of it?
 
 Once I've figured out that I might be able to optimize some pagespecs. I
 understand pagespecs are essentially translated into sequential perl code. I
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 732cf7a89..06acc9cec 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -24,5 +24,5 @@ The [[forum]] is open for discussions.
 [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
 can be submitted and tracked using this wiki.
 
-ikiwiki is developed by [[Joey]] and many contributors,
+Ikiwiki is developed by [[Joey]] and many contributors,
 and is [[FreeSoftware]].
-- 
cgit v1.2.3


From 36202d461f86bb3869444cf161d9bfe62298b8f8 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Fri, 5 Feb 2010 12:54:07 +0100
Subject: link to commits

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index a0e76fd48..c4a92824b 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -165,7 +165,7 @@ wrong direction.
 > optimised, and security-sensitive ground, so I have to look at them very
 > carefully. --[[Joey]]
 > 
-> * In the refactoring in f3abeac919c4736429bd3362af6edf51ede8e7fe,
+> * In the refactoring in [f3abeac919c4736429bd3362af6edf51ede8e7fe][],
 >   you introduced at least 2 bugs, one a possible security hole.
 >   Now one part of the code tests `if ($file)` and the other
 >   caller tests `if ($f)`. These two tests both tested `if (! defined $f)`
@@ -181,14 +181,18 @@ wrong direction.
 > I'd like to cherry-pick the above commit, once it's in shape, before
 > looking at the rest in detail. So just a few other things that stood out.
 > 
-> * Commit 4af4d26582f0c2b915d7102fb4a604b176385748 seems unnecessary.
+> * Commit [4af4d26582f0c2b915d7102fb4a604b176385748][] seems unnecessary.
 >   `srcfile($file, 1)` already is documented to return undef if the
 >   file does not exist. (But without the second parameter, it throws
 >   an error.)
 >
-> * Commit f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 adds a line
+> * Commit [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1][] adds a line
 >   that is intented by a space, not a tab.
 > 
-> * Commit f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 says that auto-added
+> * Commit [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1][] says that auto-added
 >   files will be recreated if the user deletes them. That seems bad.
 >   `autoindex` goes to some trouble to not recreate deleted files.
+
+[f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
+[4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
+[f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1)
-- 
cgit v1.2.3


From 129bea3177b59be8ed4cc303720c8747f59a11ba Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sat, 3 Apr 2010 23:38:05 +0200
Subject: answer about autofiles for tags

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 29 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index c4a92824b..07b570b1b 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -164,7 +164,11 @@ wrong direction.
 > Starting review of this. Some of your commits are to very delicate,
 > optimised, and security-sensitive ground, so I have to look at them very
 > carefully. --[[Joey]]
-> 
+
+>> First of, sorry that it took me so damn long to answer. I didn't lose
+>> interest but it took a while for me to find the time and motivation
+>> to address you suggestions. --[[David_Riebenbauer]]
+
 > * In the refactoring in [f3abeac919c4736429bd3362af6edf51ede8e7fe][],
 >   you introduced at least 2 bugs, one a possible security hole.
 >   Now one part of the code tests `if ($file)` and the other
@@ -177,7 +181,11 @@ wrong direction.
 >   bare `_` in the first to make perl reuse the stat buffer.
 > * (As a matter of style, could you put a space after the commas in your
 >   perl?)
-> 
+
+>> The first two points should be addressed in
+>> [da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0][]. And sure, I can add the
+>> spaces. --[[David_Riebenbauer]]
+
 > I'd like to cherry-pick the above commit, once it's in shape, before
 > looking at the rest in detail. So just a few other things that stood out.
 > 
@@ -185,14 +193,27 @@ wrong direction.
 >   `srcfile($file, 1)` already is documented to return undef if the
 >   file does not exist. (But without the second parameter, it throws
 >   an error.)
->
+
+>> You're right. I must have been some confused by some other promplem I
+>> introduced then. Reverted. --[[David_Riebenbauer]]
+
 > * Commit [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1][] adds a line
 >   that is intented by a space, not a tab.
-> 
+
+>> Sorry, That one was reverted anyway. --[[David_Riebenbauer]]
+
 > * Commit [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1][] says that auto-added
 >   files will be recreated if the user deletes them. That seems bad.
 >   `autoindex` goes to some trouble to not recreate deleted files.
 
+>> I reverted the commit and addressed the issue in
+>> [a358d74bef51dae31332ff27e897fe04834571e6][] and
+>> [981400177d68a279f485727be3f013e68f0bf691][].
+ --[[David_Riebenbauer]]
+
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
 [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1)
+[da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0 (commitdiff for da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0)
+[a358d74bef51dae31332ff27e897fe04834571e6]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=a358d74bef51dae31332ff27e897fe04834571e6 (commitdiff for a358d74bef51dae31332ff27e897fe04834571e6)
+[981400177d68a279f485727be3f013e68f0bf691]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=981400177d68a279f485727be3f013e68f0bf691 (commitdiff for 981400177d68a279f485727be3f013e68f0bf691)
-- 
cgit v1.2.3


From c1a42e76bc6667bfb2882a12d53c25d9f952ca82 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 2 Apr 2010 00:28:02 +0100
Subject: implement typed links; add tagged_is_strict config option

---
 IkiWiki.pm                                         | 58 ++++++++++++++++++----
 IkiWiki/Plugin/tag.pm                              | 36 +++++++++-----
 IkiWiki/Render.pm                                  | 33 ++++++++++++
 .../tagged__40____41___matching_wikilinks.mdwn     |  3 ++
 doc/ikiwiki/pagespec.mdwn                          |  3 ++
 doc/plugins/tag.mdwn                               |  5 ++
 doc/plugins/write.mdwn                             | 21 +++++++-
 t/index.t                                          | 17 +++++--
 t/tag.t                                            | 45 +++++++++++++++++
 9 files changed, 193 insertions(+), 28 deletions(-)
 create mode 100755 t/tag.t

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6739ba56c..25e9247b2 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,7 +14,7 @@ use open qw{:utf8 :std};
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
 	    %pagesources %destsources %depends %depends_simple %hooks
-	    %forcerebuild %loaded_plugins};
+	    %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
@@ -24,7 +24,7 @@ our @EXPORT = qw(hook debug error template htmlpage deptype
 		 add_underlay pagetitle titlepage linkpage newpagefile
 		 inject add_link
                  %config %links %pagestate %wikistate %renderedfiles
-                 %pagesources %destsources);
+                 %pagesources %destsources %typedlinks);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
@@ -1503,7 +1503,7 @@ sub loadindex () {
 	if (! $config{rebuild}) {
 		%pagesources=%pagemtime=%oldlinks=%links=%depends=
 		%destsources=%renderedfiles=%pagecase=%pagestate=
-		%depends_simple=();
+		%depends_simple=%typedlinks=%oldtypedlinks=();
 	}
 	my $in;
 	if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
@@ -1569,6 +1569,14 @@ sub loadindex () {
 			if (exists $d->{state}) {
 				$pagestate{$page}=$d->{state};
 			}
+			if (exists $d->{typedlinks}) {
+				$typedlinks{$page}=$d->{typedlinks};
+
+				while (my ($type, $links) = each %{$typedlinks{$page}}) {
+					next unless %$links;
+					$oldtypedlinks{$page}{$type} = {%$links};
+				}
+			}
 		}
 		$oldrenderedfiles{$page}=[@{$d->{dest}}];
 	}
@@ -1617,6 +1625,10 @@ sub saveindex () {
 			$index{page}{$src}{depends_simple} = $depends_simple{$page};
 		}
 
+		if (exists $typedlinks{$page} && %{$typedlinks{$page}}) {
+			$index{page}{$src}{typedlinks} = $typedlinks{$page};
+		}
+
 		if (exists $pagestate{$page}) {
 			foreach my $id (@hookids) {
 				foreach my $key (keys %{$pagestate{$page}{$id}}) {
@@ -1926,12 +1938,17 @@ sub inject {
 	use warnings;
 }
 
-sub add_link ($$) {
+sub add_link ($$;$) {
 	my $page=shift;
 	my $link=shift;
+	my $type=shift;
 
 	push @{$links{$page}}, $link
 		unless grep { $_ eq $link } @{$links{$page}};
+
+	if (defined $type) {
+		$typedlinks{$page}{$type}{$link} = 1;
+	}
 }
 
 sub pagespec_translate ($) {
@@ -2212,6 +2229,11 @@ sub match_link ($$;@) {
 
 	$link=derel($link, $params{location});
 	my $from=exists $params{location} ? $params{location} : '';
+	my $linktype=$params{linktype};
+	my $qualifier='';
+	if (defined $linktype) {
+		$qualifier=" with type $linktype";
+	}
 
 	my $links = $IkiWiki::links{$page};
 	return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
@@ -2219,19 +2241,33 @@ sub match_link ($$;@) {
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
 		if (length $bestlink) {
-			return IkiWiki::SuccessReason->new("$page links to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
-				if $bestlink eq IkiWiki::bestlink($page, $p);
+			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && $bestlink eq IkiWiki::bestlink($page, $p)) {
+				return IkiWiki::SuccessReason->new("$page links to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
+			}
 		}
 		else {
-			return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
-				if match_glob($p, $link, %params);
+			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && match_glob($p, $link, %params)) {
+				return IkiWiki::SuccessReason->new("$page links to page $p$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
+			}
 			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
-				if match_glob($p_rel, $link, %params);
+			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p_rel}) && match_glob($p_rel, $link, %params)) {
+				return IkiWiki::SuccessReason->new("$page links to page $p_rel$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
+			}
 		}
 	}
-	return IkiWiki::FailReason->new("$page does not link to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
+	return IkiWiki::FailReason->new("$page does not link to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
+}
+
+sub match_typedlink($$;@) {
+	my $page = shift;
+	my $args = shift;
+
+	if ($args =~ /^(\w+)\s+(.*)$/) {
+		return match_link($page, $2, @_, linktype => $1);
+	}
+
+	return IkiWiki::ErrorReason->new("typedlink expects e.g. 'tag *' but got: $args");
 }
 
 sub match_backlink ($$;@) {
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index cdcfaf536..af4bff1bc 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -6,8 +6,6 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 
-my %tags;
-
 sub import {
 	hook(type => "getopt", id => "tag", call => \&getopt);
 	hook(type => "getsetup", id => "tag", call => \&getsetup);
@@ -36,6 +34,13 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		tagged_is_strict => {
+			type => "boolean",
+			default => 0,
+			description => "if 1, tagged() doesn't match normal WikiLinks to tag pages",
+			safe => 1,
+			rebuild => 1,
+		},
 }
 
 sub tagpage ($) {
@@ -71,9 +76,8 @@ sub preprocess_tag (@) {
 
 	foreach my $tag (keys %params) {
 		$tag=linkpage($tag);
-		$tags{$page}{$tag}=1;
 		# hidden WikiLink
-		add_link($page, tagpage($tag));
+		add_link($page, tagpage($tag), 'tag');
 	}
 		
 	return "";
@@ -87,15 +91,13 @@ sub preprocess_taglink (@) {
 	return join(" ", map {
 		if (/(.*)\|(.*)/) {
 			my $tag=linkpage($2);
-			$tags{$params{page}}{$tag}=1;
-			add_link($params{page}, tagpage($tag));
+			add_link($params{page}, tagpage($tag), 'tag');
 			return taglink($params{page}, $params{destpage}, $tag,
 				linktext => pagetitle($1));
 		}
 		else {
 			my $tag=linkpage($_);
-			$tags{$params{page}}{$tag}=1;
-			add_link($params{page}, tagpage($tag));
+			add_link($params{page}, tagpage($tag), 'tag');
 			return taglink($params{page}, $params{destpage}, $tag);
 		}
 	}
@@ -110,17 +112,19 @@ sub pagetemplate (@) {
 	my $destpage=$params{destpage};
 	my $template=$params{template};
 
+	my $tags = $typedlinks{$page}{tag};
+
 	$template->param(tags => [
 		map { 
 			link => taglink($page, $destpage, $_, rel => "tag")
-		}, sort keys %{$tags{$page}}
-	]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
+		}, sort keys %$tags
+	]) if defined $tags && %$tags && $template->query(name => "tags");
 
 	if ($template->query(name => "categories")) {
 		# It's an rss/atom template. Add any categories.
-		if (exists $tags{$page} && %{$tags{$page}}) {
+		if (defined $tags && %$tags) {
 			$template->param(categories => [map { category => $_ },
-				sort keys %{$tags{$page}}]);
+				sort keys %$tags]);
 		}
 	}
 }
@@ -130,7 +134,13 @@ package IkiWiki::PageSpec;
 sub match_tagged ($$;@) {
 	my $page = shift;
 	my $glob = shift;
-	return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
+
+	if ($IkiWiki::config{tagged_is_strict}) {
+		return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag');
+	}
+	else {
+		return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
+	}
 }
 
 1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index abafb0887..5810fc974 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -167,6 +167,7 @@ sub scan ($) {
 		else {
 			$links{$page}=[];
 		}
+		delete $typedlinks{$page};
 
 		run_hooks(scan => sub {
 			shift->(
@@ -398,6 +399,7 @@ sub find_del_files ($) {
 				push @del, $pagesources{$page};
 			}
 			$links{$page}=[];
+			delete $typedlinks{$page};
 			$renderedfiles{$page}=[];
 			$pagemtime{$page}=0;
 		}
@@ -499,6 +501,29 @@ sub remove_unrendered () {
 	}
 }
 
+sub link_types_changed ($$) {
+	# each is of the form { type => { link => 1 } }
+	my $new = shift;
+	my $old = shift;
+
+	return 0 if !defined $new && !defined $old;
+	return 1 if !defined $new || !defined $old;
+
+	while (my ($type, $links) = each %$new) {
+		foreach my $link (keys %$links) {
+			return 1 unless exists $old{$type}{$link};
+		}
+	}
+
+	while (my ($type, $links) = each %$old) {
+		foreach my $link (keys %$links) {
+			return 1 unless exists $new{$type}{$link};
+		}
+	}
+
+	return 0;
+}
+
 sub calculate_changed_links ($$$) {
 	my ($changed, $del, $oldlink_targets)=@_;
 
@@ -525,6 +550,14 @@ sub calculate_changed_links ($$$) {
 			}
 			$linkchangers{lc($page)}=1;
 		}
+
+		# we currently assume that changing the type of a link doesn't
+		# change backlinks
+		if (!exists $linkchangers{lc($page)}) {
+			if (link_types_changed($typedlinks{$page}, $oldlinktypes{$page})) {
+				$linkchangers{lc($page)}=1;
+			}
+		}
 	}
 
 	return \%backlinkchanged, \%linkchangers;
diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
index e7e4af7c3..9037d6c02 100644
--- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
+++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
@@ -28,6 +28,9 @@ rationale on this, or what am I doing wrong, and how to achieve what I want?
 >> is valid. [[todo/matching_different_kinds_of_links]] is probably
 >> how it will eventually be solved. --[[Joey]] 
 
+>>> [[Done]]: you can now set the `tagged_is_strict` config option to `1`
+>>> if you don't want `tagged` to match other wikilinks. --[[smcv]]
+
 > And this is an illustration why a clean work-around (without changing the software) is not possible: while thinking about [[todo/matching_different_kinds_of_links]], I thought one could work around the problem by simply explicitly including the kind of the relation into the link target (like the tagbase in tags), and by having a separate page without the "tagbase" to link to when one wants simply to refer to the tag without tagging. But this won't work: one has to at least once refer to the real tag page if one wants to talk about it, and this reference will count as tagging (unwanted). --Ivan Z.
 
 > But well, perhaps there is a workaround without introducing different kinds of links. One could modify the [[tag plugin|plugins/tag]] so that it adds 2 links to a page: for tagging -- `tagbase/TAG`, and for navigation -- `tagdescription/TAG` (displayed at the bottom). Then the `tagdescription/TAG` page would hold whatever list one wishes (with `tagged(TAG)` in the pagespec), and whenever one wants to merely refer to the tag, one should link to `tagdescription/TAG`--this link won't count as tagging. So, `tagbase/TAG` would become completely auxiliary (internal) link targets for ikiwiki, the users would edit or link to only `tagdescription/TAG`. --Ivan Z.
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 5c191f23f..ca6693024 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -52,6 +52,9 @@ Some more elaborate limits can be added to what matches using these functions:
   specified IP address.
 * "`postcomment(glob)`" - matches only when comments are being 
   posted to a page matching the specified glob
+* "`typedlink(type glob)`" - matches pages that link to a given page (or glob)
+  with a given link type. Plugins can create links with a specific type:
+  for instance, the tag plugin creates links of type `tag`.
 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index 8ff70a069..8cd79da41 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -8,6 +8,11 @@ These directives allow tagging pages.
 It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to
 match pages that are tagged with a specific tag.
 
+If the `tagged_is_strict` config option is set, `tagged()` will only match
+tags explicitly set with [[ikiwiki/directive/tag]] or
+[[ikiwiki/directive/taglink]]; if not (the default), it will also match
+any other [[WikiLinks|ikiwiki/WikiLink]] to the tag page.
+
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
 page is tagged with the "tags" tag.
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 96a2aa16d..fe7cf0183 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -633,6 +633,22 @@ reference. Do not modify this hash directly; call `add_link()`.
 
 	$links{"foo"} = ["bar", "baz"];
 
+### `%typedlinks`
+
+The `%typedlinks` hash records links of specific types. Do not modify this
+hash directly; call `add_link()`. The keys are page names, and the values
+are hash references. In each page's hash reference, the keys are link types
+defined by plugins, and the values are hash references with link targets
+as keys, and 1 as a dummy value, something like this:
+
+	$typedlinks{"foo"} = {
+		tag => { short_word => 1, metasyntactic_variable => 1 },
+		next_page => { bar => 1 },
+	};
+
+Ordinary [[WikiLinks|ikiwiki/WikiLink]] appear in `%links`, but not in
+`%typedlinks`.
+
 ### `%pagesources`
 
 The `%pagesources` has can be used to look up the source filename
@@ -939,11 +955,14 @@ Optionally, a third parameter can be passed, to specify the preferred
 filename of the page. For example, `targetpage("foo", "rss", "feed")`
 will yield something like `foo/feed.rss`.
 
-### `add_link($$)`
+### `add_link($$;$)`
 
 This adds a link to `%links`, ensuring that duplicate links are not
 added. Pass it the page that contains the link, and the link text.
 
+An optional third parameter sets the link type (`undef` produces an ordinary
+[[ikiwiki/WikiLink]]).
+
 ## Miscellaneous
 
 ### Internal use pages
diff --git a/t/index.t b/t/index.t
index 2f23524a7..44273059d 100755
--- a/t/index.t
+++ b/t/index.t
@@ -4,7 +4,7 @@ use strict;
 use IkiWiki;
 
 package IkiWiki; # use internal variables
-use Test::More tests => 27;
+use Test::More tests => 31;
 
 $config{wikistatedir}="/tmp/ikiwiki-test.$$";
 system "rm -rf $config{wikistatedir}";
@@ -31,6 +31,7 @@ $renderedfiles{"bar"}=["bar.html", "bar.rss", "sparkline-foo.gif"];
 $renderedfiles{"bar.png"}=["bar.png"];
 $links{"Foo"}=["bar.png"];
 $links{"bar"}=["Foo", "new-page"];
+$typedlinks{"bar"}={tag => {"Foo" => 1}};
 $links{"bar.png"}=[];
 $depends{"Foo"}={};
 $depends{"bar"}={"foo*" => 1};
@@ -45,7 +46,7 @@ ok(-s "$config{wikistatedir}/indexdb", "index file created");
 
 # Clear state.
 %oldrenderedfiles=%pagectime=();
-%pagesources=%pagemtime=%oldlinks=%links=%depends=
+%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks=
 %destsources=%renderedfiles=%pagecase=%pagestate=();
 
 ok(loadindex(), "load index");
@@ -104,10 +105,16 @@ is_deeply(\%destsources, {
 	"sparkline-foo.gif" => "bar",
 	"bar.png" => "bar.png",
 }, "%destsources generated correctly");
+is_deeply(\%typedlinks, {
+	bar => {tag => {"Foo" => 1}},
+}, "%typedlinks loaded correctly");
+is_deeply(\%oldtypedlinks, {
+	bar => {tag => {"Foo" => 1}},
+}, "%oldtypedlinks loaded correctly");
 
 # Clear state.
 %oldrenderedfiles=%pagectime=();
-%pagesources=%pagemtime=%oldlinks=%links=%depends=
+%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks=
 %destsources=%renderedfiles=%pagecase=%pagestate=();
 
 # When state is loaded for a wiki rebuild, only ctime and oldrenderedfiles
@@ -140,5 +147,9 @@ is_deeply(\%pagecase, {
 }, "%pagecase generated correctly");
 is_deeply(\%destsources, {
 }, "%destsources generated correctly");
+is_deeply(\%typedlinks, {
+}, "%typedlinks cleared correctly");
+is_deeply(\%oldtypedlinks, {
+}, "%oldtypedlinks cleared correctly");
 
 system "rm -rf $config{wikistatedir}";
diff --git a/t/tag.t b/t/tag.t
new file mode 100755
index 000000000..3383fd475
--- /dev/null
+++ b/t/tag.t
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+package IkiWiki;
+
+use warnings;
+use strict;
+use Test::More tests => 10;
+
+BEGIN { use_ok("IkiWiki"); }
+BEGIN { use_ok("IkiWiki::Plugin::tag"); }
+
+ok(! system("rm -rf t/tmp; mkdir t/tmp"));
+
+$config{userdir} = "users";
+$config{tagbase} = "tags";
+$config{tagged_is_strict} = 1;
+
+%oldrenderedfiles=%pagectime=();
+%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks=
+%destsources=%renderedfiles=%pagecase=%pagestate=();
+
+foreach my $page (qw(tags/numbers tags/letters one two alpha beta)) {
+	$pagesources{$page} = "$page.mdwn";
+	$pagemtime{$page} = $pagectime{$page} = 1000000;
+}
+
+$links{one}=[qw(tags/numbers alpha tags/letters)];
+$links{two}=[qw(tags/numbers)];
+$links{alpha}=[qw(tags/letters one)];
+$links{beta}=[qw(tags/letters)];
+$typedlinks{one}={tag => {"tags/numbers" => 1 }};
+$typedlinks{two}={tag => {"tags/numbers" => 1 }};
+$typedlinks{alpha}={tag => {"tags/letters" => 1 }};
+$typedlinks{beta}={tag => {"tags/letters" => 1 }};
+
+ok(pagespec_match("one", "tagged(numbers)"));
+ok(!pagespec_match("two", "tagged(alpha)"));
+ok(pagespec_match("one", "link(tags/numbers)"));
+ok(pagespec_match("one", "link(alpha)"));
+
+ok(pagespec_match("one", "typedlink(tag tags/numbers)"));
+ok(!pagespec_match("one", "typedlink(tag tags/letters)"));
+# invalid syntax
+ok(pagespec_match("one", "typedlink(tag)")->isa("IkiWiki::ErrorReason"));
+
+1;
-- 
cgit v1.2.3


From ef6344144051ed70649ccbff01bcc4fce927ee2f Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 4 Apr 2010 00:24:27 +0100
Subject: Remove tagged_is_strict option, and just behave as though it was
 enabled

Jon was worried about the backwards-compatibility break involved in making
tagged() not match non-tag links, but Joey seems less concerned about it.
---
 IkiWiki/Plugin/tag.pm                               | 17 +----------------
 doc/bugs/tagged__40____41___matching_wikilinks.mdwn |  3 +--
 doc/plugins/tag.mdwn                                |  5 -----
 t/tag.t                                             |  1 -
 4 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index af4bff1bc..7a85874f6 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -34,13 +34,6 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
-		tagged_is_strict => {
-			type => "boolean",
-			default => 0,
-			description => "if 1, tagged() doesn't match normal WikiLinks to tag pages",
-			safe => 1,
-			rebuild => 1,
-		},
 }
 
 sub tagpage ($) {
@@ -132,15 +125,7 @@ sub pagetemplate (@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
-	my $page = shift;
-	my $glob = shift;
-
-	if ($IkiWiki::config{tagged_is_strict}) {
-		return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag');
-	}
-	else {
-		return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
-	}
+	return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag');
 }
 
 1
diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
index 9037d6c02..a211654f1 100644
--- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
+++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn
@@ -28,8 +28,7 @@ rationale on this, or what am I doing wrong, and how to achieve what I want?
 >> is valid. [[todo/matching_different_kinds_of_links]] is probably
 >> how it will eventually be solved. --[[Joey]] 
 
->>> [[Done]]: you can now set the `tagged_is_strict` config option to `1`
->>> if you don't want `tagged` to match other wikilinks. --[[smcv]]
+>>> [[Done]]: `tagged` no longer matches other wikilinks. --[[smcv]]
 
 > And this is an illustration why a clean work-around (without changing the software) is not possible: while thinking about [[todo/matching_different_kinds_of_links]], I thought one could work around the problem by simply explicitly including the kind of the relation into the link target (like the tagbase in tags), and by having a separate page without the "tagbase" to link to when one wants simply to refer to the tag without tagging. But this won't work: one has to at least once refer to the real tag page if one wants to talk about it, and this reference will count as tagging (unwanted). --Ivan Z.
 
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index 8cd79da41..8ff70a069 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -8,11 +8,6 @@ These directives allow tagging pages.
 It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to
 match pages that are tagged with a specific tag.
 
-If the `tagged_is_strict` config option is set, `tagged()` will only match
-tags explicitly set with [[ikiwiki/directive/tag]] or
-[[ikiwiki/directive/taglink]]; if not (the default), it will also match
-any other [[WikiLinks|ikiwiki/WikiLink]] to the tag page.
-
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
 page is tagged with the "tags" tag.
diff --git a/t/tag.t b/t/tag.t
index 3383fd475..cf3bbdf01 100755
--- a/t/tag.t
+++ b/t/tag.t
@@ -12,7 +12,6 @@ ok(! system("rm -rf t/tmp; mkdir t/tmp"));
 
 $config{userdir} = "users";
 $config{tagbase} = "tags";
-$config{tagged_is_strict} = 1;
 
 %oldrenderedfiles=%pagectime=();
 %pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks=
-- 
cgit v1.2.3


From 20040772cecbddf07ab6369a22ab2fe1ad794b48 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 4 Apr 2010 00:27:20 +0000
Subject: update fieldsort plugin to be compatible with the latest version of
 my branch

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 7e94a4029..ad17f87e6 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -68,15 +68,13 @@ I think it should just be part of `field` rather than a separate plugin.
 			},
 	}
 
-	package IkiWiki::PageSpec;
+	package IkiWiki::SortSpec;
 
-	sub check_cmp_field {
+	sub cmp_field {
 		if (!length $_[0]) {
 			error("sort=field requires a parameter");
 		}
-	}
 
-	sub cmp_field {
 		my $left = IkiWiki::Plugin::field::field_get_value($_[2], $_[0]);
 		my $right = IkiWiki::Plugin::field::field_get_value($_[2], $_[1]);
 
-- 
cgit v1.2.3


From 61a31a3d63a19f75e3362c7e5ac2067f572c9dca Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 4 Apr 2010 00:34:36 +0000
Subject: updated branch

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

(limited to 'doc')

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 2cd484852..c4383c0b7 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -106,6 +106,10 @@ Some code refers to `oldtypedlinks`, and other to `oldlinktypes`. --[[Joey]]
 
 >> A test suite for the dependency resolver *would* be nice. --[[Joey]]
 
+>>> Bug fixed, I think. A test suite for the dependency resolver seems
+>>> more ambitious than I want to get into right now, but I added a
+>>> unit test for this part of it... --s
+
 I'm curious what your reasoning was for adding a new variable
 rather than using `pagestate`. Was it only because you needed
 the `old` version to detect change, or was there other complexity?
@@ -120,6 +124,17 @@ the `old` version to detect change, or was there other complexity?
 > my docs for `%typedlinks`, so I'll try to write docs for it as
 > `pagestate` and see if they work any better. --s
 
+>> On reflection, I don't think it's any better as a pagestate, and
+>> the contents of pagestates (so far) aren't documented for other
+>> plugins' consumption, so I'm inclined to leave it as-is, unless
+>> you want to veto that. Loose rationale: it needs special handling
+>> in the core to be a dependency type (I re-used the existing link
+>> type), it's API beyond a single plugin, and it's really part of
+>> the core parallel to pagestate rather than being tied to a
+>> specific plugin. Also, I'd need to special-case it to have
+>> ikiwiki not delete it from the index, unless I introduced a
+>> dummy typedlinks plugin (or just hook) that did nothing... --s
+
 I have not convinced myself this is a real problem, but..
 If a page has a typed link, there seems to be no way to tell
 if it also has a separate, regular link. `add_link` will add
@@ -145,6 +160,8 @@ without too much transitional trouble. --[[Joey]]
 > on the current semantics, on one of the pages requesting this
 > change. --s
 
+>> Removed in a newer version of the branch. --s
+
 I might have been wrong to introduce `typedlink(tag foo)`. It's not
 very user-friendly, and is more useful as a backend for other plugins
 that as a feature in its own right - any plugin introducing a link
@@ -156,3 +173,6 @@ though... --[[smcv]]
 
 > I agree, per-type matchers are more friendly and I'm not enamored of the
 > multi-parameter pagespec syntax. --[[Joey]]
+
+>> Removed in a newer version of the branch. I re-introduced it as a
+>> plugin in `smcv/typedlink`, but I don't think we really need it. --s
-- 
cgit v1.2.3


From 618bbaee3815daffe329fc1e2d77f04fcd8392b8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2010 14:17:48 +0100
Subject: meta: generalize meta_title into meta(title); support author,
 updated, date

I've left meta_title in, undocumented, as a possible replacement for
sort=title in IkiWiki 4.0 or something.
---
 IkiWiki/Plugin/meta.pm            | 58 +++++++++++++++++++++++++++++++++------
 doc/ikiwiki/directive/meta.mdwn   |  7 ++++-
 doc/ikiwiki/pagespec/sorting.mdwn |  5 ++--
 3 files changed, 58 insertions(+), 12 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index cd7d0d127..c9fdbc934 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -122,6 +122,12 @@ sub preprocess (@) {
 	}
 	elsif ($key eq 'author') {
 		$pagestate{$page}{meta}{author}=$value;
+		if (exists $params{sort}) {
+			$pagestate{$page}{meta}{authorsort}=$params{sort};
+		}
+		else {
+			$pagestate{$page}{meta}{authorsort}=$value;
+		}
 		# fallthorough
 	}
 	elsif ($key eq 'authorurl') {
@@ -288,14 +294,31 @@ sub pagetemplate (@) {
 	}
 }
 
-sub titlesort {
-	my $key = $pagestate{$_[0]}{meta}{titlesort};
+sub get_sort_key {
+	my $page = $_[0];
+	my $meta = $_[1];
 
-	if (defined $key) {
-		return $key;
-	}
+	# e.g. titlesort (also makes sense for author)
+	my $key = $pagestate{$page}{meta}{$meta . "sort"};
+	return $key if defined $key;
+
+	# e.g. title
+	$key = $pagestate{$page}{meta}{$meta};
+	return $key if defined $key;
 
-	return pagetitle(IkiWiki::basename($_[0]));
+	# fall back to closer-to-core things
+	if ($meta eq 'title') {
+		return pagetitle(IkiWiki::basename($page));
+	}
+	elsif ($meta eq 'date') {
+		return $IkiWiki::pagectime{$page};
+	}
+	elsif ($meta eq 'updated') {
+		return $IkiWiki::pagemtime{$page};
+	}
+	else {
+		return '';
+	}
 }
 
 sub match {
@@ -350,10 +373,27 @@ sub match_copyright ($$;@) {
 
 package IkiWiki::SortSpec;
 
+sub cmp_meta {
+	my $left = $_[0];
+	my $right = $_[1];
+	my $meta = $_[2];
+	error(gettext("sort=meta requires a parameter")) unless defined $meta;
+
+	if ($meta eq 'updated' || $meta eq 'date') {
+		return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+			<=>
+			IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+	}
+
+	return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+		cmp
+		IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+}
+
+# A prototype of how sort=title could behave in 4.0 or something
 sub cmp_meta_title {
-	IkiWiki::Plugin::meta::titlesort($_[0])
-	cmp
-	IkiWiki::Plugin::meta::titlesort($_[1])
+	$_[2] = 'title';
+	return cmp_meta(@_);
 }
 
 1
diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index 8d2a5b1ad..c5f74fac5 100644
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -24,7 +24,7 @@ Supported fields:
   differently in this case.
 
   An optional `sort` parameter will be used preferentially when
-  [[ikiwiki/pagespec/sorting]] by `meta_title`:
+  [[ikiwiki/pagespec/sorting]] by `meta(title)`:
 
 	\[[!meta title="The Beatles" sort="Beatles, The"]]
 
@@ -44,6 +44,11 @@ Supported fields:
 
   Specifies the author of a page.
 
+  An optional `sort` parameter will be used preferentially when
+  [[ikiwiki/pagespec/sorting]] by `meta(author)`:
+
+	\[[!meta author="Joey Hess" sort="Hess, Joey"]]
+
 * authorurl
 
   Specifies an url for the author of a page.
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index ba995a521..fbf598340 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -11,9 +11,10 @@ orders can be specified.
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
 """]]
 [[!if test="enabled(meta)" then="""
-* `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
+* `meta(title)` - Order according to the `\[[!meta title="foo" sort="bar"]]`
   or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
-  full title was set.
+  full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc.
+  also work.
 """]]
 
 In addition, you can combine several sort orders and/or reverse the order of
-- 
cgit v1.2.3


From 490f95616a8a49f2120655d07c282eefd067e640 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 3 Apr 2010 14:19:18 +0100
Subject: Rename sort parameter to meta title/author to sortas=bar

Joey pointed out that sort=x usually takes a sort order.
---
 IkiWiki/Plugin/meta.pm            |  8 ++++----
 doc/ikiwiki/directive/meta.mdwn   | 10 +++++-----
 doc/ikiwiki/pagespec/sorting.mdwn |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index c9fdbc934..4992617d0 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -89,8 +89,8 @@ sub preprocess (@) {
 	# Metadata collection that needs to happen during the scan pass.
 	if ($key eq 'title') {
 		$pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value);
-		if (exists $params{sort}) {
-			$pagestate{$page}{meta}{titlesort}=$params{sort};
+		if (exists $params{sortas}) {
+			$pagestate{$page}{meta}{titlesort}=$params{sortas};
 		}
 		else {
 			$pagestate{$page}{meta}{titlesort}=$value;
@@ -122,8 +122,8 @@ sub preprocess (@) {
 	}
 	elsif ($key eq 'author') {
 		$pagestate{$page}{meta}{author}=$value;
-		if (exists $params{sort}) {
-			$pagestate{$page}{meta}{authorsort}=$params{sort};
+		if (exists $params{sortas}) {
+			$pagestate{$page}{meta}{authorsort}=$params{sortas};
 		}
 		else {
 			$pagestate{$page}{meta}{authorsort}=$value;
diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn
index c5f74fac5..5a3919dea 100644
--- a/doc/ikiwiki/directive/meta.mdwn
+++ b/doc/ikiwiki/directive/meta.mdwn
@@ -23,12 +23,12 @@ Supported fields:
   be set to a true value in the template; this can be used to format things
   differently in this case.
 
-  An optional `sort` parameter will be used preferentially when
+  An optional `sortas` parameter will be used preferentially when
   [[ikiwiki/pagespec/sorting]] by `meta(title)`:
 
-	\[[!meta title="The Beatles" sort="Beatles, The"]]
+	\[[!meta title="The Beatles" sortas="Beatles, The"]]
 
-	\[[!meta title="David Bowie" sort="Bowie, David"]]
+	\[[!meta title="David Bowie" sortas="Bowie, David"]]
 
 * license
 
@@ -44,10 +44,10 @@ Supported fields:
 
   Specifies the author of a page.
 
-  An optional `sort` parameter will be used preferentially when
+  An optional `sortas` parameter will be used preferentially when
   [[ikiwiki/pagespec/sorting]] by `meta(author)`:
 
-	\[[!meta author="Joey Hess" sort="Hess, Joey"]]
+	\[[!meta author="Joey Hess" sortas="Hess, Joey"]]
 
 * authorurl
 
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index fbf598340..5c6cfcc2b 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -11,7 +11,7 @@ orders can be specified.
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
 """]]
 [[!if test="enabled(meta)" then="""
-* `meta(title)` - Order according to the `\[[!meta title="foo" sort="bar"]]`
+* `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`
   or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
   full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc.
   also work.
-- 
cgit v1.2.3


From ed26f287b207573cc2c2593809b3811f3f832c8c Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" <https://mukund.startssl.com/@web>
Date: Sun, 4 Apr 2010 07:13:51 +0000
Subject: Remove my homepage

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 633400f21..3b67eb74f 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -138,7 +138,6 @@ Personal sites and blogs
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
 * [Backyard Deer](http://www.backyarddeer.com/)
 * [Alex Ghitza homepage and blog](http://aghitza.org/)
-* [Mukund's homepage](http://www.mukund.org/)
 * [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
-- 
cgit v1.2.3


From 17cc857378c518114989c41dfb1411c9ab8419ea Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" <https://mukund.startssl.com/@web>
Date: Sun, 4 Apr 2010 07:16:41 +0000
Subject: Add the Banu website

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 3b67eb74f..4a3e41e83 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -53,6 +53,7 @@ Projects & Organizations
 * [Debian Costa Rica](http://cr.debian.net/)
 * [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 * [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
+* [Banu](https://www.banu.com/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 3e2a78840a22c376e40dccd358e94533313596e8 Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" <http://liw.fi/@web>
Date: Sun, 4 Apr 2010 09:12:23 +0000
Subject:

---
 doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn

(limited to 'doc')

diff --git a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
new file mode 100644
index 000000000..bd0900670
--- /dev/null
+++ b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
@@ -0,0 +1,3 @@
+Version 2.0 of bzr seems to break the bzr plugin.
+
+I traced this to the bzr_log method in the plugin, and patching that seems to fix it. The plugin just needs to parse the input little bit differently.
-- 
cgit v1.2.3


From 3190e3be93a97ccf0f1c2a4a2d4a27cd1326263b Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" <http://liw.fi/@web>
Date: Sun, 4 Apr 2010 09:13:01 +0000
Subject:

---
 doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
index bd0900670..2fd25df9c 100644
--- a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
+++ b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
@@ -1,3 +1,4 @@
 Version 2.0 of bzr seems to break the bzr plugin.
 
 I traced this to the bzr_log method in the plugin, and patching that seems to fix it. The plugin just needs to parse the input little bit differently.
+--liw
-- 
cgit v1.2.3


From 6b746ed72ba5fc49451f832f6ced9a7c26cce8f7 Mon Sep 17 00:00:00 2001
From: "http://liw.fi/" <http://liw.fi/@web>
Date: Sun, 4 Apr 2010 09:23:05 +0000
Subject:

---
 doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn | 79 +++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
index 2fd25df9c..bda07d15b 100644
--- a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
+++ b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
@@ -2,3 +2,82 @@ Version 2.0 of bzr seems to break the bzr plugin.
 
 I traced this to the bzr_log method in the plugin, and patching that seems to fix it. The plugin just needs to parse the input little bit differently.
 --liw
+
+    From fb897114124e627fd3acf5af8e784c9a77419a81 Mon Sep 17 00:00:00 2001
+    From: Lars Wirzenius <liw@liw.fi>
+    Date: Sun, 4 Apr 2010 21:05:07 +1200
+    Subject: [PATCH] Fix bzr plugin to work with bzr 2.0.
+
+    The output of "bzr log" seems to have changed a bit, so we change the
+    parsing accordingly. This has not been tested with earlier versions of
+    bzr.
+
+    Several problems seemed to occur, all in the bzr_log subroutine:
+
+    1. The @infos list would contain an empty hash, which would confuse the
+       rest of the program.
+    2. This was because bzr_log would push an empty anonymous hash to the
+       list whenever it thought a new record would start.
+    3. However, a new record marker (now?) also happens at th end of bzr log
+       output.
+    4. Now we collect the record to a hash that gets pushed to the list only
+       if it is not empty.
+    5. Also, sometimes bzr log outputs "revno: 1234 [merge]", so we catch only
+       the revision number.
+    6. Finally, there may be non-headers at the of the output, so we ignore
+       those.
+    ---
+     IkiWiki/Plugin/bzr.pm |   23 ++++++++++++++++-------
+     1 files changed, 16 insertions(+), 7 deletions(-)
+
+    diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
+    index 1ffdc23..e813331 100644
+    --- a/IkiWiki/Plugin/bzr.pm
+    +++ b/IkiWiki/Plugin/bzr.pm
+    @@ -73,28 +73,37 @@ sub bzr_log ($) {
+     	my @infos = ();
+     	my $key = undef;
+     
+    +    my $hash = {};
+     	while (<$out>) {
+     		my $line = $_;
+     		my ($value);
+     		if ($line =~ /^message:/) {
+     			$key = "message";
+    -			$infos[$#infos]{$key} = "";
+    +			$$hash{$key} = "";
+     		}
+     		elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
+     			$key = "files";
+    -			unless (defined($infos[$#infos]{$key})) { $infos[$#infos]{$key} = ""; }
+    +			unless (defined($$hash{$key})) { $$hash{$key} = ""; }
+     		}
+     		elsif (defined($key) and $line =~ /^  (.*)/) {
+    -			$infos[$#infos]{$key} .= "$1\n";
+    +			$$hash{$key} .= "$1\n";
+     		}
+     		elsif ($line eq "------------------------------------------------------------\n") {
+    +		    if (keys %$hash) {
+    +    		    push (@infos, $hash);
+    +		    }
+    +    		$hash = {};
+     			$key = undef;
+    -			push (@infos, {});
+     		}
+    -		else {
+    +		elsif ($line =~ /: /) {
+     			chomp $line;
+    -				($key, $value) = split /: +/, $line, 2;
+    -			$infos[$#infos]{$key} = $value;
+    +			if ($line =~ /^revno: (\d+)/) {
+    +			    $key = "revno";
+    +			    $value = $1;
+    +			} else {
+    +    			($key, $value) = split /: +/, $line, 2;
+    +    		}
+    +			$$hash{$key} = $value;
+     		} 
+     	}
+     	close $out;
+    -- 
+    1.7.0
-- 
cgit v1.2.3


From 7060b774e45e237727601f500da40aa6b1a19d7f Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sun, 4 Apr 2010 12:03:41 +0000
Subject: Typo.

---
 doc/news/version_3.20100403.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/news/version_3.20100403.mdwn b/doc/news/version_3.20100403.mdwn
index 86d6a0f37..3e9063028 100644
--- a/doc/news/version_3.20100403.mdwn
+++ b/doc/news/version_3.20100403.mdwn
@@ -15,7 +15,7 @@ ikiwiki 3.20100403 released with [[!toggle text="these changes"]]
    * filecheck: Fix bugs that prevented the pagespecs from matching when
      not called by attachment plugin.
    * Fix incorrect influence info returned by a failing link() pagespec,
-     that could lead to bad dependency handling in certian situations.
+     that could lead to bad dependency handling in certain situations.
    * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
      if necessary for unusual install.
    * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
@@ -27,4 +27,4 @@ ikiwiki 3.20100403 released with [[!toggle text="these changes"]]
      (especially of Firefox) see fresh page content.
    * htmlscrubber: Allow colons in urls after '?'
    * template: Search for templates in the templatedir, if they are not
-     found as pages in the wiki."""]]
\ No newline at end of file
+     found as pages in the wiki."""]]
-- 
cgit v1.2.3


From 3a02cfca99922e8e15b55962d534629b777e463f Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Sun, 4 Apr 2010 13:00:52 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index ac297028c..7ff1a012f 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -28,3 +28,8 @@ It worked just fine with this configuration. I swear I have not modified it. :)
 > So I suspect you have simply not rebuilt your wiki after making some
 > change that fixed the comments, and so only newer pages are getting them.
 > --[[Joey]]
+
+I have tried rebuilding on my squeeze system and still comments don't appear. Any clues how to debug this?
+<http://natalian.org/comments/>
+
+I was worried is was due to a time skew problem I was experiencing on my VPS in the last month, though the time is right now and still comments do not appear on blog posts like <http://natalian.org/archives/2010/03/25/BBC_News_complaints/>
-- 
cgit v1.2.3


From 834936a408d0d9f481071fbcaefc67273eabb60c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 4 Apr 2010 14:03:51 +0000
Subject: bug report + patch: unnecessary YAML::Any dependency

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index ad17f87e6..c2b75a76d 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -84,3 +84,11 @@ I think it should just be part of `field` rather than a separate plugin.
 	}
 
 	1;
+
+-------
+
+Bug report: `field` has an unnecessary `use YAML::Any`, presumably from before
+you separated out `ymlfront`. Trivial patch available from
+field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
+<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
+--[[smcv]]
-- 
cgit v1.2.3


From f6dde92957f8b21d8823f2e51d9e3c48bbad7146 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 4 Apr 2010 14:05:42 +0000
Subject: advertise some bugfixes

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
new file mode 100644
index 000000000..f437624b6
--- /dev/null
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -0,0 +1,4 @@
+My field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
+<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
+has some fixes for compatibility with old YAML modules, mostly done by imitating
+Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]]
-- 
cgit v1.2.3


From 6876c5a588a55df212cde24d7eabaa76b67ac292 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 4 Apr 2010 12:28:12 -0400
Subject: close bug, comment

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

(limited to 'doc')

diff --git a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
index bda07d15b..39500af20 100644
--- a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
+++ b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn
@@ -3,6 +3,10 @@ Version 2.0 of bzr seems to break the bzr plugin.
 I traced this to the bzr_log method in the plugin, and patching that seems to fix it. The plugin just needs to parse the input little bit differently.
 --liw
 
+> Patch applied, [[done]] (but, it would be good if it could be tested with
+> an older bzr, and it's a pity bzr's human-targeted log has to be parsed,
+> I assume there is no machine-targeted version?) --[[Joey]] 
+
     From fb897114124e627fd3acf5af8e784c9a77419a81 Mon Sep 17 00:00:00 2001
     From: Lars Wirzenius <liw@liw.fi>
     Date: Sun, 4 Apr 2010 21:05:07 +1200
-- 
cgit v1.2.3


From b51703569d35790f31dccc3dc2921e8bcccd5b49 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Apr 2010 14:59:29 -0400
Subject: speed

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 8c6e1df3b..739a3d6b0 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -181,6 +181,20 @@ That earlier version of the branch is also available for comparison:
 > to specify a sort method in other directives. --[[Joey]]
 >> Done. --[[smcv]]
 
+## speed
+
+I notice the implementation does not use the magic `$a` and `$b` globals.
+That nasty perl optimisation is still worthwhile:
+
+	perl -e 'use warnings; use strict; use Benchmark; sub a { $a <=> $b } sub b ($$) { $_[0] <=> $_[1] }; my @list=reverse(1..9999); timethese(10000, {a => sub {my @f=sort a @list}, b => sub {my @f=sort b  @list}, c => => sub {my @f=sort { b($a,$b) } @list}})'
+	Benchmark: timing 10000 iterations of a, b, c...
+	         a: 80 wallclock secs (76.74 usr +  0.05 sys = 76.79 CPU) @ 130.23/s (n=10000)
+	         b: 112 wallclock secs (106.14 usr +  0.20 sys = 106.34 CPU) @ 94.04/s (n=10000)
+                 c: 330 wallclock secs (320.25 usr +  0.17 sys = 320.42 CPU) @ 31.21/s (n=10000)
+
+Unfortunatly, I think that c is closest to the new implementation.
+--[[Joey]]
+
 ## Documentation from sort-package branch
 
 ### advanced sort orders (conditionally added to [[ikiwiki/pagespec/sorting]])
-- 
cgit v1.2.3


From 861080b918ef71d82f4a4b9a22093f4a379b5ef8 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Mon, 5 Apr 2010 19:19:00 +0000
Subject: potential performance improvements

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 739a3d6b0..2ce1de6a4 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -195,6 +195,28 @@ That nasty perl optimisation is still worthwhile:
 Unfortunatly, I think that c is closest to the new implementation.
 --[[Joey]]
 
+> Unfortunately, `$a` isn't always `$main::a` - it's `$Package::a` where
+> `Package` is the call site of the sort call. This was a showstopper when
+> `sort` was a hook implemented in many packages, but now that it's a
+> `SortSpec`, I may be able to fix this by putting a `sort` wrapper in the
+> `SortSpec` namespace, so it's like this:
+>
+>     sub sort ($@)
+>     {
+>         my $cmp = shift;
+>         return sort $cmp @_;
+>     }
+>
+> which would mean that the comparison used `$IkiWiki::SortSpec::a`.
+>
+> I do notice that `pagespec_match_list` performs the sort before the
+> filter by pagespec. Is this a deliberate design choice, or
+> coincidence? I can see that when `limit` is used, this could be
+> used to only run the pagespec match function until `limit` pages
+> have been selected, but the cost is that every page in the wiki
+> is sorted. Or, it might be useful to do the filtering first, then
+> sort the sub-list thus produced, then finally apply the limit? --s
+
 ## Documentation from sort-package branch
 
 ### advanced sort orders (conditionally added to [[ikiwiki/pagespec/sorting]])
-- 
cgit v1.2.3


From 10f4695abd65db6c009864c5abb7cb5dfa1cf153 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Apr 2010 15:28:54 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 2ce1de6a4..0aca74be2 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -165,7 +165,6 @@ That earlier version of the branch is also available for comparison:
 >>>>>>> I've kept the semantics from `report` as-is, then:
 >>>>>>> e.g. `sort="age -title"`. --s
 
->>>>>
 >>>>> Perhaps we could borrow from `meta updated` and use `update_age`?
 >>>>> `updateage` would perhaps be a more normal IkiWiki style - but that
 >>>>> makes me think that updateage is a quantity analagous to tonnage or
@@ -190,7 +189,7 @@ That nasty perl optimisation is still worthwhile:
 	Benchmark: timing 10000 iterations of a, b, c...
 	         a: 80 wallclock secs (76.74 usr +  0.05 sys = 76.79 CPU) @ 130.23/s (n=10000)
 	         b: 112 wallclock secs (106.14 usr +  0.20 sys = 106.34 CPU) @ 94.04/s (n=10000)
-                 c: 330 wallclock secs (320.25 usr +  0.17 sys = 320.42 CPU) @ 31.21/s (n=10000)
+	         c: 330 wallclock secs (320.25 usr +  0.17 sys = 320.42 CPU) @ 31.21/s (n=10000)
 
 Unfortunatly, I think that c is closest to the new implementation.
 --[[Joey]]
@@ -217,6 +216,10 @@ Unfortunatly, I think that c is closest to the new implementation.
 > is sorted. Or, it might be useful to do the filtering first, then
 > sort the sub-list thus produced, then finally apply the limit? --s
 
+>> Yes, it was deliberate, pagespec matching can be expensive enough that
+>> needing to sort a lot of pages seems likely to be less work. (I don't
+>> remember what benchmarking was done though.) --[[Joey]] 
+
 ## Documentation from sort-package branch
 
 ### advanced sort orders (conditionally added to [[ikiwiki/pagespec/sorting]])
-- 
cgit v1.2.3


From a01028ae8156679a108a40c62aa6b4cc3e2b3ae7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Apr 2010 17:02:10 -0400
Subject: txt: Add a special case for robots.txt.

---
 IkiWiki/Plugin/txt.pm | 9 ++++++++-
 debian/changelog      | 1 +
 doc/plugins/txt.mdwn  | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
index 1ed9f0856..0d9a0b35b 100644
--- a/IkiWiki/Plugin/txt.pm
+++ b/IkiWiki/Plugin/txt.pm
@@ -39,7 +39,14 @@ sub filter (@) {
 	my %params = @_;
 	my $content = $params{content};
 
-	if (defined $pagesources{$params{page}} && $pagesources{$params{page}} =~ /\.txt$/) {
+	if (defined $pagesources{$params{page}} &&
+	    $pagesources{$params{page}} =~ /\.txt$/) {
+		if ($pagesources{$params{page}} eq 'robots.txt' &&
+		    $params{page} eq $params{destpage}) {
+			will_render($params{page}, 'robots.txt');
+			writefile('robots.txt', $config{destdir}, $content);
+		}
+
 		encode_entities($content, "<>&");
 		if ($findurl) {
 			my $finder = URI::Find->new(sub {
diff --git a/debian/changelog b/debian/changelog
index be89d0918..77d17f566 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20100404) UNRELEASED; urgency=low
 
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
   * comments: Fix missing entity encoding in title.
+  * txt: Add a special case for robots.txt.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn
index 420898d09..a3087c9e0 100644
--- a/doc/plugins/txt.mdwn
+++ b/doc/plugins/txt.mdwn
@@ -12,3 +12,8 @@ The only exceptions are that [[WikiLinks|ikiwiki/WikiLink]] and
 [[directives|ikiwiki/directive]] are still expanded by
 ikiwiki, and that, if the [[!cpan URI::Find]] perl module is installed, URLs
 in the txt file are converted to hyperlinks.
+
+----
+
+As a special case, a file `robots.txt` will be copied intact into the
+`destdir`, as well as creating a wiki page named "robots".
-- 
cgit v1.2.3


From f8457f9a902e880e0240ba7f5180c22999f0e713 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 5 Apr 2010 17:18:30 -0400
Subject: fix bug that left stray </p> tags

Both markdown and tidy add paragraph tags around text, that needs to be
stripped when the text is a short, one line fragment that is being inserted
into a larger page. tidy also adds several newlines to the end, and this
broke removal of the paragraph tags.
---
 IkiWiki.pm                                   | 7 +++----
 doc/bugs/stray___60____47__p__62___tags.mdwn | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6739ba56c..0cbc84788 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1164,7 +1164,7 @@ sub htmlize ($$$$) {
 	my $content=shift;
 	
 	my $oneline = $content !~ /\n/;
-
+	
 	if (exists $hooks{htmlize}{$type}) {
 		$content=$hooks{htmlize}{$type}{call}->(
 			page => $page,
@@ -1185,10 +1185,9 @@ sub htmlize ($$$$) {
 	
 	if ($oneline) {
 		# hack to get rid of enclosing junk added by markdown
-		# and other htmlizers
+		# and other htmlizers/sanitizers
 		$content=~s/^<p>//i;
-		$content=~s/<\/p>$//i;
-		chomp $content;
+		$content=~s/<\/p>\n*$//i;
 	}
 
 	return $content;
diff --git a/doc/bugs/stray___60____47__p__62___tags.mdwn b/doc/bugs/stray___60____47__p__62___tags.mdwn
index 6e508ffda..99d6fe09f 100644
--- a/doc/bugs/stray___60____47__p__62___tags.mdwn
+++ b/doc/bugs/stray___60____47__p__62___tags.mdwn
@@ -13,3 +13,5 @@ I believe that this snippet in `IkiWiki.pm` might be the reason for the imbalanc
         }
 
 The fact that HTML in a `\[[!meta title]]` is added but then escaped might indicate that some other bug is involved.
+
+> [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From cb8b2f80b2f8c91eba3f3a6a5b9913ab80326df8 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Mon, 5 Apr 2010 22:50:51 +0100
Subject: Use $a and $b for SortSpec cmp callbacks

---
 IkiWiki.pm                      | 27 ++++++++++++++++++---------
 IkiWiki/Plugin/meta.pm          | 14 ++++++--------
 IkiWiki/Plugin/sortnaturally.pm |  4 ++--
 doc/plugins/write.mdwn          | 20 ++++++++++----------
 t/pagespec_match_list.t         |  2 +-
 5 files changed, 37 insertions(+), 30 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d716e8b39..da36494fb 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1975,10 +1975,10 @@ sub sortspec_translate ($) {
 		if (exists $IkiWiki::SortSpec::{"cmp_$word"}) {
 			if (defined $params) {
 				push @data, $params;
-				$code .= "IkiWiki::SortSpec::cmp_$word(\@_, \$data[$#data])";
+				$code .= "IkiWiki::SortSpec::cmp_$word(\$data[$#data])";
 			}
 			else {
-				$code .= "IkiWiki::SortSpec::cmp_$word(\@_, undef)";
+				$code .= "IkiWiki::SortSpec::cmp_$word(undef)";
 			}
 		}
 		else {
@@ -2095,9 +2095,8 @@ sub pagespec_match_list ($$;@) {
 	}
 
 	if (defined $params{sort}) {
-		my $f = sortspec_translate($params{sort});
-
-		@candidates = sort { $f->($a, $b) } @candidates;
+		@candidates = IkiWiki::SortSpec::sort_pages($params{sort},
+			@candidates);
 	}
 
 	@candidates=reverse(@candidates) if $params{reverse};
@@ -2412,13 +2411,23 @@ sub match_ip ($$;@) {
 
 package IkiWiki::SortSpec;
 
+# This is in the SortSpec namespace so that the $a and $b that sort() uses
+# $IkiWiki::SortSpec::a and $IkiWiki::SortSpec::b, so that plugins' cmp
+# functions can access them easily.
+sub sort_pages
+{
+	my $f = IkiWiki::sortspec_translate(shift);
+
+	return sort $f @_;
+}
+
 sub cmp_title {
-	IkiWiki::pagetitle(IkiWiki::basename($_[0]))
+	IkiWiki::pagetitle(IkiWiki::basename($a))
 	cmp
-	IkiWiki::pagetitle(IkiWiki::basename($_[1]))
+	IkiWiki::pagetitle(IkiWiki::basename($b))
 }
 
-sub cmp_mtime { $IkiWiki::pagemtime{$_[1]} <=> $IkiWiki::pagemtime{$_[0]} }
-sub cmp_age { $IkiWiki::pagectime{$_[1]} <=> $IkiWiki::pagectime{$_[0]} }
+sub cmp_mtime { $IkiWiki::pagemtime{$b} <=> $IkiWiki::pagemtime{$a} }
+sub cmp_age { $IkiWiki::pagectime{$b} <=> $IkiWiki::pagectime{$a} }
 
 1
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 4992617d0..553f93455 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -374,25 +374,23 @@ sub match_copyright ($$;@) {
 package IkiWiki::SortSpec;
 
 sub cmp_meta {
-	my $left = $_[0];
-	my $right = $_[1];
-	my $meta = $_[2];
+	my $meta = $_[0];
 	error(gettext("sort=meta requires a parameter")) unless defined $meta;
 
 	if ($meta eq 'updated' || $meta eq 'date') {
-		return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+		return IkiWiki::Plugin::meta::get_sort_key($a, $meta)
 			<=>
-			IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+			IkiWiki::Plugin::meta::get_sort_key($b, $meta);
 	}
 
-	return IkiWiki::Plugin::meta::get_sort_key($left, $meta)
+	return IkiWiki::Plugin::meta::get_sort_key($a, $meta)
 		cmp
-		IkiWiki::Plugin::meta::get_sort_key($right, $meta);
+		IkiWiki::Plugin::meta::get_sort_key($b, $meta);
 }
 
 # A prototype of how sort=title could behave in 4.0 or something
 sub cmp_meta_title {
-	$_[2] = 'title';
+	$_[0] = 'title';
 	return cmp_meta(@_);
 }
 
diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm
index f498820a5..92453749d 100644
--- a/IkiWiki/Plugin/sortnaturally.pm
+++ b/IkiWiki/Plugin/sortnaturally.pm
@@ -25,8 +25,8 @@ sub checkconfig () {
 package IkiWiki::SortSpec;
 
 sub cmp_title_natural {
-	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
-		IkiWiki::pagetitle(IkiWiki::basename($_[1])))
+	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($a)),
+		IkiWiki::pagetitle(IkiWiki::basename($b)))
 }
 
 1;
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index b67142230..f42cc86ae 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1117,16 +1117,16 @@ Similarly, it's possible to write plugins that add new functions as
 the IkiWiki::SortSpec package named `cmp_foo`, which will be used when sorting
 by `foo` or `foo(...)` is requested.
 
-The function will be passed three or more parameters. The first two are
-page names, and the third is `undef` if invoked as `foo`, or the parameter
-`"bar"` if invoked as `foo(bar)`. It may also be passed additional, named
-parameters.
-
-It should return the same thing as Perl's `cmp` and `<=>` operators: negative
-if the first argument is less than the second, positive if the first argument
-is greater, or zero if they are considered equal. It may also raise an
-error using `error`, for instance if it needs a parameter but one isn't
-provided.
+The names of pages to be compared are in the global variables `$a` and `$b`
+in the IkiWiki::SortSpec package. The function should return the same thing
+as Perl's `cmp` and `<=>` operators: negative if `$a` is less than `$b`,
+positive if `$a` is greater, or zero if they are considered equal. It may
+also raise an error using `error`, for instance if it needs a parameter but
+one isn't provided.
+
+The function will also be passed one or more parameters. The first is
+`undef` if invoked as `foo`, or the parameter `"bar"` if invoked as `foo(bar)`;
+it may also be passed additional, named parameters.
 
 ### Setup plugins
 
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 68112f5c0..2ad7a9105 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -12,7 +12,7 @@ IkiWiki::checkconfig();
 {
 	package IkiWiki::SortSpec;
 
-	sub cmp_path { $_[0] cmp $_[1] }
+	sub cmp_path { $a cmp $b }
 }
 
 %pagesources=(
-- 
cgit v1.2.3


From b186ec1b4cb8145d6a6cb68478e23d7fb0fa1476 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:02:18 +0000
Subject: ready for review, I think

---
 doc/todo/allow_plugins_to_add_sorting_methods.mdwn | 51 +++++++++++++++++-----
 1 file changed, 39 insertions(+), 12 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index 0aca74be2..d4da13feb 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -20,7 +20,7 @@ That earlier version of the branch is also available for comparison:
 
 >> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages?  Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]]
 
->>> [[!template id=gitbranch branch=smcv/sort-package author="[[Simon_McVittie|smcv]]"]]
+>>> [[!template id=gitbranch branch=smcv/ready/sort-package author="[[Simon_McVittie|smcv]]"]]
 >>> I'd be inclined to think that's overkill, but it wasn't very hard to
 >>> implement, and in a way is more elegant. I set it up so sort mechanisms
 >>> share the `IkiWiki::PageSpec` package, but with a `cmp_` prefix. Gitweb:
@@ -207,7 +207,26 @@ Unfortunatly, I think that c is closest to the new implementation.
 >     }
 >
 > which would mean that the comparison used `$IkiWiki::SortSpec::a`.
->
+> --s
+
+>> I've now done this. On a wiki with many [[plugins/contrib/album]]s
+>> (a full rebuild takes half an hour!), I tested a refresh after
+>> `touch tags/*.mdwn` (my tag pages contain inlines of the form
+>> `tagged(foo)` sorted by date, so they exercise sorting).
+>> I also tried removing sorting from `pagespec_match_list`
+>> altogether, as an upper bound for how fast we can possibly make it.
+>>
+>> * `master` at branch point: 63.72user 0.29system
+>> * `master` at branch point: 63.91user 0.37system
+>> * my branch, with `@_`: 65.28user 0.29system
+>> * my branch, with `@_`: 65.21user 0.28system
+>> * my branch, with `$a`: 64.09user 0.28system
+>> * my branch, with `$a`: 63.83user 0.36system
+>> * not sorted at all: 58.99user 0.29system
+>> * not sorted at all: 58.92user 0.29system
+>>
+>> --s
+
 > I do notice that `pagespec_match_list` performs the sort before the
 > filter by pagespec. Is this a deliberate design choice, or
 > coincidence? I can see that when `limit` is used, this could be
@@ -218,7 +237,15 @@ Unfortunatly, I think that c is closest to the new implementation.
 
 >> Yes, it was deliberate, pagespec matching can be expensive enough that
 >> needing to sort a lot of pages seems likely to be less work. (I don't
->> remember what benchmarking was done though.) --[[Joey]] 
+>> remember what benchmarking was done though.) --[[Joey]]
+
+>>> We discussed this on IRC and Joey pointed out that this also affects
+>>> dependency calculation, so I'm not going to get into this now... --s
+
+Joey pointed out on IRC that the `titlesort` feature duplicates all the
+meta titles. I did that in order to sort by the unescaped version, but
+I've now changed the branch to only store that if it makes a difference.
+--s
 
 ## Documentation from sort-package branch
 
@@ -262,13 +289,13 @@ Similarly, it's possible to write plugins that add new functions as
 the IkiWiki::SortSpec package named `cmp_foo`, which will be used when sorting
 by `foo` or `foo(...)` is requested.
 
-The function will be passed three or more parameters. The first two are
-page names, and the third is `undef` if invoked as `foo`, or the parameter
-`"bar"` if invoked as `foo(bar)`. It may also be passed additional, named
-parameters.
+The names of pages to be compared are in the global variables `$a` and `$b`
+in the IkiWiki::SortSpec package. The function should return the same thing
+as Perl's `cmp` and `<=>` operators: negative if `$a` is less than `$b`,
+positive if `$a` is greater, or zero if they are considered equal. It may
+also raise an error using `error`, for instance if it needs a parameter but
+one isn't provided.
 
-It should return the same thing as Perl's `cmp` and `<=>` operators: negative
-if the first argument is less than the second, positive if the first argument
-is greater, or zero if they are considered equal. It may also raise an
-error using `error`, for instance if it needs a parameter but one isn't
-provided.
+The function will also be passed one or more parameters. The first is
+`undef` if invoked as `foo`, or the parameter `"bar"` if invoked as `foo(bar)`;
+it may also be passed additional, named parameters.
-- 
cgit v1.2.3


From 1fb5b9f61c114a0151416d2de69b5ea420c6706b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:04:47 +0000
Subject: switch branch for review to use ready/foo convention

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

(limited to 'doc')

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index c4383c0b7..5678ee7e2 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -53,7 +53,7 @@ I don't have any opinion on this syntax (whether it's good or not)...--Ivan Z.
 
 -------
 
->> [[!template id=gitbranch author="[[Simon_McVittie|smcv]]" branch=smcv/link-types]]
+>> [[!template id=gitbranch author="[[Simon_McVittie|smcv]]" branch=smcv/ready/link-types]]
 >> [[!tag patch]]
 
 ## Documentation for smcv's branch
-- 
cgit v1.2.3


From 26bf69d17aff4c74dd6c368712091d8c1fc977a6 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:49:38 +0000
Subject: as seen on IRC

---
 ...but_not_all_meta_fields_are_stored_escaped.mdwn | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn

(limited to 'doc')

diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
new file mode 100644
index 000000000..d79318dd8
--- /dev/null
+++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
@@ -0,0 +1,32 @@
+[[!template id=gitbranch branch=smcv/unescaped-meta author="[[Simon_McVittie|smcv]]"]]
+(Warning: this branch has not been tested thoroughly.)
+
+While discussing the [[plugins/meta]] plugin on IRC, Joey pointed out that
+it stores most meta fields unescaped, but 'title', 'guid' and 'description'
+are special-cased and stored escaped (with numeric XML/HTML entities). This
+is to avoid emitting markup in the <title> of a HTML page, or in an RSS/Atom
+feed, neither of which are subject to the [[plugins/htmlscrubber]].
+
+However, having the meta fields "partially escaped" like this is somewhat
+error-prone. Joey suggested that perhaps everything should be stored
+unescaped, and the escaping should be done on output; this branch
+implements that.
+
+Points of extra subtlety:
+
+* The title given to the [[plugins/search]] plugin was previously HTML;
+  now it's plain text, potentially containing markup characters. I suspect
+  that that's what Xapian wants anyway (which is why I didn't change it),
+  but I could be wrong...
+
+* Page descriptions in the HTML `<head>` were previously double-escaped:
+  the description was stored escaped with numeric entities, then that was
+  output with a second layer of escaping! In this branch, I just emit
+  the page description escaped once, as was presumably the intention.
+
+* It's safe to apply this change to a wiki and neglect to rebuild it
+  (assuming I implemented it correctly!), but until the wiki is rebuilt,
+  titles, descriptions and GUIDs for unchanged pages will appear
+  double-escaped on any page that inlines them in `quick=yes` mode, and
+  is rebuilt for some other reason. The failure mode is too much escaping
+  rather than too little, so it shouldn't be a security problem.
-- 
cgit v1.2.3


From 0ed94696c0a449b425bc319297d39060ee24dcf2 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:50:51 +0000
Subject: pages talking about escaping should really be escaped correctly

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

(limited to 'doc')

diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
index d79318dd8..cbfcfd6b7 100644
--- a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
+++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
@@ -4,7 +4,7 @@
 While discussing the [[plugins/meta]] plugin on IRC, Joey pointed out that
 it stores most meta fields unescaped, but 'title', 'guid' and 'description'
 are special-cased and stored escaped (with numeric XML/HTML entities). This
-is to avoid emitting markup in the <title> of a HTML page, or in an RSS/Atom
+is to avoid emitting markup in the `<title>` of a HTML page, or in an RSS/Atom
 feed, neither of which are subject to the [[plugins/htmlscrubber]].
 
 However, having the meta fields "partially escaped" like this is somewhat
-- 
cgit v1.2.3


From 315bcf866c490ae2041cef59f960e8021d52e840 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:51:27 +0000
Subject: tag as patch

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

(limited to 'doc')

diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
index cbfcfd6b7..6a934d4eb 100644
--- a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
+++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
@@ -1,4 +1,5 @@
 [[!template id=gitbranch branch=smcv/unescaped-meta author="[[Simon_McVittie|smcv]]"]]
+[[!tag patch]]
 (Warning: this branch has not been tested thoroughly.)
 
 While discussing the [[plugins/meta]] plugin on IRC, Joey pointed out that
-- 
cgit v1.2.3


From 1f112d570ef235416c4001605e15980b2f628da4 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 00:55:54 +0000
Subject: if applied, reverting this would be problematic

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

(limited to 'doc')

diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
index 6a934d4eb..8e1ca42e0 100644
--- a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
+++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
@@ -31,3 +31,9 @@ Points of extra subtlety:
   double-escaped on any page that inlines them in `quick=yes` mode, and
   is rebuilt for some other reason. The failure mode is too much escaping
   rather than too little, so it shouldn't be a security problem.
+
+* Reverting this change, if applied, is more dangerous; until the wiki is
+  rebuilt, any titles, descriptions and GUIDs on unchanged pages that
+  contained markup could appear unescaped on any page that inlines them
+  in `quick=yes` mode, and is rebuilt for some other reason. The failure
+  mode here would be too little escaping, i.e. cross-site scripting.
-- 
cgit v1.2.3


From 5f8df5828834c0163d04ad3b949888d78e37ae73 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 03:59:09 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
index f437624b6..ce3b2b483 100644
--- a/doc/plugins/contrib/ymlfront/discussion.mdwn
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -2,3 +2,6 @@ My field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb
 <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
 has some fixes for compatibility with old YAML modules, mostly done by imitating
 Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]]
+
+> I would if I could *find* it.  I checked out the "field-etc" branch, but I can't find the plugins in question under IkiWiki/Plugin; am I looking in the wrong place, or what?
+> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 06f58b1b888a6cea1a9a5cce9e098428f0adab75 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 04:00:47 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index c2b75a76d..af5bfd6c9 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -92,3 +92,5 @@ you separated out `ymlfront`. Trivial patch available from
 field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
 <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
 --[[smcv]]
+
+> Can do for the field plugin (delete one line? Easy.)  Will push when I get to a better connection.  --[[KathrynAndersen]]
-- 
cgit v1.2.3


From ee1e7079ebe0a1e9d3d6c79cb221a0fb86f423d5 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 04:41:55 +0000
Subject: more flexible underlays, please?

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

(limited to 'doc')

diff --git a/doc/todo/optional_underlaydir_prefix.mdwn b/doc/todo/optional_underlaydir_prefix.mdwn
new file mode 100644
index 000000000..8fd6d76c5
--- /dev/null
+++ b/doc/todo/optional_underlaydir_prefix.mdwn
@@ -0,0 +1,20 @@
+For security reasons, symlinks are disabled in IkiWiki.  That's fair enough, but that means that some problems, which one could otherwise solve by using a symlink, cannot be solved. The specfic problem in this case is that all underlays are placed at the root of the wiki, when it could be more convenient to place some underlays in specific sub-directories.
+
+Use-case 1 (to keep things tidy):
+
+Currently IkiWiki has some javascript files in `underlays/javascript`; that directory is given as one of the underlay directories.  Thus, all the javascript files appear in the root of the generated site.  But it would be tidier if one could say "put the contents of *this* underlaydir under the `js` directory".
+
+Use-case 2 (a read-only external dir):
+
+Suppose I want to include a subset of `/usr/local/share/docs` on my wiki, say the docs about `foo`.  But I want them to be under the `docs/foo` sub-directory on the generated site.  Currently I can't do that.  If I give `/usr/local/share/docs/foo` as an underlaydir, then the contents of that will be in the root of the site, rather than under `docs/foo`.  And if I give `/usr/local/share/docs` as an underlaydir, then the contents of the `foo` dir will be under `foo`, but it will also include every other thing in `/usr/local/share/docs`.
+
+Since we can't use symlinks in an underlay dir to link to these directories, then perhaps one could give a specific underlay dir a specific prefix, which defines the sub-directory that the underlay should appear in.
+
+I'm not sure how this would be implemented, but I guess it could be configured something like this:
+
+    prefixed_underlay => {
+         'js' => '/usr/local/share/ikiwiki/javascript',
+         'docs/foo' => '/usr/local/share/docs/foo',
+    }
+
+[[!taglink wishlist]]
-- 
cgit v1.2.3


From 2efec70c7e55f9426d7051ffebc6c1eb55afb16b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 10:47:28 +0000
Subject: oops, branch returned now

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
index ce3b2b483..3ad02af29 100644
--- a/doc/plugins/contrib/ymlfront/discussion.mdwn
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -5,3 +5,7 @@ Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]]
 
 > I would if I could *find* it.  I checked out the "field-etc" branch, but I can't find the plugins in question under IkiWiki/Plugin; am I looking in the wrong place, or what?
 > --[[KathrynAndersen]]
+
+>> Sorry, I accidentally removed `field-etc` by pushing with `--mirror` from a
+>> different checkout. I've put it back; it's a branch from your `ikiplugins.git`,
+>> so yes, the code should be in `IkiWiki/Plugin`. --[[smcv]]
-- 
cgit v1.2.3


From 089a7faff8defe98ffc593702be93f8f35d2153a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 13:25:26 -0400
Subject: first question

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index af5bfd6c9..646a5f3f4 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -94,3 +94,18 @@ field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
 --[[smcv]]
 
 > Can do for the field plugin (delete one line? Easy.)  Will push when I get to a better connection.  --[[KathrynAndersen]]
+
+----
+
+Disclaimer: I've only looked at this plugin and ymlfront, not other related
+stuff yet. (I quite like ymlfront, so I looked at this as its dependency. :)
+I also don't want to annoy you with a lot of design discussion 
+if your main goal was to write a plugin that did exactly what you wanted.
+
+My first question is: Why we need another plugin storing metadata
+about the page, when we already have the meta plugin? Much of the
+complication around the field plugin has to do with it accessing info
+belonging to the meta plugin, and generalizing that to be able to access
+info stored by other plugins too. (But I don't see any other plugins that
+currently store such info). Then too, it raises points of confusion like
+smcv's discuission of field author vs meta author above. --[[Joey]] 
-- 
cgit v1.2.3


From c87ddb6908485fecff9c516223ca0b2973df88f6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 13:58:55 -0400
Subject: idea

---
 doc/todo/optional_underlaydir_prefix.mdwn | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/optional_underlaydir_prefix.mdwn b/doc/todo/optional_underlaydir_prefix.mdwn
index 8fd6d76c5..dd11d062d 100644
--- a/doc/todo/optional_underlaydir_prefix.mdwn
+++ b/doc/todo/optional_underlaydir_prefix.mdwn
@@ -4,6 +4,9 @@ Use-case 1 (to keep things tidy):
 
 Currently IkiWiki has some javascript files in `underlays/javascript`; that directory is given as one of the underlay directories.  Thus, all the javascript files appear in the root of the generated site.  But it would be tidier if one could say "put the contents of *this* underlaydir under the `js` directory".
 
+> Of course, this could be accomplished, if we wanted to, by moving the
+> files to `underlays/javascript/js`. --[[Joey]] 
+
 Use-case 2 (a read-only external dir):
 
 Suppose I want to include a subset of `/usr/local/share/docs` on my wiki, say the docs about `foo`.  But I want them to be under the `docs/foo` sub-directory on the generated site.  Currently I can't do that.  If I give `/usr/local/share/docs/foo` as an underlaydir, then the contents of that will be in the root of the site, rather than under `docs/foo`.  And if I give `/usr/local/share/docs` as an underlaydir, then the contents of the `foo` dir will be under `foo`, but it will also include every other thing in `/usr/local/share/docs`.
@@ -17,4 +20,25 @@ I'm not sure how this would be implemented, but I guess it could be configured s
          'docs/foo' => '/usr/local/share/docs/foo',
     }
 
+> So, let me review why symlinks are an issue. For normal, non-underlay
+> pages, users who do not have filesystem access to the server may have 
+> commit access, and so could commit eg, a symlink to `/etc/passwd` (or
+> to `/` !). The guards are there to prevent ikiwiki either exposing the
+> symlink target's contents, or potentially overwriting it.
+> 
+> Is this a concern for underlays? Most of the time, certianly not;
+> the underlay tends to be something only the site admin controls.
+> Not all the security checks that are done on the srcdir are done
+> on the underlays, either. Most checks done on files in the underlay
+> are only done because the same code handles srcdir files. The one
+> exception is the test that skips processing symlinks in the underlay dir.
+> (But note that the underlay directory can be a symlinkt to elsewhere
+> which the srcdir, by default, cannot.)
+> 
+> So, one way to approach this is to make ikiwiki follow directory symlinks
+> inside the underlay directory. Just a matter of passing `follow => 1` to
+> find. (This would still not allow individual files to be symlinks, because
+> `readfile` does not allow reading symlinks. But I don't see much need
+> for that.) --[[Joey]]
+
 [[!taglink wishlist]]
-- 
cgit v1.2.3


From 33d934b5ca1666bfe3f9fa3004ad7d31c38c69c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 14:05:00 -0400
Subject: comment

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

(limited to 'doc')

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index 045bfd7aa..06c82337a 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -18,6 +18,10 @@ I think it could be really powerful and useful, especially if it becomes part of
 
 > It looks like an interesting idea.  I don't have time right now to look at it in depth, but it looks interesting. -- [[Will]]
 
+> I agree such a separation makes some sense. But note that the discussion on [[todo/structured_page_data]]
+> talks about associating data types with fields for a good reason: It's hard to later develop a good UI for
+> querying or modifying a page's data if all the data has an implicit type "string". --[[Joey]] 
+
 ## Second Pass
 
 I have written additional plugins which integrate with the [[plugins/contrib/field]] plugin to both set and get structured page data.
-- 
cgit v1.2.3


From 6fd59908ba8f6999f63c94c918f8c309ed108f74 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 14:06:29 -0400
Subject: comment

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/pod/discussion.mdwn b/doc/plugins/contrib/pod/discussion.mdwn
index 76e858680..9187b1350 100644
--- a/doc/plugins/contrib/pod/discussion.mdwn
+++ b/doc/plugins/contrib/pod/discussion.mdwn
@@ -8,3 +8,7 @@ supports, or later support latex, that could be problimatic since that
 could maybe be used to include files or run code. --[[Joey]]
 
 > I don't know, either; the documentation for [[!cpan Pod:Xhtml]] is silent on this subject. --[[KathrynAndersen]]
+
+>> I'm afraid the only approach is to audit the existing code in the perl
+>> module(s), and then hope nothing is added to them later that opens a
+>> security hole. --[[Joey]] 
-- 
cgit v1.2.3


From ff267e7ac33226cfbdf30ae8e9b9f7688c485dc7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 14:09:02 -0400
Subject: comment

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

(limited to 'doc')

diff --git a/doc/users/KathrynAndersen/discussion.mdwn b/doc/users/KathrynAndersen/discussion.mdwn
index 288ea8c51..35340b22f 100644
--- a/doc/users/KathrynAndersen/discussion.mdwn
+++ b/doc/users/KathrynAndersen/discussion.mdwn
@@ -9,6 +9,10 @@ that as a patch to the existing map plugin.) --[[Joey]]
 
 > I think pmap is probably better as a separate plugin, because it has additional dependencies (HTML::LinkList) which people might not want to have to install.
 
+>> One approach commonly used in ikiwiki is to make such optional features
+>> be enabled by a switch somewhere, and 'eval q{use Foo}` so the module
+>> does not have to be loaded unless the feature is used. --[[Joey]] 
+
 > The "includepage" plugin I'm not sure whether it is worth releasing or not; it's basically a cut-down version of "inline", because the inline plugin is so complicated and has so many options, I felt more at ease to have something simpler.
 
 > --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 407a3493599afbb2f16a0ace49ff1924997895d2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 14:20:44 -0400
Subject: nearly there!

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

(limited to 'doc')

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 5678ee7e2..76a99f6a5 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -176,3 +176,15 @@ though... --[[smcv]]
 
 >> Removed in a newer version of the branch. I re-introduced it as a
 >> plugin in `smcv/typedlink`, but I don't think we really need it. --s
+
+----
+
+I am ready to merge this, but I noticed one problem -- since `match_tagged`
+now only matches pages with the tag linktype, a wiki will need to be
+rebuilt on upgrade in order to get the linktype of existing tags in it
+recorded. So there needs to be a NEWS item about this and
+the postinst modified to force the rebuild.
+
+Also, the ready branch adds `typedlink()` to [[ikiwiki/pagespec]],
+but you removed that feature as documented above.
+--[[Joey]]
-- 
cgit v1.2.3


From b29c50c731d17c83fef21ef606654ce3bde84310 Mon Sep 17 00:00:00 2001
From: webkatalog <webkatalog@web>
Date: Tue, 6 Apr 2010 18:38:17 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4a3e41e83..ef9c3da59 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -96,6 +96,7 @@ Personal sites and blogs
 * [Embedded Moose](http://embeddedmoose.com), Andrew Greenberg's personal and consulting page.
 * [Chez Fred](http://fred.ccheznous.org)
 * [Cameron Dale](http://www.camrdale.org/)
+* [webkatalog ohne backlinkpflicht](http://www.1a-verzeichnis.de/)
 * [[KarlMW]]'s [homepage](http://mowson.org/karl/), generated with an ikiwiki 
   [asciidoc plugin](http://mowson.org/karl/colophon/).
 * [Carl Worth's Boring Web Pages](http://www.cworth.org)
-- 
cgit v1.2.3


From 4568ba8a6228cb80cea4b3c4520ae8a066e6f04a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 14:39:51 -0400
Subject: Revert spam

This reverts commit b29c50c731d17c83fef21ef606654ce3bde84310.

Nice try, no cigar.
---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index ef9c3da59..4a3e41e83 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -96,7 +96,6 @@ Personal sites and blogs
 * [Embedded Moose](http://embeddedmoose.com), Andrew Greenberg's personal and consulting page.
 * [Chez Fred](http://fred.ccheznous.org)
 * [Cameron Dale](http://www.camrdale.org/)
-* [webkatalog ohne backlinkpflicht](http://www.1a-verzeichnis.de/)
 * [[KarlMW]]'s [homepage](http://mowson.org/karl/), generated with an ikiwiki 
   [asciidoc plugin](http://mowson.org/karl/colophon/).
 * [Carl Worth's Boring Web Pages](http://www.cworth.org)
-- 
cgit v1.2.3


From e496920e51ae9f0ecfbad5799634a5064193dcdb Mon Sep 17 00:00:00 2001
From: webkatalog <webkatalog@web>
Date: Tue, 6 Apr 2010 18:43:08 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4a3e41e83..472bd5728 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -143,6 +143,7 @@ Personal sites and blogs
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
 * [Gustaf Thorslund's blog](http://blog.thorslund.org)
+* [Webkatalog ohne Backlinkpflicht](http://www.1a-verzeichnis.de/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 1a646f7e77e94128c3ef6938fbd727b302c9ef07 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 15:12:54 -0400
Subject: Revert spam

This reverts commit e496920e51ae9f0ecfbad5799634a5064193dcdb.

"Twice is enemy action"; enjoy your ban!
---
 doc/ikiwikiusers.mdwn | 1 -
 1 file changed, 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 472bd5728..4a3e41e83 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -143,7 +143,6 @@ Personal sites and blogs
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
 * [Gustaf Thorslund's blog](http://blog.thorslund.org)
-* [Webkatalog ohne Backlinkpflicht](http://www.1a-verzeichnis.de/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From b8f4ffdc5d381da04000502f20f0d4e4c13704b3 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Tue, 6 Apr 2010 21:00:48 +0100
Subject: Remove typedlink from [[ikiwiki/pagespec]]

It's not supported in this branch any more.
---
 doc/ikiwiki/pagespec.mdwn | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index ca6693024..5c191f23f 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -52,9 +52,6 @@ Some more elaborate limits can be added to what matches using these functions:
   specified IP address.
 * "`postcomment(glob)`" - matches only when comments are being 
   posted to a page matching the specified glob
-* "`typedlink(type glob)`" - matches pages that link to a given page (or glob)
-  with a given link type. Plugins can create links with a specific type:
-  for instance, the tag plugin creates links of type `tag`.
 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:
-- 
cgit v1.2.3


From 899639f10d49cff410059c3af2e1d5717c25b738 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 6 Apr 2010 20:03:26 +0000
Subject: fixed

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

(limited to 'doc')

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 76a99f6a5..8e81860a1 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -185,6 +185,12 @@ rebuilt on upgrade in order to get the linktype of existing tags in it
 recorded. So there needs to be a NEWS item about this and
 the postinst modified to force the rebuild.
 
+> Done, although you'll need to plug in an appropriate version number when
+> you release it. Is there a distinctive reminder string you grep for
+> during releases? I've used `UNRELEASED` for now. --[[smcv]]
+
 Also, the ready branch adds `typedlink()` to [[ikiwiki/pagespec]],
 but you removed that feature as documented above.
 --[[Joey]]
+
+> Done. --s
-- 
cgit v1.2.3


From af99d4cb10b06292e8a0acd472ae905e072e3e84 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 22:24:24 +0000
Subject: reply

---
 doc/users/KathrynAndersen/discussion.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/users/KathrynAndersen/discussion.mdwn b/doc/users/KathrynAndersen/discussion.mdwn
index 35340b22f..4f2790c39 100644
--- a/doc/users/KathrynAndersen/discussion.mdwn
+++ b/doc/users/KathrynAndersen/discussion.mdwn
@@ -11,7 +11,9 @@ that as a patch to the existing map plugin.) --[[Joey]]
 
 >> One approach commonly used in ikiwiki is to make such optional features
 >> be enabled by a switch somewhere, and 'eval q{use Foo}` so the module
->> does not have to be loaded unless the feature is used. --[[Joey]] 
+>> does not have to be loaded unless the feature is used. --[[Joey]]
+
+>>> Unfortunately, HTML::LinkList isn't an optional feature for pmap; that's what it uses to create the HTML for the map. --[[KathrynAndersen]]
 
 > The "includepage" plugin I'm not sure whether it is worth releasing or not; it's basically a cut-down version of "inline", because the inline plugin is so complicated and has so many options, I felt more at ease to have something simpler.
 
-- 
cgit v1.2.3


From 121405e8aa80e7ceb5283b0ff8c9865458a6dd52 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 23:09:59 +0000
Subject: response to Joey and smcv

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 646a5f3f4..b243e2dfe 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -21,7 +21,9 @@ behaviour, an auxiliary plugin would be easy.)
 >> (like `map`). Is your plan that `meta` should register itself by
 >> default, and `map` and friends should be adapted to
 >> work based on `getfield()` instead of `$pagestate{foo}{meta}`, then?
->>
+
+>>> Based on `field_get_value()`, yes.  That would be my ideal.  Do you think I should implement that as an ikiwiki branch? --[[KathrynAndersen]]
+
 >> (On the site I mentioned, I'm using an unmodified version of `field`,
 >> and currently working around the collision by tagging books' pages
 >> with `bookauthor` instead of `author` in the YAML.) --s
@@ -94,6 +96,7 @@ field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
 --[[smcv]]
 
 > Can do for the field plugin (delete one line? Easy.)  Will push when I get to a better connection.  --[[KathrynAndersen]]
+>> Done! -K.A.
 
 ----
 
@@ -109,3 +112,16 @@ belonging to the meta plugin, and generalizing that to be able to access
 info stored by other plugins too. (But I don't see any other plugins that
 currently store such info). Then too, it raises points of confusion like
 smcv's discuission of field author vs meta author above. --[[Joey]] 
+
+> The point is exactly in the generalization, to provide a uniform interface for accessing structured data, no matter what the source of it, whether that be the meta plugin or some other plugin.
+
+> There were a few reasons for this:
+
+>1. In converting my site over from PmWiki, I needed something that was equivalent to PmWiki's Page-Text-Variables (which is how PmWiki implements structured data).
+>2. I also wanted an equivalent of PmWiki's Page-Variables, which, rather than being simple variables, are the return-value of a function.  This gives one a lot of power, because one can do calculations, derive one thing from another.  Heck, just being able to have a "basename" variable is useful.
+>3. I noticed that in the discussion about structured data, it was mired down in disagreements about what form the structured data should take; I wanted to overcome that hurdle by decoupling the form from the content.
+>4. I actually use this to solve (1), because, while I do use ymlfront, initially my pages were in PmWiki format (I wrote (another) unreleased plugin which parses PmWiki format) including PmWiki's Page-Text-Variables for structured data.  So I needed something that could deal with multiple formats.
+
+> So, yes, it does cater to mostly my personal needs, but I think it is more generally useful, also.
+> --[[KathrynAndersen]]
+
-- 
cgit v1.2.3


From c7eaf3c262f322290f6e15959369c14d190bbe09 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 23:19:18 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn
index 06c82337a..6e6af8adb 100644
--- a/doc/forum/an_alternative_approach_to_structured_data.mdwn
+++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn
@@ -20,7 +20,9 @@ I think it could be really powerful and useful, especially if it becomes part of
 
 > I agree such a separation makes some sense. But note that the discussion on [[todo/structured_page_data]]
 > talks about associating data types with fields for a good reason: It's hard to later develop a good UI for
-> querying or modifying a page's data if all the data has an implicit type "string". --[[Joey]] 
+> querying or modifying a page's data if all the data has an implicit type "string". --[[Joey]]
+
+>> I'm not sure that having an implicit type of "string" is really such a bad thing.  After all, Perl itself manages with just string and number, and easily converts from one to the other.  Strong typing is generally used to (a) restrict what can be done with the data and/or (b) restrict how the data is input.  The latter could be done with some sort of validated form, but that, too, could be decoupled from looking up and returning the value of a field. --[[KathrynAndersen]]
 
 ## Second Pass
 
-- 
cgit v1.2.3


From 811d398646337717f8f2ad92897c6410faa42777 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 6 Apr 2010 23:20:49 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/optional_underlaydir_prefix.mdwn b/doc/todo/optional_underlaydir_prefix.mdwn
index dd11d062d..06900a904 100644
--- a/doc/todo/optional_underlaydir_prefix.mdwn
+++ b/doc/todo/optional_underlaydir_prefix.mdwn
@@ -41,4 +41,6 @@ I'm not sure how this would be implemented, but I guess it could be configured s
 > `readfile` does not allow reading symlinks. But I don't see much need
 > for that.) --[[Joey]]
 
+>> If you think that enabling symlinks in underlay directories wouldn't be a security issue, then I'm all for it!  That would be much simpler to implement, I'm sure. --[[KathrynAndersen]]
+
 [[!taglink wishlist]]
-- 
cgit v1.2.3


From 1158fe8f4400943d7a24350c6ac8fee6a95c2bed Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 7 Apr 2010 02:55:50 +0000
Subject: further discussion, point out potential XSS

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index b243e2dfe..16b40cf06 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -24,10 +24,64 @@ behaviour, an auxiliary plugin would be easy.)
 
 >>> Based on `field_get_value()`, yes.  That would be my ideal.  Do you think I should implement that as an ikiwiki branch? --[[KathrynAndersen]]
 
+>>>> This doesn't solve cases where certain fields are treated specially; for
+>>>> instance, putting a `\[[!meta permalink]]` on a page is not the same as
+>>>> putting it in `ymlfront` (in the latter case you won't get your
+>>>> `<link>` header), and putting `\[[!meta date]]` is not the same as putting
+>>>> `date` in `ymlfront` (in the latter case, `%pagectime` won't be changed).
+>>>>
+>>>> One way to resolve that would be to have `ymlfront`, or similar, be a
+>>>> front-end for `meta` rather than for `field`, and call
+>>>> `IkiWiki::Plugin::meta::preprocess` (or a refactored-out function that's
+>>>> similar).
+>>>>
+>>>> There are also some cross-site scripting issues (see below)... --[[smcv]]
+
 >> (On the site I mentioned, I'm using an unmodified version of `field`,
 >> and currently working around the collision by tagging books' pages
 >> with `bookauthor` instead of `author` in the YAML.) --s
 
+>> Revisiting this after more thought, the problem here is similar to the
+>> possibility that a wiki user adds a `meta` shortcut
+>> to [[shortcuts]], or conversely, that a plugin adds a `cpan` directive
+>> that conflicts with the `cpan` shortcut that pages already use. (In the
+>> case of shortcuts, this is resolved by having plugin-defined directives
+>> always win.) For plugin-defined meta keywords this is the plugin
+>> author's/wiki admin's problem - just don't enable conflicting plugins! -
+>> but it gets scary when you start introducing things like `ymlfront`, which
+>> allow arbitrary, wiki-user-defined fields, even ones that subvert
+>> other plugins' assumptions.
+>>
+>> The `pagetemplate` hook is particularly alarming because page templates are
+>> evaluated in many contexts, not all of which are subject to the
+>> htmlscrubber or escaping; because the output from `field` isn't filtered,
+>> prefixed or delimited, when combined with an arbitrary-key-setting plugin
+>> like `ymlfront` it can interfere with other plugins' expectations
+>> and potentially cause cross-site scripting exploits. For instance, `inline`
+>> has a `pagetemplate` hook which defines the `FEEDLINKS` template variable
+>> to be a blob of HTML to put in the `<head>` of the page. As a result, this
+>> YAML would be bad:
+>>
+>>     ---
+>>     FEEDLINKS: <script>alert('code injection detected')</script>
+>>     ---
+>>
+>> (It might require a different case combination due to implementation
+>> details, I'm not sure.)
+>>
+>> It's difficult for `field` to do anything about this, because it doesn't
+>> know whether a field is meant to be plain text, HTML, a URL, or something
+>> else.
+>>
+>> If `field`'s `pagetemplate` hook did something more limiting - like
+>> only emitting template variables starting with `field_`, or from some
+>> finite set, or something - then this would cease to be a problem, I think?
+>>
+>> `ftemplate` and `getfield` don't have this problem, as far as I can see,
+>> because their output is in contexts where the user could equally well have
+>> written raw HTML directly; the user can cause themselves confusion, but
+>> can't cause harmful output. --[[smcv]]
+
 From a coding style point of view, the `$CamelCase` variable names aren't
 IkiWiki style, and the `match_foo` functions look as though they could benefit
 from being thin wrappers around a common `&IkiWiki::Plugin::field::match`
@@ -125,3 +179,59 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 > So, yes, it does cater to mostly my personal needs, but I think it is more generally useful, also.
 > --[[KathrynAndersen]]
 
+>> Is it fair to say, then, that `field`'s purpose is to take other
+>> plugins' arbitrary per-page data, and present it as a single
+>> merged/flattened string => string map per page? From the plugins
+>> here, things you then use that merged map for include:
+>>
+>> * sorting - stolen by [[todo/allow_plugins_to_add_sorting_methods]]
+>> * substitution into pages with Perl-like syntax - `getfield`
+>> * substitution into wiki-defined templates - the `pagetemplate`
+>>   hook
+>> * substitution into user-defined templates - `ftemplate`
+>>
+>> As I mentioned above, the flattening can cause collisions (and in the
+>> `pagetemplate` case, even security problems).
+>>
+>> I wonder whether conflating Page Text Variables with Page Variables
+>> causes `field` to be more general than it needs to be?
+>> To define a Page Variable (function-like field), you need to write
+>> a plugin containing that Perl function; if we assume that `field`
+>> or something resembling it gets merged into ikiwiki, then it's
+>> reasonable to expect third-party plugins to integrate with whatever
+>> scaffolding there is for these (either in an enabled-by-default
+>> plugin that most people are expected to leave enabled, like `meta`
+>> now, or in the core), and it doesn't seem onerous to expect each
+>> plugin that wants to participate in this mechanism to have code to
+>> do so. While it's still contrib, `field` could just have a special case
+>> for the meta plugin, rather than the converse?
+>>
+>> If Page Text Variables are limited to being simple strings as you
+>> suggest over in [[forum/an_alternative_approach_to_structured_data]],
+>> then they're functionally similar to `meta` fields, so one way to
+>> get their functionality would be to extend `meta` so that
+>>
+>>     \[[!meta badger="mushroom"]]
+>>
+>> (for an unrecognised keyword `badger`) would store
+>> `$pagestate{$page}{meta}{badger} = "mushroom"`? Getting this to
+>> appear in templates might be problematic, because a naive
+>> `pagetemplate` hook would have the same problem that `field` combined
+>> with `ymlfront` currently does.
+>>
+>> One disadvantage that would appear if the function-like and
+>> meta-like fields weren't in the same namespace would be that it
+>> wouldn't be possible to switch a field from being meta-like to being
+>> function-like without changing any wiki content that referenced it.
+>>
+>> Perhaps meta-like fields should just *be* `meta` (with the above
+>> enhancement), as a trivial case of function-like fields? That would
+>> turn `ymlfront` into an alternative syntax for `meta`, I think?
+>> That, in turn, would hopefully solve the special-fields problem,
+>> by just delegating it to meta. I've been glad of the ability to define
+>> new ad-hoc fields with this plugin without having to write an extra plugin
+>> to do so (listing books with a `bookauthor` and sorting them by
+>> `"field(bookauthor) title"`), but that'd be just as easy if `meta`
+>> accepted ad-hoc fields?
+>>
+>> --[[smcv]]
-- 
cgit v1.2.3


From 3b1dd03c7e7f56eaf6da956779c885c2e9e7ef53 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 22:57:02 -0400
Subject: improve wording to not encourage explicitly passing undef

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

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index fe7cf0183..71ff1fd29 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -960,8 +960,8 @@ will yield something like `foo/feed.rss`.
 This adds a link to `%links`, ensuring that duplicate links are not
 added. Pass it the page that contains the link, and the link text.
 
-An optional third parameter sets the link type (`undef` produces an ordinary
-[[ikiwiki/WikiLink]]).
+An optional third parameter sets the link type. If not specified,
+it is an ordinary [[ikiwiki/WikiLink]].
 
 ## Miscellaneous
 
-- 
cgit v1.2.3


From e12cd5f293fea9d85c7e4cdc86e2bf9381d5676a Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 7 Apr 2010 03:03:40 +0000
Subject: update fieldsort plugin again; remove obsolete bug + fix note
 (thanks!)

---
 doc/plugins/contrib/field/discussion.mdwn | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 16b40cf06..2ea195e5b 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -131,8 +131,8 @@ I think it should just be part of `field` rather than a separate plugin.
 			error("sort=field requires a parameter");
 		}
 
-		my $left = IkiWiki::Plugin::field::field_get_value($_[2], $_[0]);
-		my $right = IkiWiki::Plugin::field::field_get_value($_[2], $_[1]);
+		my $left = IkiWiki::Plugin::field::field_get_value($_[0], $a);
+		my $right = IkiWiki::Plugin::field::field_get_value($_[0], $b);
 
 		$left = "" unless defined $left;
 		$right = "" unless defined $right;
@@ -141,17 +141,6 @@ I think it should just be part of `field` rather than a separate plugin.
 
 	1;
 
--------
-
-Bug report: `field` has an unnecessary `use YAML::Any`, presumably from before
-you separated out `ymlfront`. Trivial patch available from
-field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb:
-<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>)
---[[smcv]]
-
-> Can do for the field plugin (delete one line? Easy.)  Will push when I get to a better connection.  --[[KathrynAndersen]]
->> Done! -K.A.
-
 ----
 
 Disclaimer: I've only looked at this plugin and ymlfront, not other related
-- 
cgit v1.2.3


From fcd810d236fdf779beb740082953a14feba07f0d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:04:54 -0400
Subject: close

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

(limited to 'doc')

diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn
index 8e81860a1..da3ea49f6 100644
--- a/doc/todo/matching_different_kinds_of_links.mdwn
+++ b/doc/todo/matching_different_kinds_of_links.mdwn
@@ -193,4 +193,4 @@ Also, the ready branch adds `typedlink()` to [[ikiwiki/pagespec]],
 but you removed that feature as documented above.
 --[[Joey]]
 
-> Done. --s
+> [[Done]]. --s
-- 
cgit v1.2.3


From be2af2e5c1ddfe90802a67aa150cf17dbe903df0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:19:00 -0400
Subject: add cpan link

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

(limited to 'doc')

diff --git a/doc/plugins/sortnaturally.mdwn b/doc/plugins/sortnaturally.mdwn
index 91f373f6b..a16381946 100644
--- a/doc/plugins/sortnaturally.mdwn
+++ b/doc/plugins/sortnaturally.mdwn
@@ -1,5 +1,6 @@
 [[!template id=plugin name=sortnaturally core=1 author="[[chrysn]], [[smcv]]"]]
 [[!tag type/meta]]
 
-This plugin provides the `title_natural` [[ikiwiki/pagespec/sorting]] order,
-which uses Sort::Naturally to sort numbered pages in a more natural order.
+This plugin provides the `title_natural` [[ikiwiki/pagespec/sorting]]
+order, which uses [[!cpan Sort::Naturally]] to sort numbered pages in a
+more natural order.
-- 
cgit v1.2.3


From dad7ac5a21bc049b9f559c98f4e113c99edb4eb5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:24:22 -0400
Subject: question

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index d4da13feb..d7f10528a 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -10,6 +10,9 @@ title over the page name, but for compatibility, I'm not going to (I do wonder
 whether it would be worth making sort=name an alias for the current sort=title,
 and changing the meaning of sort=title in 4.0, though).
 
+> What compatability concerns, exactly, are there that prevent making that
+> change now? --[[Joey]] 
+
 *[sort-hooks branch now withdrawn in favour of sort-package --s]*
 
 I briefly tried to turn *all* the current sort types into hook functions, and
-- 
cgit v1.2.3


From 04a9d8e867f1eef46e9c79dee055756bdbb6a039 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:26:59 -0400
Subject: remove note about more sort types possibly being available

Good plugins should document them :)
---
 doc/ikiwiki/pagespec/sorting.mdwn | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 5c6cfcc2b..37995f1e8 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -21,7 +21,4 @@ In addition, you can combine several sort orders and/or reverse the order of
 sorting, with a string like `age -title` (which would sort by age, then by
 title in reverse order if two pages have the same age).
 
-Plugins can add additional sort orders, so more might be available on this
-wiki.
-
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From 32ce94f5a30e52da17f06b9b9dce7f3d3112da98 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 6 Apr 2010 23:30:10 -0400
Subject: close (but one question remains!)

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

(limited to 'doc')

diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
index d7f10528a..b523cd19f 100644
--- a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
+++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn
@@ -43,7 +43,7 @@ That earlier version of the branch is also available for comparison:
 
 >>>>>> `SortSpec` --[[Joey]] 
 
->>>>>>> Done. --s
+>>>>>>> [[Done]]. --s
 
 >>>> I would be inclined to drop the `check_` stuff. --[[Joey]] 
 
-- 
cgit v1.2.3


From d58444a3e956e329cea4cbcdddcba99664ee585e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Apr 2010 00:01:38 -0400
Subject: note about sort and dependency types

There's a gotcha where pagespec_match_list is used with a dependency type
that is not a full content dependency, and so ikiwiki does not know that
a content change to a page that sorted too low to match needs to trigger
a rebuild, since its sort order may have changed.

Inline is mostly ok re this, as it does use content dependencies. Except
for in the case of raw mode. But then, page metadata is documented to not
be loaded, so it doesn't make sense to use sortspecs that depend on
metadata. I hope. :)
---
 doc/plugins/write.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 05ddf2215..707622956 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -734,7 +734,10 @@ Additional named parameters can be specified:
 * `filter` is a reference to a function, that is called and passed a page,
   and returns true if the page should be filtered out of the list.
 * `sort` specifies a sort order for the list. See
-  [[ikiwiki/PageSpec/sorting]] for the avilable sort methods.
+  [[ikiwiki/PageSpec/sorting]] for the avilable sort methods. Note that
+  if a sort method is specified that depends on the
+  page content (such as 'meta(foo)'), the deptype needs to be set to
+  a content dependency.
 * `reverse` if true, sorts in reverse.
 * `num` if nonzero, specifies the maximum number of matching pages that
   will be returned.
-- 
cgit v1.2.3


From ef1ebf6079bd2a91d1d799bafacf6a51d4633db3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Apr 2010 00:28:56 -0400
Subject: add peter's git repo

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

(limited to 'doc')

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 379285a49..55967e543 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -26,7 +26,8 @@ be browsed, subscribed to etc on its
 You are of course free to set up your own ikiwiki git repository with your
 own [[patches|patch]]. If you list it here, the `gitremotes` script will
 automatically add it to git remotes. Your repo will automatically be pulled
-into [[Joey]]'s working tree. This is recommended. :-)
+into [[Joey]]'s working repository where he can see your branches and
+think about merging them. This is recommended. :-)
 
 <!-- Machine-parsed format: * wikilink <git:url> -->
 
@@ -60,6 +61,7 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[davrieb|David_Riebenbauer]] `git://git.liegesta.at/git/ikiwiki`
   ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
 * [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
+* [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 2e9fae5c11d9fabf6270de18d0c26bc251750b09 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 7 Apr 2010 15:12:39 +0000
Subject: response about XSS, meta and pagetemplates

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 2ea195e5b..dd9342224 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -224,3 +224,32 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >> accepted ad-hoc fields?
 >>
 >> --[[smcv]]
+
+>>> Your point above about cross-site scripting is a valid one, and something I
+>>> hadn't thought of (oops).
+
+>>> I still want to be able to populate pagetemplate templates with field, because I
+>>> use it for a number of things, such as setting which CSS files to use for a
+>>> given page, and, as I said, for titles.  But apart from the titles, I
+>>> realize I've been setting them in places other than the page data itself.
+>>> (Another unreleased plugin, `concon`, uses Config::Context to be able to
+>>> set variables on a per-site, per-directory and a per-page basis).
+
+>>> The first possible solution is what you suggested above: for field to only
+>>> set values in pagetemplate which are prefixed with *field_*.  I don't think
+>>> this is quite satisfactory, since that would still mean that people could
+>>> put un-scrubbed values into a pagetemplate, albeit they would be values
+>>> named field_foo, etc.
+
+>>> An alternative solution would be to classify field registration as "secure"
+>>> and "insecure".  Sources such as ymlfront would be insecure, sources such
+>>> as concon (or the $config hash) would be secure, since they can't be edited
+>>> as pages.  Then, when doing pagetemplate substitution (but not ftemplate
+>>> substitution) the insecure sources could be HTML-escaped.
+
+>>> Another problem, as you point out, is special-case fields, such as a number of
+>>> those defined by `meta`, which have side-effects associated with them, more
+>>> than just providing a value to pagetemplate.  Perhaps `meta` should deal with
+>>> the side-effects, but use `field` as an interface to get the values of those special fields.
+
+>>> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From e46a3b753463e71d8a24c35a5035cfbc47dd4816 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 7 Apr 2010 17:39:04 +0000
Subject: "safe" and "unsafe" too simplistic, I suspect

---
 doc/plugins/contrib/field/discussion.mdwn | 49 ++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index dd9342224..24c37cc4c 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -239,13 +239,60 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >>> set values in pagetemplate which are prefixed with *field_*.  I don't think
 >>> this is quite satisfactory, since that would still mean that people could
 >>> put un-scrubbed values into a pagetemplate, albeit they would be values
->>> named field_foo, etc.
+>>> named field_foo, etc. --[[KathrynAndersen]]
+
+>>>> They can already do similar; `PERMALINK` is pre-sanitized to
+>>>> ensure that it's a "safe" URL, but if an extremely confused wiki admin was
+>>>> to put `COPYRIGHT` in their RSS/Atom feed's `<link>`, a malicious user
+>>>> could put an unsafe (e.g. Javascript) URL in there (`COPYRIGHT` *is*
+>>>> HTML-scrubbed, but "javascript:alert('pwned!')" is just text as far as a
+>>>> HTML sanitizer is concerned, so it passes straight through). The solution
+>>>> is to not use variables in situations where that variable would be
+>>>> inappropriate. Because `field` is so generic, the definition of what's
+>>>> appropriate is difficult. --[[smcv]]
 
 >>> An alternative solution would be to classify field registration as "secure"
 >>> and "insecure".  Sources such as ymlfront would be insecure, sources such
 >>> as concon (or the $config hash) would be secure, since they can't be edited
 >>> as pages.  Then, when doing pagetemplate substitution (but not ftemplate
 >>> substitution) the insecure sources could be HTML-escaped.
+>>> --[[KathrynAndersen]]
+
+>>>> Whether you trust the supplier of data seems orthogonal to whether its value
+>>>> is (meant to be) interpreted as plain text, HTML, a URL or what?
+>>>>
+>>>> Even in cases where you trust the supplier, you need to escape things
+>>>> suitably for the context, not for security but for correctness. The
+>>>> definition of the value, and the context it's being used in, changes the
+>>>> processing you need to do. An incomplete list:
+>>>>
+>>>> * HTML used as HTML needs to be html-scrubbed if and only if untrusted
+>>>> * URLs used as URLs need to be put through `safeurl()` if and only if
+>>>>   untrusted
+>>>> * HTML used as plain text needs tags removed regardless
+>>>> * URLs used as plain text are safe
+>>>> * URLs or plain text used in HTML need HTML-escaping (and URLs also need
+>>>>   `safeurl()` if untrusted)
+>>>> * HTML or plain text used in URLs need URL-escaping (and the resulting
+>>>>   URL might need sanitizing too?)
+>>>>
+>>>> I can't immediately think of other data types we'd be interested in beyond
+>>>> text, HTML and URL, but I'm sure there are plenty.
+>>>>
+>>>> One reasonable option would be to declare that `field` takes text-valued
+>>>> fields, in which case either consumers need to escape
+>>>> it with `<TMPL_VAR FIELD_FOO ESCAPE=HTML>`, and not interpret it as a URL
+>>>> without first checking `safeurl`), or the pagetemplate hook needs to
+>>>> pre-escape.
+>>>>
+>>>> Another reasonable option would be to declare that `field` takes raw HTML,
+>>>> in which case consumers need to only use it in contexts that will be
+>>>> HTML-scrubbed (but it becomes unsuitable for using as text - problematic
+>>>> for text-based things like sorting or URLs, and not ideal for searching).
+>>>>
+>>>> You could even let each consumer choose how it's going to use the field,
+>>>> by having the `foo` field generate `TEXT_FOO` and `HTML_FOO` variables?
+>>>> --[[smcv]]
 
 >>> Another problem, as you point out, is special-case fields, such as a number of
 >>> those defined by `meta`, which have side-effects associated with them, more
-- 
cgit v1.2.3


From c127e964f1704a6704639350851afee722825529 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Wed, 7 Apr 2010 21:25:26 +0100
Subject: expand my response

---
 doc/todo/allow_site-wide_meta_definitions.mdwn | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn
index 7129a44ac..82670250e 100644
--- a/doc/todo/allow_site-wide_meta_definitions.mdwn
+++ b/doc/todo/allow_site-wide_meta_definitions.mdwn
@@ -217,6 +217,16 @@ definitions essentially.
 
 >>> For this to work with websetup and --dumpsetup, it needs to define the
 >>> `meta_*` settings in the getsetup function.
+>>>> 
+>>>> I think this will be problematic with the current implementation of this
+>>>> patch. The datatype here is an array of hash references, with each hash
+>>>> having a variable (and arbitrary) number of key/value pairs.  I can't
+>>>> think of an intuitive way of implementing a way of editing such a
+>>>> datatype in the web interface, let alone registering the option in
+>>>> getsetup.
+>>>> 
+>>>> Perhaps a limited set of defined meta values could be exposed via
+>>>> websetup (the obvious ones: author, copyright, license, etc.) -- [[Jon]]
 >>>
 >>> I also have some concerns about both these patches, since both throw
 >>> a lot of redundant data at meta, which then stores it in a very redundant
@@ -232,6 +242,5 @@ definitions essentially.
 >>> meta special-case the site-wide settings, not store them in these
 >>> per-page data structures, and just make them be used if no per-page
 >>> metadata of the given type is present. --[[Joey]]
-
->>>> Thanks for the review - these are all valid points. I'll get working
->>>> on a revised patch. -- [[Jon]]
+>>>> 
+>>>> that should be easy enough to do. I will work on a patch. -- [[Jon]]
-- 
cgit v1.2.3


From 15a65ffae67b7eaf2702b3a42edee95daf8f4c89 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 7 Apr 2010 23:29:25 +0000
Subject: further response to smcv on pagetemplates

---
 doc/plugins/contrib/field/discussion.mdwn | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 24c37cc4c..36c2118e7 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -278,13 +278,34 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >>>>
 >>>> I can't immediately think of other data types we'd be interested in beyond
 >>>> text, HTML and URL, but I'm sure there are plenty.
->>>>
+
+>>>>> But isn't this a problem with anything that uses pagetemplates?  Or is
+>>>>> the point that, with plugins other than `field`, they all know,
+>>>>> beforehand, the names of all the fields that they are dealing with, and
+>>>>> thus the writer of the plugin knows which treatment each particular field
+>>>>> needs?  For example, that `meta` knows that `title` needs to be
+>>>>> HTML-escaped, and that `baseurl` doesn't.  In that case, yes, I see the problem.
+>>>>> It's a tricky one.  It isn't as if there's only ever going to be a fixed set of fields that need different treatment, either.  Because the site admin is free to add whatever fields they like to the page template (if they aren't using the default one, that is.  I'm not using the default one myself).
+>>>>> Mind you, for trusted sources, since the person writing the page template and the person providing the variable are the same, they themselves would know whether the value will be treated as HTML, plain text, or a URL, and thus could do the needed escaping themselves when writing down the value.
+
+>>>>> Looking at the content of the default `page.tmpl` let's see what variables fall into which categories:
+>>>>> * Used as URL: BASEURL, EDITURL, PARENTLINKS->URL, RECENTCHANGESURL, HISTORYURL, GETSOURCEURL, PREFSURL, OTHERLANGUAGES->URL, ADDCOMMENTURL, BACKLINKS->URL, MORE_BACKLINKS->URL
+>>>>> * Used as part of a URL: FAVICON, LOCAL_CSS
+>>>>> * Needs to be HTML-escaped: TITLE
+>>>>> * Used as-is (as HTML): FEEDLINKS, RELVCS, META, PERCENTTRANSLATED, SEARCHFORM, COMMENTSLINK, DISCUSSIONLINK, OTHERLANGUAGES->PERCENT, SIDEBAR, CONTENT, COMMENTS, TAGS->LINK, COPYRIGHT, LICENSE, MTIME, EXTRAFOOTER
+
+>>>>> This looks as if only TITLE needs HTML-escaping all the time, and that the URLS all end with "URL" in their name.  Unfortunately the FAVICON and LOCAL_CSS which are part of URLS don't have "URL" in their name, though that's fair enough, since they aren't full URLs.
+
+>>>>>  --K.A.
+
 >>>> One reasonable option would be to declare that `field` takes text-valued
 >>>> fields, in which case either consumers need to escape
 >>>> it with `<TMPL_VAR FIELD_FOO ESCAPE=HTML>`, and not interpret it as a URL
 >>>> without first checking `safeurl`), or the pagetemplate hook needs to
 >>>> pre-escape.
->>>>
+
+>>>>> Since HTML::Template does have the ability to do ESCAPE=HTML/URL/JS, why not take advantage of that? Some things, like TITLE, probably should have ESCAPE=HTML all the time; that would solve the "to escape or not to escape" problem that `meta` has with titles. After all, when one *sorts* by title, one doesn't really want HTML-escaping in it; only when one uses it in a template. -- K.A.
+
 >>>> Another reasonable option would be to declare that `field` takes raw HTML,
 >>>> in which case consumers need to only use it in contexts that will be
 >>>> HTML-scrubbed (but it becomes unsuitable for using as text - problematic
@@ -294,6 +315,8 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >>>> by having the `foo` field generate `TEXT_FOO` and `HTML_FOO` variables?
 >>>> --[[smcv]]
 
+>>>>> Something similar is already done in `template` and `ftemplate` with the `raw_` prefix, which determines whether the variable should have `htmlize` run over it first before the value is applied to the template.  Of course, that isn't scrubbing or escaping, because with those templates, the scrubbing is done afterwards as part of the normal processing.
+
 >>> Another problem, as you point out, is special-case fields, such as a number of
 >>> those defined by `meta`, which have side-effects associated with them, more
 >>> than just providing a value to pagetemplate.  Perhaps `meta` should deal with
-- 
cgit v1.2.3


From ce9cf967d01eb8e112c19d9f7b1c9a727717ef30 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 7 Apr 2010 23:33:04 +0000
Subject: formatting

---
 doc/plugins/contrib/field/discussion.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 36c2118e7..103e061e5 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -289,10 +289,11 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 >>>>> Mind you, for trusted sources, since the person writing the page template and the person providing the variable are the same, they themselves would know whether the value will be treated as HTML, plain text, or a URL, and thus could do the needed escaping themselves when writing down the value.
 
 >>>>> Looking at the content of the default `page.tmpl` let's see what variables fall into which categories:
->>>>> * Used as URL: BASEURL, EDITURL, PARENTLINKS->URL, RECENTCHANGESURL, HISTORYURL, GETSOURCEURL, PREFSURL, OTHERLANGUAGES->URL, ADDCOMMENTURL, BACKLINKS->URL, MORE_BACKLINKS->URL
->>>>> * Used as part of a URL: FAVICON, LOCAL_CSS
->>>>> * Needs to be HTML-escaped: TITLE
->>>>> * Used as-is (as HTML): FEEDLINKS, RELVCS, META, PERCENTTRANSLATED, SEARCHFORM, COMMENTSLINK, DISCUSSIONLINK, OTHERLANGUAGES->PERCENT, SIDEBAR, CONTENT, COMMENTS, TAGS->LINK, COPYRIGHT, LICENSE, MTIME, EXTRAFOOTER
+
+>>>>> * **Used as URL:** BASEURL, EDITURL, PARENTLINKS->URL, RECENTCHANGESURL, HISTORYURL, GETSOURCEURL, PREFSURL, OTHERLANGUAGES->URL, ADDCOMMENTURL, BACKLINKS->URL, MORE_BACKLINKS->URL
+>>>>> * **Used as part of a URL:** FAVICON, LOCAL_CSS
+>>>>> * **Needs to be HTML-escaped:** TITLE
+>>>>> * **Used as-is (as HTML):** FEEDLINKS, RELVCS, META, PERCENTTRANSLATED, SEARCHFORM, COMMENTSLINK, DISCUSSIONLINK, OTHERLANGUAGES->PERCENT, SIDEBAR, CONTENT, COMMENTS, TAGS->LINK, COPYRIGHT, LICENSE, MTIME, EXTRAFOOTER
 
 >>>>> This looks as if only TITLE needs HTML-escaping all the time, and that the URLS all end with "URL" in their name.  Unfortunately the FAVICON and LOCAL_CSS which are part of URLS don't have "URL" in their name, though that's fair enough, since they aren't full URLs.
 
-- 
cgit v1.2.3


From 1c1c76c53e1d0e713e470bb6542c5cc3cef20ad2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Apr 2010 12:25:10 -0400
Subject: close bug, was fixed in 3.20100403

---
 ...ox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
index 46e77a265..558eb90c8 100644
--- a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
+++ b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn
@@ -5,3 +5,10 @@ Only explicitly pressing "reload" helps.
 Is it a bug? I haven't been noticing such problems usually on other sites. --Ivan Z.
 
 This remains to be true now, with Epiphany 2.26.3 (Mozilla/5.0 (X11; U; Linux i686; en; rv:1.9.1.4pre) Gecko/20080528 Epiphany/2.22 Firefox/3.5). --Ivan Z.
+
+> In the most recent ikiwiki release, I added a Cache-Control hack
+> explicitly to work around firefox's broken over-caching.
+> 
+> (When I tested epiphany and chromium, neither had firefox's problem.)
+>
+> [[!tag done]]
-- 
cgit v1.2.3


From a8761a086ebf353192e4721090ff11d3f67707b6 Mon Sep 17 00:00:00 2001
From: Cord <Cord@web>
Date: Sat, 10 Apr 2010 07:06:06 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/todo/More_flexible_po-plugin_for_translation.mdwn b/doc/todo/More_flexible_po-plugin_for_translation.mdwn
new file mode 100644
index 000000000..3399f7834
--- /dev/null
+++ b/doc/todo/More_flexible_po-plugin_for_translation.mdwn
@@ -0,0 +1,5 @@
+I have a website with multi-language content, where some content is only in English, some in German, and some is available in both languages.
+
+The po-module currently has only one master-language, with slave languages, and a  PageSpec should be considered.
+
+It would be nice to flag the content which should have a translation on a file-by-file basis (with some inline directive?) which could contain the information of the master-language for that file and the desired target-languages.
-- 
cgit v1.2.3


From d2c36a6f4b8b4bf30d59c430893a88352ac208fc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 10 Apr 2010 15:29:31 -0400
Subject: close

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

(limited to 'doc')

diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
index 8e1ca42e0..587771ba4 100644
--- a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
+++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn
@@ -20,6 +20,9 @@ Points of extra subtlety:
   that that's what Xapian wants anyway (which is why I didn't change it),
   but I could be wrong...
 
+  > AFAICS, this if anything, fixes a bug, xapian definitely expects
+  > unescaped text here. --[[Joey]] 
+
 * Page descriptions in the HTML `<head>` were previously double-escaped:
   the description was stored escaped with numeric entities, then that was
   output with a second layer of escaping! In this branch, I just emit
@@ -37,3 +40,5 @@ Points of extra subtlety:
   contained markup could appear unescaped on any page that inlines them
   in `quick=yes` mode, and is rebuilt for some other reason. The failure
   mode here would be too little escaping, i.e. cross-site scripting.
+
+[[!tag done]]
-- 
cgit v1.2.3


From cecbd529389788c1f1cb647e2ff297cda7554456 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Apr 2010 00:30:27 -0400
Subject: plan for more efficient pagespec_match_list sorting

(smcv please note)
---
 doc/todo/smarter_sorting.mdwn | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 doc/todo/smarter_sorting.mdwn

(limited to 'doc')

diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn
new file mode 100644
index 000000000..5a6d63ef1
--- /dev/null
+++ b/doc/todo/smarter_sorting.mdwn
@@ -0,0 +1,33 @@
+I benchmarked a build of a large wiki (my home wiki), and it was spending
+quite a lot of time sorting; `CORE::sort` was called only 1138 times, but
+still flagged as the #1 time sink. (I'm not sure I trust NYTProf fully
+about that FWIW, since it also said 27238263 calls to `cmp_age` were
+the #3 timesink, and I suspect it may not entirely accurately measure
+the overhead of so many short function calls.)
+
+`pagespec_match_list` currently always sorts *all* pages first, and then
+finds the top M that match the pagespec. That's innefficient when M is
+small (as for example in a typical blog, where only 20 posts are shown,
+out of maybe thousands).
+
+As [[smcv]] noted, It could be flipped, so the pagespec is applied first,
+and then sort the smaller matching set. But, checking pagespecs is likely
+more expensive than sorting. (Also, influence calculation complicates
+doing that, since only influences for the M returned pages should be tracked.)
+
+Another option, when there is a limit on M pages to return, might be to
+cull the M top pages without sorting the rest. This could be done using
+a variant of Ye Olde Bubble Sort. Take the first M pages, and (quick)sort.
+Then for each of the rest, check if it is higher than the Mth page.
+If it is, bubble it up so it's sorted.
+If not, throw it out (that's the fast bit and why this is not O(N^2)).
+
+This would be bad when M is very large, and particularly, of course, when
+there is no limit and all pages are being matched on. (For example, an
+archive page shows all pages that match a pagespec specifying a creation
+date range.) Well, in this case, it *does* make sense to flip it, limit by
+pagespe first, and do a (quick)sort second. (No influence complications,
+either.)
+
+Adding these special cases will be more complicated, but I think the best
+of both worlds. --[[Joey]]
-- 
cgit v1.2.3


From 0bfc364a7df124509855b8ed0b1b33ab5bc9ebbb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 11 Apr 2010 01:30:03 -0400
Subject: optimization: pagespec_match_list with no num limit matches before
 sorting

This can be a lot faster, since huge numbers of pages are not sorted
only to mostly be thrown away. It sped up a build of my blog by at least
5 minutes.
---
 IkiWiki.pm                    | 38 ++++++++++++++++++++++++++------------
 doc/todo/smarter_sorting.mdwn |  3 +++
 t/pagespec_match_list.t       |  6 +++++-
 3 files changed, 34 insertions(+), 13 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 2cad6a3ef..74d452c50 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1951,8 +1951,9 @@ sub add_link ($$;$) {
 	}
 }
 
-sub sortspec_translate ($) {
+sub sortspec_translate ($$) {
 	my $spec = shift;
+	my $reverse = shift;
 
 	my $code = "";
 	my @data;
@@ -2007,6 +2008,10 @@ sub sortspec_translate ($) {
 		return sub { 0 };
 	}
 
+	if ($reverse) {
+		$code="-($code)";
+	}
+
 	no warnings;
 	return eval 'sub { '.$code.' }';
 }
@@ -2109,18 +2114,20 @@ sub pagespec_match_list ($$;@) {
 			? grep { ! $params{filter}->($_) } keys %pagesources
 			: keys %pagesources;
 	}
-
-	if (defined $params{sort}) {
-		@candidates = IkiWiki::SortSpec::sort_pages($params{sort},
-			@candidates);
+	
+	my $num=$params{num};
+	my $sort=$params{sort};
+	my $reverse=$params{reverse};
+	# when only the top matches will be returned, it's efficient to
+	# sort before matching to pagespec,
+	if (defined $num && defined $sort) {
+		@candidates=IkiWiki::SortSpec::sort_pages(
+			$sort, $reverse, @candidates);
 	}
-
-	@candidates=reverse(@candidates) if $params{reverse};
 	
 	$depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
 	
 	# clear params, remainder is passed to pagespec
-	my $num=$params{num};
 	delete @params{qw{num deptype reverse sort filter list}};
 	
 	my @matches;
@@ -2144,7 +2151,15 @@ sub pagespec_match_list ($$;@) {
 		$depends_simple{$page}{lc $k} |= $i->{$k};
 	}
 
-	return @matches;
+	# when all matches will be returned, it's efficient to
+	# sort after matching
+	if (! defined $num && defined $sort) {
+		return IkiWiki::SortSpec::sort_pages(
+			$sort, $reverse, @matches);
+	}
+	else {
+		return @matches;
+	}
 }
 
 sub pagespec_valid ($) {
@@ -2437,9 +2452,8 @@ package IkiWiki::SortSpec;
 # This is in the SortSpec namespace so that the $a and $b that sort() uses
 # are easily available in this namespace, for cmp functions to use them.
 sub sort_pages {
-	my $f = IkiWiki::sortspec_translate(shift);
-
-	return sort $f @_;
+	my $f=IkiWiki::sortspec_translate(shift, shift);
+	sort $f @_
 }
 
 sub cmp_title {
diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn
index 5a6d63ef1..f8ac216dc 100644
--- a/doc/todo/smarter_sorting.mdwn
+++ b/doc/todo/smarter_sorting.mdwn
@@ -29,5 +29,8 @@ date range.) Well, in this case, it *does* make sense to flip it, limit by
 pagespe first, and do a (quick)sort second. (No influence complications,
 either.)
 
+> Flipping when there's no limit implemented, and it knocked 1/3 off
+> the rebuild time of my blog's archive pages. --[[Joey]] 
+
 Adding these special cases will be more complicated, but I think the best
 of both worlds. --[[Joey]]
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 2ad7a9105..c7688c6c0 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 90;
+use Test::More tests => 92;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -38,12 +38,16 @@ $links{foo3}=[qw{bar}];
 is_deeply([pagespec_match_list("foo", "bar")], ["bar"]);
 is_deeply([sort(pagespec_match_list("foo", "* and !post/*"))], ["bar", "foo", "foo2", "foo3"]);
 is_deeply([sort(pagespec_match_list("foo", "post/*"))], ["post/1", "post/2", "post/3"]);
+is_deeply([pagespec_match_list("foo", "post/*", sort => "title")],
+	["post/1", "post/2", "post/3"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", reverse => 1)],
 	["post/3", "post/2", "post/1"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 2)],
 	["post/1", "post/2"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50)],
 	["post/1", "post/2", "post/3"]);
+is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50, reverse => 1)],
+	["post/3", "post/2", "post/1"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
                          filter => sub { $_[0] =~ /3/}) ],
 	["post/1", "post/2"]);
-- 
cgit v1.2.3


From 9060cb0cf8f73fca276719dd92dfae9b48d64d38 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 11 Apr 2010 14:32:18 +0100
Subject: Space sorting orders consistently

Markdown interprets the empty lines resulting from [[!if]] as a request
that each <li> contain a <p>. For consistent spacing in the HTML, either
the unconditional items should have blank lines between (resulting in
each <li> having a <p>), or the conditional items should not (resulting
in messy source code, and no <li> having a <p>). I think the former
looks nicer.
---
 doc/ikiwiki/pagespec/sorting.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index 37995f1e8..ccd7f7eaa 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -4,7 +4,9 @@ specifying the order that matching pages are shown in. The following sort
 orders can be specified.
 
 * `age` - List pages from the most recently created to the oldest.
+
 * `mtime` - List pages with the most recently modified first.
+
 * `title` - Order by title (page name).
 [[!if test="enabled(sortnaturally)" then="""
 * `title_natural` - Orders by title, but numbers in the title are treated
-- 
cgit v1.2.3


From df022df35e3e3fd1d2916e762a2359f23a84a955 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Apr 2010 14:57:40 -0400
Subject: implemented the other half of this

Writing my own sort code actually was faster than the built in sort. Whee!
(That's not supposed to happen, is it. ;)

But, I need to make sure influences are calculated alright.
---
 doc/todo/smarter_sorting.mdwn | 107 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn
index f8ac216dc..4a638213f 100644
--- a/doc/todo/smarter_sorting.mdwn
+++ b/doc/todo/smarter_sorting.mdwn
@@ -13,7 +13,7 @@ out of maybe thousands).
 As [[smcv]] noted, It could be flipped, so the pagespec is applied first,
 and then sort the smaller matching set. But, checking pagespecs is likely
 more expensive than sorting. (Also, influence calculation complicates
-doing that, since only influences for the M returned pages should be tracked.)
+doing that.)
 
 Another option, when there is a limit on M pages to return, might be to
 cull the M top pages without sorting the rest. This could be done using
@@ -22,6 +22,111 @@ Then for each of the rest, check if it is higher than the Mth page.
 If it is, bubble it up so it's sorted.
 If not, throw it out (that's the fast bit and why this is not O(N^2)).
 
+> The patch below implements this, perhaps not as efficiently as possible.
+> It speeds up building just the top page of my blog by 1 second (out of
+> 18). It's probably buggy.
+> 
+> But, I have not thought enough about influence calculation.
+> I need to figure out which pagespec matches influences need to be
+> accumulated for in order to determine all possible influences of a
+> pagespec are known.
+> 
+> The old code accumulates influences from matching all successful pages
+> up to the num cutoff, as well as influences from an arbitrary (sometimes
+> zero) number of failed matches. New code does not accumulate influences
+> from all the top successful matches, only an arbitrary group of
+> successes and some failures.
+
+<pre>
+diff --git a/IkiWiki.pm b/IkiWiki.pm
+index 1730e47..6798799 100644
+--- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -2122,36 +2122,53 @@ sub pagespec_match_list ($$;@) {
+ 	my $num=$params{num};
+ 	delete @params{qw{num deptype reverse sort filter list}};
+ 	
+-	# when only the top matches will be returned, it's efficient to
+-	# sort before matching to pagespec,
+-	if (defined $num && defined $sort) {
+-		@candidates=IkiWiki::SortSpec::sort_pages(
+-			$sort, @candidates);
+-	}
+-	
++	# Find the first num matches (or all), before sorting.
+ 	my @matches;
+-	my $firstfail;
+ 	my $count=0;
+ 	my $accum=IkiWiki::SuccessReason->new();
+-	foreach my $p (@candidates) {
+-		my $r=$sub->($p, %params, location => $page);
++	my $i;
++	for ($i=0; $i < @candidates; $i++) {
++		my $r=$sub->($candidates[$i], %params, location => $page);
+ 		error(sprintf(gettext("cannot match pages: %s"), $r))
+ 			if $r->isa("IkiWiki::ErrorReason");
+ 		$accum |= $r;
+ 		if ($r) {
+-			push @matches, $p;
++			push @matches, $candidates[$i];
+ 			last if defined $num && ++$count == $num;
+ 		}
+ 	}
+ 
++	# We have num natches, but they may not be the best.
++	# Efficiently find and add the rest, without sorting the full list of
++	# candidates.
++	if (defined $num && defined $sort) {
++		@matches=IkiWiki::SortSpec::sort_pages($sort, @matches);
++
++		for ($i++; $i < @candidates; $i++) {
++			# Comparing candidate with lowest match is cheaper,
++			# so it's done before testing against pagespec.
++			if (IkiWiki::SortSpec::cmptwo($candidates[$i], $matches[-1], $sort) < 0 &&
++			    $sub->($candidates[$i], %params, location => $page)
++			) {
++				# this could be done less expensively
++				# using a binary search
++				for (my $j=0; $j < @matches; $j++) {
++					if (IkiWiki::SortSpec::cmptwo($candidates[$i], $matches[$j], $sort) < 0) {
++						$matches[$j]=$candidates[$i];
++						last;
++					}
++				}
++			}
++		}
++	}
++
+ 	# Add simple dependencies for accumulated influences.
+-	my $i=$accum->influences;
+-	foreach my $k (keys %$i) {
+-		$depends_simple{$page}{lc $k} |= $i->{$k};
++	my $inf=$accum->influences;
++	foreach my $k (keys %$inf) {
++		$depends_simple{$page}{lc $k} |= $inf->{$k};
+ 	}
+ 
+-	# when all matches will be returned, it's efficient to
+-	# sort after matching
++	# Sort if we didn't already.
+ 	if (! defined $num && defined $sort) {
+ 		return IkiWiki::SortSpec::sort_pages(
+ 			$sort, @matches);
+@@ -2455,6 +2472,12 @@ sub sort_pages {
+ 	sort $f @_
+ }
+ 
++sub cmptwo {
++	$a=$_[0];
++	$b=$_[1];
++	$_[2]->();
++}
++
+ sub cmp_title {
+ 	IkiWiki::pagetitle(IkiWiki::basename($a))
+ 	cmp
+</pre>
+
 This would be bad when M is very large, and particularly, of course, when
 there is no limit and all pages are being matched on. (For example, an
 archive page shows all pages that match a pagespec specifying a creation
-- 
cgit v1.2.3


From 24fb346938037b0d41988510bc6e19e81aa62190 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Apr 2010 16:04:49 -0400
Subject: fix bug

---
 doc/todo/smarter_sorting.mdwn | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn
index 4a638213f..33c825641 100644
--- a/doc/todo/smarter_sorting.mdwn
+++ b/doc/todo/smarter_sorting.mdwn
@@ -24,7 +24,7 @@ If not, throw it out (that's the fast bit and why this is not O(N^2)).
 
 > The patch below implements this, perhaps not as efficiently as possible.
 > It speeds up building just the top page of my blog by 1 second (out of
-> 18). It's probably buggy.
+> 18).
 > 
 > But, I have not thought enough about influence calculation.
 > I need to figure out which pagespec matches influences need to be
@@ -39,10 +39,10 @@ If not, throw it out (that's the fast bit and why this is not O(N^2)).
 
 <pre>
 diff --git a/IkiWiki.pm b/IkiWiki.pm
-index 1730e47..6798799 100644
+index 1730e47..bc8b23d 100644
 --- a/IkiWiki.pm
 +++ b/IkiWiki.pm
-@@ -2122,36 +2122,53 @@ sub pagespec_match_list ($$;@) {
+@@ -2122,36 +2122,54 @@ sub pagespec_match_list ($$;@) {
  	my $num=$params{num};
  	delete @params{qw{num deptype reverse sort filter list}};
  	
@@ -89,7 +89,8 @@ index 1730e47..6798799 100644
 +				# using a binary search
 +				for (my $j=0; $j < @matches; $j++) {
 +					if (IkiWiki::SortSpec::cmptwo($candidates[$i], $matches[$j], $sort) < 0) {
-+						$matches[$j]=$candidates[$i];
++						splice @matches, $j, $#matches-$j+1, $candidates[$i],
++							@matches[$j..$#matches-1];
 +						last;
 +					}
 +				}
@@ -112,7 +113,7 @@ index 1730e47..6798799 100644
  	if (! defined $num && defined $sort) {
  		return IkiWiki::SortSpec::sort_pages(
  			$sort, @matches);
-@@ -2455,6 +2472,12 @@ sub sort_pages {
+@@ -2455,6 +2473,12 @@ sub sort_pages {
  	sort $f @_
  }
  
-- 
cgit v1.2.3


From aaaef740107aacd8f6987711da6895c02e4473ad Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 12 Apr 2010 16:46:38 -0400
Subject: update

---
 doc/todo/smarter_sorting.mdwn | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn
index 33c825641..901e143a7 100644
--- a/doc/todo/smarter_sorting.mdwn
+++ b/doc/todo/smarter_sorting.mdwn
@@ -16,15 +16,9 @@ more expensive than sorting. (Also, influence calculation complicates
 doing that.)
 
 Another option, when there is a limit on M pages to return, might be to
-cull the M top pages without sorting the rest. This could be done using
-a variant of Ye Olde Bubble Sort. Take the first M pages, and (quick)sort.
-Then for each of the rest, check if it is higher than the Mth page.
-If it is, bubble it up so it's sorted.
-If not, throw it out (that's the fast bit and why this is not O(N^2)).
+cull the M top pages without sorting the rest.
 
-> The patch below implements this, perhaps not as efficiently as possible.
-> It speeds up building just the top page of my blog by 1 second (out of
-> 18).
+> The patch below implements this.
 > 
 > But, I have not thought enough about influence calculation.
 > I need to figure out which pagespec matches influences need to be
@@ -36,6 +30,11 @@ If not, throw it out (that's the fast bit and why this is not O(N^2)).
 > zero) number of failed matches. New code does not accumulate influences
 > from all the top successful matches, only an arbitrary group of
 > successes and some failures.
+> 
+> Also, by the time I finished this, it was not measuarably faster than 
+> the old method. At least not with a few thousand pages; it
+> might be worth revisiting this sometime for many more pages? [[done]]
+> --[[Joey]] 
 
 <pre>
 diff --git a/IkiWiki.pm b/IkiWiki.pm
-- 
cgit v1.2.3


From 46551be9efcdecc41163750fabadebf4957358b3 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Wed, 14 Apr 2010 15:42:25 +0000
Subject: Give a bit more details about the Wikis (now one more) I run.

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

(limited to 'doc')

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index de58cb207..3d3951d71 100644
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -1,4 +1,14 @@
 &hellip; To put it short: an Ikiwiki newbie.
 
-I run an Ikiwiki instance at <http://gray.siamics.net/~ivan/lhc/>
-(though the DNS servers may be flacky due to transition to Dyn Inc.)
+Currently, I run a couple of Ikiwiki instances.  Namely:
+
+* <http://lhc.am-1.org/lhc/>
+  &mdash; to hold random stuff written by me, my colleagues,
+  students, etc.
+
+* <http://rsdesne.am-1.org/rsdesne-2010/>
+  &mdash; for some of the materials related to the
+  &ldaquo;Remote Sensing in Education, Science and National
+  Economy&rdaquo; (2010-03-29 &hellip; 2010-04-10, Altai State
+  University) program I've recently recently participated in as
+  an instructor.
-- 
cgit v1.2.3


From 43ad6bf96171e88a165278078d61fd221f14b1b4 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Wed, 14 Apr 2010 15:54:49 +0000
Subject: More details on my personal preferences (as related to Ikiwiki.)

---
 doc/users/ivan_shmakov.mdwn | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'doc')

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index 3d3951d71..d21825c2f 100644
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -1,5 +1,10 @@
 &hellip; To put it short: an Ikiwiki newbie.
 
+[Emacs]: http://www.gnu.org/software/emacs/
+[Lynx]: http://lynx.isc.org/
+
+## Wikis
+
 Currently, I run a couple of Ikiwiki instances.  Namely:
 
 * <http://lhc.am-1.org/lhc/>
@@ -12,3 +17,34 @@ Currently, I run a couple of Ikiwiki instances.  Namely:
   Economy&rdaquo; (2010-03-29 &hellip; 2010-04-10, Altai State
   University) program I've recently recently participated in as
   an instructor.
+
+## Preferences
+
+I prefer to use [Lynx][] along with [Emacs][] (via
+`emacsclient`) to work with the wikis.  (Note the &ldaquo;Local
+variables&rdaquo; section below.)
+
+The things I dislike in the wiki engines are:
+
+* the use of home-brew specialized version control systems
+  &mdash; while there're a lot of much more developed general
+  purpose ones;
+
+* oversimplified syntax
+  &mdash; which (to some extent) precludes more sophisticated
+  forms of automated processing; in particular, this forces one
+  to reformat the material, once complete, to, say, prepare a
+  book, or an article, or slides.
+
+Out of all the wiki engines I'm familiar with, only Ikiwiki is
+free of the first of these.  I hope that it will support more
+elaborate syntaxes eventually.
+
+----
+
+    Local variables:
+    mode: markdown
+    coding: utf-8
+    fill-column: 64
+    ispell-dictionary: "american"
+    End: 
-- 
cgit v1.2.3


From 766ad1cb4c78a9cc3f745deb0f9325a139d363d9 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Wed, 14 Apr 2010 15:56:45 +0000
Subject: Fixed the double quotes.

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

(limited to 'doc')

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index d21825c2f..69fc29d7f 100644
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -13,16 +13,16 @@ Currently, I run a couple of Ikiwiki instances.  Namely:
 
 * <http://rsdesne.am-1.org/rsdesne-2010/>
   &mdash; for some of the materials related to the
-  &ldaquo;Remote Sensing in Education, Science and National
-  Economy&rdaquo; (2010-03-29 &hellip; 2010-04-10, Altai State
+  &ldquo;Remote Sensing in Education, Science and National
+  Economy&rdquo; (2010-03-29 &hellip; 2010-04-10, Altai State
   University) program I've recently recently participated in as
   an instructor.
 
 ## Preferences
 
 I prefer to use [Lynx][] along with [Emacs][] (via
-`emacsclient`) to work with the wikis.  (Note the &ldaquo;Local
-variables&rdaquo; section below.)
+`emacsclient`) to work with the wikis.  (Note the &ldquo;Local
+variables&rdquo; section below.)
 
 The things I dislike in the wiki engines are:
 
-- 
cgit v1.2.3


From e6e77d2311503627fb9ac8485f323535de059359 Mon Sep 17 00:00:00 2001
From: "http://oneingray.myopenid.com/" <http://oneingray.myopenid.com/@web>
Date: Wed, 14 Apr 2010 16:03:20 +0000
Subject: Fixed a typo.

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

(limited to 'doc')

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index 69fc29d7f..4123e0fc6 100644
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -15,7 +15,7 @@ Currently, I run a couple of Ikiwiki instances.  Namely:
   &mdash; for some of the materials related to the
   &ldquo;Remote Sensing in Education, Science and National
   Economy&rdquo; (2010-03-29 &hellip; 2010-04-10, Altai State
-  University) program I've recently recently participated in as
+  University) program I've recently participated in as
   an instructor.
 
 ## Preferences
-- 
cgit v1.2.3


From 53c8e674ace50d8733e913e8cfa5d40793e5019d Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Wed, 14 Apr 2010 17:38:39 +0000
Subject: Correct comment. We want to merge the branch *doc* into branch
 *master* as the sample output suggests.

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

(limited to 'doc')

diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn
index 507858c0c..a07889e6b 100644
--- a/doc/tips/spam_and_softwaresites.mdwn
+++ b/doc/tips/spam_and_softwaresites.mdwn
@@ -34,7 +34,7 @@ branch. If there is, see 'erase spam from the commit history', below, first.
 
 Once you are confident it's clean:
 
-    # ensure you are on the doc branch
+    # ensure you are on the master branch
     $ git branch
       doc
     * master
-- 
cgit v1.2.3


From 43ed0cd07ece2b5238d1c148552620a6a1c37436 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 14 Apr 2010 16:04:52 -0400
Subject: note link types are now available

---
 doc/todo/structured_page_data.mdwn            | 3 +++
 doc/todo/tracking_bugs_with_dependencies.mdwn | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/structured_page_data.mdwn b/doc/todo/structured_page_data.mdwn
index da9da9663..9f21fab7f 100644
--- a/doc/todo/structured_page_data.mdwn
+++ b/doc/todo/structured_page_data.mdwn
@@ -253,6 +253,9 @@ in a large number of other cases.
 > dependencies between bugs from arbitrary links.
 >> This issue (the need for distinguished kinds of links) has also been brought up in other discussions: [[tracking_bugs_with_dependencies#another_kind_of_links]] (deps vs. links) and [[tag_pagespec_function]] (tags vs. links). --Ivan Z.
 
+>>> And multiple link types are now supported; plugins can set the link
+>>> type when registering a link, and pagespec functions can match on them. --[[Joey]] 
+
 ----
 
     #!/usr/bin/perl
diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 5f3ece290..456dadad0 100644
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -81,6 +81,9 @@ I like the idea of [[tips/integrated_issue_tracking_with_ikiwiki]], and I do so
 
 >> I saw that this issue is targeted at by the work on [[structured page data#another_kind_of_links]]. --Ivan Z.
 
+>>> It's fixed now; links can have a type, such as "tag", or "dependency", 
+>>> and pagespecs can match links of a given typo. --[[Joey]] 
+
 Okie - I've had a quick attempt at this.  Initial patch attached.  This one doesn't quite work.
 And there is still a lot of debugging stuff in there.
 
-- 
cgit v1.2.3


From 2f6da5fd2b17541ff88072862d37c4d6f95a50b5 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Thu, 15 Apr 2010 07:19:47 +0000
Subject: Describe my tag type proposal

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

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
new file mode 100644
index 000000000..8a0866dc5
--- /dev/null
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -0,0 +1,24 @@
+I came across this when working on converting my old blog into an ikiwiki, but I think it could be of more general use.
+
+The background: I have a (currently suspended, waiting to be converted) blog on the [il Cannocchiale](http://www.ilcannocchiale.it) hosting platform. Aside from the usual metatadata (title, author), il Cannocchiale also provides tags and two additional categorization namespaces: a blog-specific user-defind "column" (Rubrica) and a platform-wide "category" (Categoria). The latter is used to group and label a couple of platform-wide lists of latest posts, the former may be used in many different ways (e.g. multi-author blogs could have one column per author or so, or as a form of 'macro-tagging'). Columns are also a little more sophisticated than classical tags because you can assign them a subtitle too.
+
+When I started working on the conversion, my first idea was to convert Rubriche to subdirectories of an ikiwiki blog. However, this left me with a few annoying things: when rebuilding links from the import, I had to (programmatically) dive into each subdirectory to see where each post was; this would also be problematic for future posting, too. It also meant that moving a post from a Robrica to the other would break all links (unless ikiwiki has a way to fix this automagically). And I wasn't too keen on the fact that the Rubrica would come up in the URL of the post. And finally, of course, I couldn't use this to preserve the Categoria metadata.
+
+Another solution I thought about was to use special deeper tags for the Rubrica and Categoria (like: `\[[!tag "Rubrica/Some name"]]`), but this is horrible, clumsy, and makes special treatment of these tags a PITN (for example you wouldn't want the Rubrica to be displayed together with the other tags, and you would want it displayed somewhere else like next to the title of the post). This solution however looks to me as the proper path, as long as tags could support totally separate namespaces. I have a tentative implementation of this `tagtype` feature at [my git clone of ikiwiki](http://git.oblomov.eu/ikiwiki).
+
+The feature is currently implemented as follows: a `tagtypes` config options takes an array of strings: the tag types to be defined _aside from the usual tags_. Each tag type automatically provides a new directive which sets up tags that different from standard tags by having a different tagbase (the same as the tagtype) and link type (again, the same as the tagtype) (a TODO item for this would to make the directive, tagbase and link type customizable). For example, for my imported blog I would define
+
+    tagtypes => [qw{Categoria Rubrica}]
+
+and then in the blog posts I would have stuff like
+
+    \[[!Categoria "LAVORO/Vita da impiegato"]]
+    \[[!Rubrica "Il mio mondo"]]
+    \[[!meta title="Blah blah"]]
+    \[[!meta author="oblomov"]]
+
+    The body of the article
+
+    \[[!tag a bunch of tags]]
+
+and the tags would appear at the bottom of the post, the Rubrica next to the title, etc. All of this information would end up as categories in the feeds (although I would like to rework that code to make use of namespaces, terms and labels in a different way).
-- 
cgit v1.2.3


From 19700c70e54cd6d94cf02bf160d65f951dcb7d66 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 15 Apr 2010 07:39:32 +0000
Subject: response, alternative proposal

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index 8a0866dc5..dc66a0245 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -22,3 +22,14 @@ and then in the blog posts I would have stuff like
     \[[!tag a bunch of tags]]
 
 and the tags would appear at the bottom of the post, the Rubrica next to the title, etc. All of this information would end up as categories in the feeds (although I would like to rework that code to make use of namespaces, terms and labels in a different way).
+
+> Note [[plugins/contrib/report/discussion]].  To quote myself from the latter page:
+> *I find tags as they currently exist to be too limiting. I prefer something that can be used for Faceted Tagging http://en.wikipedia.org/wiki/Faceted_classification; that is, things like Author:Fred Nurk, Genre:Historical, Rating:Good, and so on. Of course, that doesn't mean that each tag is limited to only one value, either; just to take the above examples, something might have more than one author, or have multiple genres (such as Historical + Romance).*
+
+> So you aren't the only one who wants to do more with tags, but I don't think that adding a new directive for each tag type is the way to go; I think it would be simpler to just have one directive, and take advantage of the new [[matching different kinds of links]] functionality, and enhance the tag directive.
+> Perhaps something like this:
+
+	     \[[!tag categorica="LAVORO/Vita da impiegato" rubrica="Il mio mondo"]]
+
+> Part of my thinking in this is to also combine tags with [[plugins/contrib/field]], so that the tags for a page could be queried and displayed; that way, one could put them wherever you wanted on the page, using any of [[plugins/contrib/getfield]], [[plugins/contrib/ftemplate]], or [[plugins/contrib/report]].
+> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 55d4e6bdce5cf16c629765bf227125ea8899417b Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Thu, 15 Apr 2010 13:54:54 +0000
Subject: Reply to KA about collapsing metadata functionality

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

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index dc66a0245..15b97e480 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -2,7 +2,7 @@ I came across this when working on converting my old blog into an ikiwiki, but I
 
 The background: I have a (currently suspended, waiting to be converted) blog on the [il Cannocchiale](http://www.ilcannocchiale.it) hosting platform. Aside from the usual metatadata (title, author), il Cannocchiale also provides tags and two additional categorization namespaces: a blog-specific user-defind "column" (Rubrica) and a platform-wide "category" (Categoria). The latter is used to group and label a couple of platform-wide lists of latest posts, the former may be used in many different ways (e.g. multi-author blogs could have one column per author or so, or as a form of 'macro-tagging'). Columns are also a little more sophisticated than classical tags because you can assign them a subtitle too.
 
-When I started working on the conversion, my first idea was to convert Rubriche to subdirectories of an ikiwiki blog. However, this left me with a few annoying things: when rebuilding links from the import, I had to (programmatically) dive into each subdirectory to see where each post was; this would also be problematic for future posting, too. It also meant that moving a post from a Robrica to the other would break all links (unless ikiwiki has a way to fix this automagically). And I wasn't too keen on the fact that the Rubrica would come up in the URL of the post. And finally, of course, I couldn't use this to preserve the Categoria metadata.
+When I started working on the conversion, my first idea was to convert Rubriche to subdirectories of an ikiwiki blog. However, this left me with a few annoying things: when rebuilding links from the import, I had to (programmatically) dive into each subdirectory to see where each post was; this would also be problematic for future posting, too. It also meant that moving a post from a Rubrica to the other would break all links (unless ikiwiki has a way to fix this automagically). And I wasn't too keen on the fact that the Rubrica would come up in the URL of the post. And finally, of course, I couldn't use this to preserve the Categoria metadata.
 
 Another solution I thought about was to use special deeper tags for the Rubrica and Categoria (like: `\[[!tag "Rubrica/Some name"]]`), but this is horrible, clumsy, and makes special treatment of these tags a PITN (for example you wouldn't want the Rubrica to be displayed together with the other tags, and you would want it displayed somewhere else like next to the title of the post). This solution however looks to me as the proper path, as long as tags could support totally separate namespaces. I have a tentative implementation of this `tagtype` feature at [my git clone of ikiwiki](http://git.oblomov.eu/ikiwiki).
 
@@ -33,3 +33,13 @@ and the tags would appear at the bottom of the post, the Rubrica next to the tit
 
 > Part of my thinking in this is to also combine tags with [[plugins/contrib/field]], so that the tags for a page could be queried and displayed; that way, one could put them wherever you wanted on the page, using any of [[plugins/contrib/getfield]], [[plugins/contrib/ftemplate]], or [[plugins/contrib/report]].
 > --[[KathrynAndersen]]
+
+>> A very generic metadata framework could cover all possible usages of fields, tags, and related metadata, but keeping its _user interface_ generic would only make it hard to use. Note that this is not an objection to the idea of collapsing the fields and tags functionality (at quick glance, I cannot see a real difference between single-valued custom tagtypes and fields, but see below), but more about the syntax.
+
+>> I had thought about the `\[[!tag type1=value1 type2=value2]]` syntax myself, but ultimately decided against it for a number of reasons, most importantly the fact that (1) it's harder to type, (2) it's harder to spot errors in the tag types (so for example if one misspelled `categoria` as `categorica`, he might not notice it as quickly as seeing the un-parsed `\[[!categorica ]]` directive in the output html) and (3) it encourages collapsing possibly unrelated metadata together (for example, I would never consider putting the categoria information together with the rubrica  one; of course with your syntax it's perfectly possible to keep them separate as well).
+
+>> Point (2) may be considered a downside as well as an upside, depending on perspective, of course. And it would be possible to have a set of predefined tag types to match against, like in my tagtype directive approach but with your syntax. Point (3) is of course entirely in the hands of the user, but that's exactly what syntax should be about. There is nothing functionally wrong with e.g. `\[[!meta tag=sometag author=someauthor title=sometitle rubrica=somecolumn]]`, but I honestly find it horrible.
+
+>> A solution could be to allow both syntaxes, getting to have for example `\[[!sometagtype "blah"]]` as a shortcut for `\[[!tag sometagtype="blah"]]` (or, in the more general case, `\[[!somefieldname "blah"]]` as a shortcut for `\[[!meta fieldname="blah"]]`).
+
+>> I would like to point out however that there are some functional differences between categorization metadata vs other metadata that might suggest to keep fields and (my extended) tags separate. For examples, in feeds you'd want all categorization metadata to fall in one place, with some appropriate manipulation (which I still have to implement, by the way), while things like author or title would go to the corresponding feed item properties. Although it all would be possible with appropriate report or template juggling, having such default metadata handled natively looks like a bonus to me.
-- 
cgit v1.2.3


From 81ce1cf9daf113c88581407d5e68d8f6ee61d674 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 13:38:24 -0400
Subject: remove example comments_pagespec setting

auto-blog.setup configures this automatically now
---
 doc/examples/blog.mdwn | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index f542cad0c..b9b57b944 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -19,10 +19,8 @@ Some additional configuration you might want to do:
 * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud
   to display on the [[index]].
 
-* Enable the [[comments|plugins/comments]] plugin and configure it to
-  enable comments to posts to the blog:
-
-  	comments_pagespec => 'blog/posts/* and !*/Discussion',
+* Enable the [[comments|plugins/comments]] plugin to
+  enable comments to posts to the blog.
 
 * Enable the [[calendar|plugins/calendar]] plugin and run the
   [[ikiwiki-calendar]] command from cron daily to get an interlinked
-- 
cgit v1.2.3


From 3131433f64235ad5425eb93d5773580b607876fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 13:40:53 -0400
Subject: calendar: Add archive_pagespec, which is used by ikiwiki-calendar to
 specify which pages to include on the calendar archive pages. (The pagespec
 can still also be specified on the ikiwiki-calendar command line.)

---
 IkiWiki/Plugin/calendar.pm          | 8 ++++++++
 debian/changelog                    | 4 ++++
 doc/ikiwiki-calendar.mdwn           | 8 +++++---
 doc/ikiwiki/directive/calendar.mdwn | 7 +++++--
 ikiwiki-calendar.in                 | 6 +++++-
 5 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index ff84bc440..0f0e9518a 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -47,6 +47,14 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		archive_pagespec => {
+			type => "pagespec",
+			example => "posts/* and !*/Discussion",
+			description => "PageSpec of pages to include in the archives; used by ikiwiki-calendar command",
+			link => 'ikiwiki/PageSpec',
+			safe => 1,
+			rebuild => 0,
+		},
 }
 
 sub is_leap_year (@) {
diff --git a/debian/changelog b/debian/changelog
index 26b00a07c..7c607b2a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,10 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
     for master language.
   * po: Configuring the same language as master and slave confuses processing;
     so filter out such a misconfiguration.
+  * calendar: Add archive_pagespec, which is used by ikiwiki-calendar to
+    specify which pages to include on the calendar archive pages.
+    (The pagespec can still also be specified on the ikiwiki-calendar command
+    line.)
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn
index 982892fca..c1f4d7267 100644
--- a/doc/ikiwiki-calendar.mdwn
+++ b/doc/ikiwiki-calendar.mdwn
@@ -16,9 +16,11 @@ You must specify the setup file for your wiki. The pages will
 be created inside its `srcdir`, beneath the `archivebase`
 directory used by the calendar plugin (default "archives").
 
-You will probably want to specify a [[ikiwiki/PageSpec]]
-to control which pages are included on the calendars. The
-default is all pages. To limit it to only posts in a blog,
+To control which pages are included on the calendars,
+a [[ikiwiki/PageSpec]] can be specified. The default is
+all pages, or the pages specified by the `comments_pagespec`
+setting in the config file. A pagespec can also be specified
+on the command line. To limit it to only posts in a blog,
 use something like "posts/* and !*/Discussion".
 
 It defaults to creating calendar pages for the current
diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn
index b2ac75b11..8a08081ee 100644
--- a/doc/ikiwiki/directive/calendar.mdwn
+++ b/doc/ikiwiki/directive/calendar.mdwn
@@ -40,9 +40,12 @@ An example crontab:
   "month" or "year". The default is a month view calendar.
 * `pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the
   month calendar. Defaults to "*".
-* `archivebase` - Configures the base of the archives hierarchy. The
-  default is "archives". Note that this default can also be overridden
+* `archivebase` - Configures the base of the archives hierarchy. 
+  The default is "archives". Note that this default can also be overridden
   for the whole wiki by setting `archivebase` in ikiwiki's setup file.
+  Calendars link to pages under here, with names like "2010/04" and
+  "2010". These pages can be automatically created using the
+  [[ikiwiki-calendar]] tool. 
 * `year` - The year for which the calendar is requested. Defaults to the
   current year.
 * `month` - The numeric month for which the calendar is requested, in the
diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
index 9738ea5f7..6b6f693b3 100755
--- a/ikiwiki-calendar.in
+++ b/ikiwiki-calendar.in
@@ -15,7 +15,7 @@ GetOptions(
 	"force" => \$force,
 ) || usage();
 my $setup=shift		|| usage();
-my $pagespec=shift	|| "*";
+my $pagespec=shift;
 my $startyear=shift	|| 1900+(localtime(time))[5];
 my $endyear=shift	|| $startyear;
 
@@ -27,6 +27,10 @@ IkiWiki::checkconfig();
 my $archivebase = 'archives';
 $archivebase = $config{archivebase} if defined $config{archivebase};
 
+if (! defined $pagespec) {
+	$pagespec=$config{archive_pagespec} || "*";
+}
+
 sub writearchive ($$;$) {
 	my $template=template(shift);
 	my $year=shift;
-- 
cgit v1.2.3


From fe733e2a424f50227e4a501c3efbf1ce43e07352 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 14:29:14 -0400
Subject: enhance pagestats and rework example blog front page

* pagestats: Class parameter can be used to override default class for
  custom styling.
* pagestats: Use style=list to get a list of tags, scaled by use like
  in a tag cloud. This is useful to put in a sidebar.
* Rework example blog front page.
---
 IkiWiki/Plugin/pagestats.pm          | 21 ++++++++++++++++++---
 debian/changelog                     |  5 +++++
 doc/examples/blog/archives.mdwn      |  7 +++++++
 doc/examples/blog/comments.mdwn      |  2 +-
 doc/examples/blog/index.mdwn         | 12 ++++++++----
 doc/ikiwiki/directive/pagestats.mdwn | 11 ++++++++++-
 6 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 doc/examples/blog/archives.mdwn

(limited to 'doc')

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 1c0b46830..48715bd3e 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -75,7 +75,7 @@ sub preprocess (@) {
 	}
 
 	if ($style eq 'table') {
-		return "<table class='pageStats'>\n".
+		return "<table class='".(exists $params{class} ? $params{class} : "pageStats")."'>\n".
 			join("\n", map {
 				"<tr><td>".
 				htmllink($params{page}, $params{destpage}, $_, noimageinline => 1).
@@ -87,16 +87,31 @@ sub preprocess (@) {
 	else {
 		# In case of misspelling, default to a page cloud
 
-		my $res = "<div class='pagecloud'>\n";
+		my $res;
+		if ($style eq 'list') {
+			$res = "<ul class='".(exists $params{class} ? $params{class} : "list")."'>\n";
+		}
+		else {
+			$res = "<div class='".(exists $params{class} ? $params{class} : "pagecloud")."'>\n";
+		}
 		foreach my $page (sort keys %counts) {
 			next unless $counts{$page} > 0;
 
 			my $class = $classes[$counts{$page} * scalar(@classes) / ($max + 1)];
+			
+			$res.="<li>" if $style eq 'list';
 			$res .= "<span class=\"$class\">".
 			        htmllink($params{page}, $params{destpage}, $page).
 			        "</span>\n";
+			$res.="</li>" if $style eq 'list';
+
+		}
+		if ($style eq 'list') {
+			$res = "</ul>\n";
+		}
+		else {
+			$res .= "</div>\n";
 		}
-		$res .= "</div>\n";
 
 		return $res;
 	}
diff --git a/debian/changelog b/debian/changelog
index 7c607b2a5..c2b0c3c23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,11 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
     specify which pages to include on the calendar archive pages.
     (The pagespec can still also be specified on the ikiwiki-calendar command
     line.)
+  * pagestats: Class parameter can be used to override default class for
+    custom styling.
+  * pagestats: Use style=list to get a list of tags, scaled by use like
+    in a tag cloud. This is useful to put in a sidebar.
+  * Rework example blog front page.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/examples/blog/archives.mdwn b/doc/examples/blog/archives.mdwn
new file mode 100644
index 000000000..14686cdfe
--- /dev/null
+++ b/doc/examples/blog/archives.mdwn
@@ -0,0 +1,7 @@
+[[!if test="enabled(calendar)" then="""
+Browse through blog archives by year:
+[[!map pages="./archives/* and !./archives/*/* and !*/Discussion"]]
+"""
+else="""
+Calendar based archives are not enabled. See [[posts]] for a full list of posts.
+"""]]
diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 4735dea08..0b503ba01 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,3 +1,3 @@
-This page will show all comments made to posts in my [[blog|index]].
+This page will show recent comments made to posts in the [[blog|index]].
 
 [[!inline pages="./posts/*/Discussion or internal(./posts/*/comment_*)"]]
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 01b714fcd..b273ba1a9 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,9 +1,13 @@
-[[!pagestats pages="./tags/*" among="./posts/*"]]
+[[!template id=note text="""
 
-Welcome to my blog.
+* [[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
+* [[Recent_Comments|comments]]
+* [[Archives]]
 
-Have a look at the most recent posts below, or browse the tag cloud on the
-right. Archives of all [[posts]] and all [[comments]] are also available.
+[[!if test="enabled(calendar)" then="""
+[[!calendar pages="./posts/* and !*/Discussion"]]
+
+"""]]
 
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn
index 68f4d2734..d0e0e7be7 100644
--- a/doc/ikiwiki/directive/pagestats.mdwn
+++ b/doc/ikiwiki/directive/pagestats.mdwn
@@ -4,10 +4,16 @@ This directive can generate stats about how pages link to each other. It can
 produce either a tag cloud, or a table counting the number of links to each
 page.
 
-Here's how to use it to create a [[tag]] cloud:
+Here's how to use it to create a [[tag]] cloud, with tags sized based
+on frequency of use:
 
 	\[[!pagestats pages="tags/*"]]
 
+Here's how to create a list of tags, sized by use as they would be in a
+cloud.
+	
+	\[[!pagestats style="list" pages="tags/*"]]
+
 And here's how to create a table of all the pages on the wiki:
 
 	\[[!pagestats style="table"]]
@@ -28,4 +34,7 @@ links:
 
 	\[[!pagestats style="table" show="10"]]
 
+The optional `class` parameter can be used to control the class
+of the generated tag cloud `div` or page stats `table`.
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From d6bfe2a25ec20ea33a0537143afdfbb847e4183f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 14:32:53 -0400
Subject: don't link to ikiwiki-calendar, broken link on basewiki

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

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn
index 8a08081ee..198da9d51 100644
--- a/doc/ikiwiki/directive/calendar.mdwn
+++ b/doc/ikiwiki/directive/calendar.mdwn
@@ -45,7 +45,7 @@ An example crontab:
   for the whole wiki by setting `archivebase` in ikiwiki's setup file.
   Calendars link to pages under here, with names like "2010/04" and
   "2010". These pages can be automatically created using the
-  [[ikiwiki-calendar]] tool. 
+  `ikiwiki-calendar` program. 
 * `year` - The year for which the calendar is requested. Defaults to the
   current year.
 * `month` - The numeric month for which the calendar is requested, in the
-- 
cgit v1.2.3


From baaa848f6c06b0b3a59677d3551e130c65e5fde7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 15:04:17 -0400
Subject: CSS and templates for sidebar changed to use a class, not an id.

Multiple sidebars should be possible; also, I want to add a sidebar
template.
---
 debian/changelog               | 3 ++-
 doc/examples/blog.mdwn         | 2 +-
 doc/examples/blog/index.mdwn   | 1 -
 doc/examples/blog/sidebar.mdwn | 7 -------
 doc/style.css                  | 2 +-
 templates/page.tmpl            | 2 +-
 6 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 doc/examples/blog/sidebar.mdwn

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index c2b0c3c23..03361e6a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100410) UNRELEASED; urgency=low
+ikiwiki (3.20100415) UNRELEASED; urgency=low
 
   [ Joey Hess ]
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
@@ -36,6 +36,7 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
   * pagestats: Use style=list to get a list of tags, scaled by use like
     in a tag cloud. This is useful to put in a sidebar.
   * Rework example blog front page.
+  * CSS and templates for sidebar changed to use a class, not an id.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index b9b57b944..33637e57d 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -14,7 +14,7 @@ Some additional configuration you might want to do:
 	\[[!tag tags/life]]
 
 * Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all
-  the categories you've tagged posts with.
+  the categories you've tagged posts with, and other navigation links.
 
 * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud
   to display on the [[index]].
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index b273ba1a9..da95e7660 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -4,7 +4,6 @@
 * [[Recent_Comments|comments]]
 * [[Archives]]
 
-[[!if test="enabled(calendar)" then="""
 [[!calendar pages="./posts/* and !*/Discussion"]]
 
 """]]
diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
deleted file mode 100644
index a9fac388e..000000000
--- a/doc/examples/blog/sidebar.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-Example sidebar
-
-* [[Blog|index]]
-* [[Archive|posts]]
-
-Categories:
-[[!map pages="./tags/* and !*/Discussion"]]
diff --git a/doc/style.css b/doc/style.css
index 317d4c7aa..af0fc230c 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -228,7 +228,7 @@ div.recentchanges {
 .bigPC { font-size: 115%; }
 .biggestPC { font-size: 130%; }
 
-#sidebar {
+.sidebar {
 	line-height: 3ex;
 	width: 20ex;
 	float: right;
diff --git a/templates/page.tmpl b/templates/page.tmpl
index c24f88823..7e850a56b 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -92,7 +92,7 @@
 </div> <!-- .pageheader -->
 
 <TMPL_IF SIDEBAR>
-<div id="sidebar">
+<div class="sidebar">
 <TMPL_VAR SIDEBAR>
 </div>
 </TMPL_IF>
-- 
cgit v1.2.3


From 3fbc9e411eec34361e711813e09a516e1fb62e03 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 15:38:23 -0400
Subject: increase sidebar width from 20 to 30 ex

This makes it big enough to fit a month calendar.
---
 doc/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index af0fc230c..80b76b26c 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -230,7 +230,7 @@ div.recentchanges {
 
 .sidebar {
 	line-height: 3ex;
-	width: 20ex;
+	width: 30ex;
 	float: right;
 	margin-left: 40px;
 	margin-bottom: 40px;
-- 
cgit v1.2.3


From 5143d790b023f7f04ebdf694225b2946af676503 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:08:33 -0400
Subject: sidebar styling improvements

Added a visible border; tuned down the whitespace/borders.

Note the use of the -1 pixel margin-top -- this makes the sidebar appear
to hang down from the line under the actions at the top of the page.
---
 doc/style.css | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 80b76b26c..bdd4bb466 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -229,13 +229,14 @@ div.recentchanges {
 .biggestPC { font-size: 130%; }
 
 .sidebar {
-	line-height: 3ex;
 	width: 30ex;
 	float: right;
-	margin-left: 40px;
-	margin-bottom: 40px;
-	padding: 2ex 2ex;
+	margin-left: 4px;
+	margin-bottom: 4px;
+	margin-top: -1px;
+	padding: 0ex 2ex;
 	background: white;
+	border: 2px solid black;
 	color: black !important;
 }
 
-- 
cgit v1.2.3


From 843ce484fc9a65a814be62ab9617fc461640fbeb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:21:06 -0400
Subject: update

---
 doc/examples/blog.mdwn       |  3 ---
 doc/examples/blog/index.mdwn | 18 ++++++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'doc')

diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index 33637e57d..8775c01ab 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -13,9 +13,6 @@ Some additional configuration you might want to do:
   example of how to tag a post is:
 	\[[!tag tags/life]]
 
-* Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all
-  the categories you've tagged posts with, and other navigation links.
-
 * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud
   to display on the [[index]].
 
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index da95e7660..062c71f2e 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,16 +1,14 @@
-[[!template id=note text="""
+[[!inline pages="./posts/* and !*/Discussion" show="10"
+actions=yes rootpage="posts"]]
 
-* [[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
-* [[Recent_Comments|comments]]
-* [[Archives]]
+[[!sidebar """
+[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
 
-[[!calendar pages="./posts/* and !*/Discussion"]]
+[[Recent Comments|comments]]
 
-"""]]
+[[Archives]]
 
-[[!inline pages="./posts/* and !*/Discussion" show="10"
-actions=yes rootpage="posts"]]
-
-----
+[[!calendar pages="./posts/* and !*/Discussion"]]
+"""]]
 
 This blog is powered by [ikiwiki](http://ikiwiki.info).
-- 
cgit v1.2.3


From 358fa953e189d6f8a7925be8533fe7b7c5699503 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:40:01 -0400
Subject: sidebar: Now a sidebar directive can be used to override the sidebar
 shown on a page.

---
 IkiWiki/Plugin/sidebar.pm          | 42 +++++++++++++++++++++++++++++++++++++-
 debian/changelog                   |  2 ++
 doc/ikiwiki/directive/sidebar.mdwn | 14 +++++++++++++
 doc/plugins/sidebar.mdwn           | 17 +++++++--------
 4 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 doc/ikiwiki/directive/sidebar.mdwn

(limited to 'doc')

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 41812e1c1..d63cb5246 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -10,6 +10,7 @@ use IkiWiki 3.00;
 
 sub import {
 	hook(type => "getsetup", id => "sidebar", call => \&getsetup);
+	hook(type => "preprocess", id => "sidebar", call => \&preprocess);
 	hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate);
 }
 
@@ -21,9 +22,39 @@ sub getsetup () {
 		},
 }
 
+my %pagesidebar;
+
+sub preprocess (@) {
+	my %params=@_;
+	my $content=shift;
+	shift;
+
+	if (! defined $content) {
+		error(gettext("sidebar content not specified"));
+	}
+
+	my $page=$params{page};
+	return "" unless $page eq $params{destpage};
+	my $file = $pagesources{$page};
+	my $type = pagetype($file);
+
+	$pagesidebar{$page}=
+		IkiWiki::htmlize($page, $page, $type,
+		IkiWiki::linkify($page, $page,
+		IkiWiki::preprocess($page, $page,
+		IkiWiki::filter($page, $page, $content))));
+
+	return "";
+}
+
+my $oldfile;
+my $oldcontent;
+
 sub sidebar_content ($) {
 	my $page=shift;
 	
+	return $pagesidebar{$page} if exists $pagesidebar{$page};
+
 	my $sidebar_page=bestlink($page, "sidebar") || return;
 	my $sidebar_file=$pagesources{$sidebar_page} || return;
 	my $sidebar_type=pagetype($sidebar_file);
@@ -34,7 +65,16 @@ sub sidebar_content ($) {
 		# currently requires a wiki rebuild.
 		add_depends($page, $sidebar_page);
 
-		my $content=readfile(srcfile($sidebar_file));
+		my $content;
+		if (defined $oldfile && $sidebar_file eq $oldfile) {
+			$content=$oldcontent;
+		}
+		else {
+			$content=readfile(srcfile($sidebar_file));
+			$oldcontent=$content;
+			$oldfile=$sidebar_file;
+		}
+
 		return unless length $content;
 		return IkiWiki::htmlize($sidebar_page, $page, $sidebar_type,
 		       IkiWiki::linkify($sidebar_page, $page,
diff --git a/debian/changelog b/debian/changelog
index 03361e6a0..267a2fd7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
     in a tag cloud. This is useful to put in a sidebar.
   * Rework example blog front page.
   * CSS and templates for sidebar changed to use a class, not an id.
+  * sidebar: Now a sidebar directive can be used to override the sidebar
+    shown on a page.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
new file mode 100644
index 000000000..46f016747
--- /dev/null
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -0,0 +1,14 @@
+The `sidebar` directive is supplied by the [[!iki plugins/sidebar desc=sidebar]] plugin.
+
+This directive specifies a custom sidebar to display on the page, instead
+of any sidebar that is displayed globally.
+
+## examples
+
+	\[[!sidebar """
+	This is my custom sidebar for this page.
+
+	\[[!calendar pages="posts/*"]]
+	"""]]
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/plugins/sidebar.mdwn b/doc/plugins/sidebar.mdwn
index 4e356d65a..cd0f0ecf1 100644
--- a/doc/plugins/sidebar.mdwn
+++ b/doc/plugins/sidebar.mdwn
@@ -10,15 +10,16 @@ Typically this will be a page in the root of the wiki, but it can also be a
 [[plugins/sidebar|plugins/sidebar]], will be treated as a sidebar for the
 [[plugins]] page, and of all of its SubPages, if the plugin is enabled.
 
-Note that to disable a sidebar for a [[ikiwiki/SubPage]] of a page that has
-a sidebar, you can create a sidebar page that is completely empty. This
-will turn off the sidebar altogether.
+There is also a [[ikiwiki/directive/sidebar]] directive that can be used
+to provide a custom sidebar content for a page.
 
-Warning: Any change to the sidebar will cause a rebuild of the whole wiki,
-since every page includes a copy that has to be updated. This can
-especially be a problem if the sidebar includes an [[ikiwiki/directive/inline]]
-directive, since any changes to pages inlined into the sidebar
-will change the sidebar and cause a full wiki rebuild.
+----
+
+Warning: Any change to the sidebar page will cause a rebuild of the whole
+wiki, since every page includes a copy that has to be updated. This can
+especially be a problem if the sidebar includes an
+[[ikiwiki/directive/inline]] directive, since any changes to pages inlined
+into the sidebar will change the sidebar and cause a full wiki rebuild.
 
 Instead, if you include a [[ikiwiki/directive/map]] directive on the sidebar,
 and it does not use the `show` parameter, only adding or removing pages
-- 
cgit v1.2.3


From 37a0c2d40beaba9ae050a4eddc925b910d739736 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 16:55:20 -0400
Subject: add note if ikiwiki-calendar needs to be run

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

(limited to 'doc')

diff --git a/doc/examples/blog/archives.mdwn b/doc/examples/blog/archives.mdwn
index 14686cdfe..d07b73b74 100644
--- a/doc/examples/blog/archives.mdwn
+++ b/doc/examples/blog/archives.mdwn
@@ -1,7 +1,8 @@
-[[!if test="enabled(calendar)" then="""
+[[!if test="archives/*" then="""
 Browse through blog archives by year:
 [[!map pages="./archives/* and !./archives/*/* and !*/Discussion"]]
 """
 else="""
-Calendar based archives are not enabled. See [[posts]] for a full list of posts.
+You need to use the `ikiwiki-calendar` program to generate calendar-based
+archive pages.
 """]]
-- 
cgit v1.2.3


From 1f7175e891f87c350decc1ec821bebb5adc22c2a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:31:50 -0400
Subject: sidebar: Add global_sidebars setting.

---
 IkiWiki/Plugin/sidebar.pm          | 9 +++++++++
 debian/changelog                   | 1 +
 doc/ikiwiki/directive/sidebar.mdwn | 4 ++--
 doc/plugins/sidebar.mdwn           | 8 +++++---
 4 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index d63cb5246..1b302dcf9 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -20,6 +20,13 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		global_sidebars => {
+			type => "boolean",
+			examples => 1,
+			description => "show sidebar page on all pages?"
+			safe => 1,
+			rebuild => 1,
+		},
 }
 
 my %pagesidebar;
@@ -55,6 +62,8 @@ sub sidebar_content ($) {
 	
 	return $pagesidebar{$page} if exists $pagesidebar{$page};
 
+	return if defined $config{global_sidebars} && !$config{global_sidebars};
+
 	my $sidebar_page=bestlink($page, "sidebar") || return;
 	my $sidebar_file=$pagesources{$sidebar_page} || return;
 	my $sidebar_type=pagetype($sidebar_file);
diff --git a/debian/changelog b/debian/changelog
index af19f4a00..c379253d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * sidebar: Now a sidebar directive can be used to override the sidebar
     shown on a page.
   * Enable calendar and sidebar in auto-blog.setup.
+  * sidebar: Add global_sidebars setting.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
index 46f016747..34f078672 100644
--- a/doc/ikiwiki/directive/sidebar.mdwn
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -1,7 +1,7 @@
 The `sidebar` directive is supplied by the [[!iki plugins/sidebar desc=sidebar]] plugin.
 
-This directive specifies a custom sidebar to display on the page, instead
-of any sidebar that is displayed globally.
+This directive specifies a custom sidebar to display on the page,
+overriding any sidebar that is displayed globally.
 
 ## examples
 
diff --git a/doc/plugins/sidebar.mdwn b/doc/plugins/sidebar.mdwn
index cd0f0ecf1..012733456 100644
--- a/doc/plugins/sidebar.mdwn
+++ b/doc/plugins/sidebar.mdwn
@@ -1,9 +1,11 @@
 [[!template id=plugin name=sidebar author="Tuomo Valkonen"]]
 [[!tag type/chrome]]
 
-If this plugin is enabled, then a sidebar is added to pages in the wiki.
-The content of the sidebar is simply the content of a page named
-"sidebar" (ie, create a "sidebar.mdwn").
+This plugin allows adding a sidebar to pages in the wiki.
+
+By default, and unless the `global_sidebars` setting is turned off,
+a sidebar is added to all pages in the wiki. The content of the sidebar
+is simply the content of a page named "sidebar" (ie, create a "sidebar.mdwn").
 
 Typically this will be a page in the root of the wiki, but it can also be a
 [[ikiwiki/SubPage]]. In fact, this page,
-- 
cgit v1.2.3


From d63e043f0abf642ff4048cc20c6caf03db3e55fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:38:13 -0400
Subject: allow sidebar directive to enable use of sidebar page

This way, the example blog always has a sidebar on the index page,
but not the overhead of sidebars on all the other pages. And if a
user wants to, they can enable global_sidebars to switch to sidebars on
every page.
---
 IkiWiki/Plugin/sidebar.pm          | 33 ++++++++++++++++++---------------
 doc/examples/blog/index.mdwn       | 10 +---------
 doc/examples/blog/sidebar.mdwn     |  9 +++++++++
 doc/ikiwiki/directive/sidebar.mdwn |  8 +++++++-
 4 files changed, 35 insertions(+), 25 deletions(-)
 create mode 100644 doc/examples/blog/sidebar.mdwn

(limited to 'doc')

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 1b302dcf9..f706480ca 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -23,7 +23,7 @@ sub getsetup () {
 		global_sidebars => {
 			type => "boolean",
 			examples => 1,
-			description => "show sidebar page on all pages?"
+			description => "show sidebar page on all pages?",
 			safe => 1,
 			rebuild => 1,
 		},
@@ -36,20 +36,22 @@ sub preprocess (@) {
 	my $content=shift;
 	shift;
 
-	if (! defined $content) {
-		error(gettext("sidebar content not specified"));
-	}
-
 	my $page=$params{page};
 	return "" unless $page eq $params{destpage};
-	my $file = $pagesources{$page};
-	my $type = pagetype($file);
-
-	$pagesidebar{$page}=
-		IkiWiki::htmlize($page, $page, $type,
-		IkiWiki::linkify($page, $page,
-		IkiWiki::preprocess($page, $page,
-		IkiWiki::filter($page, $page, $content))));
+	
+	if (! defined $content) {
+		$pagesidebar{$page}=undef;
+	}
+	else {
+		my $file = $pagesources{$page};
+		my $type = pagetype($file);
+
+		$pagesidebar{$page}=
+			IkiWiki::htmlize($page, $page, $type,
+			IkiWiki::linkify($page, $page,
+			IkiWiki::preprocess($page, $page,
+			IkiWiki::filter($page, $page, $content))));
+	}
 
 	return "";
 }
@@ -60,9 +62,10 @@ my $oldcontent;
 sub sidebar_content ($) {
 	my $page=shift;
 	
-	return $pagesidebar{$page} if exists $pagesidebar{$page};
+	return $pagesidebar{$page} if defined $pagesidebar{$page};
 
-	return if defined $config{global_sidebars} && !$config{global_sidebars};
+	return if ! exists $pagesidebar{$page} && 
+		defined $config{global_sidebars} && ! $config{global_sidebars};
 
 	my $sidebar_page=bestlink($page, "sidebar") || return;
 	my $sidebar_file=$pagesources{$sidebar_page} || return;
diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 062c71f2e..a22c40c72 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,14 +1,6 @@
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
 
-[[!sidebar """
-[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
-
-[[Recent Comments|comments]]
-
-[[Archives]]
-
-[[!calendar pages="./posts/* and !*/Discussion"]]
-"""]]
+[[!sidebar]]
 
 This blog is powered by [ikiwiki](http://ikiwiki.info).
diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
new file mode 100644
index 000000000..f24a8e57a
--- /dev/null
+++ b/doc/examples/blog/sidebar.mdwn
@@ -0,0 +1,9 @@
+[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
+
+[[Recent Comments|comments]]
+
+[[Archives]]
+
+[[!if "enabled(calendar)" then="""
+[[!calendar pages="./posts/* and !*/Discussion"]]
+"""]]
diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
index 34f078672..401d7c786 100644
--- a/doc/ikiwiki/directive/sidebar.mdwn
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -1,8 +1,12 @@
 The `sidebar` directive is supplied by the [[!iki plugins/sidebar desc=sidebar]] plugin.
 
-This directive specifies a custom sidebar to display on the page,
+This directive can specify a custom sidebar to display on the page,
 overriding any sidebar that is displayed globally.
 
+If no custom sidebar content is specified, it forces the sidebar page to
+be used as the sidebar, even if the `global_sidebars` setting has been
+used to disable use of the sidebar page by default.
+
 ## examples
 
 	\[[!sidebar """
@@ -11,4 +15,6 @@ overriding any sidebar that is displayed globally.
 	\[[!calendar pages="posts/*"]]
 	"""]]
 
+	\[[!sidebar]]
+
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From 4bbbd77a48f9c3188c97637d4d4b0d503fc1738e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:49:32 -0400
Subject: typo

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

(limited to 'doc')

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index f24a8e57a..1d01f0a6c 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -4,6 +4,6 @@
 
 [[Archives]]
 
-[[!if "enabled(calendar)" then="""
+[[!if test="enabled(calendar)" then="""
 [[!calendar pages="./posts/* and !*/Discussion"]]
 """]]
-- 
cgit v1.2.3


From 4c6f5a48bcfc2462a915387515bfa39b9239a7da Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:50:43 -0400
Subject: fix sidebar directive parameter handling

---
 IkiWiki/Plugin/sidebar.pm          | 6 ++----
 doc/ikiwiki/directive/sidebar.mdwn | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index f706480ca..808f0bed2 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -33,13 +33,11 @@ my %pagesidebar;
 
 sub preprocess (@) {
 	my %params=@_;
-	my $content=shift;
-	shift;
 
 	my $page=$params{page};
 	return "" unless $page eq $params{destpage};
 	
-	if (! defined $content) {
+	if (! defined $params{content}) {
 		$pagesidebar{$page}=undef;
 	}
 	else {
@@ -50,7 +48,7 @@ sub preprocess (@) {
 			IkiWiki::htmlize($page, $page, $type,
 			IkiWiki::linkify($page, $page,
 			IkiWiki::preprocess($page, $page,
-			IkiWiki::filter($page, $page, $content))));
+			IkiWiki::filter($page, $page, $params{content}))));
 	}
 
 	return "";
diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn
index 401d7c786..599695d22 100644
--- a/doc/ikiwiki/directive/sidebar.mdwn
+++ b/doc/ikiwiki/directive/sidebar.mdwn
@@ -9,7 +9,7 @@ used to disable use of the sidebar page by default.
 
 ## examples
 
-	\[[!sidebar """
+	\[[!sidebar content="""
 	This is my custom sidebar for this page.
 
 	\[[!calendar pages="posts/*"]]
-- 
cgit v1.2.3


From f41ebb8862b7602afea6f8ecfd074f11407165fc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:56:36 -0400
Subject: reorg

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

(limited to 'doc')

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index 1d01f0a6c..de0feba9e 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -1,9 +1,9 @@
-[[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
+[[!if test="enabled(calendar)" then="""
+[[!calendar pages="./posts/* and !*/Discussion"]]
+"""]]
 
 [[Recent Comments|comments]]
 
 [[Archives]]
 
-[[!if test="enabled(calendar)" then="""
-[[!calendar pages="./posts/* and !*/Discussion"]]
-"""]]
+[[Tags]]: [[!pagestats style="list" pages="* and !smileys/*"]]
-- 
cgit v1.2.3


From a0a472d57716466fba9d8f39e7586b3ca0d17578 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 17:57:35 -0400
Subject: fix tagspec

---
 doc/examples/blog/sidebar.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index de0feba9e..5c1f17723 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -6,4 +6,5 @@
 
 [[Archives]]
 
-[[Tags]]: [[!pagestats style="list" pages="* and !smileys/*"]]
+[[Tags]]:
+[[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
-- 
cgit v1.2.3


From 425f6a8de2ed66b934c16c102456b15da4ff5a14 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 19:21:01 -0400
Subject: reduce border

---
 doc/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index bdd4bb466..44e06ae4f 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -236,7 +236,7 @@ div.recentchanges {
 	margin-top: -1px;
 	padding: 0ex 2ex;
 	background: white;
-	border: 2px solid black;
+	border: 1px solid black;
 	color: black !important;
 }
 
-- 
cgit v1.2.3


From f0ed76441d94c9bec9ebc1314b81301fe179a7fc Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 15 Apr 2010 23:36:42 +0000
Subject: some comments about this and autoindex

---
 ...auto-create_tag_pages_according_to_a_template.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 07b570b1b..7631e6fc8 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -211,6 +211,25 @@ wrong direction.
 >> [981400177d68a279f485727be3f013e68f0bf691][].
  --[[David_Riebenbauer]]
 
+>>> This doesn't seem to have all the refinements that autoindex has:
+>>>
+>>> * `autoindex` attaches the record of deletions off the `index` page, which
+>>>   is (nearly) guaranteed to exist; this one attaches the record of
+>>>   deletions to the deleted page's page state.
+>>>
+>>> * `autoindex` forgets that a page was deleted when that page is
+>>>   re-created
+>>>
+>>> * `autoindex` forgets that a page was deleted when it's no longer needed
+>>>   anyway (this may be harder for `autotag`?)
+>>>
+>>> It'd probably be an interesting test of the core change to port
+>>> `autoindex` to use it? (Adding the file to the RCS would be
+>>> necessary to get parity with `autoindex`.) --[[smcv]]
+
+> Regarding the call from `IkiWiki.pm` to `Render.pm`, wouldn't this be
+> quite easy to solve by moving `verify_src_file` to IkiWiki.pm? --[[smcv]]
+
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
 [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1)
-- 
cgit v1.2.3


From b5e7f7a67f9893c7083afe3594c4a274c1b96062 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 15 Apr 2010 23:39:02 +0000
Subject: slight clarification

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

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 7631e6fc8..6118cb014 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -213,9 +213,10 @@ wrong direction.
 
 >>> This doesn't seem to have all the refinements that autoindex has:
 >>>
->>> * `autoindex` attaches the record of deletions off the `index` page, which
+>>> * `autoindex` attaches the record of deletions to the `index` page, which
 >>>   is (nearly) guaranteed to exist; this one attaches the record of
->>>   deletions to the deleted page's page state.
+>>>   deletions to the deleted page's page state. Won't that tend to result
+>>>   in losing the record along with the deleted page?
 >>>
 >>> * `autoindex` forgets that a page was deleted when that page is
 >>>   re-created
-- 
cgit v1.2.3


From 142e025ae471c91e68a23476f700df0b8ad6b31d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 20:12:03 -0400
Subject: calendar: Improved display of arrows.

---
 IkiWiki/Plugin/calendar.pm | 21 +++++++++++----------
 debian/changelog           |  1 +
 doc/plugins/calendar.mdwn  |  2 ++
 doc/style.css              |  8 ++++++++
 4 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 0f0e9518a..aeb5f3d29 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -164,11 +164,11 @@ sub format_month (@) {
 	# Start producing the month calendar
 	$calendar=<<EOF;
 <table class="month-calendar">
-	<caption class="month-calendar-head">
-	$purl
-	$url
-	$nurl
-	</caption>
+	<tr>
+	<th class="month-calendar-arrow">$purl</th>
+	<th class="month-calendar-head" colspan="5">$url</th>
+	<th class="month-calendar-arrow">$nurl</th>
+	</tr>
 	<tr>
 EOF
 
@@ -312,13 +312,14 @@ sub format_year (@) {
 	add_depends($params{page}, "$archivebase/$nyear", deptype("presence"));
 
 	# Start producing the year calendar
+	my $m=$params{months_per_row}-2;
 	$calendar=<<EOF;
 <table class="year-calendar">
-	<caption class="year-calendar-head">
-	$purl
-	$url
-	$nurl
-	</caption>
+	<tr>
+	<th class="year-calendar-arrow">$purl</th>
+ 	<th class="year-calendar-head" colspan="$m">$url</th>
+	<th class="year-calendar-arrow">$nurl</th>
+	</tr>
 	<tr>
 		<th class="year-calendar-subhead" colspan="$params{months_per_row}">Months</th>
 	</tr>
diff --git a/debian/changelog b/debian/changelog
index e4056fdc6..737d73655 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * sidebar: Add global_sidebars setting.
   * conditional: Fix bug that forced "all" mode off by default.
   * calendarmonth.tmpl: The month calendar is now put in a sidebar.
+  * calendar: Improved display of arrows.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn
index 49fd90627..76e718a3b 100644
--- a/doc/plugins/calendar.mdwn
+++ b/doc/plugins/calendar.mdwn
@@ -14,6 +14,7 @@ customization.
 
 * `month-calendar` - The month calendar as a whole.
 * `month-calendar-head` - The head of the month calendar (ie,"March").
+* `month-calendar-arrow` - Arrow pointing to previous/next month.
 * `month-calendar-day-head` - A column head in the month calendar (ie, a
   day-of-week abbreviation).
 * `month-calendar-day-noday`, `month-calendar-day-link`,
@@ -27,6 +28,7 @@ customization.
   weekends.
 * `year-calendar` - The year calendar as a whole.
 * `year-calendar-head` - The head of the year calendar (ie, "2007").
+* `year-calendar-arrow` - Arrow pointing to previous/next year.
 * `year-calendar-subhead` - For example, "Months".
 * `year-calendar-month-link`, `year-calendar-month-nolink`,
   `year-calendar-month-future`, `year-calendar-this-month` - The month
diff --git a/doc/style.css b/doc/style.css
index 44e06ae4f..7ffcf9fe2 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -431,3 +431,11 @@ pre.hl { color:#000000; background-color:#ffffff; }
 /* For the calendar plugin. */
 .month-calendar-day-this-day { background-color: #eee; }
 .year-calendar-this-month { background-color: #eee; }
+.month-calendar-arrow A:link,
+.year-calendar-arrow A:link,
+.month-calendar-arrow A:visited,
+.year-calendar-arrow A:visited {
+	text-decoration: none;
+	font-weight: normal;
+	font-size: 150%;
+}
-- 
cgit v1.2.3


From 208a77a977615b3e285d08b33345daca7072432e Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 16 Apr 2010 03:41:25 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index 15b97e480..eb1f58cfa 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -38,8 +38,16 @@ and the tags would appear at the bottom of the post, the Rubrica next to the tit
 
 >> I had thought about the `\[[!tag type1=value1 type2=value2]]` syntax myself, but ultimately decided against it for a number of reasons, most importantly the fact that (1) it's harder to type, (2) it's harder to spot errors in the tag types (so for example if one misspelled `categoria` as `categorica`, he might not notice it as quickly as seeing the un-parsed `\[[!categorica ]]` directive in the output html) and (3) it encourages collapsing possibly unrelated metadata together (for example, I would never consider putting the categoria information together with the rubrica  one; of course with your syntax it's perfectly possible to keep them separate as well).
 
->> Point (2) may be considered a downside as well as an upside, depending on perspective, of course. And it would be possible to have a set of predefined tag types to match against, like in my tagtype directive approach but with your syntax. Point (3) is of course entirely in the hands of the user, but that's exactly what syntax should be about. There is nothing functionally wrong with e.g. `\[[!meta tag=sometag author=someauthor title=sometitle rubrica=somecolumn]]`, but I honestly find it horrible.
+>> Point (2) may be considered a downside as well as an upside, depending on perspective, of course. And it would be possible to have a set of predefined tag types to match against, like in my tagtype directive approach but with your syntax.
+
+>>> You seem to have answered your own objections already. -- K.A.
+
+>>Point (3) is of course entirely in the hands of the user, but that's exactly what syntax should be about. There is nothing functionally wrong with e.g. `\[[!meta tag=sometag author=someauthor title=sometitle rubrica=somecolumn]]`, but I honestly find it horrible.
+
+>>> So, really, point 3 comes down to differing aesthetics. -- K.A.
 
 >> A solution could be to allow both syntaxes, getting to have for example `\[[!sometagtype "blah"]]` as a shortcut for `\[[!tag sometagtype="blah"]]` (or, in the more general case, `\[[!somefieldname "blah"]]` as a shortcut for `\[[!meta fieldname="blah"]]`).
 
 >> I would like to point out however that there are some functional differences between categorization metadata vs other metadata that might suggest to keep fields and (my extended) tags separate. For examples, in feeds you'd want all categorization metadata to fall in one place, with some appropriate manipulation (which I still have to implement, by the way), while things like author or title would go to the corresponding feed item properties. Although it all would be possible with appropriate report or template juggling, having such default metadata handled natively looks like a bonus to me.
+
+>>> Whereas I prefer being able to control such things with templates, because it gives more flexibility AND control. - K.A.
-- 
cgit v1.2.3


From 5c263623c2446191332088a29fda4e045cc06f1e Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Fri, 16 Apr 2010 17:19:44 +0200
Subject: answer about the `%pagestate` of autopages.

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 26 +++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 6118cb014..ca3475149 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -217,20 +217,40 @@ wrong direction.
 >>>   is (nearly) guaranteed to exist; this one attaches the record of
 >>>   deletions to the deleted page's page state. Won't that tend to result
 >>>   in losing the record along with the deleted page?
->>>
+
+>>>> This is probably on of the harder things to do, 'cause there are (most of the
+>>>> time) several pages that are responsible for the creation of a single tag page.
+>>>> Of course I could attach the info to all of them.
+
+>>>> With current behaviour I think the information in `%pagestate` is kept around
+>>>> regardless whether the corresponding page exists or not.
+>>>> --[[David_Riebenbauer]]
+
 >>> * `autoindex` forgets that a page was deleted when that page is
 >>>   re-created
->>>
+
+>>>> Yes, I forgot about that and that is a bug. I'll fix that.
+>>>> --[[David_Riebenbauer]]
+
 >>> * `autoindex` forgets that a page was deleted when it's no longer needed
 >>>   anyway (this may be harder for `autotag`?)
->>>
+
+>>>> I don't think so. AFAIK ikiwiki can detect whether there are taglinks to a page
+>>>> anyway, so it should be quite easy. I'll try to implement that too.
+>>>> --[[David_Riebenbauer]]
+
 >>> It'd probably be an interesting test of the core change to port
 >>> `autoindex` to use it? (Adding the file to the RCS would be
 >>> necessary to get parity with `autoindex`.) --[[smcv]]
 
+>>>> Good suggestion. Adding the files to RCS is on my todo list anyway.
+>>>> --[[David_Riebenbauer]]
+
 > Regarding the call from `IkiWiki.pm` to `Render.pm`, wouldn't this be
 > quite easy to solve by moving `verify_src_file` to IkiWiki.pm? --[[smcv]]
 
+>> True. I'll do that. --[[David_Riebenbauer]]
+
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
 [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1)
-- 
cgit v1.2.3


From e26ac520bffe39e400a037aa35b68f617991da2b Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Fri, 16 Apr 2010 17:21:54 +0200
Subject: typo

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

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index ca3475149..c4d9538a1 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -126,7 +126,7 @@ is not satisfied for the newly created tag page. I shall put debug msgs into Ren
 
 ---
 
-I've made another attempt at fixiing this
+I've made another attempt at fixing this
 
 The current progress can be found at my [git repository][gitweb] on branch
 `autotag`:
-- 
cgit v1.2.3


From 18b39ff9757a0e6bc8672a2453411676a09bffea Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 16 Apr 2010 15:31:31 +0000
Subject: try to clarify

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

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index c4d9538a1..b8b0186b4 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -226,6 +226,11 @@ wrong direction.
 >>>> regardless whether the corresponding page exists or not.
 >>>> --[[David_Riebenbauer]]
 
+>>>>> Sorry, I'll try to be clearer: `autoindex` hard-codes that the [[index]] page
+>>>>> of the entire wiki is the one responsible for storing the page state. That
+>>>>> page isn't responsible for the creation of the tag page, it's just an
+>>>>> arbitrary page that's (more or less) guaranteed to exist. --[[smcv]]
+
 >>> * `autoindex` forgets that a page was deleted when that page is
 >>>   re-created
 
-- 
cgit v1.2.3


From 49be30eae88b4a027becc3e67bc321e0bf89840f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 12:08:12 -0400
Subject: clarify re %pagestate persistence

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

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index b8b0186b4..1259552bf 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -231,6 +231,11 @@ wrong direction.
 >>>>> page isn't responsible for the creation of the tag page, it's just an
 >>>>> arbitrary page that's (more or less) guaranteed to exist. --[[smcv]]
 
+>>>>> I don't like that [[plugins/autoindex]] has to do that,
+>>>>> but `%pagestate` values are only stored for pages that exist,
+>>>>> so it was necessary. (Another way to look at this is that
+>>>>> `%pagestate` is not the ideal data structure.) --[[Joey]]
+
 >>> * `autoindex` forgets that a page was deleted when that page is
 >>>   re-created
 
-- 
cgit v1.2.3


From a70c2518af7f48036a21d04c5b4070f3ea96002c Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Fri, 16 Apr 2010 18:16:47 +0200
Subject: answer to clarification.

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

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 1259552bf..0ae025a13 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -236,6 +236,8 @@ wrong direction.
 >>>>> so it was necessary. (Another way to look at this is that
 >>>>> `%pagestate` is not the ideal data structure.) --[[Joey]]
 
+>>>>> Ok, now I know what you mean. --[[David_Riebenbauer]]
+
 >>> * `autoindex` forgets that a page was deleted when that page is
 >>>   re-created
 
-- 
cgit v1.2.3


From 720522859806d9cf50231ed6aa28085754713701 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 16 Apr 2010 17:51:51 +0000
Subject: ... and indeed there is a better way to store it

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

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 0ae025a13..8fc97578c 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -236,6 +236,9 @@ wrong direction.
 >>>>> so it was necessary. (Another way to look at this is that
 >>>>> `%pagestate` is not the ideal data structure.) --[[Joey]]
 
+>>>>>> Aha! Having looked at [[plugins/write]] again, it turns out that what this
+>>>>>> feature should really use is `%wikistate`, I think? :-) --[[smcv]]
+
 >>>>> Ok, now I know what you mean. --[[David_Riebenbauer]]
 
 >>> * `autoindex` forgets that a page was deleted when that page is
-- 
cgit v1.2.3


From ff5b73163f97110e83dd777cf7e14debebf85288 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Fri, 16 Apr 2010 18:20:29 +0000
Subject: Proposal for tags/meta/field coalescing

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index eb1f58cfa..ee3bbd88d 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -51,3 +51,22 @@ and the tags would appear at the bottom of the post, the Rubrica next to the tit
 >> I would like to point out however that there are some functional differences between categorization metadata vs other metadata that might suggest to keep fields and (my extended) tags separate. For examples, in feeds you'd want all categorization metadata to fall in one place, with some appropriate manipulation (which I still have to implement, by the way), while things like author or title would go to the corresponding feed item properties. Although it all would be possible with appropriate report or template juggling, having such default metadata handled natively looks like a bonus to me.
 
 >>> Whereas I prefer being able to control such things with templates, because it gives more flexibility AND control. - K.A.
+
+>>>> Flexibility and control is good for tuning and power-usage, but sensible defaults are a must for a platform to be usable out of the box without much intervention. Moreover, there's a possible problem with what kind of data must be passed over to templates.
+
+Aside from the name of the plugin (and thus of the main directive), which could be `tag`, `meta`, `field` or whatever (maybe extending `meta` would be the most sensible choice), the features we want are
+
+  1. allow multiple values per type/attribute/field/whatever (fields currently only allows one)
+  2. allow both hidden and visible references (à la tag vs taglink)
+  3. allow each type/attribute/field to be exposed under multiple queries (e.g. tags and categories; this is mostly important for backwards compatibility, not sure if it might have other uses too)
+  4. allow arbitrary types/attributes/fields/whatever (even 'undefined' ones)
+
+Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would thus have the following parameters:
+
+  * `directive` : the name of the directive that can be used to set the value as a hidden reference; we can discuss whether, for pre- or user-defined types, it being undef means no directive or a default directive matching the attribute name would be defined.
+  * `linkdirective` : the name of the directive that can be used for a visible reference; no such directive would be defined by default
+  * `linktype` : link type for (hidden and visible) references
+  * `linkbase` : akin to the tagbase parameter
+  * `queries` : list of template queries this type/attribute/field/whatever is exposed to
+
+Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
-- 
cgit v1.2.3


From b14f84c4acccbc8450a9102b3b647013989b27bb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 17:02:29 -0400
Subject: --gettime revamp

* Rename --getctime to --gettime. (The old name still works for
  backwards compatability.)
* --gettime now also looks up last modification time.
* Add rcs_getmtime to plugin API; currently only implemented
  for git.
---
 IkiWiki.pm                                         |  8 +++++--
 IkiWiki/Plugin/bzr.pm                              |  5 +++++
 IkiWiki/Plugin/cvs.pm                              |  5 +++++
 IkiWiki/Plugin/darcs.pm                            |  5 +++++
 IkiWiki/Plugin/git.pm                              |  5 +++++
 IkiWiki/Plugin/mercurial.pm                        |  5 +++++
 IkiWiki/Plugin/monotone.pm                         |  5 +++++
 IkiWiki/Plugin/norcs.pm                            |  7 +++++-
 IkiWiki/Plugin/svn.pm                              |  5 +++++
 IkiWiki/Plugin/tla.pm                              |  5 +++++
 IkiWiki/Render.pm                                  | 18 +++++++++++++---
 debian/changelog                                   |  5 +++++
 .../How_does_ikiwiki_remember_times__63__.mdwn     | 25 ++++++----------------
 ...old_repository_to_new_ikiwiki_system__63__.mdwn |  4 ----
 doc/plugins/write.mdwn                             |  7 ++++++
 doc/rcs.mdwn                                       |  8 +++++--
 doc/tips/Importing_posts_from_Wordpress.mdwn       |  2 +-
 doc/tips/inside_dot_ikiwiki/discussion.mdwn        |  7 +++---
 doc/todo/auto_getctime_on_fresh_build.mdwn         |  8 +++++--
 doc/usage.mdwn                                     | 10 ++++-----
 ikiwiki.in                                         |  3 ++-
 mtime-to-git                                       | 14 ------------
 22 files changed, 109 insertions(+), 57 deletions(-)
 delete mode 100755 mtime-to-git

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1730e476a..7655dada5 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -440,10 +440,10 @@ sub getsetup () {
 		safe => 0,
 		rebuild => 0,
 	},
-	getctime => {
+	gettime => {
 		type => "internal",
 		default => 0,
-		description => "running in getctime mode",
+		description => "running in gettime mode",
 		safe => 0,
 		rebuild => 0,
 	},
@@ -1790,6 +1790,10 @@ sub rcs_getctime ($) {
 	$hooks{rcs}{rcs_getctime}{call}->(@_);
 }
 
+sub rcs_getmtime ($) {
+	$hooks{rcs}{rcs_getmtime}{call}->(@_);
+}
+
 sub rcs_receive () {
 	$hooks{rcs}{rcs_receive}{call}->();
 }
diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 0efc26b49..f79ca7c8f 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -20,6 +20,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -306,4 +307,8 @@ sub rcs_getctime ($) {
 	return $ctime;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for bzr\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 26a3e9dd2..360d97249 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -49,6 +49,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub genwrapper () {
@@ -485,4 +486,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for cvs\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index bc8394b90..c1d6661d3 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -18,6 +18,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub silentsystem (@) {
@@ -427,4 +428,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for darcs\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index b02f4a5ed..86d80186f 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -25,6 +25,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 	hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive);
 }
 
@@ -634,6 +635,10 @@ sub rcs_getctime ($) {
 	return $ctime;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for git\n"; # TODO
+}
+
 sub rcs_receive () {
 	# The wiki may not be the only thing in the git repo.
 	# Determine if it is in a subdirectory by examining the srcdir,
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index ea00a3364..34e009c7a 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -20,6 +20,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -254,4 +255,8 @@ sub rcs_getctime ($) {
 	return $ctime;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for mercurial\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index c33cf7e3a..67d4abbaa 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -23,6 +23,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -693,4 +694,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for monotone\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm
index e6a05a3c5..053652a5f 100644
--- a/IkiWiki/Plugin/norcs.pm
+++ b/IkiWiki/Plugin/norcs.pm
@@ -18,6 +18,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub getsetup () {
@@ -63,7 +64,11 @@ sub rcs_diff ($) {
 }
 
 sub rcs_getctime ($) {
-	error gettext("getctime not implemented");
+	return 0;
+}
+
+sub rcs_getmtime ($) {
+	return 0;
 }
 
 1
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index 7d27ec842..85c205f09 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -19,6 +19,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -379,4 +380,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for svn\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index 764da9b98..f5ad0cc96 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -18,6 +18,7 @@ sub import {
 	hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
 	hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -284,4 +285,8 @@ sub rcs_getctime ($) {
 	return $date;
 }
 
+sub rcs_getmtime ($) {
+	error "rcs_getmtime is not implemented for tla\n"; # TODO
+}
+
 1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e98888d76..e1cb68462 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -365,14 +365,26 @@ sub find_new_files ($) {
 			}
 			else {
 				push @new, $file;
-				if ($config{getctime} && -e "$config{srcdir}/$file") {
+				if ($config{gettime} && -e "$config{srcdir}/$file") {
 					eval {
-						my $time=rcs_getctime("$config{srcdir}/$file");
-						$pagectime{$page}=$time;
+						my $ctime=rcs_getctime("$config{srcdir}/$file");
+						if ($ctime > 0) {
+							$pagectime{$page}=$ctime;
+						}
 					};
 					if ($@) {
 						print STDERR $@;
 					}
+					my $mtime;
+					eval {
+						my $mtime=rcs_getmtime("$config{srcdir}/$file");
+					};
+					if ($@) {
+						print STDERR $@;
+					}
+					elsif ($mtime > 0) {
+						utime($mtime, $mtime, "$config{srcdir}/$file");
+					}
 				}
 			}
 			$pagecase{lc $page}=$page;
diff --git a/debian/changelog b/debian/changelog
index 737d73655..615d5916f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,11 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * conditional: Fix bug that forced "all" mode off by default.
   * calendarmonth.tmpl: The month calendar is now put in a sidebar.
   * calendar: Improved display of arrows.
+  * Rename --getctime to --gettime. (The old name still works for
+    backwards compatability.)
+  * --gettime now also looks up last modification time.
+  * Add rcs_getmtime to plugin API; currently only implemented
+    for git.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
index 6ce576db1..6b7739fd0 100644
--- a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
+++ b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn
@@ -20,15 +20,17 @@ Do I have it right?
 > Some VCS, like git, set the file mtimes to the current time
 > when making a new checkout, so they will be lost if you do that.
 > The creation times can be retrived using the `--getctime` option.
-> I suppose it might be nice if there were a `--getmtime` that pulled
-> true modification times out of the VCS, but I haven't found it a big
-> deal in practice for the last modification times to be updated to the
-> current time when rebuilding a wiki like this. --[[Joey]] 
+> --[[Joey]] 
 >
 > > Thanks for the clarification. I ran some tests of my own to make sure I understand it right, and I'm satisfied
 > > that the order of posts in my blog can be retrieved from the VCS using the `--getctime` option, at least if I
 > > choose to order my posts by creation time rather than modification time. But I now know that I can't rely on
 > > page modification times in ikiwiki as these can be lost permanently.
+> 
+> > > Update: It's now renamed to `--gettime`, and pulls both the creation
+> > > and modification times. Also, per [[todo/auto_getctime_on_fresh_build]],
+> > > this is now done automatically the first time ikiwiki builds a
+> > > srcdir. So, no need to worry about this any more! --[[Joey]] 
 > >
 > > I would suggest that there should at least be a `--getmtime` option like you describe, and perhaps that 
 > > `--getctime` and `--getmtime` be _on by default_. In my opinion the creation times and modification times of 
@@ -91,19 +93,6 @@ Do I have it right?
 > A quick workaround for me to get modification times right is the following
 > little zsh script, which unfortunately only works for git:
 
-    #!/usr/bin/env zsh
-    
-    set +x
-    
-    for FILE in **/*(.); do
-      TIMES="`git log --pretty=format:%ai $FILE`"
-      MTIME="`echo $TIMES | head -n1`"
-    
-      if [ ! -z $MTIME ]; then
-        echo  touch -m -d "$MTIME" $FILE
-        touch -m -d "$MTIME" $FILE
-      fi
-    
-    done
+>> Elided; no longer needed since --gettime does that, and much faster! --[[Joey]] 
 
 > --[[David_Riebenbauer]]
diff --git a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn
index fe67e6aba..d7a33b526 100644
--- a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn
+++ b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn
@@ -20,10 +20,6 @@ How do I set up an ikiwiki system using a pre-existing repository (instead of cr
 >    recreate the ikiwiki srcdir
 > 3. `git clone` from the bare git repository a second time,
 >    to create a checkout you can manually edit (optional)
-> 4. run `ikiwiki --getctime --setup your.setup`
->    The getctime will ensure page creation times are accurate
->    by putting the info out of the git history,
->    and only needs to be done once.
 >
 > If you preserved your repository, but not the setup file,
 > the easiest way to make one is probably to run
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 707622956..cf7044b2c 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1085,6 +1085,13 @@ it up in the history.
 
 It's ok if this is not implemented, and throws an error.
 
+#### `rcs_getmtime($)`
+
+This is used to get the page modification time for a file from the RCS, by
+looking it up in the history.
+
+It's ok if this is not implemented, and throws an error.
+
 #### `rcs_receive()`
 
 This is called when ikiwiki is running as a pre-receive hook (or
diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index 4e7a8d2a6..b5bfc2414 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -14,8 +14,10 @@ use, some advanced or special features are not supported in all of them.
 Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to
 set up a wiki using that revision control system. The `rcs_commit_staged`
 hook is needed to use [[attachments|plugins/attachment]] or
-[[plugins/comments]]. And so on. The table below summarises this for each
-revision control system and links to more information about each.
+[[plugins/comments]]. `rcs_getctime` may be implemented in a fast way
+(ie, one log lookup for all files), or very slowly (one lookup per file).
+And so on. The table below summarises this for each revision control
+system and links to more information about each.
 
 [[!table data="""
 feature             |[[git]]|[[svn]]|[[bzr]]   |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]]   |[[cvs]]
@@ -25,6 +27,8 @@ auto.setup          |yes    |yes    |incomplete|yes         |incomplete   |yes
 `rcs_rename`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
 `rcs_remove`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
 `rcs_diff`          |yes    |yes    |yes       |yes         |no           |yes      |yes       |yes
+`rcs_getctime`      |fast   |slow   |slow      |slow        |slow         |slow     |slow      |slow
+`rcs_getmtime`      |fast   |no     |no        |no          |no           |no       |no        |no
 anonymous push      |yes    |no     |no        |no          |no           |no       |no        |no
 conflict handling   |yes    |yes    |yes       |buggy       |yes          |yes      |yes       |yes
 """]]
diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn
index 59330caa4..8774c9723 100644
--- a/doc/tips/Importing_posts_from_Wordpress.mdwn
+++ b/doc/tips/Importing_posts_from_Wordpress.mdwn
@@ -1,6 +1,6 @@
 Use case: You want to move away from Wordpress to Ikiwiki as your blogging/website platform, but you want to retain your old posts.
 
-[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. It retains creation time of each post, so you can use Ikiwiki's <tt>--getctime</tt> to get the preserve creation times on checkout. 
+[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. It retains creation time of each post, so you can use Ikiwiki's <tt>--gettime</tt> to get the preserve creation times on checkout. 
 
 WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned.
 
diff --git a/doc/tips/inside_dot_ikiwiki/discussion.mdwn b/doc/tips/inside_dot_ikiwiki/discussion.mdwn
index 34d5b9252..69df369ec 100644
--- a/doc/tips/inside_dot_ikiwiki/discussion.mdwn
+++ b/doc/tips/inside_dot_ikiwiki/discussion.mdwn
@@ -6,14 +6,15 @@ My database appears corrupted:
 No idea how this happened.  I've blown it away and recreated it but, for future reference, is there any less violent way to recover from this situation?  I miss having the correct created and last edited times.  --[[sabr]]
 > update: fixed ctimes and mtimes using [these instructions](http://u32.net/Mediawiki_Conversion/Git_Import/#Correct%20Creation%20and%20Last%20Edited%20time) --[[sabr]]
 
-> That's overly complex. Just run `ikiwiki -setup your.setup -getctime`. 
+> That's overly complex. Just run `ikiwiki -setup your.setup -gettime`. 
 > BTW, I'd be interested in examining such a corrupt storable file to try
 > to see what happened to it. --[[Joey]]
 
->> --getctime appears to only set the last edited date.  It's not supposed to set the creation date, is it?  The only place that info is stored is in the git repo.
+>> --gettime appears to only set the last edited date.  It's not supposed to set the creation date, is it?  The only place that info is stored is in the git repo.
 
 >>> Pulling the page creation date out of the git history is exactly what
->>> --getctime does. --[[Joey]]
+>>> --gettime does. (It used to be called --getctime, and only do that; now
+>>> it also pulls out the last modified date). --[[Joey]]
 
 >> Alas, I seem to have lost the bad index file to periodic /tmp wiping; I'll send it to you if it happens again.  --[[sabr]]
 
diff --git a/doc/todo/auto_getctime_on_fresh_build.mdwn b/doc/todo/auto_getctime_on_fresh_build.mdwn
index ea95fb8c9..760c56fa1 100644
--- a/doc/todo/auto_getctime_on_fresh_build.mdwn
+++ b/doc/todo/auto_getctime_on_fresh_build.mdwn
@@ -1,9 +1,13 @@
 [[!tag wishlist]]
 
-It might be a good idea to enable --getctime when `.ikiwiki` does not
+It might be a good idea to enable --gettime when `.ikiwiki` does not
 exist. This way a new checkout of a `srcdir` would automatically get
-ctimes right. (Running --getctime whenever a rebuild is done would be too
+ctimes right. (Running --gettime whenever a rebuild is done would be too
 slow.) --[[Joey]] 
 
 Could this be too annoying in some cases, eg, checking out a large wiki
 that needs to get set up right away? --[[Joey]] 
+
+> Not for git with the new, optimised --getctime. For other VCS.. well,
+> pity they're not as fast as git ;), but it is a one-time expense...
+> [[done]] --[[Joey]]
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index db1e36a10..553fef01e 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -320,13 +320,11 @@ also be configured using a setup file.
   intercepted. If you enable this option then you must run at least the 
   CGI portion of ikiwiki over SSL.
 
-* --getctime
+* --gettime
 
-  Pull creation time for each new page out of the revision control
-  system. This rarely used option provides a way to get the real creation
-  times of items in weblogs, such as when building a wiki from a new
-  VCS checkout. It is unoptimised and quite slow. It is best used
-  with --rebuild, to force ikiwiki to get the ctime for all pages.
+  Extract creation and modification times for each new page from the
+  the revision control's log. This is done automatically when building a
+  wiki for the first time, so you normally do not need to use this option.
 
 * --set var=value
   
diff --git a/ikiwiki.in b/ikiwiki.in
index 38e4d3201..801ff9a0b 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -44,7 +44,8 @@ sub getconfig () {
 			"wrappergroup=s" => \$config{wrappergroup},
 			"usedirs!" => \$config{usedirs},
 			"prefix-directives!" => \$config{prefix_directives},
-			"getctime" => \$config{getctime},
+			"getctime" => \$config{gettime},
+			"gettime" => \$config{gettime},
 			"numbacklinks=i" => \$config{numbacklinks},
 			"rcs=s" => \$config{rcs},
 			"no-rcs" => sub { $config{rcs}="" },
diff --git a/mtime-to-git b/mtime-to-git
deleted file mode 100755
index 9875af5d7..000000000
--- a/mtime-to-git
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# Sets mtimes of all files in the tree their last change date
-# based on git's log. Useful to avoid too new dates after a
-# fresh checkout, which lead to ikiwiki unnecessarily rebuilding
-# basewiki files on upgrade.
-if [ -d .git ]; then
-	for file in $(git ls-files); do
-		date="$(git log -1 --date=rfc "$file" | grep ^Date: | sed -e 's/Date://')"
-		if [ -n "$date" ]; then
-			echo "$date $file"
-			touch -d"$date" $file
-		fi
-	done
-fi
-- 
cgit v1.2.3


From e3e245956fe6dcbb884428d24bed4cb9eb7c8ba7 Mon Sep 17 00:00:00 2001
From: Cord <Cord@web>
Date: Fri, 16 Apr 2010 21:48:35 +0000
Subject: typo

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

(limited to 'doc')

diff --git a/doc/examples/softwaresite/news.mdwn b/doc/examples/softwaresite/news.mdwn
index 9b53c7d99..20efba6e0 100644
--- a/doc/examples/softwaresite/news.mdwn
+++ b/doc/examples/softwaresite/news.mdwn
@@ -1,4 +1,4 @@
-This is where annoucements of new releases, features, and other news is
+This is where announcements of new releases, features, and other news is
 posted. FooBar users are recommended to subscribe to this page's RSS
 feed.
 
-- 
cgit v1.2.3


From dee2940c0bc97080088c99f399cd0ff0df3bec23 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 18:29:45 -0400
Subject: automatically run --gettime, and optimise it for git

* Automatically run --gettime the first time ikiwiki is run on
  a given srcdir.
* Optimise --gettime for git, so it's appropriatly screamingly
  fast. (This could be done for other backends too.)
* However, --gettime for git no longer follows renames.
* Use above to fix up timestamps on docwiki, as well as ensure that
  timestamps on basewiki files shipped in the deb are sane.
---
 IkiWiki.pm             |  2 +-
 IkiWiki/Plugin/git.pm  | 48 ++++++++++++++++++++++++++++++++++++------------
 IkiWiki/Render.pm      | 11 +++++++++--
 debian/changelog       |  7 +++++++
 debian/control         |  2 +-
 doc/plugins/write.mdwn |  4 ++++
 doc/usage.mdwn         |  2 +-
 docwiki.setup          | 17 ++++++++++++++++-
 ikiwiki.in             |  2 +-
 9 files changed, 76 insertions(+), 19 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7655dada5..b37b1f344 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -442,7 +442,6 @@ sub getsetup () {
 	},
 	gettime => {
 		type => "internal",
-		default => 0,
 		description => "running in gettime mode",
 		safe => 0,
 		rebuild => 0,
@@ -1512,6 +1511,7 @@ sub loadindex () {
 			open ($in, "<", "$config{wikistatedir}/indexdb") || return;
 		}
 		else {
+			$config{gettime}=1; # first build
 			return;
 		}
 	}
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 86d80186f..aa402c04f 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -616,27 +616,51 @@ sub rcs_diff ($) {
 	}
 }
 
-sub rcs_getctime ($) {
+{
+my %time_cache;
+
+sub findtimes ($$) {
 	my $file=shift;
+	my $id=shift; # 0 = mtime ; 1 = ctime
+
 	# Remove srcdir prefix
 	$file =~ s/^\Q$config{srcdir}\E\/?//;
 
-	my @raw_lines = run_or_die('git', 'log', 
-		'--follow', '--no-merges',
-		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
-		'-r', '--', $file);
-	my @ci;
-	while (my $parsed = parse_diff_tree("", \@raw_lines)) {
-		push @ci, $parsed;
+	if (! keys %time_cache) {
+		my $date;
+		foreach my $line (run_or_die('git', 'log',
+				'--pretty=format:%ct',
+				'--name-only', '--relative')) {
+			if (! defined $date && $line =~ /^(\d+)$/) {
+				$date=$line;
+			}
+			elsif (! length $line) {
+				$date=undef;
+			}
+			else {
+				if (! $time_cache{$line}) {
+					$time_cache{$line}[0]=$date; # mtime
+				}
+				$time_cache{$line}[1]=$date; # ctime
+			}
+		}
 	}
-	my $ctime = $ci[$#ci]->{'author_epoch'};
-	debug("ctime for '$file': ". localtime($ctime));
 
-	return $ctime;
+	return exists $time_cache{$file} ? $time_cache{$file}[$id] : 0;
+}
+
+}
+
+sub rcs_getctime ($) {
+	my $file=shift;
+
+	return findtimes($file, 1);
 }
 
 sub rcs_getmtime ($) {
-	error "rcs_getmtime is not implemented for git\n"; # TODO
+	my $file=shift;
+
+	return findtimes($file, 0);
 }
 
 sub rcs_receive () {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e1cb68462..a6b0f0617 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -352,6 +352,8 @@ sub find_new_files ($) {
 	my @new;
 	my @internal_new;
 
+	my $times_noted;
+
 	foreach my $file (@$files) {
 		my $page=pagename($file);
 		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
@@ -363,7 +365,12 @@ sub find_new_files ($) {
 			if (isinternal($page)) {
 				push @internal_new, $file;
 			}
-			else {
+			elsif ($config{rcs}) {
+				if (! $times_noted) {
+					debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
+					$times_noted=1;
+				}
+
 				push @new, $file;
 				if ($config{gettime} && -e "$config{srcdir}/$file") {
 					eval {
@@ -377,7 +384,7 @@ sub find_new_files ($) {
 					}
 					my $mtime;
 					eval {
-						my $mtime=rcs_getmtime("$config{srcdir}/$file");
+						$mtime=rcs_getmtime("$config{srcdir}/$file");
 					};
 					if ($@) {
 						print STDERR $@;
diff --git a/debian/changelog b/debian/changelog
index 615d5916f..60a67cbe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,8 +47,15 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * Rename --getctime to --gettime. (The old name still works for
     backwards compatability.)
   * --gettime now also looks up last modification time.
+  * Automatically run --gettime the first time ikiwiki is run on 
+    a given srcdir.
   * Add rcs_getmtime to plugin API; currently only implemented
     for git.
+  * Optimise --gettime for git, so it's appropriatly screamingly
+    fast. (This could be done for other backends too.)
+  * However, --gettime for git no longer follows renames.
+  * Use above to fix up timestamps on docwiki, as well as ensure that
+    timestamps on basewiki files shipped in the deb are sane.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/debian/control b/debian/control
index 87f7d8209..ae06f32b0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl,
   libtimedate-perl, libhtml-template-perl,
   libhtml-scrubber-perl, wdg-html-validator,
   libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34),
-  libfile-chdir-perl
+  libfile-chdir-perl,
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>
 Standards-Version: 3.8.4
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index cf7044b2c..0bf6fcf48 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1085,6 +1085,8 @@ it up in the history.
 
 It's ok if this is not implemented, and throws an error.
 
+If the RCS cannot determine a ctime for the file, return 0.
+
 #### `rcs_getmtime($)`
 
 This is used to get the page modification time for a file from the RCS, by
@@ -1092,6 +1094,8 @@ looking it up in the history.
 
 It's ok if this is not implemented, and throws an error.
 
+If the RCS cannot determine a mtime for the file, return 0.
+
 #### `rcs_receive()`
 
 This is called when ikiwiki is running as a pre-receive hook (or
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 553fef01e..2e12517ea 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -320,7 +320,7 @@ also be configured using a setup file.
   intercepted. If you enable this option then you must run at least the 
   CGI portion of ikiwiki over SSL.
 
-* --gettime
+* --gettime, --no-gettime
 
   Extract creation and modification times for each new page from the
   the revision control's log. This is done automatically when building a
diff --git a/docwiki.setup b/docwiki.setup
index 8278b73ea..6bc200066 100644
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -1,6 +1,18 @@
 #!/usr/bin/perl
 # Configuration file for ikiwiki to build its documentation wiki.
 
+# Use git during the build, if it's available and if we're building
+# from a git checkout. This ensures ikiwiki gets the right mtimes and
+# ctimes for files in the doc wiki.
+our $rcs="norcs";
+BEGIN {
+	my $git=`which git 2>&1`;
+	chomp $git;
+	if (-x $git && -d ".git") {
+		$rcs="git";
+	}
+}
+
 use IkiWiki::Setup::Standard {
 	wikiname => "ikiwiki",
 	srcdir => "doc",
@@ -9,7 +21,7 @@ use IkiWiki::Setup::Standard {
 	underlaydirbase => "underlays",
 	underlaydir => "underlays/basewiki",
 	discussion => 0,
-	exclude => qr/\/discussion|bugs\/*|todo\/*|forum\/*/,
+	exclude => qr/\/discussion|bugs\/*|todo\/*|forum\/*/, # save space
 	locale => '',
 	verbose => 1,
 	syslog => 0,
@@ -17,4 +29,7 @@ use IkiWiki::Setup::Standard {
 	usedirs => 0,
 	prefix_directives => 1,
 	add_plugins => [qw{goodstuff version haiku polygen fortune table}],
+	disable_plugins => [qw{recentchanges}], # not appropriate for doc dir
+	rcs => $rcs,
+	gitorigin_branch => '', # don't pull during build
 }
diff --git a/ikiwiki.in b/ikiwiki.in
index 801ff9a0b..acd37f802 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -45,7 +45,7 @@ sub getconfig () {
 			"usedirs!" => \$config{usedirs},
 			"prefix-directives!" => \$config{prefix_directives},
 			"getctime" => \$config{gettime},
-			"gettime" => \$config{gettime},
+			"gettime!" => \$config{gettime},
 			"numbacklinks=i" => \$config{numbacklinks},
 			"rcs=s" => \$config{rcs},
 			"no-rcs" => sub { $config{rcs}="" },
-- 
cgit v1.2.3


From b13bb0c83c8f23bca97734882997fd3dc29f0553 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 18:43:51 -0400
Subject: implement rcs_getmtime for svn

This is a slow implementation; it runs svn log once per file
still, rather than running svn log once on the whole srcdir.

I did it this way because in my experience, svn log, run on a directory,
does not always list every change to files inside that directory.
I don't know why, and I use svn as little as possible these days.
---
 IkiWiki/Plugin/svn.pm | 42 +++++++++++++++++++++++++++++++-----------
 debian/changelog      |  2 +-
 doc/rcs.mdwn          |  2 +-
 3 files changed, 33 insertions(+), 13 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index 85c205f09..6e1d4a40f 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -350,9 +350,18 @@ sub rcs_diff ($) {
 	return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`;
 }
 
-sub rcs_getctime ($) {
+{
+
+my ($lastfile, $lastmtime, $lastctime);
+
+sub findtimes ($) {
 	my $file=shift;
 
+	if ($lastfile eq $file) {
+		return $lastmtime, $lastctime;
+	}
+	$lastfile=$file;
+
 	my $svn_log_infoline=qr/^r\d+\s+\|\s+[^\s]+\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
 		
 	my $child = open(SVNLOG, "-|");
@@ -360,28 +369,39 @@ sub rcs_getctime ($) {
 		exec("svn", "log", $file) || error("svn log $file failed to run");
 	}
 
-	my $date;
+	my ($cdate, $mdate);
 	while (<SVNLOG>) {
 		if (/$svn_log_infoline/) {
-			$date=$1;
+			$cdate=$1;
+			$mdate=$1 unless defined $mdate;
 	    	}
 	}
-	close SVNLOG || warn "svn log $file exited $?";
+	close SVNLOG || error "svn log $file exited $?";
 
-	if (! defined $date) {
-		warn "failed to parse svn log for $file\n";
-		return 0;
+	if (! defined $cdate) {
+		error "failed to parse svn log for $file\n";
 	}
 		
 	eval q{use Date::Parse};
 	error($@) if $@;
-	$date=str2time($date);
-	debug("found ctime ".localtime($date)." for $file");
-	return $date;
+	
+	$lastctime=str2time($cdate);
+	$lastmtime=str2time($mdate);
+	return $lastmtime, $lastctime;
+}
+
+}
+
+sub rcs_getctime ($) {
+	my $file=shift;
+
+	return (findtimes($file))[1];
 }
 
 sub rcs_getmtime ($) {
-	error "rcs_getmtime is not implemented for svn\n"; # TODO
+	my $file=shift;
+
+	return (findtimes($file))[0];
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index 60a67cbe3..774aedc40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,7 +50,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
   * Automatically run --gettime the first time ikiwiki is run on 
     a given srcdir.
   * Add rcs_getmtime to plugin API; currently only implemented
-    for git.
+    for git and svn.
   * Optimise --gettime for git, so it's appropriatly screamingly
     fast. (This could be done for other backends too.)
   * However, --gettime for git no longer follows renames.
diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index b5bfc2414..450d16800 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -28,7 +28,7 @@ auto.setup          |yes    |yes    |incomplete|yes         |incomplete   |yes
 `rcs_remove`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
 `rcs_diff`          |yes    |yes    |yes       |yes         |no           |yes      |yes       |yes
 `rcs_getctime`      |fast   |slow   |slow      |slow        |slow         |slow     |slow      |slow
-`rcs_getmtime`      |fast   |no     |no        |no          |no           |no       |no        |no
+`rcs_getmtime`      |fast   |slow   |no        |no          |no           |no       |no        |no
 anonymous push      |yes    |no     |no        |no          |no           |no       |no        |no
 conflict handling   |yes    |yes    |yes       |buggy       |yes          |yes      |yes       |yes
 """]]
-- 
cgit v1.2.3


From e31b1b27f83f47da10b2775f192eb8eefcfc68a2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 19:25:25 -0400
Subject: remove note about needing --gettime; automatically run on first build
 now

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

(limited to 'doc')

diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn
index 8774c9723..ecc6ae505 100644
--- a/doc/tips/Importing_posts_from_Wordpress.mdwn
+++ b/doc/tips/Importing_posts_from_Wordpress.mdwn
@@ -1,6 +1,6 @@
 Use case: You want to move away from Wordpress to Ikiwiki as your blogging/website platform, but you want to retain your old posts.
 
-[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. It retains creation time of each post, so you can use Ikiwiki's <tt>--gettime</tt> to get the preserve creation times on checkout. 
+[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file.
 
 WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned.
 
-- 
cgit v1.2.3


From c6c03768da90df0d7474edce09c2abf2a7e32052 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 16 Apr 2010 19:42:18 -0400
Subject: add list of compatability breaking changes

---
 doc/roadmap.mdwn            | 14 ++++++++++++++
 doc/roadmap/discussion.mdwn |  1 +
 2 files changed, 15 insertions(+)

(limited to 'doc')

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index a701a2685..0c7bf2fa8 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -69,6 +69,20 @@ backwards compatability.
 
 ----
 
+# compatability breaking changes
+
+Probably incomplete list:
+
+* Drop old `--getctime` option.
+* Remove compatability code in `loadindex` to handle old index data layouts.
+* Make pagespecs match relative by default? (see [[discussion]])
+* Flip wikilinks? (see [[todo/link_plugin_perhaps_too_general?]])
+* YADA format setup files per default?
+
+In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
+upgrade to deal with changes that break compatability. Some things that
+can't help with.
+
 # future goals
 
 * Conversion support for existing other wikis.
diff --git a/doc/roadmap/discussion.mdwn b/doc/roadmap/discussion.mdwn
index 0b69867bf..8233b1990 100644
--- a/doc/roadmap/discussion.mdwn
+++ b/doc/roadmap/discussion.mdwn
@@ -3,6 +3,7 @@ backwards compatibility problems. Should this be marked as a future plan, perhap
 major version number like 2.0? --Ethan
 
 Yes, I'm looking at making this kind of change at 2.0, added to the list.
+(Update: Didn't make it in 2.0 or 3.0...)
 However, I have doubts that it makes good sense to go relative by default.
 While it's not consitent with links, it seems to work better overall to
 have pagespecs be absolute by default, IMHO. --[[Joey]]
-- 
cgit v1.2.3


From c769a33392c4dedbabfb1fa1fda5c8bb30b84c78 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 17 Apr 2010 12:20:50 -0400
Subject: autoindex: Switch to using %wikistate instead of abusing
 $pagestate{index}.

---
 IkiWiki/Plugin/autoindex.pm                          | 20 ++++++++++++++------
 debian/changelog                                     |  2 ++
 ...uto-create_tag_pages_according_to_a_template.mdwn |  3 +++
 3 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 555856b11..c71d73349 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -61,8 +61,16 @@ sub refresh () {
 	}
 	
 	my %deleted;
-        if (ref $pagestate{index}{autoindex}{deleted}) {
-	       %deleted=%{$pagestate{index}{autoindex}{deleted}};
+	if (ref $wikistate{autoindex}{deleted}) {
+		%deleted=%{$wikistate{autoindex}{deleted}};
+	}
+        elsif (ref $pagestate{index}{autoindex}{deleted}) {
+		# compatability code
+		%deleted=%{$pagestate{index}{autoindex}{deleted}};
+		delete $pagestate{index}{autoindex};
+	}
+
+	if (keys %deleted) {
 		foreach my $dir (keys %deleted) {
 			# remove deleted page state if the deleted page is re-added,
 			# or if all its subpages are deleted
@@ -71,7 +79,7 @@ sub refresh () {
 				delete $deleted{$dir};
 			}
 		}
-		$pagestate{index}{autoindex}{deleted}=\%deleted;
+		$wikistate{autoindex}{deleted}=\%deleted;
 	}
 
 	my @needed;
@@ -82,10 +90,10 @@ sub refresh () {
 				# This page must have just been deleted, so
 				# don't re-add it. And remember it was
 				# deleted.
-				if (! ref $pagestate{index}{autoindex}{deleted}) {
-					$pagestate{index}{autoindex}{deleted}={};
+				if (! ref $wikistate{autoindex}{deleted}) {
+					$wikistate{autoindex}{deleted}={};
 				}
-				${$pagestate{index}{autoindex}{deleted}}{$dir}=1;
+				${$wikistate{autoindex}{deleted}}{$dir}=1;
 			}
 			else {
 				push @needed, $dir;
diff --git a/debian/changelog b/debian/changelog
index d65ffffd7..4721c5309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,8 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
     an iffy thing.
   * Use above to fix up timestamps on docwiki, as well as ensure that
     timestamps on basewiki files shipped in the deb are sane.
+  * autoindex: Switch to using %wikistate instead of abusing
+    $pagestate{index}.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 8fc97578c..49da3c80c 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -239,6 +239,9 @@ wrong direction.
 >>>>>> Aha! Having looked at [[plugins/write]] again, it turns out that what this
 >>>>>> feature should really use is `%wikistate`, I think? :-) --[[smcv]]
 
+>>>>>>> Ah, indeed, that came after I wrote autoindex. I've fixed autoindex to
+>>>>>>> use it. --[[Joey]]
+
 >>>>> Ok, now I know what you mean. --[[David_Riebenbauer]]
 
 >>> * `autoindex` forgets that a page was deleted when that page is
-- 
cgit v1.2.3


From 7fcc0faf8367c5ae64a3ff06d0d74baa063c4dfc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 12:45:20 -0400
Subject: few more suggestions

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 49da3c80c..def55f3ee 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -269,6 +269,15 @@ wrong direction.
 
 >> True. I'll do that. --[[David_Riebenbauer]]
 
+> Seems that `%autofiles` stores plugin names as keys, but never
+> really uses them. So it could just as easily be an array.
+> 
+> I'd be happy if the `%del_hash` global were not needed. 
+> Looks like it could be avoided by moving the checks
+> that `add_autofile` does into the autofile handling loop in
+> `Render`. (Also, that loop should probably be in its own
+> function anyway.) --[[Joey]] 
+
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
 [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1)
-- 
cgit v1.2.3


From c721a9ef872db85b26d430a2098234a4fca6ec51 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:41:06 -0400
Subject: my autotag branch

---
 .../auto-create_tag_pages_according_to_a_template.mdwn     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index def55f3ee..867306f0d 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -269,14 +269,12 @@ wrong direction.
 
 >> True. I'll do that. --[[David_Riebenbauer]]
 
-> Seems that `%autofiles` stores plugin names as keys, but never
-> really uses them. So it could just as easily be an array.
-> 
-> I'd be happy if the `%del_hash` global were not needed. 
-> Looks like it could be avoided by moving the checks
-> that `add_autofile` does into the autofile handling loop in
-> `Render`. (Also, that loop should probably be in its own
-> function anyway.) --[[Joey]] 
+>> I've pushed an autotag branch of my own, which refactors
+>> things a bit. It is untested so far though. --[[Joey]]
+>>
+>> * `verify_src_file` only called from Render.pm
+>> * Gets rid of `%del_files`.
+>> * Uses `%wikistate`.
 
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
-- 
cgit v1.2.3


From 9fbef7e1d2c4e8bbaf3eaf89885f18b88edbe429 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:42:50 -0400
Subject: reformat

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 867306f0d..ed681ac4d 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -269,12 +269,13 @@ wrong direction.
 
 >> True. I'll do that. --[[David_Riebenbauer]]
 
->> I've pushed an autotag branch of my own, which refactors
->> things a bit. It is untested so far though. --[[Joey]]
->>
->> * `verify_src_file` only called from Render.pm
->> * Gets rid of `%del_files`.
->> * Uses `%wikistate`.
+[[!template id=gitbranch branch=origin/autotag author="[[Joey]]"]]
+I've pushed an autotag branch of my own, which refactors
+things a bit. It is untested so far though. --[[Joey]]
+
+* `verify_src_file` only called from Render.pm
+* Gets rid of `%del_files`.
+* Uses `%wikistate`.
 
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
-- 
cgit v1.2.3


From a1aa71efc9d1db42b425f43afc1ff4a37c4c0f3a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:49:20 -0400
Subject: document the gitbranch template

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

(limited to 'doc')

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 55967e543..0f280fb35 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -65,6 +65,10 @@ think about merging them. This is recommended. :-)
 
 ## branches
 
+In order to refer to a branch in one of the above git repositories, for
+example when submitting a [[patch]], you can use the
+[[templates/gitbranch]] template.
+
 Some of the branches included in the main repository include:
 
 * `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
-- 
cgit v1.2.3


From 6f485b8f459549521541af7bb087185dada112bf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:57:59 -0400
Subject: note that tla plugin is not being maintained

---
 doc/rcs/tla.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/rcs/tla.mdwn b/doc/rcs/tla.mdwn
index cad5d51f4..79eecd627 100644
--- a/doc/rcs/tla.mdwn
+++ b/doc/rcs/tla.mdwn
@@ -2,6 +2,9 @@
 [GNU](http://www.gnu.org/) [Arch](http://www.gnuarch.org/) revision control
 system. Ikiwiki supports storing a wiki in tla.
 
+Warning: Since tla is not being maintained, neither is this plugin, and
+using ikiwiki with tla is not recommended.
+
 Ikiwiki can run as a [[post-commit]] hook to update a wiki whenever commits
 come in. When running as a [[cgi]] with tla, ikiwiki automatically
 commits edited pages to the Arch repostory, and uses the Arch
-- 
cgit v1.2.3


From cd8ec309d26cbc3f634328cb90e4c9d38b404632 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:58:31 -0400
Subject: bzr getmtime done

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

(limited to 'doc')

diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index 450d16800..8b9929920 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -28,7 +28,7 @@ auto.setup          |yes    |yes    |incomplete|yes         |incomplete   |yes
 `rcs_remove`        |yes    |yes    |yes       |yes         |no           |yes      |no        |yes
 `rcs_diff`          |yes    |yes    |yes       |yes         |no           |yes      |yes       |yes
 `rcs_getctime`      |fast   |slow   |slow      |slow        |slow         |slow     |slow      |slow
-`rcs_getmtime`      |fast   |slow   |no        |no          |no           |no       |no        |no
+`rcs_getmtime`      |fast   |slow   |slow      |no          |no           |no       |no        |no
 anonymous push      |yes    |no     |no        |no          |no           |no       |no        |no
 conflict handling   |yes    |yes    |yes       |buggy       |yes          |yes      |yes       |yes
 """]]
-- 
cgit v1.2.3


From e289e0b4ba48d01e24586dbdcaeda367763edd67 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 14:00:25 -0400
Subject: recommend git

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

(limited to 'doc')

diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index 8b9929920..248d93024 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -6,8 +6,7 @@ histories.
 Ikiwiki started out supporting only [[Subversion|svn]], but the interface
 ikiwiki uses to a revision control system is sufficiently simple and
 generic that it can be adapted to work with many systems by writing a
-[[plugin|plugins/write]]. [[Subversion|svn]] is still a recommended choice;
-[[git]] is another well-tested option. 
+[[plugin|plugins/write]]. These days, most people use [[git]].
 
 While all supported revision control systems work well enough for basic
 use, some advanced or special features are not supported in all of them.
-- 
cgit v1.2.3


From ca02c57ee47d4c05946c0c34eee32a0ad4ec6b01 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 14:07:12 -0400
Subject: document add_autofile

---
 doc/plugins/write.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 0bf6fcf48..e33c99421 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -966,6 +966,22 @@ added. Pass it the page that contains the link, and the link text.
 An optional third parameter sets the link type. If not specified,
 it is an ordinary [[ikiwiki/WikiLink]].
 
+### `add_autofile($$$)`
+
+Sometimes you may want to add a file to the `srcdir`. For example,
+[[plugins/tag]] pages can be automatically created as needed. This function
+can be used to do that. 
+
+The three parameters are the filename to add, the name of the plugin,
+and a callback function. The callback will be called if it is appropriate
+to automatically add the file, and should then take care of creating it,
+and doing anything else it needs to (such as checking it into revision
+control). Note that the callback may not always be called. For example,
+if an automatically added file is deleted by the user, ikiwiki will avoid
+re-adding it again.
+
+This function needs to be called during the scan hook, or earlier to work.
+
 ## Miscellaneous
 
 ### Internal use pages
-- 
cgit v1.2.3


From 59ceeb5621ae0ae2bcb7501c6ac0c7a06562a7cc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 17:15:07 -0400
Subject: improve docs

---
 doc/plugins/write.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index e33c99421..5190a26ed 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -968,9 +968,9 @@ it is an ordinary [[ikiwiki/WikiLink]].
 
 ### `add_autofile($$$)`
 
-Sometimes you may want to add a file to the `srcdir`. For example,
-[[plugins/tag]] pages can be automatically created as needed. This function
-can be used to do that. 
+Sometimes you may want to add a file to the `srcdir` as a result of content
+of other pages. For example, [[plugins/tag]] pages can be automatically
+created as needed. This function can be used to do that. 
 
 The three parameters are the filename to add, the name of the plugin,
 and a callback function. The callback will be called if it is appropriate
@@ -980,7 +980,8 @@ control). Note that the callback may not always be called. For example,
 if an automatically added file is deleted by the user, ikiwiki will avoid
 re-adding it again.
 
-This function needs to be called during the scan hook, or earlier to work.
+This function needs to be called during the scan hook, or earlier in the
+build process, in order to add the file early enough for it to be built.
 
 ## Miscellaneous
 
-- 
cgit v1.2.3


From 56bf9c04a290cfce6270f974c1d48be8a5d54942 Mon Sep 17 00:00:00 2001
From: PeteG <PeteG@web>
Date: Sun, 18 Apr 2010 12:33:51 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/peteg.mdwn b/doc/peteg.mdwn
new file mode 100644
index 000000000..90593c16f
--- /dev/null
+++ b/doc/peteg.mdwn
@@ -0,0 +1,7 @@
+I'm adding some plugins to Ikiwiki to support a bioacoustic wiki. See here:
+
+<http://bioacoustics.cse.unsw.edu.au/wiki/>
+
+Personal home page:
+
+http://peteg.org/
-- 
cgit v1.2.3


From 472694b8b420be128c1d9d0ba8393ea6efff8716 Mon Sep 17 00:00:00 2001
From: PeteG <PeteG@web>
Date: Sun, 18 Apr 2010 12:34:20 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/peteg.mdwn b/doc/peteg.mdwn
index 90593c16f..4e2face0e 100644
--- a/doc/peteg.mdwn
+++ b/doc/peteg.mdwn
@@ -4,4 +4,4 @@ I'm adding some plugins to Ikiwiki to support a bioacoustic wiki. See here:
 
 Personal home page:
 
-http://peteg.org/
+<http://peteg.org/>
-- 
cgit v1.2.3


From 63e6c00890a11144f8d035f7052a6229227fce52 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Mon, 19 Apr 2010 02:23:12 +0000
Subject: response to the further thoughts

---
 doc/todo/Multiple_categorization_namespaces.mdwn | 26 ++++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index ee3bbd88d..1861d860c 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -56,17 +56,25 @@ and the tags would appear at the bottom of the post, the Rubrica next to the tit
 
 Aside from the name of the plugin (and thus of the main directive), which could be `tag`, `meta`, `field` or whatever (maybe extending `meta` would be the most sensible choice), the features we want are
 
-  1. allow multiple values per type/attribute/field/whatever (fields currently only allows one)
-  2. allow both hidden and visible references (à la tag vs taglink)
-  3. allow each type/attribute/field to be exposed under multiple queries (e.g. tags and categories; this is mostly important for backwards compatibility, not sure if it might have other uses too)
-  4. allow arbitrary types/attributes/fields/whatever (even 'undefined' ones)
+1. allow multiple values per type/attribute/field/whatever (fields currently only allows one)
+   * Agreed about multiple values; I've been considering whether I should add that to `field`. -- K.A.
+2. allow both hidden and visible references (a la tag vs taglink)
+   * Hidden and visible references; that's fair enough too.  My approach with `ymlfront` and `getfield` is that the YAML code is hidden, and the display is done with `getfield`, but there's no reason not to use additional approaches. -- K.A.
+3. allow each type/attribute/field to be exposed under multiple queries (e.g. tags and categories; this is mostly important for backwards compatibility, not sure if it might have other uses too)
+   * I'm not sure what you mean here. -- K.A.
+4. allow arbitrary types/attributes/fields/whatever (even 'undefined' ones)
+   * Are you saying that these must be typed, or are you saying that they can be user-defined? -- K.A.
 
 Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would thus have the following parameters:
 
-  * `directive` : the name of the directive that can be used to set the value as a hidden reference; we can discuss whether, for pre- or user-defined types, it being undef means no directive or a default directive matching the attribute name would be defined.
-  * `linkdirective` : the name of the directive that can be used for a visible reference; no such directive would be defined by default
-  * `linktype` : link type for (hidden and visible) references
-  * `linkbase` : akin to the tagbase parameter
-  * `queries` : list of template queries this type/attribute/field/whatever is exposed to
+* `directive` : the name of the directive that can be used to set the value as a hidden reference; we can discuss whether, for pre- or user-defined types, it being undef means no directive or a default directive matching the attribute name would be defined.
+  * I still want there to be able to be enough flexibility in the concept to enable plugins such as `yamlfront`, which sets the data using YAML format, rather than using directives. -- K.A.
+* `linkdirective` : the name of the directive that can be used for a visible reference; no such directive would be defined by default
+* `linktype` : link type for (hidden and visible) references
+  * Is this the equivalent to "field name"? -- K.A.
+* `linkbase` : akin to the tagbase parameter
+  * Is this a field-name -> directory mapping? -- K.A.
+* `queries` : list of template queries this type/attribute/field/whatever is exposed to
+  * I'm not sure what you mean here. -- K.A.
 
 Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
-- 
cgit v1.2.3


From 99cdd38dd54047d0e79dbf65d58ba11ee38f2c92 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Mon, 19 Apr 2010 08:36:38 +0000
Subject: Respond

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

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index 1861d860c..ae35e8dfe 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -62,19 +62,25 @@ Aside from the name of the plugin (and thus of the main directive), which could
    * Hidden and visible references; that's fair enough too.  My approach with `ymlfront` and `getfield` is that the YAML code is hidden, and the display is done with `getfield`, but there's no reason not to use additional approaches. -- K.A.
 3. allow each type/attribute/field to be exposed under multiple queries (e.g. tags and categories; this is mostly important for backwards compatibility, not sure if it might have other uses too)
    * I'm not sure what you mean here. -- K.A.
+     * Typical example is tags: they are accessible both as `tags` and as `categories`, although the way they are presented changes a little -- G.B.
 4. allow arbitrary types/attributes/fields/whatever (even 'undefined' ones)
    * Are you saying that these must be typed, or are you saying that they can be user-defined? -- K.A.
+     * I am saying that the user should be able to define (e.g. in the config) some set of types/fields/attributes/whatever, following the specification illustrated below, but also be able to use something like `\[[!meta somefield="somevalue"]]` where `somefield` was never defined before. In this case `somefield` will have some default values for the properties described in the spec below. -- G.B.
 
 Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would thus have the following parameters:
 
 * `directive` : the name of the directive that can be used to set the value as a hidden reference; we can discuss whether, for pre- or user-defined types, it being undef means no directive or a default directive matching the attribute name would be defined.
   * I still want there to be able to be enough flexibility in the concept to enable plugins such as `yamlfront`, which sets the data using YAML format, rather than using directives. -- K.A.
+     * The possibility to use a directive does not preclude other ways of defining the field values. IOW, even if the directive `somefield` is defined, the user would still be able to use the syntax `\[[!meta somefield="somevalue"]]`, or any other syntax (such as YAML). -- G.B.
 * `linkdirective` : the name of the directive that can be used for a visible reference; no such directive would be defined by default
 * `linktype` : link type for (hidden and visible) references
   * Is this the equivalent to "field name"? -- K.A.
+     * This would be such by default, but it could be set to something different. [[Typed links|matching_different_kinds_of_links]] is a very recent ikiwiki feature. -- G.B.
 * `linkbase` : akin to the tagbase parameter
   * Is this a field-name -> directory mapping? -- K.A.
+     * yes, with each directory having one page per value. It might not make sense for all fields, of course -- G.B.
 * `queries` : list of template queries this type/attribute/field/whatever is exposed to
   * I'm not sure what you mean here. -- K.A.
+     * as mentioned before, some fields may be made accessible through different template queries, in different form. This is the case already for tags, that also come up in the `categories` query (used by Atom and RSS feeds). -- G.B.
 
-Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
+Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries, or also see what is done with the fields in the current `meta` plugin). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
-- 
cgit v1.2.3


From 1b7c455f4a4214bc9df766be4ec2b12adcf679e1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 19 Apr 2010 16:03:53 -0400
Subject: thinking about changing how templatedir works and allowing
 wikitemplate files into the srcdir

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

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
new file mode 100644
index 000000000..c4ffae178
--- /dev/null
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -0,0 +1,33 @@
+If `page.tmpl` is changed, it would be nice if ikiwiki automatically
+noticed, and rebuilt all pages. If `inlinepage.tmpl` is changed, a rebuild
+of all pages using it in an inline would be stellar.
+
+This would allow setting:
+
+	templatedir => "$srcdir/templates",
+
+.. and then the [[wikitemplates]] are managed like other wiki files; and
+like other wiki files, a change to them automatically updates dependent
+pages.
+
+Originally, it made good sense not to have the templatedir inside the wiki.
+Those templates can be used to bypass the htmlscrubber, and you don't want
+just anyone to edit them. But the same can be said of `style.css` and
+`ikiwiki.js`, which *are* in the wiki. We rely on `allowed_attachments`
+being set to secure those to prevent users uploading replacements. And we
+assume that users who can directly (non-anon) commit *can* edit them, and
+that's ok.
+
+So, perhaps the easiest way to solve this [[wishlist]] would be to
+make templatedir *default* to "$srcdir/templates/, and make ikiwiki
+register dependencies on `page.tmpl`, `inlinepage.tmpl`, etc, as they're
+used. Although, having every page declare an explicit dep on `page.tmpl`
+is perhaps a bit much; might be better to implement a special case for that
+one. Also, having the templates be copied to `destdir` is not desirable.
+
+The risk is that a site might have `allowed_attachments` set to "templates/*"
+or "*.tmpl" something like that. I think such a configuration is the *only*
+risk, and it's unlikely enough that a NEWS warning should suffice.
+
+(This would also help to clear up the tricky disctinction between
+wikitemplates and in-wiki templates.)
-- 
cgit v1.2.3


From e1ebdda72bb14c70c9d35c29f5a6afe197623282 Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Mon, 19 Apr 2010 16:12:09 -0700
Subject: Remove www prefix from Svend's website URLs

---
 doc/ikiwikiusers.mdwn | 2 +-
 doc/users/svend.mdwn  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 4a3e41e83..cb4213405 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -120,7 +120,7 @@ Personal sites and blogs
 * [[Adam_Trickett|ajt]]'s home intranet/sanbox system ([Internet site & blog](http://www.iredale.net/) -- not ikiwiki yet)
 * [[Simon_McVittie|smcv]]'s [website](http://www.pseudorandom.co.uk/) and
   [blog](http://smcv.pseudorandom.co.uk/)
-* Svend's [website](http://www.ciffer.net/~svend/) and [blog](http://www.ciffer.net/~svend/blog/)
+* Svend's [website](http://ciffer.net/~svend/) and [blog](http://ciffer.net/~svend/blog/)
 * [muammar's site](http://muammar.me)
 * [Per Bothner's blog](http://per.bothner.com/blog/)
 * [Bernd Zeimetz (bzed)](http://bzed.de/)
diff --git a/doc/users/svend.mdwn b/doc/users/svend.mdwn
index 69d83584f..712a0d3e7 100644
--- a/doc/users/svend.mdwn
+++ b/doc/users/svend.mdwn
@@ -1,4 +1,4 @@
 [[!meta title="Svend Sorensen"]]
 
-* [website](http://www.ciffer.net/~svend/)
-* [blog](http://www.ciffer.net/~svend/blog/)
+* [website](http://ciffer.net/~svend/)
+* [blog](http://ciffer.net/~svend/blog/)
-- 
cgit v1.2.3


From 09c647c1773d5c8eafacea486082684909e47449 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 20 Apr 2010 02:31:00 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index c4ffae178..2799842ed 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -31,3 +31,5 @@ risk, and it's unlikely enough that a NEWS warning should suffice.
 
 (This would also help to clear up the tricky disctinction between
 wikitemplates and in-wiki templates.)
+
+> But would this require that templates be parseable as wiki pages?  Because that would be a nuisance. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 9f00692a798888b9cc9edb30a961c6418efba39b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 19 Apr 2010 22:37:55 -0400
Subject: response

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 2799842ed..cde19700c 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -25,11 +25,15 @@ used. Although, having every page declare an explicit dep on `page.tmpl`
 is perhaps a bit much; might be better to implement a special case for that
 one. Also, having the templates be copied to `destdir` is not desirable.
 
-The risk is that a site might have `allowed_attachments` set to "templates/*"
-or "*.tmpl" something like that. I think such a configuration is the *only*
-risk, and it's unlikely enough that a NEWS warning should suffice.
+The risk is that a site might have `allowed_attachments` set to
+`templates/*` or `*.tmpl` something like that. I think such a configuration
+is the *only* risk, and it's unlikely enough that a NEWS warning should
+suffice.
 
 (This would also help to clear up the tricky disctinction between
 wikitemplates and in-wiki templates.)
 
 > But would this require that templates be parseable as wiki pages?  Because that would be a nuisance. --[[KathrynAndersen]]
+
+>> It would be better for them not to be rendered separately at all.
+>> --[[Joey]]  
-- 
cgit v1.2.3


From 16afa9e8446771fabe45ab45d8a36d09034d0319 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 20 Apr 2010 02:41:13 +0000
Subject: further clarification

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

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index ae35e8dfe..190070816 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -79,8 +79,10 @@ Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would t
 * `linkbase` : akin to the tagbase parameter
   * Is this a field-name -> directory mapping? -- K.A.
      * yes, with each directory having one page per value. It might not make sense for all fields, of course -- G.B.
+       * (nods) I've been working on something similar with my unreleased `tagger` module. In that, by default, the field-name maps to the closest wiki-page of the same name.  Thus, if one had the field "genre=poetry" on the page fiction/stories/mary/lamb, then that would map to fiction/genre/poetry if fiction/genre existed. --K.A.
 * `queries` : list of template queries this type/attribute/field/whatever is exposed to
   * I'm not sure what you mean here. -- K.A.
      * as mentioned before, some fields may be made accessible through different template queries, in different form. This is the case already for tags, that also come up in the `categories` query (used by Atom and RSS feeds). -- G.B.
+       * Ah, do you mean that the input value is the same, but the output format is different?  Like the difference between TMPL_VAR NAME="FOO" and TMPL_VAR NAME="raw_FOO"; one is htmlized, and the other is not. -- K.A.
 
 Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries, or also see what is done with the fields in the current `meta` plugin). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
-- 
cgit v1.2.3


From fda191cbbbfa76114a27a53bfc5b90289f26f72b Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 20 Apr 2010 02:43:44 +0000
Subject: formatting

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

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index 190070816..74e5bc812 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -79,10 +79,10 @@ Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would t
 * `linkbase` : akin to the tagbase parameter
   * Is this a field-name -> directory mapping? -- K.A.
      * yes, with each directory having one page per value. It might not make sense for all fields, of course -- G.B.
-       * (nods) I've been working on something similar with my unreleased `tagger` module. In that, by default, the field-name maps to the closest wiki-page of the same name.  Thus, if one had the field "genre=poetry" on the page fiction/stories/mary/lamb, then that would map to fiction/genre/poetry if fiction/genre existed. --K.A.
+         * (nods) I've been working on something similar with my unreleased `tagger` module. In that, by default, the field-name maps to the closest wiki-page of the same name.  Thus, if one had the field "genre=poetry" on the page fiction/stories/mary/lamb, then that would map to fiction/genre/poetry if fiction/genre existed. --K.A.
 * `queries` : list of template queries this type/attribute/field/whatever is exposed to
   * I'm not sure what you mean here. -- K.A.
      * as mentioned before, some fields may be made accessible through different template queries, in different form. This is the case already for tags, that also come up in the `categories` query (used by Atom and RSS feeds). -- G.B.
-       * Ah, do you mean that the input value is the same, but the output format is different?  Like the difference between TMPL_VAR NAME="FOO" and TMPL_VAR NAME="raw_FOO"; one is htmlized, and the other is not. -- K.A.
+         * Ah, do you mean that the input value is the same, but the output format is different?  Like the difference between TMPL_VAR NAME="FOO" and TMPL_VAR NAME="raw_FOO"; one is htmlized, and the other is not. -- K.A.
 
 Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries, or also see what is done with the fields in the current `meta` plugin). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
-- 
cgit v1.2.3


From 529929e732e1c6604d31b68e81898780de06e640 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Tue, 20 Apr 2010 02:45:14 +0000
Subject: non comprend

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

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index cde19700c..6a1013f8d 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -37,3 +37,5 @@ wikitemplates and in-wiki templates.)
 
 >> It would be better for them not to be rendered separately at all.
 >> --[[Joey]]  
+
+>>> I don't follow you. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 563428ebd2a75cfabccf1974da0c1cbbe07eb369 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 19 Apr 2010 23:52:16 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 6a1013f8d..2558d5f3e 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -24,6 +24,7 @@ register dependencies on `page.tmpl`, `inlinepage.tmpl`, etc, as they're
 used. Although, having every page declare an explicit dep on `page.tmpl`
 is perhaps a bit much; might be better to implement a special case for that
 one. Also, having the templates be copied to `destdir` is not desirable.
+(However, if they're not copied, wikilinks to them will be broken. Hmm.)
 
 The risk is that a site might have `allowed_attachments` set to
 `templates/*` or `*.tmpl` something like that. I think such a configuration
@@ -39,3 +40,8 @@ wikitemplates and in-wiki templates.)
 >> --[[Joey]]  
 
 >>> I don't follow you. --[[KathrynAndersen]]
+
+>>>> If they don't render to output files, they clearly don't
+>>>> need to be treated as wiki pages. (They need to be treated
+>>>> as raw files anyway, because you don't want random users editing them 
+>>>> in the online editor.) --[[Joey]] 
-- 
cgit v1.2.3


From 11718519348382892d5c6fdb21b8e721c2413eb0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 01:32:19 -0400
Subject: similarity to internal pages

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

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 2558d5f3e..2e4ba8e9a 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -24,7 +24,8 @@ register dependencies on `page.tmpl`, `inlinepage.tmpl`, etc, as they're
 used. Although, having every page declare an explicit dep on `page.tmpl`
 is perhaps a bit much; might be better to implement a special case for that
 one. Also, having the templates be copied to `destdir` is not desirable.
-(However, if they're not copied, wikilinks to them will be broken. Hmm.)
+In a sense, these template would be like internal pages, except not wiki
+pages, but raw files.
 
 The risk is that a site might have `allowed_attachments` set to
 `templates/*` or `*.tmpl` something like that. I think such a configuration
-- 
cgit v1.2.3


From 52ccc03d10c532b3cf6335b00a9b60057061596b Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Tue, 20 Apr 2010 15:40:10 +0100
Subject: clarify whether the raw files would be put in destdir

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

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 2e4ba8e9a..09a623427 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -46,3 +46,6 @@ wikitemplates and in-wiki templates.)
 >>>> need to be treated as wiki pages. (They need to be treated
 >>>> as raw files anyway, because you don't want random users editing them 
 >>>> in the online editor.) --[[Joey]] 
+
+>>>>> Just to be clear, the raw files would not be copied across to the output
+>>>>> directory? -- [[Jon]]
-- 
cgit v1.2.3


From 3b8f4f59d6720e5a77cae30eacc4c46582b1603b Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 20 Apr 2010 15:01:39 +0000
Subject: internal pages: the revenge?

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

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 09a623427..b5c107915 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -49,3 +49,9 @@ wikitemplates and in-wiki templates.)
 
 >>>>> Just to be clear, the raw files would not be copied across to the output
 >>>>> directory? -- [[Jon]]
+
+>>>>>> Without modifying ikiwiki, they'd be copied to the output directory as
+>>>>>> (e.g.) http://ikiwiki.info/templates/inlinepage.tmpl; to not copy them,
+>>>>>> it'd either be necessary to make them be internal pages
+>>>>>> (templates/inlinepage._tmpl) or special-case them in some other way.
+>>>>>> --[[smcv]]
-- 
cgit v1.2.3


From 4b4fdc85abba7200eed78eb473341e44fecc6087 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Tue, 20 Apr 2010 20:18:29 +0000
Subject: Clarifications

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

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index 74e5bc812..a8ee6755c 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -80,9 +80,14 @@ Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would t
   * Is this a field-name -> directory mapping? -- K.A.
      * yes, with each directory having one page per value. It might not make sense for all fields, of course -- G.B.
          * (nods) I've been working on something similar with my unreleased `tagger` module. In that, by default, the field-name maps to the closest wiki-page of the same name.  Thus, if one had the field "genre=poetry" on the page fiction/stories/mary/lamb, then that would map to fiction/genre/poetry if fiction/genre existed. --K.A.
+             * that's the idea. In your case you could have the linkbase of genre be fiction/genre, and it would be created if it was missing. -- G.B.
 * `queries` : list of template queries this type/attribute/field/whatever is exposed to
   * I'm not sure what you mean here. -- K.A.
      * as mentioned before, some fields may be made accessible through different template queries, in different form. This is the case already for tags, that also come up in the `categories` query (used by Atom and RSS feeds). -- G.B.
          * Ah, do you mean that the input value is the same, but the output format is different?  Like the difference between TMPL_VAR NAME="FOO" and TMPL_VAR NAME="raw_FOO"; one is htmlized, and the other is not. -- K.A.
+              * Actually this is about the same information appearing in different queries (e.g. NAME="FOO" and NAME="BAR"). Example: say that I defined a "Rubrica" field. I would want both tags and categories to appear in `categories` template query, but only tags would appear in the `tags` query, and only Rubrica values to appear in `rubrica` queries. The issue of different output formats was presented in the next paragraph instead. -- G.B.
 
 Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries, or also see what is done with the fields in the current `meta` plugin). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome.
+
+One possibility could be to have the `queries` configuration allow a hash mapping query names to functions that would transform the data. Lacking that possibility, we might have to leave some predefined fields to have custom Perl-side treatment and leave custom fields to be untransformable.
+
-- 
cgit v1.2.3


From 5d2df9651fee83cf17acde48ba12442104311492 Mon Sep 17 00:00:00 2001
From: "http://oblomov.myopenid.com/" <http://oblomov.myopenid.com/@web>
Date: Wed, 21 Apr 2010 08:17:03 +0000
Subject: Missing links with no CGI

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

(limited to 'doc')

diff --git a/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn b/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn
new file mode 100644
index 000000000..d9f3d518f
--- /dev/null
+++ b/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn
@@ -0,0 +1,5 @@
+When the CGI URL is not defined, links to missing pages appear as plain, unstyled text. I think the 'createlink' span should always wrap this text, even when the actual question mark linking to the CGI for the create action is missing. This ensures consistent styling regardless of whether the CGI is available or not (and is thus useful for example when the same wiki has clones with the CGI link and clones without).
+
+A proposed patch is available [on my ikiwiki clone](http://git.oblomov.eu/ikiwiki/patch/290d1b498f00f63e6d41218ddb76d87e68ed5081)
+
+[[!tag patch cgi]]
-- 
cgit v1.2.3


From 5c855b2bcab82e4075d49713d53869857a4e9385 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 12:50:43 -0400
Subject: applied

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

(limited to 'doc')

diff --git a/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn b/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn
index d9f3d518f..73213209a 100644
--- a/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn
+++ b/doc/bugs/Links_to_missing_pages_should_always_be_styled.mdwn
@@ -2,4 +2,4 @@ When the CGI URL is not defined, links to missing pages appear as plain, unstyle
 
 A proposed patch is available [on my ikiwiki clone](http://git.oblomov.eu/ikiwiki/patch/290d1b498f00f63e6d41218ddb76d87e68ed5081)
 
-[[!tag patch cgi]]
+[[!tag patch cgi done]]
-- 
cgit v1.2.3


From 9c8761ba49b06a76a923eb91735f842f419d2916 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 14:27:12 -0400
Subject: add_autofile filename should be relative to srcdir

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

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 5190a26ed..404c3b44f 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -972,13 +972,13 @@ Sometimes you may want to add a file to the `srcdir` as a result of content
 of other pages. For example, [[plugins/tag]] pages can be automatically
 created as needed. This function can be used to do that. 
 
-The three parameters are the filename to add, the name of the plugin,
-and a callback function. The callback will be called if it is appropriate
-to automatically add the file, and should then take care of creating it,
-and doing anything else it needs to (such as checking it into revision
-control). Note that the callback may not always be called. For example,
-if an automatically added file is deleted by the user, ikiwiki will avoid
-re-adding it again.
+The three parameters are the filename to create (relative to the `srcdir`),
+the name of the plugin, and a callback function. The callback will be
+called if it is appropriate to automatically add the file, and should then
+take care of creating it, and doing anything else it needs to (such as
+checking it into revision control). Note that the callback may not always
+be called. For example, if an automatically added file is deleted by the
+user, ikiwiki will avoid re-adding it again.
 
 This function needs to be called during the scan hook, or earlier in the
 build process, in order to add the file early enough for it to be built.
-- 
cgit v1.2.3


From e72973afdb3b08b1755295e348e223a7c51cf702 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Wed, 21 Apr 2010 19:07:32 +0000
Subject: debugging

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

(limited to 'doc')

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index 7ff1a012f..c7403f0f1 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -33,3 +33,15 @@ I have tried rebuilding on my squeeze system and still comments don't appear. An
 <http://natalian.org/comments/>
 
 I was worried is was due to a time skew problem I was experiencing on my VPS in the last month, though the time is right now and still comments do not appear on blog posts like <http://natalian.org/archives/2010/03/25/BBC_News_complaints/>
+
+# Getting closer
+
+    hendry@webconverger templates$ for i in *.tmpl; do ./test-template.perl $i || echo $i has an error; done
+    HTML::Template->new() : At least one <TMPL_IF> or <TMPL_UNLESS> not terminated at end of file! at /usr/share/perl5/HTML/Template.pm line 2351.
+    page.tmpl has an error
+    hendry@webconverger templates$ cat test-template.perl 
+    #!/usr/bin/perl
+    use HTML::Template;
+    my $htc = HTML::Template->new(filename => "$ARGV[0]");
+
+I think the problem was before that it was `<TMPL_IF COMMENTS>` and now it is `<TMPL_IF NAME="COMMENTS">` ?
-- 
cgit v1.2.3


From 9fa5f71034497043e2b5dbb2c40417aebd94e327 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 15:18:11 -0400
Subject: update; my branch is (partially) debugged now

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

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index ed681ac4d..63bcabaee 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -273,7 +273,7 @@ wrong direction.
 I've pushed an autotag branch of my own, which refactors
 things a bit. It is untested so far though. --[[Joey]]
 
-* `verify_src_file` only called from Render.pm
+* `verify_src_file` only called from Render.pm (actually, function removed)
 * Gets rid of `%del_files`.
 * Uses `%wikistate`.
 
-- 
cgit v1.2.3


From 9ed523d762afd74c3004a07fc8ee12daa9354813 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Wed, 21 Apr 2010 19:21:38 +0000
Subject:

---
 doc/bugs/Comments_dissapeared.mdwn | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index c7403f0f1..830c3519f 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -34,14 +34,28 @@ I have tried rebuilding on my squeeze system and still comments don't appear. An
 
 I was worried is was due to a time skew problem I was experiencing on my VPS in the last month, though the time is right now and still comments do not appear on blog posts like <http://natalian.org/archives/2010/03/25/BBC_News_complaints/>
 
-# Getting closer
+# Debugging templates
 
-    hendry@webconverger templates$ for i in *.tmpl; do ./test-template.perl $i || echo $i has an error; done
-    HTML::Template->new() : At least one <TMPL_IF> or <TMPL_UNLESS> not terminated at end of file! at /usr/share/perl5/HTML/Template.pm line 2351.
-    page.tmpl has an error
-    hendry@webconverger templates$ cat test-template.perl 
+`sudo apt-get install libhtml-template-compiled-perl`
+
+    hendry@webconverger templates$ cat test-template.perl
     #!/usr/bin/perl
-    use HTML::Template;
-    my $htc = HTML::Template->new(filename => "$ARGV[0]");
+    use HTML::Template::Compiled;
+    local $HTML::Template::Compiled::DEBUG = 1;
+    my $htc = HTML::Template::Compiled->new(
+             filename => "$ARGV[0]",
+    );
+    eval {  
+            print $htc->output;
+    };
+    if ($@) {
+            # reports as text
+            my $msg = $htc->debug_code;
+            # reports as a html table
+            my $msg_html = $htc->debug_code('html');
+    }
+    hendry@webconverger templates$ ./test-template.perl page.tmpl
+    Missing closing tag for 'IF' atend of page.tmpl line 159
+
 
 I think the problem was before that it was `<TMPL_IF COMMENTS>` and now it is `<TMPL_IF NAME="COMMENTS">` ?
-- 
cgit v1.2.3


From 204c0a63f3fd7673dac83da6aa5f9c9e3cc9a6c5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 15:22:05 -0400
Subject: document tag_autocreate

---
 debian/changelog     | 2 ++
 doc/plugins/tag.mdwn | 3 +++
 doc/roadmap.mdwn     | 1 +
 3 files changed, 6 insertions(+)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index b7ec99463..d66b5e4d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20100415) UNRELEASED; urgency=low
 
   [ Joey Hess ]
+  * tag: Automatic creation of tag pages can now be enabled using
+    the tag_autocreate setting. (David Riebenbauer)
   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
   * comments: Fix missing entity encoding in title.
   * txt: Add a special case for robots.txt.
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index 8ff70a069..bdf39d7e8 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -8,6 +8,9 @@ These directives allow tagging pages.
 It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to
 match pages that are tagged with a specific tag.
 
+If the `tag_autocreate` setting is enabled, tag pages will automatically be
+created as needed.
+
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
 page is tagged with the "tags" tag.
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 0c7bf2fa8..8e2a01827 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -78,6 +78,7 @@ Probably incomplete list:
 * Make pagespecs match relative by default? (see [[discussion]])
 * Flip wikilinks? (see [[todo/link_plugin_perhaps_too_general?]])
 * YADA format setup files per default?
+* Enable `tag_autocreate` by default.
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
-- 
cgit v1.2.3


From 86e73e42e835821984fdf6dc5671dae06cec5f90 Mon Sep 17 00:00:00 2001
From: "http://hendry.iki.fi/" <http://hendry.iki.fi/@web>
Date: Wed, 21 Apr 2010 19:48:31 +0000
Subject:

---
 doc/bugs/Comments_dissapeared.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn
index 830c3519f..787f18c98 100644
--- a/doc/bugs/Comments_dissapeared.mdwn
+++ b/doc/bugs/Comments_dissapeared.mdwn
@@ -59,3 +59,11 @@ I was worried is was due to a time skew problem I was experiencing on my VPS in
 
 
 I think the problem was before that it was `<TMPL_IF COMMENTS>` and now it is `<TMPL_IF NAME="COMMENTS">` ?
+
+
+
+# Solved
+
+A merge with the templates in master with my [html5](http://git.webconverger.org/?p=ikiwiki;a=shortlog;h=refs/heads/html5) branch looks like it has solved the problem. Also see [[bugs/html5_support]].
+
+[[bugs/done]]
-- 
cgit v1.2.3


From e3ea28f8c7fb9682d9e5bea32de835cee7605846 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 15:53:44 -0400
Subject: update, tag deletion bug

---
 ...uto-create_tag_pages_according_to_a_template.mdwn | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 63bcabaee..d7637ef1b 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -152,12 +152,12 @@ consider this a feature, not a bug)
 Todo/Bugs:
 
 * Will still create a page even if there's a page other than `$tag` under
-`tagbase` satisfying the tag link.
+`tagbase` satisfying the tag link. (details? --[[Joey]])
 * Call from `IkiWiki.pm` to `Render.pm`, which adds a module dependency in the
-wrong direction.
+wrong direction. (fixed --[[Joey]] )
 * Add files to RCS.
 * Unit tests.
-* Proper documentation.
+* Proper documentation. (fixed (mostly) --[[Joey]])
 
 --[[David_Riebenbauer]]
 
@@ -273,9 +273,17 @@ wrong direction.
 I've pushed an autotag branch of my own, which refactors
 things a bit. It is untested so far though. --[[Joey]]
 
-* `verify_src_file` only called from Render.pm (actually, function removed)
-* Gets rid of `%del_files`.
-* Uses `%wikistate`.
+---
+
+Known bugs in my branch (probably also in David's):
+
+* Does not remember that a tag was deleted.
+  
+  The code to do that only works if, at the same time the tag
+  is deleted, one of the pages that has the tag is modified.
+  That's because `add_autofile` needs to be called before it's
+  aware the autofile exists, and if it's not aware, it does not
+  record it as a deleted autofile.
 
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
-- 
cgit v1.2.3


From 6a30b45e7521f98a3e94b04ff46eeeb7f80774ca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:07:23 -0400
Subject: update

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index d7637ef1b..f10c2cdee 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -250,6 +250,12 @@ wrong direction. (fixed --[[Joey]] )
 >>>> Yes, I forgot about that and that is a bug. I'll fix that.
 >>>> --[[David_Riebenbauer]]
 
+>>>>> In my branch, it keeps a list of autofiles that were created,
+>>>>> not deleted. And I think that turns out to be necessary, really.
+>>>>> However, I see no way to clean out that list on deletion and
+>>>>> manual recreation -- it still needs to remember it was once an autofile,
+>>>>> in order to avoid recreating it if it's deleted yet again. --[[Joey]]
+
 >>> * `autoindex` forgets that a page was deleted when it's no longer needed
 >>>   anyway (this may be harder for `autotag`?)
 
@@ -264,6 +270,13 @@ wrong direction. (fixed --[[Joey]] )
 >>>> Good suggestion. Adding the files to RCS is on my todo list anyway.
 >>>> --[[David_Riebenbauer]]
 
+>>>>> I think it may be better to allow the `add_autofile` caller
+>>>>> to specify if it is added to RCS. In my branch, it can do
+>>>>> so by just making the callback it registers call `rcs_add`; 
+>>>>> and I have tag do this. Other plugins might want autofiles
+>>>>> that do not get checked in, conceivably.
+>>>>> --[[Joey]] 
+
 > Regarding the call from `IkiWiki.pm` to `Render.pm`, wouldn't this be
 > quite easy to solve by moving `verify_src_file` to IkiWiki.pm? --[[smcv]]
 
@@ -271,19 +284,8 @@ wrong direction. (fixed --[[Joey]] )
 
 [[!template id=gitbranch branch=origin/autotag author="[[Joey]]"]]
 I've pushed an autotag branch of my own, which refactors
-things a bit. It is untested so far though. --[[Joey]]
-
----
-
-Known bugs in my branch (probably also in David's):
-
-* Does not remember that a tag was deleted.
-  
-  The code to do that only works if, at the same time the tag
-  is deleted, one of the pages that has the tag is modified.
-  That's because `add_autofile` needs to be called before it's
-  aware the autofile exists, and if it's not aware, it does not
-  record it as a deleted autofile.
+things a bit and fixes bugs around deletion/recreation.
+I've tested it somewhat. --[[Joey]]
 
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
-- 
cgit v1.2.3


From 760b840e8f5af9e8ea0197bda783fd9b54a8ab7c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:19:16 -0400
Subject: update

---
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index f10c2cdee..724a52ec9 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -281,6 +281,7 @@ wrong direction. (fixed --[[Joey]] )
 > quite easy to solve by moving `verify_src_file` to IkiWiki.pm? --[[smcv]]
 
 >> True. I'll do that. --[[David_Riebenbauer]]
+>> Fixed in my branch --[[Joey]]
 
 [[!template id=gitbranch branch=origin/autotag author="[[Joey]]"]]
 I've pushed an autotag branch of my own, which refactors
-- 
cgit v1.2.3


From b21db4197802ebd4d268b81b3df9448aa8108742 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 21 Apr 2010 20:23:19 +0000
Subject: elide an older patch that's no longer under discussion

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 81 +---------------------
 1 file changed, 1 insertion(+), 80 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index f10c2cdee..e993a9aa4 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -15,86 +15,7 @@ A new setting is used to enable or disable auto-create tag pages, `tag_autocreat
 The new tag file is created during the preprocess phase. 
 The new tag file is then complied during the change phase.
 
-_tag.pm from version 3.01_
-
-
-	--- tag.pm      2009-02-06 10:26:03.000000000 -0700
-	+++ tag_new.pm  2009-02-06 12:17:19.000000000 -0700
-	@@ -14,6 +14,7 @@
-			hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1);
-			hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1);
-			hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
-	+       hook(type => "change", id => "tag", call => \&change);
-	 }
-	 
-	 sub getopt () {
-	@@ -36,6 +37,36 @@
-							safe => 1,
-							rebuild => 1,
-					},
-	+               tag_autocreate => {
-	+                       type => "boolean",
-	+                       example => 0,
-	+                       description => "Auto-create the new tag pages, uses autotagpage.tmpl ",
-	+                       safe => 1,
-	+                       rebulid => 1,
-	+               },
-	+}
-	+
-	+my $autocreated_page = 0;
-	+
-	+sub gen_tag_page($)    {
-	+       my $tag=shift;
-	+
-	+       my $tag_file=$tag.'.'.$config{default_pageext};
-	+       return if (-f $config{srcdir}.$tag_file);
-	+
-	+       my $template=template("autotagpage.tmpl");
-	+       $template->param(tag => $tag);
-	+       writefile($tag_file, $config{srcdir}, $template->output);
-	+       $autocreated_page = 1;
-	+
-	+       if ($config{rcs}) {
-	+               IkiWiki::disable_commit_hook();
-	+               IkiWiki::rcs_add($tag_file);
-	+               IkiWiki::rcs_commit_staged(
-	+                       gettext("Automatic tag page generation"),
-	+                       undef, undef);
-	+               IkiWiki::enable_commit_hook();
-	+       }
-	 }
-	 
-	 sub tagpage ($) {
-	@@ -47,6 +78,10 @@
-					$tag=~y#/#/#s; # squash dups
-			}
-	 
-	+       if (defined $config{tag_autocreate} && $config{tag_autocreate} ) {
-	+               gen_tag_page($tag);
-	+       }
-	+
-			return $tag;
-	 }
-	 
-	@@ -125,4 +160,18 @@
-			}
-	 }
-	 
-	+sub change(@) {
-	+       return unless($autocreated_page);
-	+       $autocreated_page = 0;
-	+
-	+       # This refresh/saveindex is to complie the autocreated tag pages
-	+       IkiWiki::refresh();
-	+       IkiWiki::saveindex();
-	+
-	+       # This refresh/saveindex is to fix the Tags link
-	+       # With out this additional refresh/saveindex the tag link displays ?tag
-	+       IkiWiki::refresh();
-	+       IkiWiki::saveindex();
-	+}
-	+
-
+*see git history of this page if you want the patch --[[smcv]]*
 
 This uses a [[template|wikitemplates]] called `autotagpage.tmpl`, here is my template file:
 
-- 
cgit v1.2.3


From ffe9fd8eb14cedaf31477dbce72c28dd38cc78ae Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Wed, 21 Apr 2010 20:30:14 +0000
Subject: suppressing auto-creation can be quite counter-intuitive

---
 ...o-create_tag_pages_according_to_a_template.mdwn | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index e993a9aa4..5a1aff928 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -177,6 +177,32 @@ wrong direction. (fixed --[[Joey]] )
 >>>>> manual recreation -- it still needs to remember it was once an autofile,
 >>>>> in order to avoid recreating it if it's deleted yet again. --[[Joey]]
 
+>>>>>> Are these really the semantics we want? It seems strange to me
+>>>>>> that this:
+>>>>>>
+>>>>>> * tag a page as foo
+>>>>>> * tags/foo automatically appears
+>>>>>> * delete tags/foo
+>>>>>> * create tags/foo manually
+>>>>>> * delete tags/foo again
+>>>>>> * tags/foo isn't automatically created
+>>>>>>
+>>>>>> isn't the same as this:
+>>>>>>
+>>>>>> * create tags/foo
+>>>>>> * delete tags/foo
+>>>>>> * tag a page as foo
+>>>>>> * tags/foo automatically appears
+>>>>>>
+>>>>>> or even this:
+>>>>>>
+>>>>>> * create tags/foo
+>>>>>> * tag a page as foo
+>>>>>> * delete tags/foo
+>>>>>> * tags/foo automatically appears (?)
+>>>>>>
+>>>>>> --[[smcv]]
+
 >>> * `autoindex` forgets that a page was deleted when it's no longer needed
 >>>   anyway (this may be harder for `autotag`?)
 
-- 
cgit v1.2.3


From 463ba55dce0d07e97fa44500146e850f72d7ea24 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:33:03 -0400
Subject: note re includes

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

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index b5c107915..a112cb9da 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -35,6 +35,10 @@ suffice.
 (This would also help to clear up the tricky disctinction between
 wikitemplates and in-wiki templates.)
 
+Note also that when using templates from "$srcdir/templates/", `no_includes`
+needs to be set. Currently this is done by the two plugins that use
+such templates, while includes are allowed in `templatedir`.
+
 > But would this require that templates be parseable as wiki pages?  Because that would be a nuisance. --[[KathrynAndersen]]
 
 >> It would be better for them not to be rendered separately at all.
-- 
cgit v1.2.3


From 1336a3270b664dbd548c6ad66ec981d5fa24a953 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:36:58 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 254ec42b5..32870dd3d 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -203,6 +203,12 @@ wrong direction. (fixed --[[Joey]] )
 >>>>>>
 >>>>>> --[[smcv]]
 
+>>>>>>> I agree that the last of these is not desired. It could be avoided
+>>>>>>> by extending the list of autofiles to include those that were not
+>>>>>>> created due to the file/page already existing.
+>>>>>>> 
+>>>>>>> Hmm, that would fix the previous scenario too. --[[Joey]] 
+
 >>> * `autoindex` forgets that a page was deleted when it's no longer needed
 >>>   anyway (this may be harder for `autotag`?)
 
-- 
cgit v1.2.3


From 129cd00bdb03e32df8645b12138cb4c79952775e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:15:11 -0400
Subject: remove broken ./tag support

The commit that added the (working) support for using /tag to override
tagbase also tried to make ./tag work. Problem is, tags are links,
and ./foo is not a valid link (though I think there's a wishlist about it).

So, using ./tag really resulted in tag creation links that led to a
"bad page name" error. And even if the tag were created in the right place,
the link didn't go to it.
---
 IkiWiki/Plugin/tag.pm          | 2 +-
 doc/ikiwiki/directive/tag.mdwn | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 62e0cc3b8..8ec08e936 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -39,7 +39,7 @@ sub getsetup () {
 sub tagpage ($) {
 	my $tag=shift;
 			
-	if ($tag !~ m{^\.?/} &&
+	if ($tag !~ m{^/} &&
 	    defined $config{tagbase}) {
 		$tag="/".$config{tagbase}."/".$tag;
 		$tag=~y#/#/#s; # squash dups
diff --git a/doc/ikiwiki/directive/tag.mdwn b/doc/ikiwiki/directive/tag.mdwn
index 64736f8cd..807a96f25 100644
--- a/doc/ikiwiki/directive/tag.mdwn
+++ b/doc/ikiwiki/directive/tag.mdwn
@@ -28,7 +28,7 @@ into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is
 If you want to override the tagbase for a particular tag, you can use
 something like this:
 
-	\[[!tag ./foo]]
+	\[[!tag /foo]]
 	\[[!taglink /foo]]
 
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From d048e9c64aca24b8e064aaf1608862b50c427de2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:39:20 -0400
Subject: turn on tag_autocreate by default if tagbase is set

---
 IkiWiki/Plugin/tag.pm          | 5 +++--
 debian/NEWS                    | 4 ++++
 doc/ikiwiki/directive/tag.mdwn | 3 ++-
 doc/plugins/tag.mdwn           | 8 ++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index cd7ecc212..62f030f4e 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -36,7 +36,7 @@ sub getsetup () {
 		},
 		tag_autocreate => {
 			type => "boolean",
-			example => 0,
+			example => 1,
 			description => "autocreate new tag pages?",
 			safe => 1,
 			rebuild => undef,
@@ -67,7 +67,8 @@ sub htmllink_tag ($$$;@) {
 sub gentag ($) {
 	my $tag=shift;
 
-	if ($config{tag_autocreate}) {
+	if ($config{tag_autocreate} ||
+	    ($config{tagbase} && ! defined $config{tag_autocreate})) {
 		my $tagpage=taglink($tag);
 		if ($tagpage=~/^\.\/(.*)/) {
 			$tagpage=$1;
diff --git a/debian/NEWS b/debian/NEWS
index 9fd882ad2..8b87bc601 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -11,6 +11,10 @@ ikiwiki (3.20100406) unstable; urgency=low
   not regular wikilinks. If your wiki accidentially relied on the old,
   buggy behavior, you might need to change pagespecs to use `link()`.
 
+  Tag pages can automatically be created as new tags are used. This
+  feature is enabled by default if you have configured a tagbase. It
+  can be turned on or off using the `tag_autocreate` setting.
+
   The title_natural sort method (as used by the inline directive, etc)
   have been moved to the new sortnaturally plugin, which is not enabled
   by default since it requires the Sort::Naturally perl module.
diff --git a/doc/ikiwiki/directive/tag.mdwn b/doc/ikiwiki/directive/tag.mdwn
index 807a96f25..c8d9b9816 100644
--- a/doc/ikiwiki/directive/tag.mdwn
+++ b/doc/ikiwiki/directive/tag.mdwn
@@ -19,7 +19,8 @@ instead:
 Note that if the wiki is configured to use a tagbase, then the tags will be
 located under a base directory, such as "tags/". This is a useful way to
 avoid having to write the full path to tags, if you want to keep them
-grouped together out of the way.
+grouped together out of the way. Also, since ikiwiki then knows where to put
+tags, it will automatically create tag pages when new tags are used.
 
 Bear in mind that specifying a tagbase means you will need to incorporate it
 into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index bdf39d7e8..8e1286e62 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -8,8 +8,12 @@ These directives allow tagging pages.
 It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to
 match pages that are tagged with a specific tag.
 
-If the `tag_autocreate` setting is enabled, tag pages will automatically be
-created as needed.
+The `tagbase` setting can be used to make tags default to being put in a
+particular subdirectory.
+
+The `tag_autocreate` setting can be used to control whether new tag pages
+are created as needed. It defaults to being done only if a `tagbase` is
+set.
 
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
-- 
cgit v1.2.3


From 557912c723a6e8df320a3c6dae461956cf893f10 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:47:18 -0400
Subject: my autotag branch seems ready

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

(limited to 'doc')

diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 32870dd3d..b05e1db3d 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -239,7 +239,7 @@ wrong direction. (fixed --[[Joey]] )
 [[!template id=gitbranch branch=origin/autotag author="[[Joey]]"]]
 I've pushed an autotag branch of my own, which refactors
 things a bit and fixes bugs around deletion/recreation.
-I've tested it somewhat. --[[Joey]]
+I've tested it fairly thouroughly. --[[Joey]]
 
 [f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe)
 [4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748)
-- 
cgit v1.2.3


From 6c5f315970b0e7a8473e9a1151229459781192a8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 21:38:58 -0400
Subject: argh. head exploding.

---
 doc/bugs/depends_simple_mixup.mdwn | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 2603ff04c..2ebd53e85 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -18,6 +18,42 @@ not noticing that bugs dependeded on the page and needs to be updated.
 
 Ok.. Turns out this was not a problem with the actual influences
 calculation or dependency calculation code. Whew! `match_link`
-just didn't set the influence correctly when failing. [[fixed|done]]
+just didn't set the influence correctly when failing. fixed
 
 --[[Joey]]
+
+---
+
+Update: Reopening this because the fix for it rather sucks.
+
+I made `match_link` return on failure an influence of
+type DEPEND_LINKS. So, a tag page that inlines `tagged(foo)`
+gets a `depends_simple` built up that contains link dependencies for
+*every* page in the wiki. A very bloaty way to represent the dependency!
+
+Per [[dependency_types]], `link(done)` only needs to list in
+`depends_simple` the pages that currently match. If a page is modified
+to add the link, the regular dependency calculation code notices that
+a new page matches. If a page that had the link is modified to remove it,
+the `depends_simple` lets ikiwiki remember that the now non-matching page
+matched before.
+
+Where that fell down was `!link(done)`. A page matching that was not added
+to `depends_simple`, because the `link(done)` did not match it. If the page
+is modified to add the link, the regular dependency calculation code
+didn't notice, since the pagespec no longer matched.
+
+In this case, `depends_simple` needs to contain all pages
+that do *not* match `link_done)`, but before my change, it contained
+all pages that *do* match. After my change, it contained all pages.
+
+So, seems what is needed is a way for influence info to be manipulated by
+the boolean operations that are applied. One way would be to have two
+sets of influences be returned, one for successful matches, and one for
+failed matches. Normally, these would be the same. For successful
+`match_link`, the successful influence would be the page.
+For failed `match_link`, the failed influence would be the page.
+
+Then, when NOTting a `*Reason`, swap the two sets of influences.
+When ANDing/ORing, combine the individual sets. Querying the object for
+influences should return only the successful influences.
-- 
cgit v1.2.3


From 8cf6b7abf87818f9063b6ef672f20125de75249c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 21:42:18 -0400
Subject: link fix

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

(limited to 'doc')

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 2ebd53e85..4fe69a90a 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -31,7 +31,7 @@ type DEPEND_LINKS. So, a tag page that inlines `tagged(foo)`
 gets a `depends_simple` built up that contains link dependencies for
 *every* page in the wiki. A very bloaty way to represent the dependency!
 
-Per [[dependency_types]], `link(done)` only needs to list in
+Per [[todo/dependency_types]], `link(done)` only needs to list in
 `depends_simple` the pages that currently match. If a page is modified
 to add the link, the regular dependency calculation code notices that
 a new page matches. If a page that had the link is modified to remove it,
-- 
cgit v1.2.3


From 09ff797682fd89380a4a71564ec02649af99851e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 21:55:12 -0400
Subject: more wrongness

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

(limited to 'doc')

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 4fe69a90a..472de6349 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -57,3 +57,8 @@ For failed `match_link`, the failed influence would be the page.
 Then, when NOTting a `*Reason`, swap the two sets of influences.
 When ANDing/ORing, combine the individual sets. Querying the object for
 influences should return only the successful influences.
+
+In light of this, commit f2b3d1341447cbf29189ab490daae418fbe5d02d seems
+thuroughly wrong. So, what about influence info for other matches
+like `!author(foo)` etc? Currently, none is returned, but it should
+be a content influence. What about backlink influence data?
-- 
cgit v1.2.3


From 17a89d3d19f3a04ca2686ff18df127e5afaf9577 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 21:57:12 -0400
Subject: update

---
 doc/plugins/tag/discussion.mdwn                             | 1 +
 doc/todo/auto-create_tag_pages_according_to_a_template.mdwn | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/tag/discussion.mdwn b/doc/plugins/tag/discussion.mdwn
index 03dcb7b2f..dfd749252 100644
--- a/doc/plugins/tag/discussion.mdwn
+++ b/doc/plugins/tag/discussion.mdwn
@@ -28,3 +28,4 @@ See [[todo/auto-create tag pages according to a template]]
 
 -- Jeremy Schultz <jeremy.schultz@uleth.ca>
 
+`tag_autocreate` can now enable this. --[[Joey]] 
diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 32870dd3d..1e0a910f4 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -247,3 +247,5 @@ I've tested it somewhat. --[[Joey]]
 [da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0 (commitdiff for da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0)
 [a358d74bef51dae31332ff27e897fe04834571e6]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=a358d74bef51dae31332ff27e897fe04834571e6 (commitdiff for a358d74bef51dae31332ff27e897fe04834571e6)
 [981400177d68a279f485727be3f013e68f0bf691]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=981400177d68a279f485727be3f013e68f0bf691 (commitdiff for 981400177d68a279f485727be3f013e68f0bf691)
+
+[[!tag done]]
-- 
cgit v1.2.3


From 13325317a32529e02769baa5e61e6c401c675b27 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 22:04:03 -0400
Subject: backlink influence data seems ok

---
 doc/bugs/depends_simple_mixup.mdwn | 2 +-
 t/pagespec_match_list.t            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 472de6349..e7b48f802 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -61,4 +61,4 @@ influences should return only the successful influences.
 In light of this, commit f2b3d1341447cbf29189ab490daae418fbe5d02d seems
 thuroughly wrong. So, what about influence info for other matches
 like `!author(foo)` etc? Currently, none is returned, but it should
-be a content influence. What about backlink influence data?
+be a content influence. (Backlink influence data is ok.)
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 05dc012fe..ee5d60f88 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 94;
+use Test::More tests => 107;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -80,7 +80,7 @@ foreach my $spec ("* and link(bar)", "* or link(bar)") {
 }
 
 # a pagespec with backlinks() will add as an influence the page with the links
-foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)") {
+foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)", "!backlink(foo)") {
 	pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
-- 
cgit v1.2.3


From c98414e192285b2607ee9fcb27f0e8e00db5fb26 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 23:08:54 -0400
Subject: added a test case for this bug

Further analysis suggests fixing this might not be as dreadful as I first
thought!
---
 doc/bugs/depends_simple_mixup.mdwn | 24 ++++++++++++++++++++++--
 t/pagespec_match_list.t            | 20 +++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index e7b48f802..79bfa8bdc 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -44,9 +44,11 @@ is modified to add the link, the regular dependency calculation code
 didn't notice, since the pagespec no longer matched.
 
 In this case, `depends_simple` needs to contain all pages
-that do *not* match `link_done)`, but before my change, it contained
+that do *not* match `link(done)`, but before my change, it contained
 all pages that *do* match. After my change, it contained all pages.
 
+----
+
 So, seems what is needed is a way for influence info to be manipulated by
 the boolean operations that are applied. One way would be to have two
 sets of influences be returned, one for successful matches, and one for
@@ -58,7 +60,25 @@ Then, when NOTting a `*Reason`, swap the two sets of influences.
 When ANDing/ORing, combine the individual sets. Querying the object for
 influences should return only the successful influences.
 
-In light of this, commit f2b3d1341447cbf29189ab490daae418fbe5d02d seems
+----
+
+Would it be possible to avoid the complication of maintianing two sets of
+influence info? 
+
+Well, notice that the influence of `pagespec_match($page, "link(done)")`
+is $page. Iff the match succeeds.
+
+Also, the influence of `pagespec_match($page, "!link(done)")` is
+$page. Iff the (overall) match succeeds.
+
+Does that hold for all cases? If so, the code that populates
+`depends_simple` could just test if the pagespec was successful, and
+if not, avoid adding $page influences, while still adding any other, 
+non-$page influences.
+
+----
+
+Hmm, commit f2b3d1341447cbf29189ab490daae418fbe5d02d seems
 thuroughly wrong. So, what about influence info for other matches
 like `!author(foo)` etc? Currently, none is returned, but it should
 be a content influence. (Backlink influence data is ok.)
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index ee5d60f88..27546e6ca 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 107;
+use Test::More tests => 115;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -27,6 +27,8 @@ IkiWiki::checkconfig();
 $IkiWiki::pagectime{foo} = 2;
 $IkiWiki::pagectime{foo2} = 2;
 $IkiWiki::pagectime{foo3} = 1;
+$IkiWiki::pagectime{foo4} = 1;
+$IkiWiki::pagectime{foo5} = 1;
 $IkiWiki::pagectime{bar} = 3;
 $IkiWiki::pagectime{"post/1"} = 6;
 $IkiWiki::pagectime{"post/2"} = 6;
@@ -69,12 +71,28 @@ foreach my $spec ("* and link(bar)", "* or link(bar)") {
 	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
 	ok($IkiWiki::depends_simple{foo2}{foo2} == $IkiWiki::DEPEND_LINKS);
+	ok($IkiWiki::depends_simple{foo2}{foo} != $IkiWiki::DEPEND_LINKS);
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 	pagespec_match_list("foo3", $spec, deptype => deptype("links"));
 	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
 	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_LINKS);
+	ok($IkiWiki::depends_simple{foo3}{foo} != $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+}
+# Above we tested that a link pagespec is influenced
+# by the pages that currently contain the link.
+
+# Oppositely, a pagespec that tests for pages that do not have a link
+# is not influenced by pages that currently contain the link, but
+# is instead influenced by pages that currently do not (but that
+# could be changed to have it).
+foreach my $spec ("* and !link(bar)", "* and !(!(!link(bar)))") {
+	pagespec_match_list("foo2", $spec);
+	ok($IkiWiki::depends_simple{foo2}{foo2} != $IkiWiki::DEPEND_LINKS);
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 }
-- 
cgit v1.2.3


From 2b175d7c1fe997277800c0d501332e96de475c6d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:12:15 -0400
Subject: improved fix for depends_simple_mixup

Avoid adding the page matched against as an influence for
currently failing pagespec matches, while still adding
any other influences.

This avoids bloating depends_simple with lots of bogus influences when
matching eg, "!link(done)". It's only necessary for the page being tested
to be an influence of that if the page matches.
---
 IkiWiki.pm                         | 14 +++++++++++++-
 doc/bugs/depends_simple_mixup.mdwn |  6 +++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0791e1e75..509f9ba2e 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1818,10 +1818,12 @@ sub add_depends ($$;$) {
 	foreach my $p (keys %pagesources) {
 		my $r=$sub->($p, location => $page);
 		my $i=$r->influences;
+		my $static=$r->influences_static;
 		foreach my $k (keys %$i) {
+			next unless $r || $static || $k eq $page;
 			$depends_simple{$page}{lc $k} |= $i->{$k};
 		}
-		last if $r->influences_static;
+		last if $static;
 	}
 
 	$depends{$page}{$pagespec} |= $deptype;
@@ -2136,6 +2138,9 @@ sub pagespec_match_list ($$;@) {
 		my $r=$sub->($p, %params, location => $page);
 		error(sprintf(gettext("cannot match pages: %s"), $r))
 			if $r->isa("IkiWiki::ErrorReason");
+		unless ($r) {
+			$r->remove_influence($p);
+		}
 		$accum |= $r;
 		if ($r) {
 			push @matches, $p;
@@ -2232,6 +2237,13 @@ sub merge_influences {
 	}
 }
 
+sub remove_influence {
+	my $this=shift;
+	my $torm=shift;
+
+	delete $this->[1]{$torm};
+}
+
 package IkiWiki::ErrorReason;
 
 our @ISA = 'IkiWiki::FailReason';
diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
index 79bfa8bdc..a5910d02e 100644
--- a/doc/bugs/depends_simple_mixup.mdwn
+++ b/doc/bugs/depends_simple_mixup.mdwn
@@ -81,4 +81,8 @@ non-$page influences.
 Hmm, commit f2b3d1341447cbf29189ab490daae418fbe5d02d seems
 thuroughly wrong. So, what about influence info for other matches
 like `!author(foo)` etc? Currently, none is returned, but it should
-be a content influence. (Backlink influence data is ok.)
+be a content influence. (Backlink influence data seems ok.)
+
+----
+
+[[done]] again!
-- 
cgit v1.2.3


From 170725dc3e6dd99397959c50d8f33bb0c7926f3a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:40:05 -0400
Subject: update

---
 doc/ikiwiki/directive/pagestats/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/pagestats/discussion.mdwn b/doc/ikiwiki/directive/pagestats/discussion.mdwn
index d72b4058d..99029e88e 100644
--- a/doc/ikiwiki/directive/pagestats/discussion.mdwn
+++ b/doc/ikiwiki/directive/pagestats/discussion.mdwn
@@ -13,3 +13,6 @@ Thanks
 
 > The approach that [PmWiki](http://www.pmwiki.org) takes is that it enables the optional auto-creation of (empty) pages which match a particular "group" (set of sub-pages); thus one could set all the "tags/*" pages to be auto-created, creating a new tags/foo page the first time the \[[!tag foo]] directive is used. See [[todo/auto-create_tag_pages_according_to_a_template]] for more discussion on this idea.
 > -- [[KathrynAndersen]]
+
+> Update: Ikiwiki can auto-create tags now, though it only defaults to
+> doing so when tagbase is set. --[[Joey]] 
-- 
cgit v1.2.3


From 1f5d1dff615b8741a2104dad1d42c13b5b4f6d02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 00:42:53 -0400
Subject: update

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

(limited to 'doc')

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 8e2a01827..c126fd585 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -78,7 +78,8 @@ Probably incomplete list:
 * Make pagespecs match relative by default? (see [[discussion]])
 * Flip wikilinks? (see [[todo/link_plugin_perhaps_too_general?]])
 * YADA format setup files per default?
-* Enable `tag_autocreate` by default.
+* Enable tagbase by default (so that tag autocreation will work by default).
+  Note that this is already done for wikis created by `auto-blog.setup`.
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
-- 
cgit v1.2.3


From ad296f90c3b99bb5e033f769c44e5653f518f264 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 13:45:25 -0400
Subject: add

---
 ...dittemplate_should_look_in_templates_directory_by_default.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/todo/edittemplate_should_look_in_templates_directory_by_default.mdwn

(limited to 'doc')

diff --git a/doc/todo/edittemplate_should_look_in_templates_directory_by_default.mdwn b/doc/todo/edittemplate_should_look_in_templates_directory_by_default.mdwn
new file mode 100644
index 000000000..4bc10e432
--- /dev/null
+++ b/doc/todo/edittemplate_should_look_in_templates_directory_by_default.mdwn
@@ -0,0 +1,8 @@
+[[plugins/edittemplate]] looks for the specified template relative to the
+page the directive appears on. Which can be handy, eg, make a
+blog/mytemplate and put the directive on blog, and it will find
+"mytemplate". However, it can also be confusing, since other templates
+always are looked for in `templates/`.
+
+I think it should probably fall back to looking for `templates/$foo`.
+--[[Joey]] 
-- 
cgit v1.2.3


From 584391aedd2f5392db7e9d3d46cf202d6cb8e951 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 14:07:45 -0400
Subject: clarify

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

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 404c3b44f..9e8c59f63 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -315,9 +315,9 @@ a new custom parameter to the template.
 
 This hook allows plugins to change the [[template|wikitemplates]] that is
 used for a page in the wiki. The hook is passed a "page" parameter, and
-should return the name of the template file to use, or undef if it doesn't
-want to change the default ("page.tmpl"). Template files are looked for in
-/usr/share/ikiwiki/templates by default.
+should return the name of the template file to use (relative to the
+template directory), or undef if it doesn't want to change the default
+("page.tmpl").
 
 ### sanitize
 
-- 
cgit v1.2.3


From 23d62f42bd8fe18087cd293962a79d937cf5a3bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 14:35:00 -0400
Subject: remove add_templates option

Templates are moving into the srcdir, and will also be searched for in
configured underlays, so this is redundant.
---
 IkiWiki.pm                 |  9 +--------
 IkiWiki/Plugin/underlay.pm | 11 -----------
 doc/plugins/underlay.mdwn  |  6 ------
 3 files changed, 1 insertion(+), 25 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ec8b32a63..c2c2337b4 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -157,13 +157,6 @@ sub getsetup () {
 		safe => 0, # path
 		rebuild => 1,
 	},
-	templatedirs => {
-		type => "internal",
-		default => [],
-		description => "additional directories containing template files",
-		safe => 0,
-		rebuild => 0,
-	},
 	underlaydir => {
 		type => "string",
 		default => "$installdir/share/ikiwiki/basewiki",
@@ -1661,7 +1654,7 @@ sub saveindex () {
 sub template_file ($) {
 	my $template=shift;
 
-	foreach my $dir ($config{templatedir}, @{$config{templatedirs}},
+	foreach my $dir ($config{templatedir},
 	                 "$installdir/share/ikiwiki/templates") {
 		return "$dir/$template" if -e "$dir/$template";
 	}
diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 116fe7324..3ea19c635 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -27,14 +27,6 @@ sub getsetup () {
 			safe => 0,
 			rebuild => 1,
 		},
-		add_templates => {
-			type => "string",
-			example => ["$ENV{HOME}/.ikiwiki/templates"],
-			description => "extra template directories to add",
-			advanced => 1,
-			safe => 0,
-			rebuild => 1,
-		},
 }
 
 sub checkconfig () {
@@ -43,9 +35,6 @@ sub checkconfig () {
 			add_underlay($dir);
 		}
 	}
-	if ($config{add_templates}) {
-		push @{$config{templatedirs}}, @{$config{add_templates}};
-	}
 }
 
 1;
diff --git a/doc/plugins/underlay.mdwn b/doc/plugins/underlay.mdwn
index 8836a394c..0cf819472 100644
--- a/doc/plugins/underlay.mdwn
+++ b/doc/plugins/underlay.mdwn
@@ -12,9 +12,3 @@ revision control, like photos or software releases.
 Directories in `add_underlays` should usually be absolute. If relative,
 they're interpreted as relative to the parent directory of the basewiki
 underlay, which is probably not particularly useful in this context.
-
---
-
-This plugin also adds an `add_templates` option to the setup file.
-Its value is a list of template directories to look for template files in,
-if they are not present in the `templatedir`.
-- 
cgit v1.2.3


From 8eac7c2ad4966bdf2a1ea003df9e356da4c4e6bd Mon Sep 17 00:00:00 2001
From: "http://seph.myopenid.com/" <http://seph.myopenid.com/@web>
Date: Thu, 22 Apr 2010 19:15:42 +0000
Subject:

---
 doc/ikiwiki/directive/map/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn
index f6eaa6b80..a39862347 100644
--- a/doc/ikiwiki/directive/map/discussion.mdwn
+++ b/doc/ikiwiki/directive/map/discussion.mdwn
@@ -83,3 +83,9 @@ Is there any way to do that?  I don't mind mucking around with `\[[!meta]]` on e
 >>> I think that the ideas and code in
 >>> [[todo/tracking_bugs_with_dependencies]] might also handle this case.
 >>> --[[Joey]]
+
+----
+
+I feel like this should be obvious, but I can't figure out how to sort numerically. 
+
+I have `map pages="./* and !*/Discussion and !*/sidebar"`  and a bunch of pages with names like 1, 2, 3, 11, 12, 1/1.1, 12/12.3 etc. I want to sort them numerically. I see lots of conversation implying there's a simple way to do it, but not how.
-- 
cgit v1.2.3


From 418670c7e85ca32252b82b505ba6bb907229306e Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Thu, 22 Apr 2010 19:28:31 +0000
Subject: map can't currently change sort ordering

---
 doc/ikiwiki/directive/map/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn
index a39862347..b7ac17b1a 100644
--- a/doc/ikiwiki/directive/map/discussion.mdwn
+++ b/doc/ikiwiki/directive/map/discussion.mdwn
@@ -89,3 +89,9 @@ Is there any way to do that?  I don't mind mucking around with `\[[!meta]]` on e
 I feel like this should be obvious, but I can't figure out how to sort numerically. 
 
 I have `map pages="./* and !*/Discussion and !*/sidebar"`  and a bunch of pages with names like 1, 2, 3, 11, 12, 1/1.1, 12/12.3 etc. I want to sort them numerically. I see lots of conversation implying there's a simple way to do it, but not how.
+
+> No, you can't: map can't currently use a non-default sort order. If it
+> could, then you could use [[plugins/sortnaturally]]. There's a
+> [[feature_request|todo/sort_parameter_for_map_plugin_and_directive]];
+> [[a_bug_references_it|bugs/map_sorts_by_pagename_and_not_title_when_show=title_is_used]].
+> --[[smcv]]
-- 
cgit v1.2.3


From abd233931247ef38f1b084afd5906619f02c13b6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 15:34:32 -0400
Subject: look for templates in srcdir and underlays, first

This entailed changing template_params; it no longer takes the template
filename as its first parameter.

Add template_depends to api and replace calls to template() with
template_depends() in appropriate places, where a dependency should be
added on the template.

Other plugins don't use template(), so will need further work.

Also, includes are disabled for security. Enabling includes only when using
templates from the templatedir would be nice, but would add a lot of
complexity to the implementation.
---
 IkiWiki.pm                 | 59 +++++++++++++++++++++++++++-------------------
 IkiWiki/Plugin/comments.pm |  2 +-
 IkiWiki/Plugin/editpage.pm |  2 +-
 IkiWiki/Plugin/google.pm   |  2 +-
 IkiWiki/Plugin/inline.pm   | 22 ++++++++++-------
 IkiWiki/Plugin/search.pm   |  2 +-
 IkiWiki/Render.pm          |  4 +++-
 doc/plugins/write.mdwn     |  8 +++++++
 8 files changed, 63 insertions(+), 38 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c2c2337b4..1327e4db5 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -18,8 +18,8 @@ use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	%autofiles};
 
 use Exporter q{import};
-our @EXPORT = qw(hook debug error template htmlpage deptype
-	add_depends pagespec_match pagespec_match_list bestlink
+our @EXPORT = qw(hook debug error htmlpage template template_depends
+	deptype add_depends pagespec_match pagespec_match_list bestlink
 	htmllink readfile writefile pagetype srcfile pagename
 	displaytime will_render gettext ngettext urlto targetpage
 	add_underlay pagetitle titlepage linkpage newpagefile
@@ -1652,47 +1652,58 @@ sub saveindex () {
 }
 
 sub template_file ($) {
-	my $template=shift;
+	my $name=shift;
 
+	my $template=srcfile("templates/$name", 1);
+	return $template if defined $template;
+	
 	foreach my $dir ($config{templatedir},
 	                 "$installdir/share/ikiwiki/templates") {
-		return "$dir/$template" if -e "$dir/$template";
+		return "$dir/$name" if -e "$dir/$name";
 	}
 	return;
 }
 
 sub template_params (@) {
-	my $filename=template_file(shift);
-
-	if (! defined $filename) {
-		return if wantarray;
-		return "";
-	}
+	filter => sub {
+		my $text_ref = shift;
+		${$text_ref} = decode_utf8(${$text_ref});
+	},
+	loop_context_vars => 1,
+	die_on_bad_params => 0,
+	@_,
+	no_includes => 1,
+}
 
-	my @ret=(
-		filter => sub {
-			my $text_ref = shift;
-			${$text_ref} = decode_utf8(${$text_ref});
-		},
-		filename => $filename,
-		loop_context_vars => 1,
-		die_on_bad_params => 0,
+sub template ($;@) {
+	require HTML::Template;
+	return HTML::Template->new(template_params(
+		filename => template_file(shift),
 		@_
-	);
-	return wantarray ? @ret : {@ret};
+	));
 }
 
-sub template ($;@) {
+sub template_depends ($$;@) {
+	my $name=shift;
+	my $page=shift;
+
+	if (defined $page) {
+		add_depends($page, "templates/$name");
+	}
+	my $filename=template_file($name);
+
 	require HTML::Template;
-	return HTML::Template->new(template_params(@_));
+	return HTML::Template->new(template_params(
+		filename => $filename,
+		@_
+	));
 }
 
 sub misctemplate ($$;@) {
 	my $title=shift;
 	my $pagebody=shift;
 	
-	my $template=template("misc.tmpl");
-	$template->param(
+	my $template=template("misc.tmpl",
 		title => $title,
 		indexlink => indexlink(),
 		wikiname => $config{wikiname},
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 58bd4b851..ed75a6e46 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -274,7 +274,7 @@ sub editcomment ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		table => 0,
-		template => scalar IkiWiki::template_params('editcomment.tmpl'),
+		template => template('editcomment.tmpl'),
 	);
 
 	IkiWiki::decode_form_utf8($form);
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 26e38abc1..5c94ecbca 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -78,7 +78,7 @@ sub cgi_editpage ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		table => 0,
-		template => scalar template_params("editpage.tmpl"),
+		template => template("editpage.tmpl"),
 	);
 	
 	decode_form_utf8($form);
diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 48ad4c8ce..68cb16513 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -36,7 +36,7 @@ sub pagetemplate (@) {
 	# Add search box to page header.
 	if ($template->query(name => "searchform")) {
 		if (! defined $form) {
-			my $searchform = template("googleform.tmpl", blind_cache => 1);
+			my $searchform = template_depends("googleform.tmpl", $page, blind_cache => 1);
 			$searchform->param(url => $config{url});
 			$form=$searchform->output;
 		}
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 3359af314..043649742 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -299,7 +299,7 @@ sub preprocess_inline (@) {
 	    (exists $params{postform} && yesno($params{postform}))) &&
 	    IkiWiki->can("cgi_editpage")) {
 		# Add a blog post form, with feed buttons.
-		my $formtemplate=template("blogpost.tmpl", blind_cache => 1);
+		my $formtemplate=template_depends("blogpost.tmpl", $params{page}, blind_cache => 1);
 		$formtemplate->param(cgiurl => $config{cgiurl});
 		$formtemplate->param(rootpage => rootpage(%params));
 		$formtemplate->param(rssurl => $rssurl) if $feeds && $rss;
@@ -320,19 +320,23 @@ sub preprocess_inline (@) {
 	}
 	elsif ($feeds && !$params{preview} && ($emptyfeeds || @feedlist)) {
 		# Add feed buttons.
-		my $linktemplate=template("feedlink.tmpl", blind_cache => 1);
+		my $linktemplate=template_depends("feedlink.tmpl", $params{page}, blind_cache => 1);
 		$linktemplate->param(rssurl => $rssurl) if $rss;
 		$linktemplate->param(atomurl => $atomurl) if $atom;
 		$ret.=$linktemplate->output;
 	}
 	
 	if (! $feedonly) {
-		require HTML::Template;
-		my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
-		if (! @params) {
-			error sprintf(gettext("nonexistant template %s"), $params{template});
+		my $template;
+		if (! $raw) {
+			eval {
+				$template=template_depends($params{template}.".tmpl", $params{page},
+					blind_cache => 1);
+			};
+			if (! $@ || ! $template) {
+				error sprintf(gettext("nonexistant template %s"), $params{template});
+			}
 		}
-		my $template=HTML::Template->new(@params) unless $raw;
 		my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content'));
 	
 		foreach my $page (@list) {
@@ -534,7 +538,7 @@ sub genfeed ($$$$$@) {
 	
 	my $url=URI->new(encode_utf8(urlto($page,"",1)));
 	
-	my $itemtemplate=template($feedtype."item.tmpl", blind_cache => 1);
+	my $itemtemplate=template_depends($feedtype."item.tmpl", $page, blind_cache => 1);
 	my $content="";
 	my $lasttime = 0;
 	foreach my $p (@pages) {
@@ -598,7 +602,7 @@ sub genfeed ($$$$$@) {
 		$lasttime = $pagemtime{$p} if $pagemtime{$p} > $lasttime;
 	}
 
-	my $template=template($feedtype."page.tmpl", blind_cache => 1);
+	my $template=template_depends($feedtype."page.tmpl", $page, blind_cache => 1);
 	$template->param(
 		title => $page ne "index" ? pagetitle($page) : $config{wikiname},
 		wikiname => $config{wikiname},
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index a1e7026ca..55edf8752 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -52,7 +52,7 @@ sub pagetemplate (@) {
 	# Add search box to page header.
 	if ($template->query(name => "searchform")) {
 		if (! defined $form) {
-			my $searchform = template("searchform.tmpl", blind_cache => 1);
+			my $searchform = template_depends("searchform.tmpl", $page, blind_cache => 1);
 			$searchform->param(searchaction => $config{cgiurl});
 			$form=$searchform->output;
 		}
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 49d080c16..7cf19645e 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -74,7 +74,9 @@ sub genpage ($$) {
 			$templatefile=$file;
 		}
 	});
-	my $template=template(defined $templatefile ? $templatefile : 'page.tmpl', blind_cache => 1);
+	my $template=template_depends(
+		defined $templatefile ? $templatefile : 'page.tmpl', $page,
+		blind_cache => 1);
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 9e8c59f63..eaa008131 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -705,6 +705,14 @@ Creates and returns a [[!cpan HTML::Template]] object. The first parameter
 is the name of the file in the template directory. The optional remaining
 parameters are passed to `HTML::Template->new`.
 
+### `template_depends($$;@)`
+
+Use this instead of `template()` if the content of a template is being
+included into a page. This causes the page to depend on the template,
+so it will be updated if the template is modified.
+
+Like `template()`, except the second parameter is the page.
+
 ### `htmlpage($)`
 
 Passed a page name, returns the base name that will be used for a the html
-- 
cgit v1.2.3


From 4c99904af30c9213060809937962c1a4ab9c5ad2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 16:29:49 -0400
Subject: reference my branch for this

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

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index a112cb9da..66aa07193 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -39,6 +39,9 @@ Note also that when using templates from "$srcdir/templates/", `no_includes`
 needs to be set. Currently this is done by the two plugins that use
 such templates, while includes are allowed in `templatedir`.
 
+Have started working on this.
+[[!template id=gitbranch branch=origin/templatemove author="[[Joey]]"]]
+
 > But would this require that templates be parseable as wiki pages?  Because that would be a nuisance. --[[KathrynAndersen]]
 
 >> It would be better for them not to be rendered separately at all.
-- 
cgit v1.2.3


From 898fc1095563412400484d5378ad82b334414b36 Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Fri, 23 Apr 2010 02:36:27 +0000
Subject:

---
 ...ails_oddly_when_older_ikiwiki_is_installed.mdwn | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn

(limited to 'doc')

diff --git a/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn b/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
new file mode 100644
index 000000000..b11972165
--- /dev/null
+++ b/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
@@ -0,0 +1,26 @@
+I got this failure when trying to build ikiwiki version 3.20100403:
+
+	$ perl Makefile.PL INSTALL_BASE=/opt/ikiwiki PREFIX=
+	Writing Makefile for IkiWiki
+	$ make
+
+*...snip...*
+
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki.in > ikiwiki.out
+	chmod +x ikiwiki.out
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-transition.in > ikiwiki-transition.out
+	chmod +x ikiwiki-transition.out
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-calendar.in > ikiwiki-calendar.out
+	chmod +x ikiwiki-calendar.out
+	HOME=/home/me /usr/bin/perl -Iblib/lib   ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+	Use of uninitialized value $IkiWiki::Setup::config{"setuptype"} in concatenation (.) or string at IkiWiki/Setup.pm line 53.
+	Can't locate IkiWiki/Setup/.pm in @INC (@INC contains: . /opt/ikiwiki/lib/perl5/i486-linux-gnu-thread-multi /opt/ikiwiki/lib/perl5 blib/lib /etc/perl /usr/local/lib/perl/5.10.1 /usr/local/share/perl/5.10.1 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at (eval 35) line 3.
+
+	make: *** [ikiwiki.setup] Error 2
+
+Note that I had been trying to upgrade with an installed ikiwiki 3.20091114
+already in place under /opt/ikiwiki.  The build does not fail for me
+if I first remove the old ikiwiki installation, nor does it fail with
+3.20100403 or newer installed at /opt/ikiwiki.  Hence this is not
+really a critical bug, although it's somewhat perplexing to me why it
+ought to make a difference.
-- 
cgit v1.2.3


From a2feb7d477a57a4e7feb1334e7ff4abc4067b1d3 Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Fri, 23 Apr 2010 02:40:36 +0000
Subject: rename
 bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn to
 bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn

---
 ...ails_oddly_when_older_ikiwiki_is_installed.mdwn | 26 ++++++++++++++++++++++
 ...ails_oddly_when_older_ikiwiki_is_installed.mdwn | 26 ----------------------
 2 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
 delete mode 100644 doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn

(limited to 'doc')

diff --git a/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn b/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
new file mode 100644
index 000000000..b11972165
--- /dev/null
+++ b/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
@@ -0,0 +1,26 @@
+I got this failure when trying to build ikiwiki version 3.20100403:
+
+	$ perl Makefile.PL INSTALL_BASE=/opt/ikiwiki PREFIX=
+	Writing Makefile for IkiWiki
+	$ make
+
+*...snip...*
+
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki.in > ikiwiki.out
+	chmod +x ikiwiki.out
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-transition.in > ikiwiki-transition.out
+	chmod +x ikiwiki-transition.out
+	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-calendar.in > ikiwiki-calendar.out
+	chmod +x ikiwiki-calendar.out
+	HOME=/home/me /usr/bin/perl -Iblib/lib   ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+	Use of uninitialized value $IkiWiki::Setup::config{"setuptype"} in concatenation (.) or string at IkiWiki/Setup.pm line 53.
+	Can't locate IkiWiki/Setup/.pm in @INC (@INC contains: . /opt/ikiwiki/lib/perl5/i486-linux-gnu-thread-multi /opt/ikiwiki/lib/perl5 blib/lib /etc/perl /usr/local/lib/perl/5.10.1 /usr/local/share/perl/5.10.1 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at (eval 35) line 3.
+
+	make: *** [ikiwiki.setup] Error 2
+
+Note that I had been trying to upgrade with an installed ikiwiki 3.20091114
+already in place under /opt/ikiwiki.  The build does not fail for me
+if I first remove the old ikiwiki installation, nor does it fail with
+3.20100403 or newer installed at /opt/ikiwiki.  Hence this is not
+really a critical bug, although it's somewhat perplexing to me why it
+ought to make a difference.
diff --git a/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn b/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
deleted file mode 100644
index b11972165..000000000
--- a/doc/bugs/creating_build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-I got this failure when trying to build ikiwiki version 3.20100403:
-
-	$ perl Makefile.PL INSTALL_BASE=/opt/ikiwiki PREFIX=
-	Writing Makefile for IkiWiki
-	$ make
-
-*...snip...*
-
-	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki.in > ikiwiki.out
-	chmod +x ikiwiki.out
-	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-transition.in > ikiwiki-transition.out
-	chmod +x ikiwiki-transition.out
-	./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-calendar.in > ikiwiki-calendar.out
-	chmod +x ikiwiki-calendar.out
-	HOME=/home/me /usr/bin/perl -Iblib/lib   ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
-	Use of uninitialized value $IkiWiki::Setup::config{"setuptype"} in concatenation (.) or string at IkiWiki/Setup.pm line 53.
-	Can't locate IkiWiki/Setup/.pm in @INC (@INC contains: . /opt/ikiwiki/lib/perl5/i486-linux-gnu-thread-multi /opt/ikiwiki/lib/perl5 blib/lib /etc/perl /usr/local/lib/perl/5.10.1 /usr/local/share/perl/5.10.1 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at (eval 35) line 3.
-
-	make: *** [ikiwiki.setup] Error 2
-
-Note that I had been trying to upgrade with an installed ikiwiki 3.20091114
-already in place under /opt/ikiwiki.  The build does not fail for me
-if I first remove the old ikiwiki installation, nor does it fail with
-3.20100403 or newer installed at /opt/ikiwiki.  Hence this is not
-really a critical bug, although it's somewhat perplexing to me why it
-ought to make a difference.
-- 
cgit v1.2.3


From 5bc7efab7cc7a437d3d593a3ff62595ed0ab7f81 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 22 Apr 2010 23:00:33 -0400
Subject: switch to PERL5LIB so that use lib inserted for INSTALL_BASE is
 overridden during build

---
 Makefile.PL                                                     | 6 +++---
 doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/Makefile.PL b/Makefile.PL
index 38db20d44..794a2ed47 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -36,7 +36,7 @@ scripts=ikiwiki-update-wikilist ikiwiki-makerepo
 	chmod +x $@
 
 ikiwiki.setup: ikiwiki.out
-	HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+	PERL5LIB=. HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -dumpsetup ikiwiki.setup
 
 extra_build: $(outprogs) ikiwiki.setup docwiki
 	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
@@ -50,10 +50,10 @@ extra_build: $(outprogs) ikiwiki.setup docwiki
 	rm -f ikiwiki.spec.bkp
 	
 docwiki: ikiwiki.out
-	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
+	PERL5LIB=. $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -setup docwiki.setup -refresh
 
 extra_clean:
-	$(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean
+	PERL5LIB=. $(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean
 	rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
 
diff --git a/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn b/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
index b11972165..7b252031b 100644
--- a/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
+++ b/doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn
@@ -24,3 +24,8 @@ if I first remove the old ikiwiki installation, nor does it fail with
 3.20100403 or newer installed at /opt/ikiwiki.  Hence this is not
 really a critical bug, although it's somewhat perplexing to me why it
 ought to make a difference.
+
+> So, using INSTALL_BASE causes a 'use lib' to be hardcoded into the `.out`
+> files; which overrides the -libdir and the -I, and so the old version
+> of IkiWiki.pm is used.
+> [[fixed|done]] --[[Joey]] 
-- 
cgit v1.2.3


From f5466ad7173459bc9481781d8f54ba969f56a516 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Fri, 23 Apr 2010 16:29:05 +0100
Subject: how important is perl 5.10?

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

(limited to 'doc')

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index b71263dae..2000c5dfb 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -245,3 +245,12 @@ Thank you! I'm not a Perl programmer, so what's your opinion: is this behavior a
 
 I am experiencing the same problem "/etc/ikiwiki/custom: failed to set up the repository with ikiwiki-makerepo
 " on Debian squeeze with perl5.10.0. Upgrading to ikiwiki 3.10 fixes it. -- [Albert](http://www.docunext.com/)
+
+----
+
+Just a note, perl 5.10 isn't packaged as part of RHEL or thus CentOS nor EPEL,
+so it's not especially trivial to satisfy that requirement for ikiwiki on
+those platforms, without backporting it from Fedora or building from source.
+However, I have an ikiwiki 3.20100403 running on RHEL-4 supplied 5.8.8 without
+(seemingly too much) complaint.  How strong is the 5.10 requirement? what
+precicely breaks without it? -- [[Jon]]
-- 
cgit v1.2.3


From 4afe2d1170e85a09d43460045b5825fce081c469 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Fri, 23 Apr 2010 17:20:51 +0000
Subject: add my repository in the list

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

(limited to 'doc')

diff --git a/doc/git.mdwn b/doc/git.mdwn
index 0f280fb35..a5fd742ca 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -62,6 +62,7 @@ think about merging them. This is recommended. :-)
   ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
 * [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
 * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
+* [[privat]] `git://github.com/privat/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 92c927cb9285fb2b6e185f24d93ced3729bda04e Mon Sep 17 00:00:00 2001
From: Jon Dowland <jon@alcopop.org>
Date: Fri, 23 Apr 2010 18:28:20 +0100
Subject: half-formed thought about accessible profiling

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

(limited to 'doc')

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index d5593dcbf..eb01821ff 100644
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -51,6 +51,8 @@ Penultimately, the following are merely half-formed thoughts:
    unticking checkboxes next to a tag name (rather than entering the 
    directive into the text of the page directly)
  * perhaps the same for meta
+ * I'd like to make profiling ikiwiki in action very easy for newcomers.
+   Perhaps even a plugin that created a file /profile or similar on build.
 
 Finally, backlinks (since I have issues with the current backlinks
 implementation, see [[bugs/backlinks onhover thing can go weird]]):
-- 
cgit v1.2.3


From 53c8bf9ed98f263163768daeb1d4e0fdbf6e7ef3 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Fri, 23 Apr 2010 17:28:38 +0000
Subject: multiple_sidebars in a gitbranch

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

(limited to 'doc')

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index 02b83244e..bb4339f88 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -15,6 +15,8 @@ those contents instead.
 
 >> Here a simple [[patch]] for multiple sidebars. Not too fancy but better than having multiple copies of the sidebar plugin. --[[jeanprivat]]
 
+>>> I made a [[git]] branch for it [[!template id=gitbranch branch="privat/multiple_sidebars" author="[[jeanprivat]]"]] --[[jeanprivat]]
+
 <pre>
 --- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
 +++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
-- 
cgit v1.2.3


From 796ece2a8a482f219a5d4c568af271286511574e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 13:30:52 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn
index 2000c5dfb..74f7740db 100644
--- a/doc/setup/discussion.mdwn
+++ b/doc/setup/discussion.mdwn
@@ -254,3 +254,7 @@ those platforms, without backporting it from Fedora or building from source.
 However, I have an ikiwiki 3.20100403 running on RHEL-4 supplied 5.8.8 without
 (seemingly too much) complaint.  How strong is the 5.10 requirement? what
 precicely breaks without it? -- [[Jon]]
+
+> I don't remember what was the specific problem with perl 5.8.8. All I can
+> find is some taint checking bugs, which are currently worked around by
+> taint checking being disabled. --[[Joey]]
-- 
cgit v1.2.3


From 54898d16d4c86fddcb1b5588eac67a729c14deeb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 14:44:37 -0400
Subject: allow a bare page name to be specified as a template

---
 IkiWiki.pm                | 31 +++++++++++++++++++++----------
 doc/plugins/write.mdwn    | 11 +++++++++--
 template-transition-notes |  1 +
 3 files changed, 31 insertions(+), 12 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0aaf60569..03441b594 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1653,9 +1653,18 @@ sub saveindex () {
 
 sub template_file ($) {
 	my $name=shift;
+	
+	my $tpage="templates/$name";
+	if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) {
+		$tpage=$pagesources{$tpage};
+		$name.=".tmpl";
+	}
 
-	my $template=srcfile("templates/$name", 1);
-	return $template if defined $template;
+	my $template=srcfile($tpage, 1);
+	if (defined $template) {
+		return $template, $tpage if wantarray;
+		return $template;
+	}
 	
 	foreach my $dir ($config{templatedir},
 	                 "$installdir/share/ikiwiki/templates") {
@@ -1664,18 +1673,16 @@ sub template_file ($) {
 	return;
 }
 
-sub template ($;@) {
-	template_depends(shift, undef, @_);
-}
-
 sub template_depends ($$;@) {
 	my $name=shift;
 	my $page=shift;
-
-	if (defined $page) {
-		add_depends($page, "templates/$name");
+	
+	my ($filename, $tpage)=template_file($name);
+	if (defined $page && defined $tpage) {
+		add_depends($page, $tpage);
 	}
-	my $filename=template_file($name);
+
+	return unless defined $filename;
 
 	require HTML::Template;
 	return HTML::Template->new(
@@ -1691,6 +1698,10 @@ sub template_depends ($$;@) {
 	);
 }
 
+sub template ($;@) {
+	template_depends(shift, undef, @_);
+}
+
 sub misctemplate ($$;@) {
 	my $title=shift;
 	my $pagebody=shift;
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index eaa008131..1407b5a12 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -702,8 +702,15 @@ the entire wiki build and make the wiki unusable.
 ### `template($;@)`
 
 Creates and returns a [[!cpan HTML::Template]] object. The first parameter
-is the name of the file in the template directory. The optional remaining
-parameters are passed to `HTML::Template->new`.
+is the name of the template file. The optional remaining parameters are
+passed to `HTML::Template->new`.
+
+The template file is first looked for in the templates/ subdirectory of the
+srcdir. Failing that, it is looked for in the templatedir. Typically
+the filename will have a ".tmpl" extension. If a filename with no extension
+is passed, a wiki page in templates/ with its name is used as the template.
+That should only be done for templates which it is safe to let wiki users
+edit.
 
 ### `template_depends($$;@)`
 
diff --git a/template-transition-notes b/template-transition-notes
index 193dd79d4..ccff3e78f 100644
--- a/template-transition-notes
+++ b/template-transition-notes
@@ -3,3 +3,4 @@
 * includes no longer allowed in templates
 * template directive no longer uses $foo.tmpl , only
   page $foo.
+* template_params removed (not exported API)
-- 
cgit v1.2.3


From 78fd3b35a2805489185a14e00b53b450eec961f1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 15:02:07 -0400
Subject: allow template pages to not be under templates/

---
 IkiWiki.pm             |  4 +++-
 doc/plugins/write.mdwn | 14 ++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 03441b594..78612cd08 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1654,7 +1654,7 @@ sub saveindex () {
 sub template_file ($) {
 	my $name=shift;
 	
-	my $tpage="templates/$name";
+	my $tpage=($name =~ /^\//) ? $name : "templates/$name";
 	if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) {
 		$tpage=$pagesources{$tpage};
 		$name.=".tmpl";
@@ -1665,6 +1665,8 @@ sub template_file ($) {
 		return $template, $tpage if wantarray;
 		return $template;
 	}
+
+	$name=~s:/::; # avoid path traversal
 	
 	foreach my $dir ($config{templatedir},
 	                 "$installdir/share/ikiwiki/templates") {
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 1407b5a12..00b54bdd3 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -705,12 +705,14 @@ Creates and returns a [[!cpan HTML::Template]] object. The first parameter
 is the name of the template file. The optional remaining parameters are
 passed to `HTML::Template->new`.
 
-The template file is first looked for in the templates/ subdirectory of the
-srcdir. Failing that, it is looked for in the templatedir. Typically
-the filename will have a ".tmpl" extension. If a filename with no extension
-is passed, a wiki page in templates/ with its name is used as the template.
-That should only be done for templates which it is safe to let wiki users
-edit.
+Normally, the template file is first looked for in the templates/ subdirectory
+of the srcdir. Failing that, it is looked for in the templatedir.
+
+Wiki pages can be used as templates. This should be done only for templates
+which it is safe to let wiki users edit. Enable it by passing a filename
+with no ".tmpl" extension. Template pages are normally looked for in
+the templates/ directory. If the page name starts with "/", a page
+elsewhere in the wiki can be used.
 
 ### `template_depends($$;@)`
 
-- 
cgit v1.2.3


From 83703d2f4a8832155e3c111792489062ccc4793b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 15:32:39 -0400
Subject: move template documentation to the template directive

allow new templates to be created via the inline that lists them
---
 doc/ikiwiki/directive/template.mdwn | 71 ++++++++++++++++++++++++++++++--
 doc/templates.mdwn                  | 82 ++-----------------------------------
 2 files changed, 71 insertions(+), 82 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index d538b69b1..ae71ba5b5 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -5,14 +5,79 @@ wiki, by using the template directive. The directive has an `id` parameter
 that identifies the template to use. The remaining parameters are used to
 fill out the template.
 
-Example:
+## Example
 
 	\[[!template id=note text="""Here is the text to insert into my note."""]]
 
 This fills out the `note` template, filling in the `text` field with
 the specified value, and inserts the result into the page.
 
-For a list of available templates, and details about how to create more,
-see the [[templates]] page.
+## Using a template
+
+Generally, a value can include any markup that would be allowed in the wiki
+page outside the template. Triple-quoting the value even allows quotes to
+be included in it. Combined with multi-line quoted values, this allows for
+large chunks of marked up text to be embedded into a template:
+
+        \[[!template id=foo name="Sally" color="green" age=8 notes="""
+        * \[[Charley]]'s sister.
+        * "I want to be an astronaut when I grow up."
+        * Really 8 and a half.
+        """]]
+
+## Creating a template
+
+The template is a regular wiki page, located in the `templates/`
+subdirectory inside the source directory of the wiki.
+
+(Alternatively, templates can be stored in a directory outside the wiki,
+as files with the extension ".tmpl".
+By default, these are searched for in `/usr/share/ikiwiki/templates`;
+the `templatedir` setting can be used to make another directory be searched
+first.)
+
+The template uses the syntax used by the [[!cpan HTML::Template]] perl
+module, which allows for some fairly complex things to be done. Consult its
+documentation for the full syntax, but all you really need to know are a
+few things:
+
+* Each parameter you pass to the template directive will generate a 
+  template variable. There are also some pre-defined variables like PAGE
+  and BASENAME.
+* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
+  in the value will first be converted to html.
+* To insert the raw value of a variable, with wiki markup not yet converted
+  to html, use `<TMPL_VAR raw_variable>`.
+* To make a block of text conditional on a variable being set use
+  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+* To use one block of text if a variable is set and a second if it's not,
+  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+
+Here's a sample template:
+
+        <span class="infobox">
+        Name: \[[<TMPL_VAR raw_name>]]<br />
+        Age: <TMPL_VAR age><br />
+        <TMPL_IF NAME="color">
+        Favorite color: <TMPL_VAR color><br />
+        <TMPL_ELSE>
+        No favorite color.<br />
+        </TMPL_IF>
+        <TMPL_IF NAME="notes">
+        <hr />
+        <TMPL_VAR notes>
+        </TMPL_IF>
+        </span>
+
+The filled out template will be formatted the same as the rest of the page
+that contains it, so you can include WikiLinks and all other forms of wiki
+markup in the template. Note though that such WikiLinks will not show up as
+backlinks to the page that uses the template.
+
+Note the use of "raw_name" inside the [[ikiwiki/WikiLink]] generator in the
+example above. This ensures that if the name contains something that might
+be mistaken for wiki markup, it's not converted to html before being
+processed as a [[ikiwiki/WikiLink]].
+
 
 [[!meta robots="noindex, follow"]]
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 07531ae98..f2b581d2f 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -9,85 +9,9 @@ wiki.
 
 [[!if test="enabled(template) and enabled(inline)" then="""
 
-These templates are available for inclusion onto other pages in this
-wiki:
+These templates are available for use with the template directive.
 
 [[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
-sort=title template=titlepage]]
+sort=title template=titlepage
+rootpage=templates postformtext="Add a new template named:"]]
 """]]
-
-## Using a template
-
-Using a template works like this:
-
-	\[[!template id=note text="""Here is the text to insert into my note."""]]
-
-This fills out the [[note]] template, filling in the `text` field with
-the specified value, and inserts the result into the page.
-
-Generally, a value can include any markup that would be allowed in the wiki
-page outside the template. Triple-quoting the value even allows quotes to
-be included in it. Combined with multi-line quoted values, this allows for
-large chunks of marked up text to be embedded into a template:
-
-        \[[!template id=foo name="Sally" color="green" age=8 notes="""
-        * \[[Charley]]'s sister.
-        * "I want to be an astronaut when I grow up."
-        * Really 8 and a half.
-        """]]
-
-## Creating a template
-
-To create a template, simply add a template directive to a page, and the 
-page will provide a link that can be used to create the template. The template
-is a regular wiki page, located in the `templates/` subdirectory inside
-the source directory of the wiki.
-
-(Alternatively, templates can be stored in a directory outside the wiki,
-as files with the extension ".tmpl".
-By default, these are searched for in `/usr/share/ikiwiki/templates`;
-the `templatedir` setting can be used to make another directory be searched
-first.)
-
-The template uses the syntax used by the [[!cpan HTML::Template]] perl
-module, which allows for some fairly complex things to be done. Consult its
-documentation for the full syntax, but all you really need to know are a
-few things:
-
-* Each parameter you pass to the template directive will generate a 
-  template variable. There are also some pre-defined variables like PAGE
-  and BASENAME.
-* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
-  in the value will first be converted to html.
-* To insert the raw value of a variable, with wiki markup not yet converted
-  to html, use `<TMPL_VAR raw_variable>`.
-* To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
-* To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
-
-Here's a sample template:
-
-        <span class="infobox">
-        Name: \[[<TMPL_VAR raw_name>]]<br />
-        Age: <TMPL_VAR age><br />
-        <TMPL_IF NAME="color">
-        Favorite color: <TMPL_VAR color><br />
-        <TMPL_ELSE>
-        No favorite color.<br />
-        </TMPL_IF>
-        <TMPL_IF NAME="notes">
-        <hr />
-        <TMPL_VAR notes>
-        </TMPL_IF>
-        </span>
-
-The filled out template will be formatted the same as the rest of the page
-that contains it, so you can include WikiLinks and all other forms of wiki
-markup in the template. Note though that such WikiLinks will not show up as
-backlinks to the page that uses the template.
-
-Note the use of "raw_name" inside the [[ikiwiki/WikiLink]] generator. This
-ensures that if the name contains something that might be mistaken for wiki
-markup, it's not converted to html before being processed as a
-[[ikiwiki/WikiLink]].
-- 
cgit v1.2.3


From d822e37d0efc34f2267f275030de11cd3c7ff7bb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 15:32:39 -0400
Subject: move template documentation to the template directive

allow new templates to be created via the inline that lists them
(cherry picked from commit 83703d2f4a8832155e3c111792489062ccc4793b)
---
 doc/ikiwiki/directive/template.mdwn | 71 ++++++++++++++++++++++++++++++--
 doc/templates.mdwn                  | 82 ++-----------------------------------
 2 files changed, 71 insertions(+), 82 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index d538b69b1..ae71ba5b5 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -5,14 +5,79 @@ wiki, by using the template directive. The directive has an `id` parameter
 that identifies the template to use. The remaining parameters are used to
 fill out the template.
 
-Example:
+## Example
 
 	\[[!template id=note text="""Here is the text to insert into my note."""]]
 
 This fills out the `note` template, filling in the `text` field with
 the specified value, and inserts the result into the page.
 
-For a list of available templates, and details about how to create more,
-see the [[templates]] page.
+## Using a template
+
+Generally, a value can include any markup that would be allowed in the wiki
+page outside the template. Triple-quoting the value even allows quotes to
+be included in it. Combined with multi-line quoted values, this allows for
+large chunks of marked up text to be embedded into a template:
+
+        \[[!template id=foo name="Sally" color="green" age=8 notes="""
+        * \[[Charley]]'s sister.
+        * "I want to be an astronaut when I grow up."
+        * Really 8 and a half.
+        """]]
+
+## Creating a template
+
+The template is a regular wiki page, located in the `templates/`
+subdirectory inside the source directory of the wiki.
+
+(Alternatively, templates can be stored in a directory outside the wiki,
+as files with the extension ".tmpl".
+By default, these are searched for in `/usr/share/ikiwiki/templates`;
+the `templatedir` setting can be used to make another directory be searched
+first.)
+
+The template uses the syntax used by the [[!cpan HTML::Template]] perl
+module, which allows for some fairly complex things to be done. Consult its
+documentation for the full syntax, but all you really need to know are a
+few things:
+
+* Each parameter you pass to the template directive will generate a 
+  template variable. There are also some pre-defined variables like PAGE
+  and BASENAME.
+* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
+  in the value will first be converted to html.
+* To insert the raw value of a variable, with wiki markup not yet converted
+  to html, use `<TMPL_VAR raw_variable>`.
+* To make a block of text conditional on a variable being set use
+  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+* To use one block of text if a variable is set and a second if it's not,
+  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+
+Here's a sample template:
+
+        <span class="infobox">
+        Name: \[[<TMPL_VAR raw_name>]]<br />
+        Age: <TMPL_VAR age><br />
+        <TMPL_IF NAME="color">
+        Favorite color: <TMPL_VAR color><br />
+        <TMPL_ELSE>
+        No favorite color.<br />
+        </TMPL_IF>
+        <TMPL_IF NAME="notes">
+        <hr />
+        <TMPL_VAR notes>
+        </TMPL_IF>
+        </span>
+
+The filled out template will be formatted the same as the rest of the page
+that contains it, so you can include WikiLinks and all other forms of wiki
+markup in the template. Note though that such WikiLinks will not show up as
+backlinks to the page that uses the template.
+
+Note the use of "raw_name" inside the [[ikiwiki/WikiLink]] generator in the
+example above. This ensures that if the name contains something that might
+be mistaken for wiki markup, it's not converted to html before being
+processed as a [[ikiwiki/WikiLink]].
+
 
 [[!meta robots="noindex, follow"]]
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 07531ae98..f2b581d2f 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -9,85 +9,9 @@ wiki.
 
 [[!if test="enabled(template) and enabled(inline)" then="""
 
-These templates are available for inclusion onto other pages in this
-wiki:
+These templates are available for use with the template directive.
 
 [[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
-sort=title template=titlepage]]
+sort=title template=titlepage
+rootpage=templates postformtext="Add a new template named:"]]
 """]]
-
-## Using a template
-
-Using a template works like this:
-
-	\[[!template id=note text="""Here is the text to insert into my note."""]]
-
-This fills out the [[note]] template, filling in the `text` field with
-the specified value, and inserts the result into the page.
-
-Generally, a value can include any markup that would be allowed in the wiki
-page outside the template. Triple-quoting the value even allows quotes to
-be included in it. Combined with multi-line quoted values, this allows for
-large chunks of marked up text to be embedded into a template:
-
-        \[[!template id=foo name="Sally" color="green" age=8 notes="""
-        * \[[Charley]]'s sister.
-        * "I want to be an astronaut when I grow up."
-        * Really 8 and a half.
-        """]]
-
-## Creating a template
-
-To create a template, simply add a template directive to a page, and the 
-page will provide a link that can be used to create the template. The template
-is a regular wiki page, located in the `templates/` subdirectory inside
-the source directory of the wiki.
-
-(Alternatively, templates can be stored in a directory outside the wiki,
-as files with the extension ".tmpl".
-By default, these are searched for in `/usr/share/ikiwiki/templates`;
-the `templatedir` setting can be used to make another directory be searched
-first.)
-
-The template uses the syntax used by the [[!cpan HTML::Template]] perl
-module, which allows for some fairly complex things to be done. Consult its
-documentation for the full syntax, but all you really need to know are a
-few things:
-
-* Each parameter you pass to the template directive will generate a 
-  template variable. There are also some pre-defined variables like PAGE
-  and BASENAME.
-* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
-  in the value will first be converted to html.
-* To insert the raw value of a variable, with wiki markup not yet converted
-  to html, use `<TMPL_VAR raw_variable>`.
-* To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
-* To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
-
-Here's a sample template:
-
-        <span class="infobox">
-        Name: \[[<TMPL_VAR raw_name>]]<br />
-        Age: <TMPL_VAR age><br />
-        <TMPL_IF NAME="color">
-        Favorite color: <TMPL_VAR color><br />
-        <TMPL_ELSE>
-        No favorite color.<br />
-        </TMPL_IF>
-        <TMPL_IF NAME="notes">
-        <hr />
-        <TMPL_VAR notes>
-        </TMPL_IF>
-        </span>
-
-The filled out template will be formatted the same as the rest of the page
-that contains it, so you can include WikiLinks and all other forms of wiki
-markup in the template. Note though that such WikiLinks will not show up as
-backlinks to the page that uses the template.
-
-Note the use of "raw_name" inside the [[ikiwiki/WikiLink]] generator. This
-ensures that if the name contains something that might be mistaken for wiki
-markup, it's not converted to html before being processed as a
-[[ikiwiki/WikiLink]].
-- 
cgit v1.2.3


From 7e79da76332b93214a7d9a5c91bc046db4219ee2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 16:10:46 -0400
Subject: template docu reorg

Remove wikitemplates page; fold its contents into templates page.
Update all backlinks. Document new ability to put templates inside srcdir.
---
 doc/bugs/SSI_include_stripped_from_mdwn.mdwn       |  2 +-
 doc/bugs/login_page_non-obvious_with_openid.mdwn   |  4 +-
 doc/features.mdwn                                  |  2 +-
 doc/freesoftware.mdwn                              |  2 +-
 doc/ikiwiki-calendar.mdwn                          |  2 +-
 doc/ikiwiki/directive/edittemplate.mdwn            |  2 +-
 doc/ikiwiki/directive/pagetemplate.mdwn            |  8 +-
 doc/ikiwiki/directive/template.mdwn                |  8 +-
 doc/plugins/autoindex.mdwn                         |  2 +-
 doc/plugins/map/discussion.mdwn                    |  2 +-
 doc/plugins/pagetemplate.mdwn                      |  6 +-
 doc/plugins/template.mdwn                          |  4 +-
 doc/plugins/write.mdwn                             |  4 +-
 doc/templates.mdwn                                 | 91 +++++++++++++++++++---
 doc/tips/comments_feed.mdwn                        |  2 +-
 ...o-create_tag_pages_according_to_a_template.mdwn |  2 +-
 doc/todo/auto_rebuild_on_template_change.mdwn      |  2 +-
 doc/todo/html.mdwn                                 |  2 +-
 doc/todo/multiple_templates.mdwn                   |  2 +-
 doc/usage.mdwn                                     |  5 +-
 doc/wikitemplates.mdwn                             | 52 -------------
 doc/wikitemplates/discussion.mdwn                  | 46 -----------
 22 files changed, 111 insertions(+), 141 deletions(-)
 delete mode 100644 doc/wikitemplates.mdwn
 delete mode 100644 doc/wikitemplates/discussion.mdwn

(limited to 'doc')

diff --git a/doc/bugs/SSI_include_stripped_from_mdwn.mdwn b/doc/bugs/SSI_include_stripped_from_mdwn.mdwn
index 5519e45c6..270da86d3 100644
--- a/doc/bugs/SSI_include_stripped_from_mdwn.mdwn
+++ b/doc/bugs/SSI_include_stripped_from_mdwn.mdwn
@@ -10,7 +10,7 @@ If I have a &lt;--#include virtual="foo" --&gt; in some file, it gets stripped,
 > Anyway, it makes sense for the htmlscrubber to strip server-side
 > includes because otherwise your wiki could be attacked
 > by them being added to it. If you want to use both the htmlscrubber and
-> SSI together, I'd suggest you modify the [[wikitemplates]]
+> SSI together, I'd suggest you modify the [[templates]]
 > and put the SSI on there.
 > 
 > Ie, `page.tmpl` has a 
diff --git a/doc/bugs/login_page_non-obvious_with_openid.mdwn b/doc/bugs/login_page_non-obvious_with_openid.mdwn
index 1d087985a..9aa702037 100644
--- a/doc/bugs/login_page_non-obvious_with_openid.mdwn
+++ b/doc/bugs/login_page_non-obvious_with_openid.mdwn
@@ -36,7 +36,7 @@ If you want to keep it as one form, then perhaps using some javascript to disabl
 > that allows modifying that form, but does not allow creating a separate
 > form. The best way to make it obvious how to use it currently is to just
 > disable password auth, then it's nice and simple. :-) Javascript is an
-> interesting idea. It's also possible to write a custom [[signin.tmpl wikitemplates]] that
+> interesting idea. It's also possible to write a custom [[templates]] that
 > is displayed instead of the regular signin form, and it should be
 > possible to use that to manually lay it out better than FormBuilder
 > manages with its automatic layout. --[[Joey]]
@@ -44,4 +44,4 @@ If you want to keep it as one form, then perhaps using some javascript to disabl
 > I've improved the form, I think it's more obvious now that the openid
 > stuff is separate. Good enough to call this [[done]]. I think. --[[Joey]]
 
->> Looks good, thanks!  :-) -- [[AdamShand]]
\ No newline at end of file
+>> Looks good, thanks!  :-) -- [[AdamShand]]
diff --git a/doc/features.mdwn b/doc/features.mdwn
index ab521213d..07ce648ea 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -72,7 +72,7 @@ you would care to syndicate.
 
 Ikiwiki aims to produce 
 [valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki
-generates html using [[templates|wikitemplates]], and uses [[css]], so you
+generates html using [[templates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
 
 ## [[Plugins]]
diff --git a/doc/freesoftware.mdwn b/doc/freesoftware.mdwn
index 7ac1ac6b4..2243d9b1f 100644
--- a/doc/freesoftware.mdwn
+++ b/doc/freesoftware.mdwn
@@ -4,7 +4,7 @@ ikiwiki, and this documentation wiki, are licensed under the terms of the
 GNU [[GPL]], version 2 or later.
 
 The parts of ikiwiki that become part of your own wiki (the [[basewiki]]
-pages (but not the smilies) and the [[templates|wikitemplates]]) are licensed
+pages (but not the smilies) and the [[templates]]) are licensed
 as follows: 
 
 > Redistribution and use in source and compiled forms, with or without
diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn
index c1f4d7267..03cbdd86c 100644
--- a/doc/ikiwiki-calendar.mdwn
+++ b/doc/ikiwiki-calendar.mdwn
@@ -43,7 +43,7 @@ An example crontab:
 
 # TEMPLATES
 
-This command uses two [[template|wikitemplates]] to generate
+This command uses two [[templates]] to generate
 the pages, `calendarmonth.tmpl` and `calendaryear.tmpl`.
 
 # AUTHOR
diff --git a/doc/ikiwiki/directive/edittemplate.mdwn b/doc/ikiwiki/directive/edittemplate.mdwn
index d731bdb47..c486e821b 100644
--- a/doc/ikiwiki/directive/edittemplate.mdwn
+++ b/doc/ikiwiki/directive/edittemplate.mdwn
@@ -21,7 +21,7 @@ something like:
 	Details:
 
 The template page can also contain [[!cpan HTML::Template]] directives,
-similar to other ikiwiki [[templates]]. Currently only one variable is
+like other ikiwiki [[templates]]. Currently only one variable is
 set: `<TMPL_VAR name>` is replaced with the name of the page being
 created.
 
diff --git a/doc/ikiwiki/directive/pagetemplate.mdwn b/doc/ikiwiki/directive/pagetemplate.mdwn
index 8ad901c1a..401b38099 100644
--- a/doc/ikiwiki/directive/pagetemplate.mdwn
+++ b/doc/ikiwiki/directive/pagetemplate.mdwn
@@ -1,17 +1,13 @@
 The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate desc=pagetemplate]] plugin.
 
-This directive allows a page to be displayed using a different template than
-the default `page.tmpl` template.
+This directive allows a page to be displayed using a different
+[[template|templates]] than the default `page.tmpl` template.
 
 The page text is inserted into the template, so the template controls the
 overall look and feel of the wiki page. This is in contrast to the
 [[ikiwiki/directive/template]] directive, which allows inserting templates
 _into_ the body of a page.
 
-This directive can only reference templates that are already installed
-by the system administrator, typically into the
-`/usr/share/ikiwiki/templates` directory. Example:
-
 	\[[!pagetemplate template="my_fancy.tmpl"]]
 
 [[!meta robots="noindex, follow"]]
diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index ae71ba5b5..052ca7873 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -1,7 +1,11 @@
 The `template` directive is supplied by the [[!iki plugins/template desc=template]] plugin.
 
-[[Templates]] are files that can be filled out and inserted into pages in the
-wiki, by using the template directive. The directive has an `id` parameter
+The template directive allows wiki pages to be used as templates.
+These templates can be filled out and inserted into other pages in the
+wiki using the directive. The [[templates]] page lists templates
+that can be used with this directive.
+
+The directive has an `id` parameter
 that identifies the template to use. The remaining parameters are used to
 fill out the template.
 
diff --git a/doc/plugins/autoindex.mdwn b/doc/plugins/autoindex.mdwn
index d1133e4f5..7c4e40419 100644
--- a/doc/plugins/autoindex.mdwn
+++ b/doc/plugins/autoindex.mdwn
@@ -3,5 +3,5 @@
 
 This plugin searches for [[SubPages|ikiwiki/subpage]] with a missing parent
 page, and generates the parent pages. The generated page content is
-controlled by the `autoindex.tmpl` [[template|wikitemplates]], which by
+controlled by the `autoindex.tmpl` [[template|templates]], which by
 default, uses a [[map]] to list the SubPages.
diff --git a/doc/plugins/map/discussion.mdwn b/doc/plugins/map/discussion.mdwn
index 2f7b140d6..54c921b0f 100644
--- a/doc/plugins/map/discussion.mdwn
+++ b/doc/plugins/map/discussion.mdwn
@@ -1,7 +1,7 @@
 I'm wanting a [[map]] (with indentation levels) showing page _titles_
 instead of page 'names'.  As far as I can see, this is not an option with
 existing plugins - I can get a list of pages using [[inline]] and
-appropriate [[wikitemplates]], but that has no indentation and therefore
+appropriate [[templates]], but that has no indentation and therefore
 doesn't show structure well.
 
 The quick way is to modify the map plugin to have a 'titles' option.  The
diff --git a/doc/plugins/pagetemplate.mdwn b/doc/plugins/pagetemplate.mdwn
index 53f069d0d..8254e14c5 100644
--- a/doc/plugins/pagetemplate.mdwn
+++ b/doc/plugins/pagetemplate.mdwn
@@ -3,8 +3,4 @@
 
 This plugin provides the [[ikiwiki/directive/pagetemplate]]
 [[ikiwiki/directive]], which allows a page to be displayed
-using a different [[template|wikitemplates]] than the default.
-
-This plugin can only use templates that are already installed in
-`/usr/share/ikiwiki/templates` (or wherever ikiwiki is configured to look for
-them). You can choose to use any .tmpl files in that directory.
+using a different [[template|templates]] than the default.
diff --git a/doc/plugins/template.mdwn b/doc/plugins/template.mdwn
index da775f232..8d17e2825 100644
--- a/doc/plugins/template.mdwn
+++ b/doc/plugins/template.mdwn
@@ -3,5 +3,5 @@
 
 This plugin provides the [[ikiwiki/directive/template]] [[ikiwiki/directive]].
 With this plugin, you can set up templates, and cause them to be filled out
-and inserted into pages in the wiki. It's documented and existing templates
-are listed in the [[templates]] page.
+and inserted into pages in the wiki. Existing templates are listed in the
+[[templates]] page.
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 00b54bdd3..9128c7f54 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -297,7 +297,7 @@ value is ignored.
 
 	hook(type => "pagetemplate", id => "foo", call => \&pagetemplate);
 
-[[Templates|wikitemplates]] are filled out for many different things in
+[[Templates]] are filled out for many different things in
 ikiwiki, like generating a page, or part of a blog page, or an rss feed, or
 a cgi. This hook allows modifying the variables available on those
 templates. The function is passed named parameters. The "page" and
@@ -313,7 +313,7 @@ a new custom parameter to the template.
 
 	hook(type => "templatefile", id => "foo", call => \&templatefile);
 
-This hook allows plugins to change the [[template|wikitemplates]] that is
+This hook allows plugins to change the [[template|templates]] that is
 used for a page in the wiki. The hook is passed a "page" parameter, and
 should return the name of the template file to use (relative to the
 template directory), or undef if it doesn't want to change the default
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index f2b581d2f..f7b3adae5 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -1,17 +1,88 @@
-[[!meta robots="noindex, follow"]]
-[[!if test="enabled(template)"
-then="This wiki has templates **enabled**."
-else="This wiki has templates **disabled**."
-]]
+[[Ikiwiki]] uses many templates for many purposes. By editing its templates,
+you can fully customise this site.
 
-Templates are files that can be filled out and inserted into pages in the
-wiki.
+[[!if test="enabled(template)" then="""
+## The template directive
 
+The template directive allows wiki pages to be used as templates.
+These templates can be filled out and inserted into other pages in the
+wiki using the directive.
+"""]]
 [[!if test="enabled(template) and enabled(inline)" then="""
-
-These templates are available for use with the template directive.
-
 [[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
 sort=title template=titlepage
 rootpage=templates postformtext="Add a new template named:"]]
 """]]
+
+[[!if test="enabled(edittemplate)" then="""
+## The edittemplate directive
+
+The edittemplate directive can be used to make new pages default to
+containing text from a template, which can be filled as out the page is
+edited.
+"""]]
+
+## Wiki templates
+
+These templates are used to build the wiki. The aim is to keep almost all
+html out of ikiwiki and in the templates.
+
+* `page.tmpl` - Used for displaying all regular wiki pages.
+* `misc.tmpl` - Generic template used for any page that doesn't
+  have a custom template.
+* `editpage.tmpl` - Create/edit page.
+* `change.tmpl` - Used to create a page describing a change made to the wiki.
+* `passwordmail.tmpl` - Not a html template, this is used to
+  generate a mail with an url the user can use to reset their password.
+* `rsspage.tmpl` - Used for generating rss feeds for [[blogs|blog]].
+* `rssitem.tmpl` - Used for generating individual items on rss feeds.
+* `atompage.tmpl` - Used for generating atom feeds for blogs.
+* `atomitem.tmpl` - Used for generating individual items on atom feeds.
+* `inlinepage.tmpl` - Used for adding a page inline in a blog
+  page.
+* `archivepage.tmpl` - Used for listing a page in a blog archive page.
+* `microblog.tmpl` - Used for showing a microblogging post inline.
+* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
+* `feedlink.tmpl` - Used to add rss/atom links if blogpost.tmpl is not used.
+* `aggregatepost.tmpl` - Used by the [[plugins/aggregate]] plugin to create
+  a page for a post.
+* `searchform.tmpl` - Used by the [[plugins/search]] plugin to add a search
+  form to wiki pages.
+* `searchquery.tmpl` - This is an omega template, used by the
+  [[plugins/search]] plugin.
+* `comment.tmpl` - This template is used to display a comment
+  by the [[plugins/comments]] plugin.
+* `editcomment.tmpl` - This template is the comment post form for the
+  [[plugins/comments]] plugin.
+* `commentmoderation.tmpl` - This template is used to produce the comment
+  moderation form.
+* `recentchanges.tmpl` - This template is used for listing a change
+  on the RecentChanges page.
+
+[[!if test="enabled(pagetemplate)" then="""
+## The pagetemplate directive
+
+The pagetemplate directive can allow individual pages to use a
+different template than `page.tmpl`.
+"""]]
+
+## Template locations
+
+Templates are located in `/usr/share/ikiwiki/templates` by default;
+the `templatedir` setting can be used to make another directory be
+searched first. Customized templates can also be placed inside the
+"templates/" directory in your wiki's source.
+
+## Template syntax
+
+Ikiwiki uses the HTML::Template module as its template engine. This
+supports things like conditionals and loops in templates and is pretty easy
+to learn. All you really need to know are a few things:
+
+* To insert the value of a template variable, use `<TMPL_VAR variable>`.
+* To make a block of text conditional on a variable being set use
+  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+* To use one block of text if a variable is set and a second if it's not,
+  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/tips/comments_feed.mdwn b/doc/tips/comments_feed.mdwn
index 6f8137256..6d4dbb803 100644
--- a/doc/tips/comments_feed.mdwn
+++ b/doc/tips/comments_feed.mdwn
@@ -6,5 +6,5 @@ add a feed that contains all the comments posted to any page. Here's how:
 	\[[!inline pages="internal(*/comment_*)" template=comment]]
 
 The special [[ikiwiki/PageSpec]] matches all comments. The
-[[template|wikitemplates]] causes the comments to be displayed formatted
+[[template|templates]] causes the comments to be displayed formatted
 nicely.
diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index f6d444890..7eb404910 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -17,7 +17,7 @@ The new tag file is then complied during the change phase.
 
 *see git history of this page if you want the patch --[[smcv]]*
 
-This uses a [[template|wikitemplates]] called `autotagpage.tmpl`, here is my template file:
+This uses a [[template|templates]] called `autotagpage.tmpl`, here is my template file:
 
     \[[!inline pages="link(<TMPL_VAR TAG>)" archive="yes"]]
 
diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index a112cb9da..838d15c1a 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -6,7 +6,7 @@ This would allow setting:
 
 	templatedir => "$srcdir/templates",
 
-.. and then the [[wikitemplates]] are managed like other wiki files; and
+.. and then the [[templates]] are managed like other wiki files; and
 like other wiki files, a change to them automatically updates dependent
 pages.
 
diff --git a/doc/todo/html.mdwn b/doc/todo/html.mdwn
index 44f20c876..4f4542be2 100644
--- a/doc/todo/html.mdwn
+++ b/doc/todo/html.mdwn
@@ -1,6 +1,6 @@
 Create some nice(r) stylesheets.
 
 Should be doable w/o touching a single line of code, just
-editing the [[wikitemplates]] and/or editing [[style.css]].
+editing the [[templates]] and/or editing [[style.css]].
 
 [[done]] ([[css_market]] ..)
diff --git a/doc/todo/multiple_templates.mdwn b/doc/todo/multiple_templates.mdwn
index 72783c556..30fb8d6ee 100644
--- a/doc/todo/multiple_templates.mdwn
+++ b/doc/todo/multiple_templates.mdwn
@@ -1,4 +1,4 @@
-> Another useful feature might be to be able to choose a different [[template|wikitemplates]]
+> Another useful feature might be to be able to choose a different [[template|templates]]
 > file for some pages; [[blog]] pages would use a template different from the
 > home page, even if both are managed in the same repository, etc.
 
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 2e12517ea..9cf61cc6c 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -120,10 +120,11 @@ also be configured using a setup file.
 
 * --templatedir dir
 
-  Specify the directory that the page [[templates|wikitemplates]] are stored in.
+  Specify the directory that [[templates|templates]] are stored in.
   Default is `/usr/share/ikiwiki/templates`, or another location as configured at
   build time. If the templatedir is changed, missing templates will still
-  be searched for in the default location as a fallback.
+  be searched for in the default location as a fallback. Templates can also be
+  placed in the "templates/" subdirectory of the srcdir.
 
   Note that if you choose to copy and modify ikiwiki's templates, you will need
   to be careful to keep them up to date when upgrading to new versions of
diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
deleted file mode 100644
index 6e5a7261d..000000000
--- a/doc/wikitemplates.mdwn
+++ /dev/null
@@ -1,52 +0,0 @@
-ikiwiki uses the HTML::Template module as its template engine. This
-supports things like conditionals and loops in templates and is pretty easy
-to learn.
-
-The aim is to keep almost all html out of ikiwiki and in the templates.
-
-It ships with some basic templates which can be customised. These are
-located in `/usr/share/ikiwiki/templates` by default; the `templatedir`
-setting can be used to make another directory be searched first.
-
-* `page.tmpl` - Used for displaying all regular wiki pages.
-* `misc.tmpl` - Generic template used for any page that doesn't
-  have a custom template.
-* `editpage.tmpl` - Create/edit page.
-* `change.tmpl` - Used to create a page describing a change made to the wiki.
-* `passwordmail.tmpl` - Not a html template, this is used to
-  generate a mail with an url the user can use to reset their password.
-* `rsspage.tmpl` - Used for generating rss feeds for [[blogs|blog]].
-* `rssitem.tmpl` - Used for generating individual items on rss feeds.
-* `atompage.tmpl` - Used for generating atom feeds for blogs.
-* `atomitem.tmpl` - Used for generating individual items on atom feeds.
-* `inlinepage.tmpl` - Used for adding a page inline in a blog
-  page.
-* `archivepage.tmpl` - Used for listing a page in a blog archive page.
-* `microblog.tmpl` - Used for showing a microblogging post inline.
-* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
-* `feedlink.tmpl` - Used to add rss/atom links if blogpost.tmpl is not used.
-* `aggregatepost.tmpl` - Used by the [[plugins/aggregate]] plugin to create
-  a page for a post.
-* `searchform.tmpl` - Used by the [[plugins/search]] plugin to add a search
-  form to wiki pages.
-* `searchquery.tmpl` - This is an omega template, used by the
-  [[plugins/search]] plugin.
-* `comment.tmpl` - This template is used to display a comment
-  by the [[plugins/comments]] plugin.
-* `editcomment.tmpl` - This template is the comment post form for the
-  [[plugins/comments]] plugin.
-* `commentmoderation.tmpl` - This template is used to produce the comment
-  moderation form.
-* `recentchanges.tmpl` - This template is used for listing a change
-  on the RecentChanges page.
-
-The [[plugins/pagetemplate]] plugin can allow individual pages to use a
-different template than `page.tmpl`.
-
-The [[plugins/template]] plugin also uses templates, though those
-[[templates]] are typically stored as pages in the wiki, and are inserted
-into pages.
-
-The [[plugins/edittemplate]] plugin is used to make new pages default to
-containing text from a template, which can be filled as out the page is
-edited.
diff --git a/doc/wikitemplates/discussion.mdwn b/doc/wikitemplates/discussion.mdwn
deleted file mode 100644
index f97444e5f..000000000
--- a/doc/wikitemplates/discussion.mdwn
+++ /dev/null
@@ -1,46 +0,0 @@
-## Place for local templates
-Where does one put any locally modified templates for an individual ikiwiki? --Ivan Z.
-
-> You can put them whereever you like; the `templatedir` controls
-> where ikiwiki looks for them. --[[Joey]] 
-
-Thank you for your response! My question arose out of my intention to make
-custom templates for a wiki--specifically suited for the kind of  content
-it will have--so, that would mean I would want to distribute them through
-git together with other content of the wiki. So, for this case the
-separation of conceptually ONE thing (the content, the templates, and the
-config option which orders to use these templates) into THREE separate
-files/repos (the main content repo, the repo with templates, and the config
-file) is not convenient: instead of distributing a single repo, I have to
-tell people to take three things if they want to replicate this wiki. How
-would you solve this inconvenience? Perhaps, a default location of the
-templates *inside* the source repo would do?--Ivan Z.
-
-> I would avoid putting the templates in a subdirectory of the ikiwiki srcdir.
-> (I'd also avoid putting the ikiwiki setup file there.)
-> While it's safe to do either in some cases, there are configurations where
-> it's unsafe. For example, a malicious user could use attachment handling to
-> replace those files with their own, bad versions.
-> 
-> So, two ideas for where to put the templatedir and ikiwiki setup. 
-
-> * The easiest option is to put your wiki content in a subdirectory
->   ("wiki", say) and point `srcdir` at that.
->   then you can have another subdirectory for the wikitemplates,
->   and put the setup file at the top.
-> * Another option if using git would be to have a separate branch,
->   in the same git repository, that holds wikitemplates and the setup file.
->   Then you check out the repository once to make the `srcdir` available,
->   and have a second checkout, of the other branch, to make the other stuff
->   available.
-> 
-> Note that with either of these methods, you have to watch out if
-> giving other direct commit access to the repository. They could
-> still edit the setup file and templates, so only trusted users should
-> be given access. (It is, however, perfectly safe to let people edit
-> the wiki via the web, and is even safe to configure
-> [[tips/untrusted_git_push]] to such a repository.) --[[Joey]]
-
-Thanks, that's a nice and simple idea: to have a subdirectory! I'll try it. --Ivan Z.
-
-A [[!taglink wish|wishlist]]: the ikiwiki program could be improved so that it follows the same logic as git in looking for its config: it could ascend directories until it finds an `.ikiwiki/` directory with `.ikiwiki/setup` and then uses that configuration. Now I'm tired to always type `ikiwiki --setup path/to/the/setup --refresh` when working in my working clone of the sources; I'd like to simply type `ikiwiki` instead, and let it find the setup file. The default location to look for templates could also be made to be a sibling of the setup file: `.ikiwiki/templates/`. --Ivan Z.
-- 
cgit v1.2.3


From d5c5fef363564261ccba236f1d64eaa60567d514 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 16:48:37 -0400
Subject: update

---
 doc/todo/auto_rebuild_on_template_change.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 66aa07193..037d0d1db 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -62,3 +62,15 @@ Have started working on this.
 >>>>>> it'd either be necessary to make them be internal pages
 >>>>>> (templates/inlinepage._tmpl) or special-case them in some other way.
 >>>>>> --[[smcv]]
+
+>>>>>>> In my branch, I left in support for the templatedir, and also
+>>>>>>> /usr/share/ikiwiki/templates. So, users do not have to put their
+>>>>>>> custom templates in templates/ in the wiki. If they do, 
+>>>>>>> the templates are copied to the destdir like other non-wiki page files
+>>>>>>> are. The templates are not wiki pages, except those used by a few
+>>>>>>> things like the [[plugins/template]] plugin.
+>>>>>>> 
+>>>>>>> That seems acceptable, since users probably don't need to modify
+>>>>>>> many templates, so the clutter is small. (Especially when
+>>>>>>> compared to the other clutter the basewiki always puts in destdir.)
+>>>>>>> This could be revisted later. --[[Joey]] 
-- 
cgit v1.2.3


From 6c64ce0336240be16eeae81313e53c630cb196bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:01:22 -0400
Subject: update news for template change

---
 debian/NEWS                                   | 32 +++++++++++++++++++--------
 doc/todo/auto_rebuild_on_template_change.mdwn |  2 ++
 template-transition-notes                     |  4 ----
 3 files changed, 25 insertions(+), 13 deletions(-)
 delete mode 100644 template-transition-notes

(limited to 'doc')

diff --git a/debian/NEWS b/debian/NEWS
index 3a8705680..69967c84c 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -2,22 +2,36 @@ ikiwiki (3.20100422) unstable; urgency=low
 
   This version of ikiwiki has a lot of changes that you need to know about.
 
+  Now you can include customised versions of templates in the source
+  of your wiki. (For example, templates/page.tmpl.) When these templates
+  are changed, ikiwiki will automatically rebuild pages that use them.
+
   The --getctime switch is renamed to --gettimes, and it also gets the 
   file modification time. And it's a lot faster (when using git). But
   the really important change is, you don't have to remember to use this
   switch. Now ikiwiki will do it when it needs to.
 
-  Starting from this version, the "tagged()" pagespec only matches tags,
-  not regular wikilinks. If your wiki accidentially relied on the old,
-  buggy behavior, you might need to change its pagespecs to use "link()".
+  At last, the "tagged()" pagespec only matches tags, not regular wikilinks.
+  If your wiki accidentially relied on the old, buggy behavior, you might
+  need to change its pagespecs to use "link()".
+
+  Many of your wishes have been answered: Now tag pages can automatically be
+  created when new tags are used. This feature is enabled by default if you
+  have configured a tagbase. It can be turned on or off using the
+  tag_autocreate setting.
+
+  These changes may also affect some users:
+
+  * The title_natural sort method (as used by the inline directive, etc)
+    have been moved to the new sortnaturally plugin, which is not enabled
+    by default since it requires the Sort::Naturally perl module.
 
-  Now tag pages can automatically be created as new tags are used. This
-  feature is enabled by default if you have configured a tagbase. It
-  can be turned on or off using the tag_autocreate setting.
+  * TMPL_INCLUDE is no longer supported in any template used by ikiwiki.
+    It used to be allowed in certian templates, but not in others.
 
-  The title_natural sort method (as used by the inline directive, etc)
-  have been moved to the new sortnaturally plugin, which is not enabled
-  by default since it requires the Sort::Naturally perl module.
+  * The add_templates option has been removed from the underlay plugin.
+    If you used this option, you can instead use templates/ subdirectories
+    inside underlay directories added by the add_underlays option.
 
   Due to the above and other changes, all wikis need to be rebuilt on
   upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn
index 192b22f70..ea990b877 100644
--- a/doc/todo/auto_rebuild_on_template_change.mdwn
+++ b/doc/todo/auto_rebuild_on_template_change.mdwn
@@ -74,3 +74,5 @@ Have started working on this.
 >>>>>>> many templates, so the clutter is small. (Especially when
 >>>>>>> compared to the other clutter the basewiki always puts in destdir.)
 >>>>>>> This could be revisted later. --[[Joey]] 
+
+[[done]]
diff --git a/template-transition-notes b/template-transition-notes
deleted file mode 100644
index a319616f4..000000000
--- a/template-transition-notes
+++ /dev/null
@@ -1,4 +0,0 @@
-* add_templates option removed from underlay plugin
-  (can use add_underlays instead)
-* includes no longer allowed in templates
-* template_params removed (not exported API)
-- 
cgit v1.2.3


From 9b112cc986023e3a9ec5a4b5e9824af05e80c4d8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:23:31 -0400
Subject: add test case to ensure all templates are documented

---
 doc/templates.mdwn       | 42 +++++++++++++++++++++---------------------
 t/templates_documented.t | 14 ++++++++++++++
 2 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100755 t/templates_documented.t

(limited to 'doc')

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index f7b3adae5..7b56600d1 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -30,34 +30,34 @@ html out of ikiwiki and in the templates.
 * `page.tmpl` - Used for displaying all regular wiki pages.
 * `misc.tmpl` - Generic template used for any page that doesn't
   have a custom template.
-* `editpage.tmpl` - Create/edit page.
-* `change.tmpl` - Used to create a page describing a change made to the wiki.
-* `passwordmail.tmpl` - Not a html template, this is used to
-  generate a mail with an url the user can use to reset their password.
-* `rsspage.tmpl` - Used for generating rss feeds for [[blogs|blog]].
+* `rsspage.tmpl` - Used for generating rss feeds for blogs.
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
 * `atompage.tmpl` - Used for generating atom feeds for blogs.
 * `atomitem.tmpl` - Used for generating individual items on atom feeds.
-* `inlinepage.tmpl` - Used for adding a page inline in a blog
-  page.
+* `inlinepage.tmpl` - Used for displaying a post in a blog.
 * `archivepage.tmpl` - Used for listing a page in a blog archive page.
+* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.
 * `microblog.tmpl` - Used for showing a microblogging post inline.
 * `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
-* `feedlink.tmpl` - Used to add rss/atom links if blogpost.tmpl is not used.
-* `aggregatepost.tmpl` - Used by the [[plugins/aggregate]] plugin to create
+* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.
+* `aggregatepost.tmpl` - Used by the aggregate plugin to create
   a page for a post.
-* `searchform.tmpl` - Used by the [[plugins/search]] plugin to add a search
-  form to wiki pages.
-* `searchquery.tmpl` - This is an omega template, used by the
-  [[plugins/search]] plugin.
-* `comment.tmpl` - This template is used to display a comment
-  by the [[plugins/comments]] plugin.
-* `editcomment.tmpl` - This template is the comment post form for the
-  [[plugins/comments]] plugin.
-* `commentmoderation.tmpl` - This template is used to produce the comment
-  moderation form.
-* `recentchanges.tmpl` - This template is used for listing a change
-  on the RecentChanges page.
+* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin 
+  and google plugin to add search forms to wiki pages.
+* `searchquery.tmpl` - This is a Omega template, used by the
+  search plugin.
+* `comment.tmpl` - Used by the comments plugin to display a comment.
+* `change.tmpl` - Used to create a page describing a change made to the wiki.
+* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.
+* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.
+* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.
+* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to
+  make calendar archive pages.
+* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
+  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
+  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
+  `passwordmail.tmpl` - Parts of ikiwiki's user interface; do not
+  normally need to be customised.
 
 [[!if test="enabled(pagetemplate)" then="""
 ## The pagetemplate directive
diff --git a/t/templates_documented.t b/t/templates_documented.t
new file mode 100755
index 000000000..826c51d36
--- /dev/null
+++ b/t/templates_documented.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More 'no_plan';
+
+$/=undef;
+open(IN, "doc/templates.mdwn") || die "doc/templates.mdwn: $!";
+my $page=<IN>;
+close IN;
+
+foreach my $file (glob("templates/*.tmpl")) {
+	$file=~s/templates\///;
+	ok($page =~ /\Q$file\E/, "$file documented on doc/templates.mdwn");
+}
-- 
cgit v1.2.3


From 33b0a69e90f4c2e22fe0e0c812836a2eb661c6d2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:36:07 -0400
Subject: improve attachment example

---
 doc/ikiwiki/pagespec/attachment.mdwn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/pagespec/attachment.mdwn b/doc/ikiwiki/pagespec/attachment.mdwn
index 419f00ee4..fa2bc5867 100644
--- a/doc/ikiwiki/pagespec/attachment.mdwn
+++ b/doc/ikiwiki/pagespec/attachment.mdwn
@@ -7,11 +7,12 @@ If attachments are enabled, the wiki admin can control what types of
 attachments will be accepted, via the `allowed_attachments`
 configuration setting.
 
-For example, to limit arbitrary files to 50 kilobytes, but allow
-larger mp3 files to be uploaded by joey into a specific directory, and
-check all attachments for viruses, something like this could be used:
+For example, to limit most users to uploading small images, and nothing else,
+while allowing larger mp3 files to be uploaded by joey into a specific
+directory, and check all attachments for viruses, something like this could be
+used:
   
-	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))
+	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))
 
 The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
 additional tests:
-- 
cgit v1.2.3


From 1473bf84c525d18f933fa2dcae86628af9dfff76 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 17:38:37 -0400
Subject: update re template change

---
 doc/security.mdwn | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/security.mdwn b/doc/security.mdwn
index 21aef316b..34a005239 100644
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -162,10 +162,11 @@ closed though.
 
 ## HTML::Template security
 
-If the [[plugins/template]] plugin is enabled, users can modify templates
-like any other part of the wiki. This assumes that HTML::Template is secure
+If the [[plugins/template]] plugin is enabled, all users can modify templates
+like any other part of the wiki. Some trusted users can modify templates
+without it too. This assumes that HTML::Template is secure
 when used with untrusted/malicious templates. (Note that includes are not
-allowed, so that's not a problem.)
+allowed.)
 
 ----
 
-- 
cgit v1.2.3


From 05517a5426fb585fdd56b21ce13cb4b80d2bc709 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 00:41:52 -0400
Subject: wording

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

(limited to 'doc')

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 7b56600d1..c91037670 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -4,9 +4,8 @@ you can fully customise this site.
 [[!if test="enabled(template)" then="""
 ## The template directive
 
-The template directive allows wiki pages to be used as templates.
-These templates can be filled out and inserted into other pages in the
-wiki using the directive.
+The template directive allows wiki pages to be used as templates,
+filled out and inserted into other pages in the wiki.
 """]]
 [[!if test="enabled(template) and enabled(inline)" then="""
 [[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
-- 
cgit v1.2.3


From a46e17893204142c4cb3400057e814aa7856d350 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 00:43:45 -0400
Subject: add link to templates page

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

(limited to 'doc')

diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn
index e0a971d96..4d840696c 100644
--- a/doc/ikiwiki.mdwn
+++ b/doc/ikiwiki.mdwn
@@ -14,3 +14,4 @@ Some documentation on using ikiwiki:
 * [[ikiwiki/markdown]]
 * [[ikiwiki/openid]]
 * [[ikiwiki/searching]]
+* [[templates]]
-- 
cgit v1.2.3


From be3d754320088ecbb0d60a1675d71078611ef62c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 00:45:54 -0400
Subject: remove paragraph about old style directives, it's been long enough

---
 doc/ikiwiki/wikilink.mdwn | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index f561d5850..0c30aafa2 100644
--- a/doc/ikiwiki/wikilink.mdwn
+++ b/doc/ikiwiki/wikilink.mdwn
@@ -22,15 +22,3 @@ page, but the link will appear like this: [[foo_bar|SandBox]].
 
 To link to an anchor inside a page, you can use something like
 `\[[WikiLink#foo]]` .
-
-## Directives and WikiLinks
-
-ikiwiki has two syntaxes for
-[[directives|directive]].  The older syntax
-used spaces to distinguish between directives and
-wikilinks; as a result, with that syntax in use, you cannot use spaces
-in WikiLinks, and must replace spaces with underscores.  The newer
-syntax, enabled with the `prefix_directives` option in an ikiwiki
-setup file, prefixes directives with `!`, and thus does not prevent
-links with spaces.  Future versions of ikiwiki will turn this option
-on by default.
-- 
cgit v1.2.3


From b28323e76a98d56fa4af813338a134dea0106626 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 00:47:46 -0400
Subject: fix caps

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

(limited to 'doc')

diff --git a/doc/ikiwiki/subpage.mdwn b/doc/ikiwiki/subpage.mdwn
index e047b860c..862f45ec1 100644
--- a/doc/ikiwiki/subpage.mdwn
+++ b/doc/ikiwiki/subpage.mdwn
@@ -5,8 +5,8 @@ this page, [[SubPage]] has some related pages placed under it, like
 wiki rather than just having a great big directory full of pages.
 
 To add a SubPage, just make a subdirectory and put pages in it. For
-example, this page is SubPage.mdwn in this wiki's source, and there is also
-a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages
+example, this page is subpage.mdwn in this wiki's source, and there is also
+a subpage subdirectory, which contains subpage/linkingrules.mdwn. Subpages
 can be nested as deeply as you'd like.
 
 Linking to and from a SubPage is explained in [[LinkingRules]].
-- 
cgit v1.2.3


From c0b2334815303d4dc2fdf0b22dff12085671c8d8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 01:13:37 -0400
Subject: reword, reorg, add example

---
 doc/templates.mdwn | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'doc')

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index c91037670..0e54ae8a0 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -2,7 +2,7 @@
 you can fully customise this site.
 
 [[!if test="enabled(template)" then="""
-## The template directive
+## template pages
 
 The template directive allows wiki pages to be used as templates,
 filled out and inserted into other pages in the wiki.
@@ -12,21 +12,32 @@ filled out and inserted into other pages in the wiki.
 sort=title template=titlepage
 rootpage=templates postformtext="Add a new template named:"]]
 """]]
+[[!if test="enabled(template)" then="""
+[[!template id=note text="This note box is built using the
+[[note]] template!"]]
+[[!template id=popup mouseover="popup example" popup="This popup is built using
+the [[popup]] template!"]]
+"""]]
 
 [[!if test="enabled(edittemplate)" then="""
-## The edittemplate directive
+## edit templates
 
 The edittemplate directive can be used to make new pages default to
 containing text from a template, which can be filled as out the page is
 edited.
 """]]
 
-## Wiki templates
+## wiki templates
 
 These templates are used to build the wiki. The aim is to keep almost all
 html out of ikiwiki and in the templates.
 
-* `page.tmpl` - Used for displaying all regular wiki pages.
+* `page.tmpl` - Used for displaying all regular wiki pages. This is the
+  key template customize.
+[[!if test="enabled(pagetemplate)" then="""
+  (The pagetemplate directive can be used to make a page use a
+  different template than `page.tmpl`.)
+"""]]
 * `misc.tmpl` - Generic template used for any page that doesn't
   have a custom template.
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
@@ -58,13 +69,6 @@ html out of ikiwiki and in the templates.
   `passwordmail.tmpl` - Parts of ikiwiki's user interface; do not
   normally need to be customised.
 
-[[!if test="enabled(pagetemplate)" then="""
-## The pagetemplate directive
-
-The pagetemplate directive can allow individual pages to use a
-different template than `page.tmpl`.
-"""]]
-
 ## Template locations
 
 Templates are located in `/usr/share/ikiwiki/templates` by default;
-- 
cgit v1.2.3


From a95d824cb43b9ffadb802f0804818b329f57d69a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 01:36:01 -0400
Subject: update

---
 doc/templates.mdwn | 46 +++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

(limited to 'doc')

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 0e54ae8a0..67e5517e4 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -1,6 +1,21 @@
 [[Ikiwiki]] uses many templates for many purposes. By editing its templates,
 you can fully customise this site.
 
+Templates are located in `/usr/share/ikiwiki/templates` by default;
+the `templatedir` setting can be used to make another directory be
+searched first. Customized templates can also be placed inside the
+"templates/" directory in your wiki's source.
+
+Ikiwiki uses the HTML::Template module as its template engine. This
+supports things like conditionals and loops in templates and is pretty
+easy to learn. All you really need to know are a few things:
+
+* To insert the value of a template variable, use `<TMPL_VAR variable>`.
+* To make a block of text conditional on a variable being set use
+  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+* To use one block of text if a variable is set and a second if it's not,
+  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+
 [[!if test="enabled(template)" then="""
 ## template pages
 
@@ -12,12 +27,6 @@ filled out and inserted into other pages in the wiki.
 sort=title template=titlepage
 rootpage=templates postformtext="Add a new template named:"]]
 """]]
-[[!if test="enabled(template)" then="""
-[[!template id=note text="This note box is built using the
-[[note]] template!"]]
-[[!template id=popup mouseover="popup example" popup="This popup is built using
-the [[popup]] template!"]]
-"""]]
 
 [[!if test="enabled(edittemplate)" then="""
 ## edit templates
@@ -33,11 +42,9 @@ These templates are used to build the wiki. The aim is to keep almost all
 html out of ikiwiki and in the templates.
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
-  key template customize.
-[[!if test="enabled(pagetemplate)" then="""
+  key template to customize. [[!if test="enabled(pagetemplate)" then="""
   (The pagetemplate directive can be used to make a page use a
-  different template than `page.tmpl`.)
-"""]]
+  different template than `page.tmpl`.)"""]]
 * `misc.tmpl` - Generic template used for any page that doesn't
   have a custom template.
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
@@ -69,23 +76,4 @@ html out of ikiwiki and in the templates.
   `passwordmail.tmpl` - Parts of ikiwiki's user interface; do not
   normally need to be customised.
 
-## Template locations
-
-Templates are located in `/usr/share/ikiwiki/templates` by default;
-the `templatedir` setting can be used to make another directory be
-searched first. Customized templates can also be placed inside the
-"templates/" directory in your wiki's source.
-
-## Template syntax
-
-Ikiwiki uses the HTML::Template module as its template engine. This
-supports things like conditionals and loops in templates and is pretty easy
-to learn. All you really need to know are a few things:
-
-* To insert the value of a template variable, use `<TMPL_VAR variable>`.
-* To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
-* To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
-
 [[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From c2656f08f3a3671b0ba7dc861d53347c7f695ec1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 16:11:33 -0400
Subject: template() - return params in list context

I forgot CGI::Formbuilder's horrible interface that needs template
parameters instead of a constructed object.
---
 IkiWiki.pm                 |   7 +-
 IkiWiki/Plugin/comments.pm |   2 +-
 IkiWiki/Plugin/editpage.pm |   2 +-
 doc/plugins/write.mdwn     |   8 +-
 po/bg.po                   | 236 ++++++++++++++++++++++---------------------
 po/cs.po                   | 243 +++++++++++++++++++++++---------------------
 po/da.po                   | 242 ++++++++++++++++++++++++--------------------
 po/de.po                   | 242 ++++++++++++++++++++++++--------------------
 po/es.po                   | 246 ++++++++++++++++++++++++---------------------
 po/fr.po                   | 242 ++++++++++++++++++++++++--------------------
 po/gu.po                   | 235 +++++++++++++++++++++++--------------------
 po/ikiwiki.pot             | 218 ++++++++++++++++++++-------------------
 po/it.po                   | 242 ++++++++++++++++++++++++--------------------
 po/pl.po                   | 241 +++++++++++++++++++++++---------------------
 po/sv.po                   | 236 ++++++++++++++++++++++---------------------
 15 files changed, 1416 insertions(+), 1226 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8bae6b72f..c218ed8ab 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1690,8 +1690,7 @@ sub template_depends ($$;@) {
 
 	return unless defined $filename;
 
-	require HTML::Template;
-	return HTML::Template->new(
+	my @opts=(
 		filter => sub {
 			my $text_ref = shift;
 			${$text_ref} = decode_utf8(${$text_ref});
@@ -1702,6 +1701,10 @@ sub template_depends ($$;@) {
 		@_,
 		no_includes => 1,
 	);
+	return @opts if wantarray;
+
+	require HTML::Template;
+	return HTML::Template->new(@opts);
 }
 
 sub template ($;@) {
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index ed75a6e46..f7dc99dca 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -274,7 +274,7 @@ sub editcomment ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		table => 0,
-		template => template('editcomment.tmpl'),
+		template => { template('editcomment.tmpl') },
 	);
 
 	IkiWiki::decode_form_utf8($form);
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 5c94ecbca..7bb6eb07c 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -78,7 +78,7 @@ sub cgi_editpage ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		table => 0,
-		template => template("editpage.tmpl"),
+		template => { template("editpage.tmpl") },
 	);
 	
 	decode_form_utf8($form);
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 9128c7f54..a9ea7db73 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -701,9 +701,11 @@ the entire wiki build and make the wiki unusable.
 
 ### `template($;@)`
 
-Creates and returns a [[!cpan HTML::Template]] object. The first parameter
-is the name of the template file. The optional remaining parameters are
-passed to `HTML::Template->new`.
+Creates and returns a [[!cpan HTML::Template]] object. (In a list context,
+returns the parameters needed to construct the obhect.) 
+
+The first parameter is the name of the template file. The optional remaining
+parameters are passed to `HTML::Template->new`.
 
 Normally, the template file is first looked for in the templates/ subdirectory
 of the srcdir. Failing that, it is looked for in the templatedir.
diff --git a/po/bg.po b/po/bg.po
index 5585a10d6..f85323ea3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Грешка"
 
@@ -137,7 +137,7 @@ msgstr "създаване на нова страницa „%s”"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "готово"
 
@@ -178,7 +178,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -210,55 +210,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -268,7 +268,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -298,14 +298,14 @@ msgstr "премахване на старата страница „%s”"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
@@ -325,9 +325,10 @@ msgstr "не е указан файл на обвивката"
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
-msgid "failed to process"
+msgid "failed to process template:"
 msgstr "грешка при обработване на шаблона"
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -358,18 +359,18 @@ msgstr "грешка при четене на „%s”: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -458,12 +459,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr ""
+msgid "template %s not found"
+msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
@@ -494,21 +495,25 @@ msgstr ""
 "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/"
 "markdown” (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 #, fuzzy
 msgid "redir page not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "шаблонът „%s” не е намерен"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Огледала"
@@ -525,10 +530,6 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "функцията „getctime” не е реализирана"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -546,39 +547,39 @@ msgstr "Всички страници имат връзки от други ст
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Акаунтът е създаден. Можете да влезете."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Грешка при създаване на акаунта."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Грешка при изпращане на поща"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -609,94 +610,94 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -841,44 +842,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr "не е указан файл на обвивката"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "обновяване на страницата „%s”"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”"
@@ -983,21 +984,21 @@ msgstr ""
 msgid "parse fail at line %d: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "създаване на нова страницa „%s”"
+
+#: ../IkiWiki/Plugin/template.pm:33
 #, fuzzy
 msgid "missing id parameter"
 msgstr "липсващ параметър „id” на шаблона"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
+#, fuzzy, perl-format
+msgid "%s not found"
 msgstr "шаблонът „%s” не е намерен"
 
-#: ../IkiWiki/Plugin/template.pm:66
-#, fuzzy
-msgid "failed to process:"
-msgstr "грешка при обработване на шаблона"
-
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr ""
@@ -1056,54 +1057,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
@@ -1176,64 +1182,65 @@ msgstr "формат: ikiwiki [опции] източник местоназна
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Дискусия"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "непознат вид сортиране „%s”"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "грешка при четене на „%s”: %s"
@@ -1258,6 +1265,13 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to process"
+#~ msgstr "грешка при обработване на шаблона"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "функцията „getctime” не е реализирана"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "грешка при запис на файла „%s”: %s"
@@ -1316,10 +1330,6 @@ msgstr ""
 #~ "изпълнява като „svn post-commit hook”. Няма да бъдат разпратени "
 #~ "известявания"
 
-#, fuzzy
-#~ msgid "%s not found"
-#~ msgstr "шаблонът „%s” не е намерен"
-
 #~ msgid "What's this?"
 #~ msgstr "Какво е това?"
 
diff --git a/po/cs.po b/po/cs.po
index 0b45bb97a..71195bae2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -55,7 +55,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Chyba"
 
@@ -136,7 +136,7 @@ msgstr "vytvářím novou stránku %s"
 msgid "deleting bucket.."
 msgstr "mažu bucket..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "hotovo"
 
@@ -174,7 +174,7 @@ msgstr "chybné jméno souboru s přílohou"
 msgid "attachment upload"
 msgstr "příloha nahrána"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "automatické vytváření indexu"
 
@@ -208,55 +208,55 @@ msgstr "komentář musí mít obsah"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "chybný název stránky"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "komentář k %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat"
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "komentáře na stránce „%s“ jsou uzamčeny"
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "komentář uložen pro schválení"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Váš komentář bude zobrazen po schválení moderátorem"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Přidán komentář"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Přidán komentář: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "nejste přihlášeni jako správce"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "schvalování komentářů"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -266,7 +266,7 @@ msgstr[1] "Komentáře"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 #, fuzzy
 msgid "Comment"
 msgstr "Komentáře"
@@ -297,14 +297,14 @@ msgstr "odstraňuji starý náhled %s"
 msgid "%s is not an editable page"
 msgstr "%s není editovatelná stránka"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
@@ -322,9 +322,11 @@ msgstr "nebyl zadán parametr match"
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s byla zaregistrována pro %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "nepodařilo se zpracovat"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "nepodařilo se zpracovat:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -352,18 +354,18 @@ msgstr "není stránkou"
 msgid "%s is an attachment, not a page."
 msgstr "%s není ani příloha, ani stránka."
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "nejste oprávněni měnit %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "nejste oprávněni měnit přístupová oprávnění souborů"
 
@@ -445,12 +447,12 @@ msgstr "parametry %s a %s nelze použít zároveň"
 msgid "Add a new post titled:"
 msgstr "Přidat nový příspěvek nazvaný:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "neexistující šablona %s"
+msgid "template %s not found"
+msgstr "šablona %s nebyla nalezena"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
@@ -478,18 +480,23 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "styl nebyl nalezen"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "stránka, na kterou vede přesměrování, nebyla nalezena"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "cykly nejsou v přesměrování povoleny"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "vyžaduje parametry „from“ a „to“"
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Zrcadla"
@@ -507,10 +514,6 @@ msgstr "schvalování komentářů"
 msgid "more"
 msgstr "více"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime není implementováno"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Přihlásit pomocí"
@@ -527,39 +530,39 @@ msgstr "Na každou stránku vede odkaz z jiné stránky."
 msgid "bad or missing template"
 msgstr "chybná nebo chybějící šablona"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Vytvoření účtu bylo úspěšné. Nyní se můžete přihlásit."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Chyba při vytváření účtu."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr "Bez e-mailové adresy nelze zaslat postup na resetování hesla."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Nepodařilo se odeslat email."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr "Postup na resetování hesla vám byl odeslán na e-mail."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "chybné URL pro resetování hesla"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "resetování hesla bylo zamítnuto"
 
@@ -589,40 +592,40 @@ msgstr "LWP nebyl nalezen, nepinkám"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není platným kódem jazyka"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy"
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr "sestavuji %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr "aktualizovány PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -630,7 +633,7 @@ msgstr ""
 "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
 "budou odstraněny také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -638,50 +641,50 @@ msgstr ""
 "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
 "budou přejmenovány také její překlady."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT soubor (%s) neexistuje"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "nepodařilo se zkopírovat PO soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr "nepodařilo se aktualizovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nepodařilo se zkopírovat POT soubor na %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr "nepodařilo se přeložit %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr "odstraněny zastaralé PO soubory"
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr "nepodařilo se zapsat %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr "překlad se nezdařil"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
@@ -825,44 +828,44 @@ msgstr "%s není ve zdrojovém adresáři a proto nelze přejmenovat"
 msgid "no change to the file name was specified"
 msgstr "jméno souboru nebylo změněno"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "neplatné jméno"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s již existuje"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s již na disku existuje"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "přejmenování %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "Také přejmenovat podstránky a přílohy"
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Najednou lze přejmenovat pouze jednu přílohu."
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Vyberte přílohu, kterou chcete přejmenovat."
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "přejmenování %s na %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizace pro přejmenování %s na %s"
@@ -960,18 +963,19 @@ msgstr "Stáhnout zdrojová data"
 msgid "parse fail at line %d: %s"
 msgstr "zpracovávání selhalo na řádku %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "vytvářím novou stránku %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "chybí parametr id"
 
 #: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
-msgid "template %s not found"
-msgstr "šablona %s nebyla nalezena"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "nepodařilo se zpracovat:"
+msgid "%s not found"
+msgstr "%s nenalezen"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1034,12 +1038,12 @@ msgstr "nemohu určit identitu nedůvěryhodného uživatele %s"
 msgid "bad file name %s"
 msgstr "chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1048,42 +1052,47 @@ msgstr ""
 "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-"
 "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir"
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s má několik možných zdrojových stránek"
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "sestavuji %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "odstraňuji %s, již není sestavována pomocí %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "sestavuji %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: nelze sestavit %s"
@@ -1156,63 +1165,64 @@ msgstr "použití: ikiwiki [volby] zdroj cíl"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup konfigurační.soubor"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "použití: --set proměnná=hodnota"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "použití: --set proměnná=hodnota"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "znovusestavuji wiki..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskuse"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr "nelze použít několik rcs modulů"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "ano"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "neznámý typ řazení %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "nelze vybrat stránky: %s"
@@ -1237,6 +1247,18 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?"
 msgid "What is the domain name of the web server?"
 msgstr "Jaké je doménové jméno webového serveru?"
 
+#~ msgid "failed to process"
+#~ msgstr "nepodařilo se zpracovat"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "neexistující šablona %s"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime není implementováno"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
+
 #~ msgid "failed to read %s"
 #~ msgstr "nepodařilo se přečíst %s"
 
@@ -1284,9 +1306,6 @@ msgstr "Jaké je doménové jméno webového serveru?"
 #~ "REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat "
 #~ "oznámení"
 
-#~ msgid "%s not found"
-#~ msgstr "%s nenalezen"
-
 #~ msgid "What's this?"
 #~ msgstr "Co to je?"
 
diff --git a/po/da.po b/po/da.po
index be7a95e6a..f830d667d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -59,7 +59,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Fejl"
 
@@ -140,7 +140,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "færdig"
 
@@ -181,7 +181,7 @@ msgstr "dårligt vedhæftningsfilnavn"
 msgid "attachment upload"
 msgstr "vedhæftningsoplægning"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "automatisk indeks-dannelse"
 
@@ -215,55 +215,55 @@ msgstr "kommentar skal have indhold"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "dårligt sidenavn"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommenterer på %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere"
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "kommentarer på side '%s' er lukket"
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "kommentar gemt for moderering"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Tilføjede en kommentar"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Tilføjede en kommentar: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "du er ikke logget på som en administrator"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Kommentarmoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "kommentarkoderering"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -273,7 +273,7 @@ msgstr[1] "Kommentarer"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 #, fuzzy
 msgid "Comment"
 msgstr "Kommentarer"
@@ -304,14 +304,14 @@ msgstr "fjerner gammelt smugkig %s"
 msgid "%s is not an editable page"
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "redigerer %s"
@@ -329,9 +329,11 @@ msgstr "sammenligning ikke angivet"
 msgid "edittemplate %s registered for %s"
 msgstr "redigeringsskabelon %s registreret for %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "dannelsen mislykkedes"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "dannelsen mislykkedes:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -360,18 +362,18 @@ msgstr "kan ikke få sider til at passe sammen: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Du har ikke lov til at ændre %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "du kan ikke påvirke en fil med modus %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "du har ikke lov til at ændre modus for filer"
 
@@ -456,12 +458,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr "Tilføj nyt indlæg med følgende titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "ikke-eksisterende skabelon: %s"
+msgid "template %s not found"
+msgstr "skabelon %s ikke fundet"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 
@@ -491,18 +493,23 @@ msgstr ""
 "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) "
 "mislykkedes"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "stilsnit (stylesheet) ikke fundet"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "henvisningsside ikke fundet"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "ring af henvisninger er ikke tilladt"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "kræver 'from'- og 'to'-parametre"
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Spejle"
@@ -520,10 +527,6 @@ msgstr "kommentarkoderering"
 msgid "more"
 msgstr "mere"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime ikke implementeret"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Log på med"
@@ -540,40 +543,40 @@ msgstr "Alle sider har henvisninger fra andre sider."
 msgid "bad or missing template"
 msgstr "dårlig eller manglende skabelon"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Konto korrekt oprettet. Nu kan du logge på."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Fejl ved kontooprettelse."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Afsendelse af mail mislykkedes"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr "Du har fået tilsendt adgangskodenulstillingsinstruktioner."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "Ukorrekt adgangskodenumstillings-URL"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "adgangskodenulstilling afvist"
 
@@ -603,12 +606,12 @@ msgstr "LWP ikke fundet, pinger ikke"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -616,7 +619,7 @@ msgstr ""
 "%s er ikke en gyldig værdi for po_link_to, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -624,21 +627,21 @@ msgstr ""
 "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "gendanner alle sider for at korrigere meta titler"
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr "opdaterer PO-filer"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -646,7 +649,7 @@ msgstr ""
 "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -654,50 +657,50 @@ msgstr ""
 "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
 "oversættelser også."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-filen %s eksisterer ikke"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr "opdatering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopiering af POT-filen til %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr "oversættelse af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr "forældede PO filer fjernet"
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr "skrivning af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr "oversættelse mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
@@ -840,44 +843,44 @@ msgstr "%s er ikke i srcdir, så kan ikke blive omdøbt"
 msgid "no change to the file name was specified"
 msgstr "ingen ændring til filnavnet blev angivet"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "ugyldigt navn"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s eksisterer allerede"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s eksisterer allerede på disken"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "omdøb %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "Omdøb også UnderSider og vedhæftninger"
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Kun en vedhæftning kan blive omdøbt ad gangen."
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Vælg vedhæftningen som skal omdøbes."
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "omdøb %s til %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "opdatering til omdøbning af %s til %s"
@@ -975,18 +978,19 @@ msgstr "Direkte datanedlastning"
 msgid "parse fail at line %d: %s"
 msgstr "afkodningsfejl på linje %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "opretter ny side %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "manglende id-parameter"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "skabelon %s ikke fundet"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "dannelsen mislykkedes:"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "fødning ikke fundet"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1049,12 +1053,12 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s"
 msgid "bad file name %s"
 msgstr "dårligt filnavn %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "gennemlæser %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1063,42 +1067,47 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan ikke danne %s"
@@ -1171,64 +1180,65 @@ msgstr "brug: ikiwiki [valg] kilde mål"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup opsætningsfil"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "bygger wrappers.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally krævet for title_natural sortering"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ukendt sorteringsform %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan ikke få sider til at passe sammen: %s"
@@ -1253,6 +1263,18 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?"
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er webserverens domænenavn?"
 
+#~ msgid "failed to process"
+#~ msgstr "dannelsen mislykkedes"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "ikke-eksisterende skabelon: %s"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime ikke implementeret"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Sort::Naturally krævet for title_natural sortering"
+
 #~ msgid "failed to read %s"
 #~ msgstr "læsning af %s mislykkedes"
 
diff --git a/po/de.po b/po/de.po
index e5a18d47b..2452c8d21 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2010-03-14 16:09+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Fehler"
 
@@ -137,7 +137,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr "lösche Behälter (bucket)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "fertig"
 
@@ -176,7 +176,7 @@ msgstr "fehlerhafter Dateiname für Anhang"
 msgid "attachment upload"
 msgstr "Anhang hochladen"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "automatische Index-Erstellung"
 
@@ -210,56 +210,56 @@ msgstr "ein Kommentar sollte Inhalt haben"
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "fehlerhafter Seitenname"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "kommentiere %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 "Seite %s existiert nicht, Sie können sie deshalb auch nicht kommentieren"
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "Kommentare zur Seite %s sind gesperrt"
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "Der Kommentar wurde zur Moderation gespeichert"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Ihr Kommentar wird nach Moderation verschickt"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Kommentar hinzugefügt"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Kommentar hinzugefügt: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "Sie sind nicht als Administrator angemeldet"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "Kommentar-Moderation"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -269,7 +269,7 @@ msgstr[1] "%i Kommentare"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr "Kommentieren"
 
@@ -299,14 +299,14 @@ msgstr "entferne alte Vorschau %s"
 msgid "%s is not an editable page"
 msgstr "Seite %s kann nicht bearbeitet werden"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "erstelle %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "bearbeite %s"
@@ -324,9 +324,11 @@ msgstr "Übereinstimmung nicht angegeben"
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s für %s registriert"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "Ablauf fehlgeschlagen"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "Fehler beim Ablauf:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -354,18 +356,18 @@ msgstr "Keine Seite"
 msgid "%s is an attachment, not a page."
 msgstr "Seite %s ist ein Anhang und keine Seite."
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Sie dürfen %s nicht verändern"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
 
@@ -451,12 +453,12 @@ msgstr "die Parameter %s und %s können nicht zusammen benutzt werden"
 msgid "Add a new post titled:"
 msgstr "Füge einen neuen Beitrag hinzu. Titel:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "nicht-vorhandene Vorlage %s"
+msgid "template %s not found"
+msgstr "Vorlage %s nicht gefunden"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus"
 
@@ -487,18 +489,23 @@ msgstr ""
 "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) "
 "fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "Stylesheet nicht gefunden"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "Umleitungsseite nicht gefunden"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "Zyklische Umleitungen sind nicht erlaubt"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "erfordert die Parameter 'from' und 'to'"
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Spiegel"
@@ -515,10 +522,6 @@ msgstr "Kommentar muss moderiert werden"
 msgid "more"
 msgstr "mehr"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime ist nicht implementiert"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Anmelden mit"
@@ -535,41 +538,41 @@ msgstr "Alle Seiten haben mindestens einen Verweis von einer anderen Seite."
 msgid "bad or missing template"
 msgstr "fehlerhafte oder fehlende Vorlage"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr "Ihre Benutzerseite: "
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr "Benutzerseite erstellen"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Kontoerstellung erfolgreich. Sie können sich jetzt anmelden."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Konto konnte nicht erstellt werden."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "es gibt keine E-Mail Adresse, deshalb kann keine Anweisung zum Zurücksetzen "
 "des Passwortes zugeschickt werden."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Es konnte keine E-Mail versandt werden"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr "Ihnen wurden Anweisungen zum Zurücksetzen des Passworts zugesandt."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "fehlerhafte URL zum Zurücksetzen des Passworts"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "zurücksetzen des Passworts abgelehnt"
 
@@ -599,12 +602,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35"
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist keine gültige Sprachkodierung"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -612,7 +615,7 @@ msgstr ""
 "%s ist kein gültiger Wert für po_link_to, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -620,21 +623,21 @@ msgstr ""
 "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt"
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr "PO-Dateien aktualisiert"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -642,7 +645,7 @@ msgstr ""
 "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
 "werden auch ihre Übersetzungen entfernt."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -650,50 +653,50 @@ msgstr ""
 "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
 "unbenannt wird, werden auch ihre Übersetzungen unbenannt."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "POT-Datei (%s) existiert nicht"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr "aktualisieren von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr "übersetzen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr "überflüssige PO-Dateien wurden entfernt"
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr "schreiben von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr "übersetzen fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
@@ -839,44 +842,44 @@ msgstr "%s ist nicht im srcdir und kann deshalb nicht umbenannt werden"
 msgid "no change to the file name was specified"
 msgstr "es wurde keine Änderung des Dateinamens angegeben"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "unzulässiger Name"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s existiert bereits"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s existiert bereits auf der Festplatte"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "benenne %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen"
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden."
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll."
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "benenne %s in %s um"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualisiert zum Umbenennen von %s nach %s"
@@ -974,18 +977,19 @@ msgstr "Direkter Daten-Download"
 msgid "parse fail at line %d: %s"
 msgstr "Auswertungsfehler in Zeile %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "erstelle neue Seite %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "fehlender Parameter id"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "Vorlage %s nicht gefunden"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "Fehler beim Ablauf:"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "Vorlage (feed) nicht gefunden"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1051,12 +1055,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "fehlerhafter Dateiname %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "durchsuche %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1065,42 +1069,47 @@ msgstr ""
 "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verweist"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "entferne %s, wird nicht länger von %s erzeugt"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
@@ -1176,66 +1185,67 @@ msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup Konfigurationsdatei"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "Aufruf: --set Variable=Wert"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "Aufruf: --set Variable=Wert"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "erzeuge Wrapper.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu.."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "ja"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally wird benötigt für title_natural sort"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Unbekannter Sortierungstyp %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Kann die Seiten nicht zuordnen: %s"
@@ -1260,6 +1270,18 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?"
 msgid "What is the domain name of the web server?"
 msgstr "Wie lautet der Domainname des Webservers?"
 
+#~ msgid "failed to process"
+#~ msgstr "Ablauf fehlgeschlagen"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "nicht-vorhandene Vorlage %s"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime ist nicht implementiert"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Sort::Naturally wird benötigt für title_natural sort"
+
 #~ msgid "failed to read %s"
 #~ msgstr "lesen von %s fehlgeschlagen"
 
diff --git a/po/es.po b/po/es.po
index 413572866..a6f3a2c6b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Error"
 
@@ -142,7 +142,7 @@ msgstr "creando nueva página %s"
 msgid "deleting bucket.."
 msgstr "borrando el directorio.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "completado"
 
@@ -183,7 +183,7 @@ msgstr "nombre de archivo adjunto erróneo"
 msgid "attachment upload"
 msgstr "enviado el adjunto"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "creación de índice automática"
 
@@ -217,55 +217,55 @@ msgstr "Un comentario debe tener algún contenido"
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "nombre de página erróneo"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "creando comentarios en la página %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "la página '%s' no existe, así que no se puede comentar sobre ella"
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "los comentarios para la página '%s' están cerrados"
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "comentario guardado a la espera de aprobación"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Su comentario será publicado después de que el moderador lo revise"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Añadir un comentario"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Comentario añadido: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "No está registrado como un administrador"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "aprobación de comentarios"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -275,7 +275,7 @@ msgstr[1] "Comentarios"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 #, fuzzy
 msgid "Comment"
 msgstr "Comentarios"
@@ -306,14 +306,14 @@ msgstr "eliminando la antigua previsualización %s"
 msgid "%s is not an editable page"
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "creando página %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
@@ -331,9 +331,11 @@ msgstr "falta indicar la coincidencia de páginas (match)"
 msgid "edittemplate %s registered for %s"
 msgstr "plantilla de edición %s registrada para %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "fallo en el proceso"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -362,18 +364,18 @@ msgstr "no encuentro páginas coincidentes: %s"
 msgid "%s is an attachment, not a page."
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "No puede cambiar %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "no puede actuar sobre un archivo con permisos %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "No puede cambiar los permisos de acceso de un archivo"
 
@@ -460,12 +462,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr "Añadir una entrada nueva titulada:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "la plantilla %s no existe "
+msgid "template %s not found"
+msgstr "no he encontrado la plantilla %s"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
@@ -495,18 +497,23 @@ msgstr ""
 "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar "
 "el programa /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "hoja de estilo no encontrada "
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "falta la página a donde redirigir"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "ciclo de redirección no permitido"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "los parámetros 'from' y 'to' son obligatorios"
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Réplicas"
@@ -524,10 +531,6 @@ msgstr "aprobación de comentarios"
 msgid "more"
 msgstr "ver más"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "la funcionalidad getctime no está incluida"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Identificarse mediante "
@@ -545,43 +548,43 @@ msgstr "Todas las páginas están referenciadas entre sí."
 msgid "bad or missing template"
 msgstr "plantilla errónea ó no existente"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Cuenta de usuario creada con éxito. Ahora puede identificarse."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Error creando la cuenta de usuario."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "No tengo dirección de correo electrónica, así que no puedo enviar "
 "instrucciones para reiniciar la contraseña"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "No he podido enviar el mensaje de correo electrónico"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Las instrucciones para reiniciar la contraseña se le han enviado por correo "
 "electrónico"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "el url para reiniciar la contraseña es incorrecto"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "reinicio de contraseña denegado"
 
@@ -611,94 +614,94 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "Informaremos a %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -840,44 +843,44 @@ msgstr "%s no está en el directorio fuente por lo que no puede ser renombrado"
 msgid "no change to the file name was specified"
 msgstr "no se ha indicado cambio alguno en el nombre del archivo"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "nombre no válido"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s ya existe"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s ya existe en el disco"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "cambiando de nombre %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "También cambia de nombre las subpáginas y los adjuntos"
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Únicamente un adjunto puede ser renombrado a la vez."
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Por favor, seleccione el adjunto al que cambiar el nombre."
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "%s cambia de nombre a %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "actualizado el cambio de nombre de %s a %s"
@@ -979,18 +982,19 @@ msgstr "Enlace directo para descarga"
 msgid "parse fail at line %d: %s"
 msgstr "error de análisis en la línea %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "creando nueva página %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "falta el parámetro \"id\""
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "no he encontrado la plantilla %s"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "fuente de datos no encontrada"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1055,12 +1059,12 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s"
 msgid "bad file name %s"
 msgstr "el nombre de archivo %s es erróneo"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1069,44 +1073,49 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
@@ -1181,69 +1190,68 @@ msgstr "uso: ikiwiki [opciones] origen destino"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup archivo_de_configuración"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "uso: --set variable=valor"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "uso: --set variable=valor"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "si"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
-"Se necesita el módulo Sort::Naturally para el tipo de ordenación "
-"title_natural"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "no encuentro páginas coincidentes: %s"
@@ -1271,6 +1279,20 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#~ msgid "failed to process"
+#~ msgstr "fallo en el proceso"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "la plantilla %s no existe "
+
+#~ msgid "getctime not implemented"
+#~ msgstr "la funcionalidad getctime no está incluida"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr ""
+#~ "Se necesita el módulo Sort::Naturally para el tipo de ordenación "
+#~ "title_natural"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "no puedo leer de %s: %s "
diff --git a/po/fr.po b/po/fr.po
index 6be9482ce..b98a498c0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Erreur"
 
@@ -138,7 +138,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "Suppression du compartiment S3 (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "Terminé"
 
@@ -176,7 +176,7 @@ msgstr "Nom de la pièce jointe incorrect"
 msgid "attachment upload"
 msgstr "Envoi de la pièce jointe"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "Génération de l'index automatique"
 
@@ -210,55 +210,55 @@ msgstr "Un commentaire doit avoir un contenu."
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "Nom de page incorrect"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "Faire un commentaire sur %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "La page '%s' n'existe pas, commentaire impossible."
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "Le commentaire pour la page '%s' est terminé."
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "Le commentaire a été enregistré, en attente de « modération »"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Votre commentaire sera publié après vérification par le modérateur"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Commentaire ajouté"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Commentaire ajouté : %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "Vous n'êtes pas authentifié comme administrateur"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "modération du commentaire"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -268,7 +268,7 @@ msgstr[1] "Commentaires"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 #, fuzzy
 msgid "Comment"
 msgstr "Commentaires"
@@ -299,14 +299,14 @@ msgstr "Suppression de l'ancienne prévisualisation %s"
 msgid "%s is not an editable page"
 msgstr "%s n'est pas une page éditable"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "Création de %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "Édition de %s"
@@ -324,9 +324,11 @@ msgstr "correspondance non indiquée"
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s enregistré pour %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "Échec du traitement"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "Échec du traitement :"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -354,18 +356,18 @@ msgstr "Ce n'est pas une page."
 msgid "%s is an attachment, not a page."
 msgstr "%s est une pièce jointe, pas une page."
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "Vous n'êtes pas autorisé à modifier %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
 
@@ -452,12 +454,12 @@ msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble."
 msgid "Add a new post titled:"
 msgstr "Ajouter un nouvel article dont le titre est :"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "Le modèle de page %s n'existe pas"
+msgid "template %s not found"
+msgstr "Modèle de page %s introuvable"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client introuvable, pas de réponse au ping"
 
@@ -486,18 +488,23 @@ msgstr ""
 "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown "
 "(%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "Feuille de style introuvable "
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "Page de redirection introuvable"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "Redirection cyclique non autorisée"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "les paramètres « from » et « to » sont nécessaires."
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Miroirs"
@@ -515,10 +522,6 @@ msgstr "modération du commentaire"
 msgid "more"
 msgstr "lire la suite"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime n'est pas implémenté"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "S'identifier en tant que"
@@ -535,43 +538,43 @@ msgstr "Toutes les pages sont liées à d'autres pages."
 msgid "bad or missing template"
 msgstr "Modèle de page incorrect ou manquant"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Erreur lors de la création du compte."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Aucune adresse indiquée. Impossible d'envoyer les instructions pour "
 "réinitialiser le mot de passe."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Impossible d'envoyer un courriel"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Vous avez reçu un message contenant les instructions pour réinitialiser le "
 "mot de passe"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "Adresse pour la réinitialisation du mot de passe incorrecte"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "réinitialisation du mot de passe refusée"
 
@@ -603,12 +606,12 @@ msgstr ""
 "Note : ancienne version de po4a détectée. Il est recommandé d'installer la "
 "version 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un code de langue valable"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
@@ -616,7 +619,7 @@ msgstr ""
 "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par "
 "défaut."
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -624,23 +627,23 @@ msgstr ""
 "po_link_to=negotiated nécessite que usedirs soit activé, retour à "
 "po_link_to=default."
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 "Reconstruction de toutes les pages pour corriger les titres (greffon "
 "« meta »)."
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr "construction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr "Fichiers PO mis à jour."
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -648,7 +651,7 @@ msgstr ""
 "Impossible de supprimer cette traduction. Si la page maître est supprimée, "
 "alors ses traductions seront supprimées."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -656,50 +659,50 @@ msgstr ""
 "Impossible de renommer cette traduction. Si la page maître est renommée, "
 "alors ses traductions pourront être renommées."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Le fichier POT %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "Impossible de copier le fichier PO underlay dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr "Impossible de mettre à jour %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Impossible de copier le fichier POT dans %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr "N/A"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr "Impossible de traduire %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr "Fichiers PO obsolètes supprimés."
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr "Impossible de modifier %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr "Impossible de traduire"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "Données gettext incorrectes, retour à la page précédente pour la poursuite "
@@ -844,44 +847,44 @@ msgstr "%s n'est pas dans srcdir. Impossible de le renommer"
 msgid "no change to the file name was specified"
 msgstr "Aucun changement dans le nom du fichier n'a été spécifié"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "Appellation interdite"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s existe déjà sur le disque"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "%s renommé"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "« SubPages » et attachements renommés."
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Modification de pièce jointe : une seule à la fois"
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Veuillez sélectionner la pièce jointe à renommer"
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "Renomme %s en %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "mise à jour, suite au changement de %s en %s"
@@ -979,18 +982,19 @@ msgstr "Téléchargement direct des données"
 msgid "parse fail at line %d: %s"
 msgstr "Erreur d'analyse à la ligne %d : %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "Création de la nouvelle page %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "Paramètre d'identification manquant"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "Modèle de page %s introuvable"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "Échec du traitement :"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "Flux introuvable "
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1054,12 +1058,12 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "Nom de fichier incorrect %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1068,42 +1072,47 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
@@ -1181,64 +1190,65 @@ msgstr "Syntaxe : ikiwiki [options] source destination"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup fichier de configuration"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "oui"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "Type de tri %s inconnu"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "Impossible de trouver les pages %s"
@@ -1263,6 +1273,18 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :"
 msgid "What is the domain name of the web server?"
 msgstr "Nom de domaine du serveur HTTP :"
 
+#~ msgid "failed to process"
+#~ msgstr "Échec du traitement"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "Le modèle de page %s n'existe pas"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime n'est pas implémenté"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
+
 #~ msgid "failed to read %s"
 #~ msgstr "Impossible de lire %s"
 
diff --git a/po/gu.po b/po/gu.po
index d4bfd42c0..4f652358d 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -135,7 +135,7 @@ msgstr "નવું પાનું %s બનાવે છે"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "સંપૂર્ણ"
 
@@ -176,7 +176,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -208,55 +208,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -266,7 +266,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -296,14 +296,14 @@ msgstr "જુનાં પાનાં દૂર કરે છે %s"
 msgid "%s is not an editable page"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
@@ -323,9 +323,10 @@ msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ ન
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
-msgid "failed to process"
+msgid "failed to process template:"
 msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -356,18 +357,18 @@ msgstr "વાંચી શકાતી નથી %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -453,12 +454,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
+msgid "template %s not found"
+msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
@@ -485,20 +486,24 @@ msgstr ""
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "સ્ટાઇલશીટ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 #, fuzzy
 msgid "redir page not found"
 msgstr "ફીડ મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "ફીડ મળ્યું નહી"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "મિરરો"
@@ -515,10 +520,6 @@ msgstr ""
 msgid "more"
 msgstr "વધુ"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime અમલમાં મૂકાયેલ નથી"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -536,39 +537,39 @@ msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે 
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "ખાતું બનાવવાનું સફળ. તમે હવે લોગઇન કરી શકો છો."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "ખાતું બનાવવામાં ક્ષતિ."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "મેઇલ મોકલવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -599,94 +600,94 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -831,44 +832,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "રેન્ડર કરે છે %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "%s નો સુધારો %s નાં %s વડે"
@@ -970,19 +971,20 @@ msgstr "સીધી માહિતી ડાઉનલોડ"
 msgid "parse fail at line %d: %s"
 msgstr "ઉકેલવાનું લીટી %d પર નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "નવું પાનું %s બનાવે છે"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "ખોવાયેલ આઇડી વિકલ્પ"
 
 #: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
-msgid "template %s not found"
+msgid "%s not found"
 msgstr "ટેમ્પલેટ %s મળ્યું નહી"
 
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
-
 #: ../IkiWiki/Plugin/teximg.pm:72
 #, fuzzy
 msgid "missing tex code"
@@ -1042,54 +1044,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
@@ -1162,62 +1169,63 @@ msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "વાંચી શકાતી નથી %s: %s"
@@ -1242,6 +1250,16 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to process"
+#~ msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime અમલમાં મૂકાયેલ નથી"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "%s વાંચવામાં નિષ્ફળ: %s"
@@ -1295,9 +1313,6 @@ msgstr ""
 #~ msgstr ""
 #~ "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી"
 
-#~ msgid "%s not found"
-#~ msgstr "ટેમ્પલેટ %s મળ્યું નહી"
-
 #~ msgid "What's this?"
 #~ msgstr "આ શું છે?"
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index c2f4e24a9..638e724d5 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr ""
 
@@ -136,7 +136,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr ""
 
@@ -174,7 +174,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -206,55 +206,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -264,7 +264,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -294,14 +294,14 @@ msgstr ""
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -319,8 +319,9 @@ msgstr ""
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+msgid "failed to process template:"
 msgstr ""
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -349,18 +350,18 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -442,12 +443,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
+msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -474,18 +475,22 @@ msgstr ""
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr ""
 
+#: ../IkiWiki/Plugin/meta.pm:383
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr ""
@@ -502,10 +507,6 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr ""
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -522,39 +523,39 @@ msgstr ""
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -584,93 +585,93 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -812,44 +813,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -947,17 +948,18 @@ msgstr ""
 msgid "parse fail at line %d: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, perl-format
+msgid "creating tag page %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr ""
 
 #: ../IkiWiki/Plugin/template.pm:47
 #, perl-format
-msgid "template %s not found"
-msgstr ""
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
+msgid "%s not found"
 msgstr ""
 
 #: ../IkiWiki/Plugin/teximg.pm:72
@@ -1017,54 +1019,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:434
+#, perl-format
+msgid "removing obsolete %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1137,62 +1144,63 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
+#: ../IkiWiki.pm:2009
+#, perl-format
+msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index b1b3dbd55..45efc2d3f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2009-08-16 11:01+0100\n"
 "Last-Translator: Luca Bruno <lucab@debian.org>\n"
 "Language-Team: Italian TP <tp@lists.linux.it>\n"
@@ -53,7 +53,7 @@ msgstr "Preferenze salvate."
 msgid "You are banned."
 msgstr "Avete ricevuto un ban."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Errore"
 
@@ -135,7 +135,7 @@ msgstr "creazione nuova pagina %s"
 msgid "deleting bucket.."
 msgstr "eliminazione contenitore..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "fatto"
 
@@ -173,7 +173,7 @@ msgstr "nome file dell'allegato non valido"
 msgid "attachment upload"
 msgstr "carica allegato"
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr "generazione automatica dell'indice"
 
@@ -207,55 +207,55 @@ msgstr "i commenti devono avere un contenuto"
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr "nome pagina non valido"
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, perl-format
 msgid "commenting on %s"
 msgstr "commento su %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr "la pagina «%s» non esiste, impossibile commentarla"
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr "i commenti per la pagina «%s» sono chiusi"
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr "commento trattenuto per moderazione"
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr "Il commento sarà pubblicato dopo la verifica del moderatore"
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr "Aggiunto commento"
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr "Aggiunto commento: %s"
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr "non siete autenticati come amministratore"
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr "Moderazione commenti"
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr "moderazione commento"
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, fuzzy, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -265,7 +265,7 @@ msgstr[1] "Commenti"
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 #, fuzzy
 msgid "Comment"
 msgstr "Commenti"
@@ -296,14 +296,14 @@ msgstr "rimozione vecchia anteprima %s"
 msgid "%s is not an editable page"
 msgstr "%s non è una pagina modificabile"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "creazione %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "modifica %s"
@@ -321,9 +321,11 @@ msgstr "corrispondenza non specificata"
 msgid "edittemplate %s registered for %s"
 msgstr "edittemplate %s registrato per %s"
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
-msgid "failed to process"
-msgstr "errore nell'elaborazione"
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+#, fuzzy
+msgid "failed to process template:"
+msgstr "errore nell'elaborazione:"
 
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
@@ -351,18 +353,18 @@ msgstr "non è una pagina"
 msgid "%s is an attachment, not a page."
 msgstr "%s è un allegato, non una pagina."
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr "non è permesso modificare %s"
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr "non è permesso lavorare su un file in modalità %s"
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr "non è permesso cambiare la modalità del file"
 
@@ -447,12 +449,12 @@ msgstr "i parametri %s e %s non possono essere usati insieme"
 msgid "Add a new post titled:"
 msgstr "Aggiungere un nuovo articolo dal titolo:"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "modello %s non esistente"
+msgid "template %s not found"
+msgstr "modello %s non trovato"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client non trovato, impossibile inviare ping"
 
@@ -481,18 +483,23 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 msgid "stylesheet not found"
 msgstr "foglio di stile non trovato"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 msgid "redir page not found"
 msgstr "pagina di reindirizzamento non trovata"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 msgid "redir cycle is not allowed"
 msgstr "ciclo di reindirizzamento non ammesso"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+#, fuzzy
+msgid "sort=meta requires a parameter"
+msgstr "sono richiesti i parametri \"to\" e \"from\""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Mirror"
@@ -510,10 +517,6 @@ msgstr "moderazione commento"
 msgid "more"
 msgstr "altro"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime non implementata"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr "Accedi tramite"
@@ -530,42 +533,42 @@ msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine."
 msgid "bad or missing template"
 msgstr "modello errato o mancante"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Account creato con successo. È ora possibile effettuare l'accesso."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Errore nella creazione dell'account."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 "Nessun indirizzo email, impossibile inviare per email le istruzioni per "
 "reimpostare la password."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Impossibile spedire il messaggio"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 "Il messaggio con le istruzioni per reimpostare la password è stato inviato."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr "url per il reset della password non corretto"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr "reset della password non permesso"
 
@@ -597,19 +600,19 @@ msgstr ""
 "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno "
 "alla versione 0.35."
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s non è una codifica di lingua valida"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
@@ -617,21 +620,21 @@ msgstr ""
 "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato "
 "po_link_to=default"
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli"
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, perl-format
 msgid "building %s"
 msgstr "compilazione di %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr "file PO aggiornati"
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
@@ -639,7 +642,7 @@ msgstr ""
 "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
 "stata eliminata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
@@ -647,50 +650,50 @@ msgstr ""
 "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
 "stata rinominata anche le traduzioni lo saranno."
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Il file POT (%s) non esiste"
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "impossibile copiare il file PO di underlay in %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, perl-format
 msgid "failed to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "impossibile copiare il file POT in %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr "N/D"
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, perl-format
 msgid "failed to translate %s"
 msgstr "impossibile tradurre %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr "file PO obsoleti rimossi"
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, perl-format
 msgid "failed to write %s"
 msgstr "impossibile scrivere %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 msgid "failed to translate"
 msgstr "impossibile tradurre"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 "dati gettext non validi, tornare alle pagina precedente per continuare le "
@@ -836,44 +839,44 @@ msgstr "%s non è in src, quindi non può essere rinominato"
 msgid "no change to the file name was specified"
 msgstr "non è stata specificata nessuna modifica al nome del file"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr "nome non valido"
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr "%s esiste già"
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr "%s già presente su disco"
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, perl-format
 msgid "rename %s"
 msgstr "rinomina di %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr "Rinomina anche SottoPagine e allegati"
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr "Si può rinominare un solo allegato alla volta."
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr "Selezionare l'allegato da rinominare."
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr "rinomina %s in %s"
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aggiornamento per rinomina di %s in %s"
@@ -971,18 +974,19 @@ msgstr "Scaricamento diretto dei dati"
 msgid "parse fail at line %d: %s"
 msgstr "errore di interpretazione alla riga %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "creazione nuova pagina %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr "parametro id mancante"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "modello %s non trovato"
-
-#: ../IkiWiki/Plugin/template.pm:66
-msgid "failed to process:"
-msgstr "errore nell'elaborazione:"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "notiziario non trovato"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
@@ -1045,12 +1049,12 @@ msgstr "impossibile determinare l'id del committer non fidato %s"
 msgid "bad file name %s"
 msgstr "nome file %s scorretto"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "scansione %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
@@ -1059,42 +1063,47 @@ msgstr ""
 "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare "
 "allow_symlinks_before_srcdir per abilitare questa configurazione"
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorato il file dal nome scorretto %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s ha diverse pagine sorgenti possibili"
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "rimozione della vecchia pagina %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr "compilazione di %s, che è collegato a %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "rimozione di %s, non più richiesto da %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr "compilazione di %s, che dipende da %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: impossibile compilare %s"
@@ -1168,63 +1177,64 @@ msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione"
 msgid "       ikiwiki --setup configfile"
 msgstr "       ikiwiki --setup configfile"
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr "utilizzo: --set var=valore"
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 #, fuzzy
 msgid "usage: --set-yaml var=value"
 msgstr "utilizzo: --set var=valore"
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "generazione contenitori..."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "ricostruzione wiki..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "aggiornamento wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Discussione"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr "impossibile usare più plugin rcs"
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr "sì"
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "ordinamento %s sconosciuto"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr "impossibile trovare pagine corrispondenti: %s"
@@ -1249,6 +1259,18 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?"
 msgid "What is the domain name of the web server?"
 msgstr "Qual è il nome del dominio del server web?"
 
+#~ msgid "failed to process"
+#~ msgstr "errore nell'elaborazione"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "modello %s non esistente"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime non implementata"
+
+#~ msgid "Sort::Naturally needed for title_natural sort"
+#~ msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
+
 #~ msgid "failed to read %s"
 #~ msgstr "impossibile leggere %s"
 
diff --git a/po/pl.po b/po/pl.po
index 9fb3cacc0..837c5acd2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Błąd"
 
@@ -139,7 +139,7 @@ msgstr "tworzenie nowej strony %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "gotowe"
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -212,55 +212,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -270,7 +270,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -300,14 +300,14 @@ msgstr "usuwanie starej strony %s"
 msgid "%s is not an editable page"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "edycja %s"
@@ -327,9 +327,10 @@ msgstr "nieokreślona nazwa pliku osłony"
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
-msgid "failed to process"
+msgid "failed to process template:"
 msgstr "awaria w trakcie przetwarzania:"
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -360,18 +361,18 @@ msgstr "awaria w trakcie odczytu %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -460,12 +461,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr "Tytuł nowego wpisu"
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr "brakujący szablon %s"
+msgid "template %s not found"
+msgstr "nieznaleziony szablon %s"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
@@ -497,21 +498,25 @@ msgstr ""
 "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub "
 "uruchamiania programu /usr/bin/markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "nieznaleziony szablon ze stylami CSS"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 #, fuzzy
 msgid "redir page not found"
 msgstr "nieznaleziony kanał RSS"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "nieznaleziony kanał RSS"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Kopie lustrzane"
@@ -528,10 +533,6 @@ msgstr ""
 msgid "more"
 msgstr "więcej"
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "niedostępna funkcja getctime"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -549,39 +550,39 @@ msgstr "Dla każdej strony istnieje odnośnik z innej strony"
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Konto założone pomyślnie. Teraz można zalogować się."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Błąd w trakcie zakładania konta."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Awaria w trakcie wysyłania wiadomości"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -612,94 +613,94 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "edycja %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -846,44 +847,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr "nieokreślona nazwa pliku osłony"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "renderowanie %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s"
@@ -990,20 +991,20 @@ msgstr "Bezpośrednie pobieranie danych"
 msgid "parse fail at line %d: %s"
 msgstr "awaria w trakcie przetwarzania linii %d: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "tworzenie nowej strony %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 #, fuzzy
 msgid "missing id parameter"
 msgstr "brakujący parametr id"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
-msgstr "nieznaleziony szablon %s"
-
-#: ../IkiWiki/Plugin/template.pm:66
-#, fuzzy
-msgid "failed to process:"
-msgstr "awaria w trakcie przetwarzania:"
+#, fuzzy, perl-format
+msgid "%s not found"
+msgstr "nie znaleziono %s"
 
 #: ../IkiWiki/Plugin/teximg.pm:72
 #, fuzzy
@@ -1064,54 +1065,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "skanowanie %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "usuwanie %s nie tworzonego już przez %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
@@ -1184,64 +1190,65 @@ msgstr "użycie: ikiwiki [parametry] źródło cel"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Dyskusja"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "nieznany sposób sortowania %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "awaria w trakcie odczytu %s: %s"
@@ -1266,6 +1273,16 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to process"
+#~ msgstr "awaria w trakcie przetwarzania:"
+
+#~ msgid "nonexistant template %s"
+#~ msgstr "brakujący szablon %s"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "niedostępna funkcja getctime"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "awaria w trakcie odczytu %s: %s"
@@ -1323,10 +1340,6 @@ msgstr ""
 #~ "Brak możliwości wysłania powiadomień od Subversion przez \"haczyk\" post-"
 #~ "commit z powodu nieustawionego parametru REV"
 
-#, fuzzy
-#~ msgid "%s not found"
-#~ msgstr "nie znaleziono %s"
-
 #~ msgid "What's this?"
 #~ msgstr "Więcej o OpenID"
 
diff --git a/po/sv.po b/po/sv.po
index 0d4c6202e..2cba1cc2e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-03 14:18-0400\n"
+"POT-Creation-Date: 2010-04-24 16:15-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
+#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291
 msgid "Error"
 msgstr "Fel"
 
@@ -136,7 +136,7 @@ msgstr "skapar nya sidan %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231
 msgid "done"
 msgstr "klar"
 
@@ -177,7 +177,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:117
 msgid "automatic index generation"
 msgstr ""
 
@@ -209,55 +209,55 @@ msgstr ""
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98
+#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:345
+#: ../IkiWiki/Plugin/comments.pm:347
 #, fuzzy, perl-format
 msgid "commenting on %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/comments.pm:363
+#: ../IkiWiki/Plugin/comments.pm:365
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:370
+#: ../IkiWiki/Plugin/comments.pm:372
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:467
+#: ../IkiWiki/Plugin/comments.pm:469
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:471
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:482
+#: ../IkiWiki/Plugin/comments.pm:484
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:486
+#: ../IkiWiki/Plugin/comments.pm:488
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
+#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:579
+#: ../IkiWiki/Plugin/comments.pm:581
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:618
+#: ../IkiWiki/Plugin/comments.pm:620
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:761
+#: ../IkiWiki/Plugin/comments.pm:759
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -267,7 +267,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:771
+#: ../IkiWiki/Plugin/comments.pm:769
 msgid "Comment"
 msgstr ""
 
@@ -297,14 +297,14 @@ msgstr "tar bort gammal sida %s"
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:296
+#: ../IkiWiki/Plugin/editpage.pm:295
 #, perl-format
 msgid "creating %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387
-#: ../IkiWiki/Plugin/editpage.pm:426
+#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386
+#: ../IkiWiki/Plugin/editpage.pm:425
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
@@ -324,9 +324,10 @@ msgstr "filnamn för wrapper har inte angivits"
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:138
+#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
 #, fuzzy
-msgid "failed to process"
+msgid "failed to process template:"
 msgstr "misslyckades med att behandla mall:"
 
 #: ../IkiWiki/Plugin/format.pm:30
@@ -357,18 +358,18 @@ msgstr "kan inte läsa %s: %s"
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676
+#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
 #: ../IkiWiki/Receive.pm:130
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:698
+#: ../IkiWiki/Plugin/git.pm:727
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:702
+#: ../IkiWiki/Plugin/git.pm:731
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -455,12 +456,12 @@ msgstr ""
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:333
+#: ../IkiWiki/Plugin/inline.pm:342
 #, perl-format
-msgid "nonexistant template %s"
-msgstr ""
+msgid "template %s not found"
+msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/inline.pm:625
+#: ../IkiWiki/Plugin/inline.pm:635
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
@@ -490,21 +491,25 @@ msgstr ""
 "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/"
 "markdown (%s)"
 
-#: ../IkiWiki/Plugin/meta.pm:162
+#: ../IkiWiki/Plugin/meta.pm:174
 #, fuzzy
 msgid "stylesheet not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:200
+#: ../IkiWiki/Plugin/meta.pm:212
 #, fuzzy
 msgid "redir page not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/meta.pm:214
+#: ../IkiWiki/Plugin/meta.pm:226
 #, fuzzy
 msgid "redir cycle is not allowed"
 msgstr "mallen %s hittades inte"
 
+#: ../IkiWiki/Plugin/meta.pm:383
+msgid "sort=meta requires a parameter"
+msgstr ""
+
 #: ../IkiWiki/Plugin/mirrorlist.pm:44
 msgid "Mirrors"
 msgstr "Speglar"
@@ -521,10 +526,6 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:66
-msgid "getctime not implemented"
-msgstr "getctime inte implementerad"
-
 #: ../IkiWiki/Plugin/openid.pm:62
 msgid "Log in with"
 msgstr ""
@@ -542,39 +543,39 @@ msgstr "Alla sidor länkas till av andra sidor."
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:229
+#: ../IkiWiki/Plugin/passwordauth.pm:231
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:236
+#: ../IkiWiki/Plugin/passwordauth.pm:238
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:264
+#: ../IkiWiki/Plugin/passwordauth.pm:268
 msgid "Account creation successful. Now you can Login."
 msgstr "Kontot har skapats. Du kan nu logga in."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:267
+#: ../IkiWiki/Plugin/passwordauth.pm:271
 msgid "Error creating account."
 msgstr "Fel vid skapandet av konto."
 
-#: ../IkiWiki/Plugin/passwordauth.pm:274
+#: ../IkiWiki/Plugin/passwordauth.pm:278
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:308
+#: ../IkiWiki/Plugin/passwordauth.pm:312
 msgid "Failed to send mail"
 msgstr "Misslyckades med att skicka e-post"
 
-#: ../IkiWiki/Plugin/passwordauth.pm:310
+#: ../IkiWiki/Plugin/passwordauth.pm:314
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:345
+#: ../IkiWiki/Plugin/passwordauth.pm:349
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:348
+#: ../IkiWiki/Plugin/passwordauth.pm:352
 msgid "password reset denied"
 msgstr ""
 
@@ -605,94 +606,94 @@ msgstr "RPC::XML::Client hittades inte, pingar inte"
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:139
+#: ../IkiWiki/Plugin/po.pm:140
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:151
+#: ../IkiWiki/Plugin/po.pm:152
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:156
+#: ../IkiWiki/Plugin/po.pm:157
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:386
+#: ../IkiWiki/Plugin/po.pm:388
 #, perl-format
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655
+#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761
 #, fuzzy, perl-format
 msgid "building %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/Plugin/po.pm:428
+#: ../IkiWiki/Plugin/po.pm:430
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:452
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:472
+#: ../IkiWiki/Plugin/po.pm:474
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:871
+#: ../IkiWiki/Plugin/po.pm:873
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:885
+#: ../IkiWiki/Plugin/po.pm:887
 #, fuzzy, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:894
+#: ../IkiWiki/Plugin/po.pm:896
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:900
+#: ../IkiWiki/Plugin/po.pm:902
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:936
+#: ../IkiWiki/Plugin/po.pm:938
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:949
+#: ../IkiWiki/Plugin/po.pm:951
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1033
+#: ../IkiWiki/Plugin/po.pm:1035
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103
-#: ../IkiWiki/Plugin/po.pm:1142
+#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1144
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1101
+#: ../IkiWiki/Plugin/po.pm:1103
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1156
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
@@ -836,44 +837,44 @@ msgstr ""
 msgid "no change to the file name was specified"
 msgstr "filnamn för wrapper har inte angivits"
 
-#: ../IkiWiki/Plugin/rename.pm:69
+#: ../IkiWiki/Plugin/rename.pm:68
 #, perl-format
 msgid "illegal name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:74
+#: ../IkiWiki/Plugin/rename.pm:73
 #, perl-format
 msgid "%s already exists"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:80
+#: ../IkiWiki/Plugin/rename.pm:79
 #, perl-format
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:123
+#: ../IkiWiki/Plugin/rename.pm:122
 #, fuzzy, perl-format
 msgid "rename %s"
 msgstr "ritar upp %s"
 
-#: ../IkiWiki/Plugin/rename.pm:162
+#: ../IkiWiki/Plugin/rename.pm:161
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:249
+#: ../IkiWiki/Plugin/rename.pm:248
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:252
+#: ../IkiWiki/Plugin/rename.pm:251
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:349
+#: ../IkiWiki/Plugin/rename.pm:348
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:573
+#: ../IkiWiki/Plugin/rename.pm:572
 #, fuzzy, perl-format
 msgid "update for rename of %s to %s"
 msgstr "uppdatering av %s, %s av %s"
@@ -978,21 +979,21 @@ msgstr ""
 msgid "parse fail at line %d: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/template.pm:34
+#: ../IkiWiki/Plugin/tag.pm:83
+#, fuzzy, perl-format
+msgid "creating tag page %s"
+msgstr "skapar nya sidan %s"
+
+#: ../IkiWiki/Plugin/template.pm:33
 #, fuzzy
 msgid "missing id parameter"
 msgstr "mall saknar id-parameter"
 
 #: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "template %s not found"
+#, fuzzy, perl-format
+msgid "%s not found"
 msgstr "mallen %s hittades inte"
 
-#: ../IkiWiki/Plugin/template.pm:66
-#, fuzzy
-msgid "failed to process:"
-msgstr "misslyckades med att behandla mall:"
-
 #: ../IkiWiki/Plugin/teximg.pm:72
 msgid "missing tex code"
 msgstr ""
@@ -1051,54 +1052,59 @@ msgstr ""
 msgid "bad file name %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:153
+#: ../IkiWiki/Render.pm:162
 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 
-#: ../IkiWiki/Render.pm:274
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:308
+#: ../IkiWiki/Render.pm:330
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:413
+#: ../IkiWiki/Render.pm:372
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
+msgstr ""
+
+#: ../IkiWiki/Render.pm:434
+#, fuzzy, perl-format
+msgid "removing obsolete %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:507
 #, fuzzy, perl-format
 msgid "building %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:495
+#: ../IkiWiki/Render.pm:516
 #, fuzzy, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
-#: ../IkiWiki/Render.pm:618
+#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777
 #, fuzzy, perl-format
 msgid "building %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:631
+#: ../IkiWiki/Render.pm:684
 #, fuzzy, perl-format
 msgid "building %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:707
+#: ../IkiWiki/Render.pm:819
 #, fuzzy, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr "ikiwiki: kan inte rita upp %s"
@@ -1171,62 +1177,63 @@ msgstr "användning: ikiwiki [flaggor] källa mål"
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
-#: ../ikiwiki.in:95
+#: ../ikiwiki.in:96
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:156
+#: ../ikiwiki.in:157
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 
-#: ../ikiwiki.in:219
+#: ../ikiwiki.in:220
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
-#: ../ikiwiki.in:222
+#: ../ikiwiki.in:223
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
-#: ../IkiWiki.pm:238
+#: ../IkiWiki.pm:233
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki.pm:530
+#: ../IkiWiki.pm:524
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:576
+#: ../IkiWiki.pm:570
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:605
+#: ../IkiWiki.pm:599
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1278
+#: ../IkiWiki.pm:1273
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1901
+#: ../IkiWiki.pm:1932
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2044
-msgid "Sort::Naturally needed for title_natural sort"
-msgstr ""
+#: ../IkiWiki.pm:2009
+#, fuzzy, perl-format
+msgid "invalid sort type %s"
+msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2055
+#: ../IkiWiki.pm:2030
 #, perl-format
 msgid "unknown sort type %s"
 msgstr "okänd sorteringstyp %s"
 
-#: ../IkiWiki.pm:2074
+#: ../IkiWiki.pm:2166
 #, fuzzy, perl-format
 msgid "cannot match pages: %s"
 msgstr "kan inte läsa %s: %s"
@@ -1251,6 +1258,13 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#, fuzzy
+#~ msgid "failed to process"
+#~ msgstr "misslyckades med att behandla mall:"
+
+#~ msgid "getctime not implemented"
+#~ msgstr "getctime inte implementerad"
+
 #, fuzzy
 #~ msgid "failed to read %s"
 #~ msgstr "misslyckades med att skriva %s: %s"
@@ -1305,10 +1319,6 @@ msgstr ""
 #~ "REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka "
 #~ "notifieringar"
 
-#, fuzzy
-#~ msgid "%s not found"
-#~ msgstr "mallen %s hittades inte"
-
 #~ msgid "What's this?"
 #~ msgstr "Vad är det här?"
 
-- 
cgit v1.2.3


From c6a473b8eea0ea015c44c3cd7a267f6325febac5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 20:30:05 -0400
Subject: update

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

(limited to 'doc')

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 67e5517e4..892e36cd2 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -23,8 +23,8 @@ The template directive allows wiki pages to be used as templates,
 filled out and inserted into other pages in the wiki.
 """]]
 [[!if test="enabled(template) and enabled(inline)" then="""
-[[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
-sort=title template=titlepage
+[[!inline pages="templates/* and !*.tmpl and !*/discussion"
+feeds=no archive=yes sort=title template=titlepage
 rootpage=templates postformtext="Add a new template named:"]]
 """]]
 
-- 
cgit v1.2.3


From 5afda336720dc83e0fd4c6e2f311ff6664c68211 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Apr 2010 21:39:03 -0400
Subject: wording

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

(limited to 'doc')

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 892e36cd2..9208db0eb 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -8,7 +8,7 @@ searched first. Customized templates can also be placed inside the
 
 Ikiwiki uses the HTML::Template module as its template engine. This
 supports things like conditionals and loops in templates and is pretty
-easy to learn. All you really need to know are a few things:
+easy to learn. All you really need to know to modify templates is this:
 
 * To insert the value of a template variable, use `<TMPL_VAR variable>`.
 * To make a block of text conditional on a variable being set use
-- 
cgit v1.2.3


From f49b9e7411bf9748dc81389e14d70cafaa6ded02 Mon Sep 17 00:00:00 2001
From: "http://id.ertugkaramatli.com/" <http://id.ertugkaramatli.com/@web>
Date: Sun, 25 Apr 2010 13:25:59 +0000
Subject: added my personal site

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index cb4213405..edf36b5c6 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -143,6 +143,7 @@ Personal sites and blogs
 * [Chris Dombroski's boring bliki](https://www.icanttype.org/)
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
 * [Gustaf Thorslund's blog](http://blog.thorslund.org)
+* [Ertug Karamatli](http://pages.karamatli.com)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 506075695f32a63bfc8b57cef1a601bd937b7a72 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 25 Apr 2010 14:16:53 -0400
Subject: typo

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

(limited to 'doc')

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 9cf61cc6c..2f87d60d5 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -330,7 +330,7 @@ also be configured using a setup file.
 * --set var=value
   
   This allows setting an arbitrary configuration variable, the same as if it
-  were set via a setup file. Since most options commonly used options can be
+  were set via a setup file. Since most commonly used options can be
   configured using command-line switches, you will rarely need to use this.
 
 * --set-yaml var=value
-- 
cgit v1.2.3


From 86484c109d30c0062c5a5056f4adf41c0581b5e9 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 26 Apr 2010 15:14:08 +0000
Subject: table name for querying the mediawiki mysql db

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 9719d9a7e..db1a1745c 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -59,7 +59,13 @@ specific prefix: e.g. `Category:` will be stripped off.
 ### Querying the database
 
 If you have access to the relational database in which your mediawiki data is
-stored, it is possible to derive a list of page names from this.
+stored, it is possible to derive a list of page names from this. With mediawiki's
+MySQL backend, the page table is, appropriately enough, called `table`:
+
+ SELECT page_namespace, page_title FROM page;
+
+As with the previous method, you will need to do some filtering based on the
+namespace.
 
 ## Step 2: fetching the page data
 
-- 
cgit v1.2.3


From 60481cad90d61a4d1abe2dc5e69eee69ce938992 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 26 Apr 2010 15:19:04 +0000
Subject: move list of namespaces to its own section

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index db1a1745c..fe0fd46b0 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -48,10 +48,7 @@ in HTML, you may need to add further processing to the last line.
 
 Note that by default, `Special:Allpages` will only list pages in the main
 namespace. You need to add a `&namespace=XX` argument to get pages in a
-different namespace. The following numbers correspond to common namespaces:
-
- * 10 - templates (`Template:foo`)
- * 14 - categories (`Category:bar`)
+different namespace. (See below for the default list of namespaces)
 
 Note that the page names obtained this way will not include any namespace
 specific prefix: e.g. `Category:` will be stripped off.
@@ -67,6 +64,12 @@ MySQL backend, the page table is, appropriately enough, called `table`:
 As with the previous method, you will need to do some filtering based on the
 namespace.
 
+### namespaces
+
+The list of default namespaces in mediawiki is available from <http://www.mediawiki.org/wiki/Manual:Namespace#Built-in_namespaces>, reproduced here for convenience:
+
+[[mediawiki_namespaces]]
+
 ## Step 2: fetching the page data
 
 Once you have a list of page names, you can fetch the data for each page.
-- 
cgit v1.2.3


From 76e8e4ea838516ebdb8e981fff47efa6af836079 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 26 Apr 2010 15:24:50 +0000
Subject: insert table of common namespaces

---
 doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index fe0fd46b0..3a266bc8b 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -66,9 +66,18 @@ namespace.
 
 ### namespaces
 
-The list of default namespaces in mediawiki is available from <http://www.mediawiki.org/wiki/Manual:Namespace#Built-in_namespaces>, reproduced here for convenience:
-
-[[mediawiki_namespaces]]
+The list of default namespaces in mediawiki is available from <http://www.mediawiki.org/wiki/Manual:Namespace#Built-in_namespaces>. Here are reproduced the ones you are most likely to encounter if you are running a small mediawiki install for your own purposes:
+
+[[!table data="""
+Index   | Name         | Example
+0       | Main         | Foo
+1       | Talk         | Talk:Foo
+2       | User         | User:Jon
+3       | User talk    | User_talk:Jon
+6       | File         | File:Barack_Obama_signature.svg
+10      | Template     | Template:Prettytable
+14      | Category     | Category:Pages_needing_review
+"""]]
 
 ## Step 2: fetching the page data
 
-- 
cgit v1.2.3


From d3c994d980c2f52102c78c0157ce06140c639bc6 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 26 Apr 2010 15:29:04 +0000
Subject: fix indent

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

(limited to 'doc')

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 3a266bc8b..38de01109 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -59,7 +59,7 @@ If you have access to the relational database in which your mediawiki data is
 stored, it is possible to derive a list of page names from this. With mediawiki's
 MySQL backend, the page table is, appropriately enough, called `table`:
 
- SELECT page_namespace, page_title FROM page;
+    SELECT page_namespace, page_title FROM page;
 
 As with the previous method, you will need to do some filtering based on the
 namespace.
-- 
cgit v1.2.3


From 0689f2dbc5d4f80cd13f51055b24ff0506f638fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 13:43:24 -0400
Subject: add blipvert

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

(limited to 'doc')

diff --git a/doc/git.mdwn b/doc/git.mdwn
index a5fd742ca..a0b9c950f 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -63,6 +63,7 @@ think about merging them. This is recommended. :-)
 * [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
 * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
 * [[privat]] `git://github.com/privat/ikiwiki.git`
+* [[blipvert]] `git://github.com/blipvert/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 06d5a19370e07d39e3dcbd975fe479388104b0a5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 13:47:40 -0400
Subject: document match_guid

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

(limited to 'doc')

diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 5c191f23f..7810e790b 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -40,8 +40,8 @@ Some more elaborate limits can be added to what matches using these functions:
 * "`internal(glob)`" - like `glob()`, but matches even internal-use 
   pages that globs do not usually match.
 * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
-  "`license(glob)`", "`copyright(glob)`" - match pages that have the given
-  metadata, matching the specified glob.
+  "`license(glob)`", "`copyright(glob)`", "`guid(glob)`" 
+  - match pages that have the given metadata, matching the specified glob.
 * "`user(username)`" - tests whether a modification is being made by a
   user with the specified username. If openid is enabled, an openid can also
   be put here. Glob patterns can be used in the username. For example, 
-- 
cgit v1.2.3


From a6bd053638c67e5410c4a0a3742ba3825320b344 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 16:31:00 -0400
Subject: remove manual file remove instructions

Since that was written, ikiwiki got fixed to track old rendered files
across --rebuild and remove them.
---
 doc/tips/switching_to_usedirs.mdwn | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/tips/switching_to_usedirs.mdwn b/doc/tips/switching_to_usedirs.mdwn
index 183ce00ac..92871439f 100644
--- a/doc/tips/switching_to_usedirs.mdwn
+++ b/doc/tips/switching_to_usedirs.mdwn
@@ -8,9 +8,7 @@ to usedirs, or edit your setup file and turn usedirs back off.
   or manually.
 * Since usedirs is enabled, ikiwiki will have created a bunch of new
   html files. Where before ikiwiki generated a `dest/foo.html`, now it will
-  generate `dest/foo/index.html`. But, the old html files will still be
-  present too. Remove them:
-	find dest -name \*.html -not -name index.html -exec rm {} \;
+  generate `dest/foo/index.html`. The old html files will be removed.
 * If you have a blog that is aggregated on a Planet or similar, all the
   items in the RSS or atom feed will seem like new posts, since their URLs
   have changed. See [[howto_avoid_flooding_aggregators]] for a workaround.
-- 
cgit v1.2.3


From 3ac2ae1f14952bd92038183d92b1eb618c9d0f55 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 26 Apr 2010 18:47:17 -0400
Subject: Add page() PageSpec, which is like glob() but matches only pages, 
 not other files.

---
 IkiWiki.pm                | 10 +++++++++-
 debian/changelog          |  2 ++
 doc/ikiwiki/pagespec.mdwn | 11 ++++++-----
 t/pagespec_match.t        | 16 +++++++++++++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 944001d9b..623396c9c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2299,7 +2299,11 @@ sub match_glob ($$;@) {
 
 	my $regexp=IkiWiki::glob2re($glob);
 	if ($page=~/^$regexp$/i) {
-		if (! IkiWiki::isinternal($page) || $params{internal}) {
+		if ($params{onlypage} &&
+		    ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
+			return IkiWiki::FailReason->new("$page is not a page");
+		}
+		elsif (! IkiWiki::isinternal($page) || $params{internal}) {
 			return IkiWiki::SuccessReason->new("$glob matches $page");
 		}
 		else {
@@ -2315,6 +2319,10 @@ sub match_internal ($$;@) {
 	return match_glob($_[0], $_[1], @_, internal => 1)
 }
 
+sub match_page ($$;@) {
+	return match_glob($_[0], $_[1], @_, onlypage => 1)
+}
+
 sub match_link ($$;@) {
 	my $page=shift;
 	my $link=lc(shift);
diff --git a/debian/changelog b/debian/changelog
index 1229b1198..610d0c9cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,8 @@ ikiwiki (3.20100424) UNRELEASED; urgency=low
     the top of the web root. This is another things that requires a wiki
     rebuild on upgrade to this version.
   * Fix removal of rendered files in rebuild mode.
+  * Add page() PageSpec, which is like glob() but matches only pages, 
+    not other files.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 7810e790b..1c99aefac 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -24,19 +24,20 @@ match all pages except for Discussion pages and the SandBox:
 
 Some more elaborate limits can be added to what matches using these functions:
 
+* "`glob(someglob)`" - matches pages and other files that match the given glob.
+  Just writing the glob by itself is actually a shorthand for this function.
+* "`page(glob)`" - like `glob()`, but only matches pages, not other files
 * "`link(page)`" - matches only pages that link to a given page (or glob)
 * "`tagged(tag)`" - matches pages that are tagged or link to the given tag (or
   tags matched by a glob)
 * "`backlink(page)`" - matches only pages that a given page links to
-* "`creation_month(month)`" - matches only pages created on the given month
+* "`creation_month(month)`" - matches only files created on the given month
 * "`creation_day(mday)`" - or day of the month
 * "`creation_year(year)`" - or year
-* "`created_after(page)`" - matches only pages created after the given page
+* "`created_after(page)`" - matches only files created after the given page
   was created
-* "`created_before(page)`" - matches only pages created before the given page
+* "`created_before(page)`" - matches only files created before the given page
   was created
-* "`glob(someglob)`" - matches pages that match the given glob. Just writing
-  the glob by itself is actually a shorthand for this function.
 * "`internal(glob)`" - like `glob()`, but matches even internal-use 
   pages that globs do not usually match.
 * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index ade9bca5a..97bcc969c 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 75;
+use Test::More tests => 85;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -66,7 +66,21 @@ $links{"ook"}=[qw{/blog/tags/foo}];
 foreach my $p (keys %links) {
 	$pagesources{$p}="$p.mdwn";
 }
+$pagesources{"foo.png"}="foo.png";
+$pagesources{"foo"}="foo.mdwn";
+$IkiWiki::hooks{htmlize}{mdwn}={};
 
+ok(pagespec_match("foo", "foo"), "simple");
+ok(! pagespec_match("foo", "bar"), "simple fail");
+ok(pagespec_match("foo", "foo"), "simple glob");
+ok(pagespec_match("foo", "f*"), "simple glob fail");
+ok(pagespec_match("foo", "page(foo)"), "page()");
+print pagespec_match("foo", "page(foo)")."\n";
+ok(! pagespec_match("foo", "page(bar)"), "page() fail");
+ok(! pagespec_match("foo.png", "page(foo.png)"), "page() fails on non-page");
+ok(! pagespec_match("foo.png", "page(foo*)"), "page() fails on non-page glob");
+ok(pagespec_match("foo", "page(foo)"), "page() glob");
+ok(pagespec_match("foo", "page(f*)"), "page() glob fail");
 ok(pagespec_match("foo", "link(bar)"), "link");
 ok(pagespec_match("foo", "link(ba?)"), "glob link");
 ok(! pagespec_match("foo", "link(quux)"), "failed link");
-- 
cgit v1.2.3


From 47dfa3b8b97c97532f4e49f9883b6a59a9036b40 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 27 Apr 2010 00:00:46 -0400
Subject: add news item for ikiwiki 3.20100427

---
 doc/news/version_3.20100122.mdwn |  15 ------
 doc/news/version_3.20100427.mdwn | 111 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+), 15 deletions(-)
 delete mode 100644 doc/news/version_3.20100122.mdwn
 create mode 100644 doc/news/version_3.20100427.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100122.mdwn b/doc/news/version_3.20100122.mdwn
deleted file mode 100644
index 11051fad8..000000000
--- a/doc/news/version_3.20100122.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-ikiwiki 3.20100122 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * inline: Avoid showing edit links if page editing is disabled.
-     (Sjoerd)
-   * signinedit: Auto-disable the plugin when all authentication methods
-     are disabled.
-   * comments: Fix permalinks for comments using new conflict-free filenames.
-   * img: Support alignment of images with captions. (Giuseppe Bilotta)
-   * websetup: Fix utf-8 problems.
-   * websetup: Fix bug in array change detection.
-   * linkmap: Simplify and improve browser compatibility by using an img,
-     not object tag.
-   * git: The new git-notes feature in git 1.6.6 changes git log output
-     in a way that broke ikiwiki's parser if notes are added to commits.
-   * po: Avoid crash when a page is empty."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100427.mdwn b/doc/news/version_3.20100427.mdwn
new file mode 100644
index 000000000..5fe732f87
--- /dev/null
+++ b/doc/news/version_3.20100427.mdwn
@@ -0,0 +1,111 @@
+News for ikiwiki 3.20100427:
+
+   This version of ikiwiki has a lot of changes that you need to know about.
+   Now you can include customised versions of templates in the source
+   of your wiki. (For example, templates/page.tmpl.) When these templates
+   are changed, ikiwiki will automatically rebuild pages that use them.
+   Allowing untrusted users to upload attachments with the ".tmpl"
+   extension is not recommended, as that allows anyone to change
+   a wiki's templates.
+   The --getctime switch is renamed to --gettimes, and it also gets the
+   file modification time. And it's a lot faster (when using git). But
+   the really important change is, you don't have to remember to use this
+   switch. Now ikiwiki will do it when it needs to.
+   At last, the "tagged()" pagespec only matches tags, not regular wikilinks.
+   If your wiki accidentially relied on the old, buggy behavior, you might
+   need to change its pagespecs to use "link()".
+   Many of your wishes have been answered: Now tag pages can automatically be
+   created when new tags are used. This feature is enabled by default if you
+   have configured a tagbase. It can be turned on or off using the
+   tag\_autocreate setting.
+   These changes may also affect some users:
+   * The title\_natural sort method (as used by the inline directive, etc)
+     has been moved to the new sortnaturally plugin, which is not enabled
+     by default since it requires the Sort::Naturally perl module.
+   * TMPL\_INCLUDE is no longer supported in any template used by ikiwiki.
+     It used to be allowed in certian templates, but not in others.
+   * The add\_templates option has been removed from the underlay plugin.
+     If you used this option, you can instead use templates/ subdirectories
+     inside underlay directories added by the add\_underlays option.
+   Due to the above and other changes, all wikis need to be rebuilt on
+   upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
+   this will be done automatically when the Debian package is upgraded. Or
+   use ikiwiki-mass-rebuild to force a rebuild.
+
+ikiwiki 3.20100427 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * [ Joey Hess ]
+   * tag: Automatic creation of tag pages can now be enabled using
+     the tag\_autocreate setting. (David Riebenbauer)
+   * Customised templates can now be included in the source of wikis
+     (and also in underlays), and dependencies on them are tracked.
+   * TMPL\_INCLUDE is no longer supported in any template.
+   * underlay: Removed the add\_templates option.
+   * Add template\_depends function to plugin API.
+   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
+   * comments: Fix missing entity encoding in title.
+   * txt: Add a special case for robots.txt.
+ * [ Simon McVittie ]
+   * Add support for link types, and make the the tagged() pagespec only
+     match tags, not regular links (a bugfix).
+   * Rebuild wikis on upgrade to this version to get tag link types recorded
+     correctly.
+   * Revamp sorting system; allow new sort methods to be added by plugins,
+     and add a "sortspec" syntax that can combine, reverse, etc sort methods.
+   * meta: Add `meta(author)`, `meta(title)` etc sortspecs to allow sorting
+     by metadata.
+   * meta: Add optional sortas parameter to author and title meta directives.
+     This can be used to get names sorted by last name without displaying
+     them last name first.
+   * sortnaturally: New plugin; the title\_natural sort method has moved here.
+   * meta: store fields consistently unescaped, and escape on use.
+     (A wiki rebuild is also needed due to this change.)
+ * [ Joey Hess ]
+   * Update dependency for git-core to git transition.
+   * po: Check that translated underlay directories exist before using them
+     for master language.
+   * po: Configuring the same language as master and slave confuses processing;
+     so filter out such a misconfiguration.
+   * calendar: Add archive\_pagespec, which is used by ikiwiki-calendar to
+     specify which pages to include on the calendar archive pages.
+     (The pagespec can still also be specified on the ikiwiki-calendar command
+     line.)
+   * pagestats: Class parameter can be used to override default class for
+     custom styling.
+   * pagestats: Use style=list to get a list of tags, scaled by use like
+     in a tag cloud. This is useful to put in a sidebar.
+   * Rework example blog front page.
+   * CSS and templates for sidebar changed to use a class, not an id.
+   * sidebar: Now a sidebar directive can be used to override the sidebar
+     shown on a page.
+   * Enable calendar and sidebar in auto-blog.setup.
+   * sidebar: Add global\_sidebars setting.
+   * conditional: Fix bug that forced "all" mode off by default.
+   * calendarmonth.tmpl: The month calendar is now put in a sidebar.
+   * calendar: Improved display of arrows.
+   * Rename --getctime to --gettime. (The old name still works for
+     backwards compatibility.)
+   * --gettime now also looks up last modification time.
+   * Automatically run --gettime the first time ikiwiki is run on
+     a given srcdir. (Use --no-gettime to disable.)
+   * Add rcs\_getmtime to plugin API; currently only implemented
+     for git and svn.
+   * Optimise --gettime for git, so it's appropriately screamingly
+     fast. (This could be done for most other backends too.)
+   * However, --gettime for git no longer follows renames. That would
+     be slow, and whether a renamed wiki page is the same page is really
+     an iffy thing.
+   * Use above to fix up timestamps on docwiki, as well as ensure that
+     timestamps on basewiki files shipped in the deb are sane.
+   * autoindex: Switch to using %wikistate instead of abusing
+     $pagestate{index}.
+   * bzr: Support rcs\_getmtime, and fix rcs\_getctime implementation
+     (Jelmer Vernooij)
+   * Quite a lot of new optimisations, and one major fix to a recent
+     performance regression.
+   * Moved javascript files under the ikiwiki/ directory, to avoid cluttering
+     the top of the web root. This is another things that requires a wiki
+     rebuild on upgrade to this version.
+   * Fix removal of rendered files in rebuild mode.
+   * Add page() PageSpec, which is like glob() but matches only pages,
+     not other files."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 9daf3db277c31d3ce434253af2dfb7e0e436b5f9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 27 Apr 2010 00:02:49 -0400
Subject: format

---
 doc/news/version_3.20100427.mdwn | 74 ++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

(limited to 'doc')

diff --git a/doc/news/version_3.20100427.mdwn b/doc/news/version_3.20100427.mdwn
index 5fe732f87..1701fd670 100644
--- a/doc/news/version_3.20100427.mdwn
+++ b/doc/news/version_3.20100427.mdwn
@@ -1,36 +1,44 @@
-News for ikiwiki 3.20100427:
+This version of ikiwiki has a lot of changes that you need to know about.
 
-   This version of ikiwiki has a lot of changes that you need to know about.
-   Now you can include customised versions of templates in the source
-   of your wiki. (For example, templates/page.tmpl.) When these templates
-   are changed, ikiwiki will automatically rebuild pages that use them.
-   Allowing untrusted users to upload attachments with the ".tmpl"
-   extension is not recommended, as that allows anyone to change
-   a wiki's templates.
-   The --getctime switch is renamed to --gettimes, and it also gets the
-   file modification time. And it's a lot faster (when using git). But
-   the really important change is, you don't have to remember to use this
-   switch. Now ikiwiki will do it when it needs to.
-   At last, the "tagged()" pagespec only matches tags, not regular wikilinks.
-   If your wiki accidentially relied on the old, buggy behavior, you might
-   need to change its pagespecs to use "link()".
-   Many of your wishes have been answered: Now tag pages can automatically be
-   created when new tags are used. This feature is enabled by default if you
-   have configured a tagbase. It can be turned on or off using the
-   tag\_autocreate setting.
-   These changes may also affect some users:
-   * The title\_natural sort method (as used by the inline directive, etc)
-     has been moved to the new sortnaturally plugin, which is not enabled
-     by default since it requires the Sort::Naturally perl module.
-   * TMPL\_INCLUDE is no longer supported in any template used by ikiwiki.
-     It used to be allowed in certian templates, but not in others.
-   * The add\_templates option has been removed from the underlay plugin.
-     If you used this option, you can instead use templates/ subdirectories
-     inside underlay directories added by the add\_underlays option.
-   Due to the above and other changes, all wikis need to be rebuilt on
-   upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
-   this will be done automatically when the Debian package is upgraded. Or
-   use ikiwiki-mass-rebuild to force a rebuild.
+Now you can include customised versions of templates in the source
+of your wiki. (For example, templates/page.tmpl.) When these templates
+are changed, ikiwiki will automatically rebuild pages that use them.
+
+Allowing untrusted users to upload attachments with the ".tmpl"
+extension is not recommended, as that allows anyone to change
+a wiki's templates.
+
+The --getctime switch is renamed to --gettimes, and it also gets the 
+file modification time. And it's a lot faster (when using git). But
+the really important change is, you don't have to remember to use this
+switch. Now ikiwiki will do it when it needs to.
+
+At last, the "tagged()" pagespec only matches tags, not regular wikilinks.
+If your wiki accidentially relied on the old, buggy behavior, you might
+need to change its pagespecs to use "link()".
+
+Many of your wishes have been answered: Now tag pages can automatically be
+created when new tags are used. This feature is enabled by default if you
+have configured a tagbase. It can be turned on or off using the
+`tag_autocreate` setting.
+
+These changes may also affect some users:
+
+* The `title_natural` sort method (as used by the inline directive, etc)
+  has been moved to the new sortnaturally plugin, which is not enabled
+  by default since it requires the Sort::Naturally perl module.
+
+* `TMPL_INCLUDE` is no longer supported in any template used by ikiwiki.
+  It used to be allowed in certian templates, but not in others.
+
+* The `add_templates` option has been removed from the underlay plugin.
+  If you used this option, you can instead use templates/ subdirectories
+  inside underlay directories added by the `add_underlays` option.
+
+Due to the above and other changes, all wikis need to be rebuilt on
+upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
+this will be done automatically when the Debian package is upgraded. Or
+use ikiwiki-mass-rebuild to force a rebuild.
 
 ikiwiki 3.20100427 released with [[!toggle text="these changes"]]
 [[!toggleable text="""
@@ -108,4 +116,4 @@ ikiwiki 3.20100427 released with [[!toggle text="these changes"]]
      rebuild on upgrade to this version.
    * Fix removal of rendered files in rebuild mode.
    * Add page() PageSpec, which is like glob() but matches only pages,
-     not other files."""]]
\ No newline at end of file
+     not other files."""]]
-- 
cgit v1.2.3


From 67e8edc59712cfc3dbd24fd7f3aae0fa734983be Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 28 Apr 2010 03:22:37 +0000
Subject: question about TMPL_INCLUDE

---
 doc/news/version_3.20100427/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/news/version_3.20100427/discussion.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100427/discussion.mdwn b/doc/news/version_3.20100427/discussion.mdwn
new file mode 100644
index 000000000..4daf8085f
--- /dev/null
+++ b/doc/news/version_3.20100427/discussion.mdwn
@@ -0,0 +1,3 @@
+*TMPL_INCLUDE is no longer supported in any template used by ikiwiki. It used to be allowed in certian templates, but not in others.*
+
+Would it be possible to make that a config option?  Because I do use includes in my templates, and I don't allow users to edit templates, so it isn't a security loophole for me. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From a6e6f604bd8e9a8f90000163f8b00299829729d5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 28 Apr 2010 12:39:13 -0400
Subject: TMPL_INCLUDE re-enabled for templates read from the templatedir. (But
 not in-wiki templates.)

---
 IkiWiki.pm                                  | 18 +++++++++++-------
 debian/changelog                            |  2 ++
 doc/news/version_3.20100427/discussion.mdwn |  4 ++++
 3 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 623396c9c..dcee376ee 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1661,7 +1661,11 @@ sub template_file ($) {
 	}
 
 	my $template=srcfile($tpage, 1);
-	if (! defined $template) {
+	if (defined $template) {
+		return $template, $tpage, 1 if wantarray;
+		return $template;
+	}
+	else {
 		$name=~s:/::; # avoid path traversal
 		foreach my $dir ($config{templatedir},
 		                 "$installdir/share/ikiwiki/templates") {
@@ -1670,12 +1674,12 @@ sub template_file ($) {
 				last;
 			}
 		}
+		if (defined $template) {	
+			return $template, $tpage if wantarray;
+			return $template;
+		}
 	}
 
-	if (defined $template) {	
-		return $template, $tpage if wantarray;
-		return $template;
-	}
 	return;
 }
 
@@ -1683,7 +1687,7 @@ sub template_depends ($$;@) {
 	my $name=shift;
 	my $page=shift;
 	
-	my ($filename, $tpage)=template_file($name);
+	my ($filename, $tpage, $untrusted)=template_file($name);
 	if (defined $page && defined $tpage) {
 		add_depends($page, $tpage);
 	}
@@ -1699,7 +1703,7 @@ sub template_depends ($$;@) {
 		die_on_bad_params => 0,
 		filename => $filename,
 		@_,
-		no_includes => 1,
+		($untrusted ? (no_includes => 1) : ()),
 	);
 	return @opts if wantarray;
 
diff --git a/debian/changelog b/debian/changelog
index b19840865..0a70dc6ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20100428) UNRELEASED; urgency=low
 
   * template: Fix typo.
+  * TMPL_INCLUDE re-enabled for templates read from the templatedir.
+    (But not in-wiki templates.)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/news/version_3.20100427/discussion.mdwn b/doc/news/version_3.20100427/discussion.mdwn
index 4daf8085f..726f9a0d2 100644
--- a/doc/news/version_3.20100427/discussion.mdwn
+++ b/doc/news/version_3.20100427/discussion.mdwn
@@ -1,3 +1,7 @@
 *TMPL_INCLUDE is no longer supported in any template used by ikiwiki. It used to be allowed in certian templates, but not in others.*
 
 Would it be possible to make that a config option?  Because I do use includes in my templates, and I don't allow users to edit templates, so it isn't a security loophole for me. --[[KathrynAndersen]]
+
+> I don't like config options that make wikis unsafe, but I should have
+> revisted enabling includes for templates read from the templatedir --
+> it's easy to do, and I've done it now. --[[Joey]] 
-- 
cgit v1.2.3


From a5923e39995165bd75d4048d646a226a88be920b Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 29 Apr 2010 00:27:03 +0000
Subject: reply

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

(limited to 'doc')

diff --git a/doc/news/version_3.20100427/discussion.mdwn b/doc/news/version_3.20100427/discussion.mdwn
index 726f9a0d2..011f3d88f 100644
--- a/doc/news/version_3.20100427/discussion.mdwn
+++ b/doc/news/version_3.20100427/discussion.mdwn
@@ -5,3 +5,5 @@ Would it be possible to make that a config option?  Because I do use includes in
 > I don't like config options that make wikis unsafe, but I should have
 > revisted enabling includes for templates read from the templatedir --
 > it's easy to do, and I've done it now. --[[Joey]] 
+
+>> Thank you! --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 0c7d2cf9b2773bd17c0ec549ed1ba833ff1913e1 Mon Sep 17 00:00:00 2001
From: albertlash <albertlash@web>
Date: Thu, 29 Apr 2010 03:44:27 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 683a3f8ac..31110f3c6 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -1,3 +1,11 @@
+20100428 - I just wrote a simple ruby script which will connect to a mysql server and then recreate the pages and their revision histories with Grit. It also does one simple conversion of equals titles to pounds. Enjoy! 
+
+http://github.com/docunext/mediawiki2gitikiwiki
+
+-- [[users/Albert]]
+
+----
+
 The u32 page is excellent, but I wonder if documenting the procedure here
 would be worthwhile. Who knows, the remote site might disappear. But also
 there are some variations on the approach that might be useful:
-- 
cgit v1.2.3


From ebde1ee2fd814e45e0e108bb1a9ba81499d86c87 Mon Sep 17 00:00:00 2001
From: albertlash <albertlash@web>
Date: Thu, 29 Apr 2010 03:44:52 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 31110f3c6..592a06a5b 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -1,6 +1,6 @@
 20100428 - I just wrote a simple ruby script which will connect to a mysql server and then recreate the pages and their revision histories with Grit. It also does one simple conversion of equals titles to pounds. Enjoy! 
 
-http://github.com/docunext/mediawiki2gitikiwiki
+<http://github.com/docunext/mediawiki2gitikiwiki>
 
 -- [[users/Albert]]
 
-- 
cgit v1.2.3


From 8d7dba2fb274b024e7a8b5d8ce4414d3e5bf7420 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Thu, 29 Apr 2010 15:35:59 +0000
Subject: wl rcs

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

(limited to 'doc')

diff --git a/doc/rcs/svn.mdwn b/doc/rcs/svn.mdwn
index f8c44b6eb..7aa682978 100644
--- a/doc/rcs/svn.mdwn
+++ b/doc/rcs/svn.mdwn
@@ -1,4 +1,4 @@
-[Subversion](http://subversion.tigris.org/) is a revision control system. While ikiwiki is relatively
+[Subversion](http://subversion.tigris.org/) is a [[revision control system|rcs]]. While ikiwiki is relatively
 independent of the underlying revision control system, and can easily be
 used without one, using it with Subversion or another revision control
 system is recommended.
-- 
cgit v1.2.3


From d57d2ecca722cb7c43d2b14ed31f38c3e204079c Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Thu, 29 Apr 2010 16:18:15 +0000
Subject: YA URI to another mediawiki to git project

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

(limited to 'doc')

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 592a06a5b..8a2261543 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -657,3 +657,6 @@ page.--[[users/Chadius]]
 > on mediawiki in general. It seems to produce output that could be
 > used by the [[plugins/contrib/mediawiki]] plugin, if the filenames
 > were fixed to use the right extension.  --[[Joey]] 
+
+>> Here's another I found while browsing around starting from the link you gave Joey<br />
+>> <http://github.com/scy/levitation>
-- 
cgit v1.2.3


From f7f1dd3a3852ef158a577387faee2c34c4f9cfad Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Thu, 29 Apr 2010 16:24:23 +0000
Subject: more to add on my comment

---
 doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index 8a2261543..d67a9131b 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -659,4 +659,7 @@ page.--[[users/Chadius]]
 > were fixed to use the right extension.  --[[Joey]] 
 
 >> Here's another I found while browsing around starting from the link you gave Joey<br />
->> <http://github.com/scy/levitation>
+>> <http://github.com/scy/levitation><br />
+>> As I don't run mediawiki anymore, but I still have my xz/gzip-compressed XML dumps,
+>> it's certainly easier for me to do it this way; also a file or a set of files is easier to lug
+>> around on some medium than a full mysqld or postgres master and relevant databases.
-- 
cgit v1.2.3


From 9fb15ec9fec8903776be0be01eaed0e7bb7d5009 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Fri, 30 Apr 2010 16:48:19 +0100
Subject: new bug: svn commit failures...

---
 ...vn_commit_failures_interpreted_as_merge_conflicts.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn

(limited to 'doc')

diff --git a/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
new file mode 100644
index 000000000..09753b4ee
--- /dev/null
+++ b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
@@ -0,0 +1,15 @@
+I'm attempting a merge with the SVN plugin via the web interface
+with ikiwiki-3.20100403 and subversion 1.6.11.
+
+The web interface says
+
+    Your changes conflict with other changes made to the page.
+    
+    Conflict markers have been inserted into the page content. Reconcile the conflict and commit again to save your changes.
+
+However there are no merge conflict markers in the page. My apache error log says:
+
+    [Fri Apr 30 16:43:57 2010] [error] [client 10.64.64.42] svn: Commit failed (details follow):, referer: https://unixwiki.ncl.ac.uk/ikiwiki.cgi
+    [Fri Apr 30 16:43:57 2010] [error] [client 10.64.64.42] svn: Authorization failed, referer: https://unixwiki.ncl.ac.uk/ikiwiki.cgi
+
+-- [[Jon]]
-- 
cgit v1.2.3


From dd75b61d9332e50364f97fc04179ab895bfc2ef8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 30 Apr 2010 14:15:58 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
index 09753b4ee..0c9bce4b9 100644
--- a/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
+++ b/doc/bugs/svn_commit_failures_interpreted_as_merge_conflicts.mdwn
@@ -13,3 +13,9 @@ However there are no merge conflict markers in the page. My apache error log say
     [Fri Apr 30 16:43:57 2010] [error] [client 10.64.64.42] svn: Authorization failed, referer: https://unixwiki.ncl.ac.uk/ikiwiki.cgi
 
 -- [[Jon]]
+
+> Only way for this to be improved would be for the svn plugin to
+> explicitly check the file for conflict markers. I guess it could
+> change the error message then, but the actual behavior of putting the
+> changed file back in the editor so the user can recommit is about right
+> as far as error recovery goes. --[[Joey]] 
-- 
cgit v1.2.3


From 3252df4aa8a35495bbaa8280ca13a545285e6192 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 15:27:32 -0400
Subject: comments, branch review, questions

---
 doc/bugs/html5_support.mdwn | 63 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 239474275..5d2a41303 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -9,10 +9,67 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 * [ikiwiki instance with HTML5 templates](http://natalian.org)
 * [HTML5 outliner tool](http://gsnedders.html5.org/outliner/) -- to check you have the structure of your markup correct
 
+> Kai, thanks enormously for working on this. I switched a page to 
+> the html5 doctype today, and was rather pleasently suprised that it
+> validated, except for the new Cache-Control meta tag. Now I see you're
+> well ahead of me. --[[Joey]] 
+> 
+> So, how should ikiwiki support html5? There are basically 3 approaches:
+> 
+> 1. Allow users to add html5 tags to their existing xhtml pages.
+>    What has been done so far, can be extended. Basically works 
+>    in browsers, if you don't care about standards. A good prerequisite
+>    for anything else, anyway.
+> 2. Switch to html5 in eg, ikiwiki 4; users have to deal with
+>    any custom markup on their pages/templates that breaks then.
+> 3. Have both a html5 and a xhtml mode, allow user to select.
+>
+> The third option seems fairly tractable from what I see here and in 
+> your branch. You made only relatively minor changes to 10 templates.
+> It would probably not be too dreadful to put them in ifdefs.
+> 
+> Some of your changes are obvious, like using the new `time` and
+> and `article` elements. Others less so, and I'm particularly
+> puzzled by these:
+> 
+> * Removing the value="Submit" from the button on the 
+>   commentmoderation form.
+> * Removing feedlink.tmpl. What?!
+> * Using a `h2` for the header of inlinepage.tmpl and page.tmpl, rather
+>   than the styled span. Ikiwiki has
+>   [[a_reason|todo/Option_to_make_title_an_h1?]] for not
+>   using real `hN` for the header atop a page and here.
+>   AFAICS, html5 does not invalidate that.
+> * Removing Editurl from inlinepage.tmpl actions. I assume 
+>   this is your own preference, needs to be removed from branch
+>   before I can use it.
+> * Removing the pageheader, content, and footer divs
+>   which are all used by style.css.
+>   Perhaps, the style sheet needs to be updated to use
+>   the new elements, like the `footer` and `header`.
+> * Removal of the favicon from page.tmpl. Surely html5 supports?
+> * Removal of BASEURL from page.tmpl, apparently a mistake.
+> * Removal of the `/` between wiki title and page title.
+>   Personal preference.
+> * Removal of `comments` div, which is there to be styled.
+> * Why use a `p` rather than the `div` for `addcomments`?
+> * Moving the action bar to the bottom of the page.
+>   Personal preference.
+> * Clearly searchquery.tmpl has no business using bad old `center`
+>   tag, but something should still be done to replace it.
+> 
+> (BTW, it would be helpful if you could re-merge master into your branch
+> as it is a bit diverged now.) --[[Joey]] 
+
 # htmlscrubber.pm needs to not scrub new HTML5 elements
 
 * [new elements](http://www.w3.org/TR/html5-diff/#new-elements)
 
+> Most of these can be supported trivially, since they are just semantic
+> markup. Make a list of these, and their attributes (and which attributes
+> can contain urls or other javascript injection mechanisms), and I can add
+> them. Others, like `embed`, and `canvas` are *scary*. --[[Joey]]
+
 # HTML5 Validation and t/html.t
 
 [validator.nu](http://validator.nu/) is the authorative HTML5 validator,
@@ -25,6 +82,9 @@ In the future, hopefully ikiwiki can test for valid HTML5 using [Relax NG
 schema](http://syntax.whattf.org/) using a Debian package tool
 [rnv](http://packages.qa.debian.org/r/rnv.html).
 
+> Validation in the test suite is nice, but I am willing to lose those
+> tests for a while. --[[Joey]] 
+
 # HTML5 migration issues
 
 # [article](http://www.whatwg.org/specs/web-apps/current-work/multipage/semantics.html#the-article-element) element
@@ -45,3 +105,6 @@ As a workaround:
 
 	au:~% grep timeformat natalian.setup
 	timeformat => '%Y-%m-%d',
+
+> Also, the [[plugins/relativedate]] plugin needs to be updated to 
+> support relatatizing the contents of time elements. --[[Joey]] 
-- 
cgit v1.2.3


From a034716009e29b1ef4bd44e0cddb7f7cf2fd93a2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 15:35:52 -0400
Subject: update example tag pages to match autotag.tmpl

---
 doc/examples/blog/tags/life.mdwn | 6 +++---
 doc/examples/blog/tags/tech.mdwn | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn
index 719f2b192..e1614dbdc 100644
--- a/doc/examples/blog/tags/life.mdwn
+++ b/doc/examples/blog/tags/life.mdwn
@@ -1,4 +1,4 @@
-This feed contains pages in the "life" category.
+[[!meta title="tag life"]]
 
-[[!inline pages="link(tags/life) and !*/Discussion"
-show="10" actions=yes]]
+[[!inline pages="tagged(tags/life)" actions="no" archive="yes"
+feedshow=10]]
diff --git a/doc/examples/blog/tags/tech.mdwn b/doc/examples/blog/tags/tech.mdwn
index e811cac34..398146cdb 100644
--- a/doc/examples/blog/tags/tech.mdwn
+++ b/doc/examples/blog/tags/tech.mdwn
@@ -1,3 +1,4 @@
-This feed contains pages in the "tech" category.
+[[!meta title="tag tech"]]
 
-[[!inline pages="link(tags/tech) and !*/Discussion" show=10 actions=yes]]
+[[!inline pages="tagged(tags/tech)" actions="no" archive="yes"
+feedshow=10]]
-- 
cgit v1.2.3


From 80f2042464f9d14bcaed999e9769c71618bf5252 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 16:34:47 -0400
Subject: htmlscrubber: Allow html5 semantic tags: section nav article aside
 hgroup header footer time mark

---
 IkiWiki/Plugin/htmlscrubber.pm |  9 ++++++---
 debian/changelog               |  2 ++
 doc/bugs/html5_support.mdwn    | 10 ++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 9f40c752f..1604d776a 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -72,7 +72,7 @@ sub scrubber {
 	eval q{use HTML::Scrubber};
 	error($@) if $@;
 	# Lists based on http://feedparser.org/docs/html-sanitization.html
-	# With html 5 video and audio tags added.
+	# With html5 tags added.
 	$_scrubber = HTML::Scrubber->new(
 		allow => [qw{
 			a abbr acronym address area b big blockquote br br/
@@ -82,7 +82,9 @@ sub scrubber {
 			menu ol optgroup option p p/ pre q s samp select small
 			span strike strong sub sup table tbody td textarea
 			tfoot th thead tr tt u ul var
-			video audio
+
+			video audio section nav article aside hgroup header
+			footer time mark
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -98,8 +100,9 @@ sub scrubber {
 				selected shape size span start summary
 				tabindex target title type valign
 				value vspace width
+
 				autoplay loopstart loopend end
-				playcount controls 
+				playcount controls pubdate
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index a1bd85bfa..9a6cf68e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     (But not in-wiki templates.)
   * Version dependency on liburi-perl to >= 1.36; previous versions
     did not support building urls from utf-8 strings. Closes: #579713
+  * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
+    header footer time mark
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 5d2a41303..a330d3ae6 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -59,7 +59,13 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 >   tag, but something should still be done to replace it.
 > 
 > (BTW, it would be helpful if you could re-merge master into your branch
-> as it is a bit diverged now.) --[[Joey]] 
+> as it is a bit diverged now.) 
+> 
+> Other ideas:
+> 
+> * Add pubdate attribute to time elements as appropriate.
+> * Use aside for the sidebar? Or for the [[templates/note]] template?
+> --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
 
@@ -68,7 +74,7 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > Most of these can be supported trivially, since they are just semantic
 > markup. Make a list of these, and their attributes (and which attributes
 > can contain urls or other javascript injection mechanisms), and I can add
-> them. Others, like `embed`, and `canvas` are *scary*. --[[Joey]]
+> them. (Added several now.) Others, like `embed`, and `canvas` are *scary*. --[[Joey]]
 
 # HTML5 Validation and t/html.t
 
-- 
cgit v1.2.3


From 73c8209484ac730c82f7c7b749d08a1b3d895ee0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 17:56:35 -0400
Subject: more html5

* htmlscrubber: Also allow html5 canvas tags.
* htmlscrubber: Round out html5 video support with the preload
  attribute and the source tag.
---
 IkiWiki/Plugin/htmlscrubber.pm | 6 +++---
 debian/changelog               | 3 +++
 doc/bugs/html5_support.mdwn    | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 1604d776a..cc00fd5ff 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -83,8 +83,8 @@ sub scrubber {
 			span strike strong sub sup table tbody td textarea
 			tfoot th thead tr tt u ul var
 
-			video audio section nav article aside hgroup header
-			footer time mark
+			video audio source section nav article aside hgroup
+			header footer time mark canvas
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -101,7 +101,7 @@ sub scrubber {
 				tabindex target title type valign
 				value vspace width
 
-				autoplay loopstart loopend end
+				autoplay preload loopstart loopend end
 				playcount controls pubdate
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
diff --git a/debian/changelog b/debian/changelog
index 9a6cf68e3..9613d8b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     did not support building urls from utf-8 strings. Closes: #579713
   * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
     header footer time mark
+  * htmlscrubber: Also allow html5 canvas tags.
+  * htmlscrubber: Round out html5 video support with the preload
+    attribute and the source tag.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index a330d3ae6..c05208fbf 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -65,6 +65,7 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > 
 > * Add pubdate attribute to time elements as appropriate.
 > * Use aside for the sidebar? Or for the [[templates/note]] template?
+> * Use nav for the actionbar
 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
@@ -74,7 +75,7 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > Most of these can be supported trivially, since they are just semantic
 > markup. Make a list of these, and their attributes (and which attributes
 > can contain urls or other javascript injection mechanisms), and I can add
-> them. (Added several now.) Others, like `embed`, and `canvas` are *scary*. --[[Joey]]
+> them. (Added several now.) Others, like `embed` are *scary*. --[[Joey]]
 
 # HTML5 Validation and t/html.t
 
-- 
cgit v1.2.3


From 442bc59a15301941613d62f4b1d846c57557ca8f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 18:14:50 -0400
Subject: htmlscrubber: Allow the placeholder attribute.

---
 IkiWiki/Plugin/htmlscrubber.pm | 2 +-
 debian/changelog               | 1 +
 doc/bugs/html5_support.mdwn    | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index cc00fd5ff..b3f659f73 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -102,7 +102,7 @@ sub scrubber {
 				value vspace width
 
 				autoplay preload loopstart loopend end
-				playcount controls pubdate
+				playcount controls pubdate placeholder
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index 9613d8b6d..951caab9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
   * htmlscrubber: Also allow html5 canvas tags.
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
+  * htmlscrubber: Allow the placeholder attribute.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index c05208fbf..9c077a2d3 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -66,6 +66,8 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > * Add pubdate attribute to time elements as appropriate.
 > * Use aside for the sidebar? Or for the [[templates/note]] template?
 > * Use nav for the actionbar
+> * Use placeholder in the search box. Allows closing
+>   [[this_todo|Add_label_to_search_form_input_field]]
 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
-- 
cgit v1.2.3


From 0a139aba823ece3166d29ff2daee0b5c9507b52f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 18:27:53 -0400
Subject: htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
 min, max, step.

---
 IkiWiki/Plugin/htmlscrubber.pm                     | 5 +++--
 debian/changelog                                   | 3 ++-
 doc/todo/Add_label_to_search_form_input_field.mdwn | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index b3f659f73..479e10e74 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -101,8 +101,9 @@ sub scrubber {
 				tabindex target title type valign
 				value vspace width
 
-				autoplay preload loopstart loopend end
-				playcount controls pubdate placeholder
+				autofocus autoplay preload loopstart
+				loopend end playcount controls pubdate
+				placeholder min max step
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index 951caab9e..12ef08a91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
   * htmlscrubber: Also allow html5 canvas tags.
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
-  * htmlscrubber: Allow the placeholder attribute.
+  * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
+    min, max, step.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/todo/Add_label_to_search_form_input_field.mdwn b/doc/todo/Add_label_to_search_form_input_field.mdwn
index 51b34927d..281ab48e2 100644
--- a/doc/todo/Add_label_to_search_form_input_field.mdwn
+++ b/doc/todo/Add_label_to_search_form_input_field.mdwn
@@ -51,4 +51,4 @@ The patch below adds a label for the field to improve usability:
 > element. already works in eg, chromium. However, ikiwiki does not use
 > html5 yet. --[[Joey]] 
 
-[[!tag wishlist html5]]
+[[!tag wishlist bugs/html5_support]]
-- 
cgit v1.2.3


From 78cee5140ac37f93cd2e87d8a03d71420303eb13 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 18:44:37 -0400
Subject: add rest of html5 form attributes

It's easy to imagine pattern being used to freeze or crash browsers, if
they implement it stupidly. Let's hope not..
---
 IkiWiki/Plugin/htmlscrubber.pm | 2 +-
 debian/changelog               | 2 +-
 doc/bugs/html5_support.mdwn    | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 0090b67b9..7517c82c6 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -103,7 +103,7 @@ sub scrubber {
 
 				autofocus autoplay preload loopstart
 				loopend end playcount controls pubdate
-				placeholder min max step
+				placeholder min max step form required
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index 108764c39..cdc79ae78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
   * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
-    min, max, step.
+    min, max, step, required, autocomplete, novalidate, pattern, and form.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 9c077a2d3..7d9dc9f79 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -79,6 +79,10 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > can contain urls or other javascript injection mechanisms), and I can add
 > them. (Added several now.) Others, like `embed` are *scary*. --[[Joey]]
 
+> I have not added the new `ping` attribute, because parsing a
+> space-separeated list of urls to avoid javascript injection is annoying, 
+> and the attribute seems generally dubious. --[[Joey]] 
+
 # HTML5 Validation and t/html.t
 
 [validator.nu](http://validator.nu/) is the authorative HTML5 validator,
-- 
cgit v1.2.3


From f1e2d0af123352b692e8e4efdb208e370a00d3c1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 19:11:03 -0400
Subject: more html5 attributes

---
 IkiWiki/Plugin/htmlscrubber.pm | 5 +++++
 debian/changelog               | 4 ++++
 doc/bugs/html5_support.mdwn    | 5 ++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 7517c82c6..d52614a4d 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -85,6 +85,7 @@ sub scrubber {
 
 			video audio source section nav article aside hgroup
 			header footer figure figcaption time mark canvas
+			datalist
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -104,11 +105,15 @@ sub scrubber {
 				autofocus autoplay preload loopstart
 				loopend end playcount controls pubdate
 				placeholder min max step form required
+				autocomplete novalidate pattern list
+				formenctype formmethod formnovalidate
+				formtarget reversed
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
 			src => $safe_url_regexp,
 			action => $safe_url_regexp,
+			formaction => $safe_url_regexp,
 			cite => $safe_url_regexp,
 			longdesc => $safe_url_regexp,
 			poster => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index cdc79ae78..e0f506f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     attribute and the source tag.
   * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
     min, max, step, required, autocomplete, novalidate, pattern, and form.
+    (Also the form* override attributes for input and buttons.)
+  * htmlscrubber: Allow the html5 datalist element, and the form list
+    attribute.
+  * htmlscrubber: Allow the html5 reversed and spellcheck attributes.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 7d9dc9f79..1ca45f46d 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -81,7 +81,10 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 
 > I have not added the new `ping` attribute, because parsing a
 > space-separeated list of urls to avoid javascript injection is annoying, 
-> and the attribute seems generally dubious. --[[Joey]] 
+> and the attribute seems generally dubious.
+> 
+> Need to understand better the attributes contenteditabl, contextmenu,
+> data-*, draggable, hidden, role, aria-*. Have not added those. --[[Joey]] 
 
 # HTML5 Validation and t/html.t
 
-- 
cgit v1.2.3


From 790a339db18f1c697052446728641c9e6ef06bdb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 19:28:28 -0400
Subject: htmlscrubber: Also allow some other html5 tags: canvas, progress,
 meter, ruby, rt, rp, details, summary.

---
 IkiWiki/Plugin/htmlscrubber.pm | 10 +++++-----
 debian/changelog               |  3 ++-
 doc/bugs/html5_support.mdwn    | 22 ++++++++++++++--------
 3 files changed, 21 insertions(+), 14 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index d52614a4d..505a6f142 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -85,7 +85,7 @@ sub scrubber {
 
 			video audio source section nav article aside hgroup
 			header footer figure figcaption time mark canvas
-			datalist
+			datalist progress meter ruby rt rp details summary
 		}],
 		default => [undef, { (
 			map { $_ => 1 } qw{
@@ -104,10 +104,10 @@ sub scrubber {
 
 				autofocus autoplay preload loopstart
 				loopend end playcount controls pubdate
-				placeholder min max step form required
-				autocomplete novalidate pattern list
-				formenctype formmethod formnovalidate
-				formtarget reversed
+				placeholder min max step low high optimum
+				form required autocomplete novalidate pattern
+				list formenctype formmethod formnovalidate
+				formtarget reversed spellcheck open
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index e0f506f29..3d33f3bfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     did not support building urls from utf-8 strings. Closes: #579713
   * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
     header footer figure figcaption time mark
-  * htmlscrubber: Also allow html5 canvas tags.
+  * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter,
+    ruby, rt, rp, details, summary.
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
   * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 1ca45f46d..48b63b29a 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -68,23 +68,29 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > * Use nav for the actionbar
 > * Use placeholder in the search box. Allows closing
 >   [[this_todo|Add_label_to_search_form_input_field]]
+> * Use details tag instead of the javascript in the toggle plugin. 
+>   (Need to wait on browser support probably.)
 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
 
 * [new elements](http://www.w3.org/TR/html5-diff/#new-elements)
 
-> Most of these can be supported trivially, since they are just semantic
-> markup. Make a list of these, and their attributes (and which attributes
-> can contain urls or other javascript injection mechanisms), and I can add
-> them. (Added several now.) Others, like `embed` are *scary*. --[[Joey]]
-
+> Many added now.
+>
+> Things I left out, too hard to understand today:
+> Attributes contenteditabl, contextmenu,
+> data-*, draggable, hidden, role, aria-*. Tags command, keygen,
+> output.
+> 
+> Clearly unsafe: embed.
+> 
+> Apparently cannot be used w/o javascript: menu.
+> 
 > I have not added the new `ping` attribute, because parsing a
 > space-separeated list of urls to avoid javascript injection is annoying, 
 > and the attribute seems generally dubious.
-> 
-> Need to understand better the attributes contenteditabl, contextmenu,
-> data-*, draggable, hidden, role, aria-*. Have not added those. --[[Joey]] 
+>  --[[Joey]] 
 
 # HTML5 Validation and t/html.t
 
-- 
cgit v1.2.3


From ccafb10007731d04e0ff6aa36978690e6dfa6dec Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 19:59:16 -0400
Subject: enable hidden attribute

---
 IkiWiki/Plugin/htmlscrubber.pm |  2 +-
 debian/changelog               | 17 ++++++++---------
 doc/bugs/html5_support.mdwn    |  6 +++---
 3 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 505a6f142..847518178 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -107,7 +107,7 @@ sub scrubber {
 				placeholder min max step low high optimum
 				form required autocomplete novalidate pattern
 				list formenctype formmethod formnovalidate
-				formtarget reversed spellcheck open
+				formtarget reversed spellcheck open hidden
 			} ),
 			"/" => 1, # emit proper <hr /> XHTML
 			href => $safe_url_regexp,
diff --git a/debian/changelog b/debian/changelog
index 3d33f3bfc..8bf6f89b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,18 +5,17 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     (But not in-wiki templates.)
   * Version dependency on liburi-perl to >= 1.36; previous versions
     did not support building urls from utf-8 strings. Closes: #579713
-  * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup
-    header footer figure figcaption time mark
+  * htmlscrubber: Allow html5 semantic tags: section, nav, article, aside
+    hgroup, header, footer, figure, figcaption, time, mark
   * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter,
-    ruby, rt, rp, details, summary.
+    ruby, rt, rp, details, summary, datalist.
   * htmlscrubber: Round out html5 video support with the preload
     attribute and the source tag.
-  * htmlscrubber: Allow the html5 form attributes: placeholder autofocus,
-    min, max, step, required, autocomplete, novalidate, pattern, and form.
-    (Also the form* override attributes for input and buttons.)
-  * htmlscrubber: Allow the html5 datalist element, and the form list
-    attribute.
-  * htmlscrubber: Allow the html5 reversed and spellcheck attributes.
+  * htmlscrubber: Allow the html5 form attributes: placeholder, autofocus,
+    min, max, step, required, autocomplete, novalidate, pattern, list,
+    and form. (Also the form* override attributes for input and buttons.)
+  * htmlscrubber: Allow additional misc html5 attributes: reversed,
+    spellcheck, and hidden.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 48b63b29a..2d27ac803 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -79,9 +79,9 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > Many added now.
 >
 > Things I left out, too hard to understand today:
-> Attributes contenteditabl, contextmenu,
-> data-*, draggable, hidden, role, aria-*. Tags command, keygen,
-> output.
+> Attributes contenteditable,
+> data-\*, draggable, role, aria-\*.
+> Tags command, keygen, output.
 > 
 > Clearly unsafe: embed.
 > 
-- 
cgit v1.2.3


From a547d2685866898665fad221939b0b820a42a088 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 20:40:31 -0400
Subject: html5 option

* Ikiwiki can be configured to generate html5 instead of the default xhtml
  1.0. The html5 output mode is experimental, not yet fully standards
  compliant, and will be subject to rapid change.
---
 IkiWiki.pm                  |  8 ++++++++
 IkiWiki/Render.pm           |  1 +
 debian/changelog            |  5 ++++-
 doc/bugs/html5_support.mdwn | 12 +++++++-----
 doc/roadmap.mdwn            |  1 +
 templates/misc.tmpl         |  5 ++++-
 templates/page.tmpl         |  5 ++++-
 7 files changed, 29 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 5ff1a5ae6..1e11d34e2 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -234,6 +234,13 @@ sub getsetup () {
 		safe => 1,
 		rebuild => 1,
 	},
+	html5 => {
+		type => "boolean",
+		default => 0,
+		description => "generate HTML5? (experimental)",
+		safe => 1,
+		rebuild => 1,
+	},
 	sslcookie => {
 		type => "boolean",
 		default => 0,
@@ -1725,6 +1732,7 @@ sub misctemplate ($$;@) {
 		wikiname => $config{wikiname},
 		pagebody => $pagebody,
 		baseurl => baseurl(),
+		html5 => $config{html5},
 		@_,
 	);
 	run_hooks(pagetemplate => sub {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 7e3d78861..5923f5e74 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -138,6 +138,7 @@ sub genpage ($$) {
 		mtime => displaytime($pagemtime{$page}),
 		ctime => displaytime($pagectime{$page}),
 		baseurl => baseurl($page),
+		html5 => $config{html5},
 	);
 
 	run_hooks(pagetemplate => sub {
diff --git a/debian/changelog b/debian/changelog
index 8bf6f89b6..fc5a6124b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 ikiwiki (3.20100428) UNRELEASED; urgency=low
 
-  * template: Fix typo.
   * TMPL_INCLUDE re-enabled for templates read from the templatedir.
     (But not in-wiki templates.)
   * Version dependency on liburi-perl to >= 1.36; previous versions
     did not support building urls from utf-8 strings. Closes: #579713
+  * Ikiwiki can be configured to generate html5 instead of the default xhtml
+    1.0. The html5 output mode is experimental, not yet fully standards
+    compliant, and will be subject to rapid change.
   * htmlscrubber: Allow html5 semantic tags: section, nav, article, aside
     hgroup, header, footer, figure, figcaption, time, mark
   * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter,
@@ -16,6 +18,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low
     and form. (Also the form* override attributes for input and buttons.)
   * htmlscrubber: Allow additional misc html5 attributes: reversed,
     spellcheck, and hidden.
+  * template: Fix typo.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 27 Apr 2010 12:10:51 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 2d27ac803..bf782a3bf 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -20,13 +20,14 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 >    What has been done so far, can be extended. Basically works 
 >    in browsers, if you don't care about standards. A good prerequisite
 >    for anything else, anyway.
-> 2. Switch to html5 in eg, ikiwiki 4; users have to deal with
+> 2. Have both a html5 and a xhtml mode, allow user to select.
+> 3. Switch to html5 in eg, ikiwiki 4; users have to deal with
 >    any custom markup on their pages/templates that breaks then.
-> 3. Have both a html5 and a xhtml mode, allow user to select.
->
-> The third option seems fairly tractable from what I see here and in 
+> 
+> The second option seems fairly tractable from what I see here and in 
 > your branch. You made only relatively minor changes to 10 templates.
-> It would probably not be too dreadful to put them in ifdefs.
+> It would probably not be too dreadful to put them in ifdefs. I've made a
+> small start at doing that.
 > 
 > Some of your changes are obvious, like using the new `time` and
 > and `article` elements. Others less so, and I'm particularly
@@ -70,6 +71,7 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 >   [[this_todo|Add_label_to_search_form_input_field]]
 > * Use details tag instead of the javascript in the toggle plugin. 
 >   (Need to wait on browser support probably.)
+> 
 > --[[Joey]] 
 
 # htmlscrubber.pm needs to not scrub new HTML5 elements
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index c126fd585..4b5f01c45 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -80,6 +80,7 @@ Probably incomplete list:
 * YADA format setup files per default?
 * Enable tagbase by default (so that tag autocreation will work by default).
   Note that this is already done for wikis created by `auto-blog.setup`.
+* html5 on by default (some day..)
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
diff --git a/templates/misc.tmpl b/templates/misc.tmpl
index 535a6f06b..0b7fefa08 100644
--- a/templates/misc.tmpl
+++ b/templates/misc.tmpl
@@ -1,6 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<TMPL_IF HTML5><!DOCTYPE html>
+<html>
+<TMPL_ELSE><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+</TMPL_IF>
 <head>
 <TMPL_IF NAME="FORCEBASEURL">
 <base href="<TMPL_VAR FORCEBASEURL>" />
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 7e850a56b..661d4a515 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -1,6 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<TMPL_IF HTML5><!DOCTYPE html>
+<html>
+<TMPL_ELSE><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+</TMPL_IF>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Cache-Control" content="must-revalidate" />
-- 
cgit v1.2.3


From 8e4af6a8e2a8e8d9b7d9f4312c4216261ebd5a28 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 20:57:54 -0400
Subject: tidy plugin issue

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

(limited to 'doc')

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index bf782a3bf..dca60d57e 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -132,3 +132,7 @@ As a workaround:
 
 > Also, the [[plugins/relativedate]] plugin needs to be updated to 
 > support relatatizing the contents of time elements. --[[Joey]] 
+
+## tidy plugin
+
+Will reformat html5 to html4.
-- 
cgit v1.2.3


From 1226269f683bce6bf3a0539f0374ee1844687b02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 21:00:06 -0400
Subject: mention html5

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

(limited to 'doc')

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 07ce648ea..215c1cecd 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -71,8 +71,10 @@ you would care to syndicate.
 ## Valid html and [[css]]
 
 Ikiwiki aims to produce 
-[valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki
-generates html using [[templates]], and uses [[css]], so you
+[valid XHTML 1.0](http://validator.w3.org/check?url=referer).
+(Experimental HTML5 support is also available.)
+
+Ikiwiki generates html using [[templates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
 
 ## [[Plugins]]
-- 
cgit v1.2.3


From f9e41d19b77f677a58bb22e1db47627cf9faa57f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 1 May 2010 21:42:48 -0400
Subject: add news item for ikiwiki 3.20100501

---
 doc/news/version_3.20100212.mdwn | 26 --------------------------
 doc/news/version_3.20100302.mdwn | 12 ------------
 doc/news/version_3.20100501.mdwn | 21 +++++++++++++++++++++
 3 files changed, 21 insertions(+), 38 deletions(-)
 delete mode 100644 doc/news/version_3.20100212.mdwn
 delete mode 100644 doc/news/version_3.20100302.mdwn
 create mode 100644 doc/news/version_3.20100501.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100212.mdwn b/doc/news/version_3.20100212.mdwn
deleted file mode 100644
index 3dcfe5f84..000000000
--- a/doc/news/version_3.20100212.mdwn
+++ /dev/null
@@ -1,26 +0,0 @@
-ikiwiki 3.20100212 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * template: Preprocess parameters before htmlizing.
-   * img: Fix a bug that could taint @links with undef values.
-   * setup automator: Configure Term::Readline to use bold for prompt, rather
-     than default underline. Closes: #[517656](http://bugs.debian.org/517656)
-   * Allow jumping directly into account registration process by going to
-     ikiwiki.cgi?do=register
-   * Improve display of openid in preferences page.
-   * Add link to userpage (or creation link) to top of preferences page.
-   * opendiscussion: This plugin will also now allow posting comments
-     to otherwise locked-down sites.
-   * auto-blog.setup: Lock all pages, so only admin can post to the blog
-     by default, and enable opendiscussion so others can comment.
-   * Fix color and format plugins to appear in the websetup interface.
-   * amazon\_s3: Fix to support the EU S3 datacenter, which is more picky
-     about attempts to create already existing buckets.
-   * httpauth: When cgiauthurl is configured, httpauth can now be used
-     alongside other authentication methods (like openid or anonok). Rather
-     than always redirect to the cgiauthurl for authentication, there is now
-     a button on the login form to use it.
-   * httpauth: Add httpauth\_pagespec setting that can be used to limit
-     pages to only being edited via users authed with httpauth.
-   * Allow globs to be used in user() pagespecs.
-   * Group related plugins into sections in the setup file, and drop
-     unused rcs plugins from the setup file."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100302.mdwn b/doc/news/version_3.20100302.mdwn
deleted file mode 100644
index f439b1b23..000000000
--- a/doc/news/version_3.20100302.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-ikiwiki 3.20100302 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * comments: Display number of comments in comment action link.
-   * Rebuild wikis on upgrade to this version to get the comment counts
-     added to existing pages.
-   * Loosen regexp, to allow empty quoted parameters in directives.
-   * Add force\_overwrite setting to make setup automator overwrite existing
-     files/directories.
-   * Fix admin openid detection in setup automator, and avoid prompting
-     for a password.
-   * Add new --clean option; this makes ikiwiki remove all built
-     files in the destdir, as well as wrappers and the .ikiwiki directory."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100501.mdwn b/doc/news/version_3.20100501.mdwn
new file mode 100644
index 000000000..0cf5e38be
--- /dev/null
+++ b/doc/news/version_3.20100501.mdwn
@@ -0,0 +1,21 @@
+ikiwiki 3.20100501 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * TMPL\_INCLUDE re-enabled for templates read from the templatedir.
+     (But not in-wiki templates.)
+   * Version dependency on liburi-perl to &gt;= 1.36; previous versions
+     did not support building urls from utf-8 strings. Closes: #[579713](http://bugs.debian.org/579713)
+   * Ikiwiki can be configured to generate html5 instead of the default xhtml
+     1.0. The html5 output mode is experimental, not yet fully standards
+     compliant, and will be subject to rapid change.
+   * htmlscrubber: Allow html5 semantic tags: section, nav, article, aside
+     hgroup, header, footer, figure, figcaption, time, mark
+   * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter,
+     ruby, rt, rp, details, summary, datalist.
+   * htmlscrubber: Round out html5 video support with the preload
+     attribute and the source tag.
+   * htmlscrubber: Allow the html5 form attributes: placeholder, autofocus,
+     min, max, step, required, autocomplete, novalidate, pattern, list,
+     and form. (Also the form* override attributes for input and buttons.)
+   * htmlscrubber: Allow additional misc html5 attributes: reversed,
+     spellcheck, and hidden.
+   * template: Fix typo."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 970373548fda77223ebbeb6aadbdbe4884b67cef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 13:44:13 -0400
Subject: Add parameter to displaytime to specify that it is a pubdate, and in
 html5 mode, use time tag.

---
 IkiWiki.pm                     | 22 ++++++++++++++++++++--
 IkiWiki/Plugin/comments.pm     |  2 +-
 IkiWiki/Plugin/inline.pm       | 12 +-----------
 IkiWiki/Plugin/relativedate.pm | 15 ++++++++++++---
 IkiWiki/Render.pm              |  2 +-
 debian/changelog               |  7 +++++++
 doc/bugs/html5_support.mdwn    |  3 +++
 doc/plugins/write.mdwn         |  5 ++++-
 8 files changed, 49 insertions(+), 19 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ed57710bb..c428de77f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -998,10 +998,18 @@ sub abs2rel ($$) {
 	return $ret;
 }
 
-sub displaytime ($;$) {
+sub displaytime ($;$$) {
 	# Plugins can override this function to mark up the time to
 	# display.
-	return '<span class="date">'.formattime(@_).'</span>';
+	my $time=formattime($_[0], $_[1]);
+	if ($config{html5}) {
+		return '<time datetime="'.date_3339($_[0]).'"'.
+			($_[2] ? ' pubdate' : '').
+			'>'.$time.'</time>';
+	}
+	else {
+		return '<span class="date">'.$time.'</span>';
+	}
 }
 
 sub formattime ($;$) {
@@ -1017,6 +1025,16 @@ sub formattime ($;$) {
 	return decode_utf8(POSIX::strftime($format, localtime($time)));
 }
 
+sub date_3339 ($) {
+	my $time=shift;
+
+	my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
+	POSIX::setlocale(&POSIX::LC_TIME, "C");
+	my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
+	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
+	return $ret;
+}
+
 sub beautify_urlpath ($) {
 	my $url=shift;
 
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index f7dc99dca..02f1d9301 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -672,7 +672,7 @@ sub previewcomment ($$$) {
 
 	my $template = template("comment.tmpl");
 	$template->param(content => $preview);
-	$template->param(ctime => displaytime($time));
+	$template->param(ctime => displaytime($time, undef, 1));
 
 	IkiWiki::run_hooks(pagetemplate => sub {
 		shift->(page => $location,
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 95fe90312..2df59f414 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -358,7 +358,7 @@ sub preprocess_inline (@) {
 				$template->param(pageurl => urlto($page, $params{destpage}));
 				$template->param(inlinepage => $page);
 				$template->param(title => pagetitle(basename($page)));
-				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}, 1));
 				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
 				$template->param(first => 1) if $page eq $list[0];
 				$template->param(last => 1) if $page eq $list[$#list];
@@ -500,16 +500,6 @@ sub date_822 ($) {
 	return $ret;
 }
 
-sub date_3339 ($) {
-	my $time=shift;
-
-	my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
-	POSIX::setlocale(&POSIX::LC_TIME, "C");
-	my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
-	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
-	return $ret;
-}
-
 sub absolute_urls ($$) {
 	# sucky sub because rss sucks
 	my $content=shift;
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 7e615f7f1..fe8ef0901 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -43,9 +43,10 @@ sub include_javascript ($;$) {
 		'" type="text/javascript" charset="utf-8"></script>';
 }
 
-sub mydisplaytime ($;$) {
+sub mydisplaytime ($;$$) {
 	my $time=shift;
 	my $format=shift;
+	my $pubdate=shift;
 
 	# This needs to be in a form that can be parsed by javascript.
 	# Being fairly human readable is also nice, as it will be exposed
@@ -53,8 +54,16 @@ sub mydisplaytime ($;$) {
 	my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
 			localtime($time)));
 
-	return '<span class="relativedate" title="'.$gmtime.'">'.
-		IkiWiki::formattime($time, $format).'</span>';
+	my $mid=' class="relativedate" title="'.$gmtime.'">'.
+		IkiWiki::formattime($time, $format);
+
+	if ($config{html5}) {
+		return '<time datetime="'.IkiWiki::date_3339($time).'"'.
+			($pubdate ? ' pubdate' : '').$mid.'</time>';
+	}
+	else {
+		return '<span'.$mid.'</span>';
+	}
 }
 
 1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5923f5e74..cf6943e7d 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -136,7 +136,7 @@ sub genpage ($$) {
 		backlinks => $backlinks,
 		more_backlinks => $more_backlinks,
 		mtime => displaytime($pagemtime{$page}),
-		ctime => displaytime($pagectime{$page}),
+		ctime => displaytime($pagectime{$page}, undef, 1),
 		baseurl => baseurl($page),
 		html5 => $config{html5},
 	);
diff --git a/debian/changelog b/debian/changelog
index 6962e5171..8158429a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100502) UNRELEASED; urgency=low
+
+  * Add parameter to displaytime to specify that it is a pubdate,
+    and in html5 mode, use time tag.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
+
 ikiwiki (3.20100501) unstable; urgency=low
 
   * TMPL_INCLUDE re-enabled for templates read from the templatedir.
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index dca60d57e..386a3094a 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -133,6 +133,9 @@ As a workaround:
 > Also, the [[plugins/relativedate]] plugin needs to be updated to 
 > support relatatizing the contents of time elements. --[[Joey]] 
 
+> Done and done; in html5 mode it uses the time tag, and even 
+> adds pubdate when displaying ctimes. --[[Joey]]
+
 ## tidy plugin
 
 Will reformat html5 to html4.
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index a9ea7db73..5e7042c3b 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -938,13 +938,16 @@ search for files.
 If the directory name is not absolute, ikiwiki will assume it is in
 the parent directory of the configured underlaydir.
 
-### `displaytime($;$)`
+### `displaytime($;$$)`
 
 Given a time, formats it for display.
 
 The optional second parameter is a strftime format to use to format the
 time.
 
+If the third parameter is true, this is the publication time of a page.
+(Ie, set the html5 pubdate attribute.)
+
 ### `gettext`
 
 This is the standard gettext function, although slightly optimised.
-- 
cgit v1.2.3


From b21df5029b94c5680d8a3e5f0c1ed40a660a1594 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 13:49:56 -0400
Subject: Add placeholder text in search form (in html5 mode only).

---
 IkiWiki/Plugin/google.pm                           | 1 +
 IkiWiki/Plugin/search.pm                           | 1 +
 debian/changelog                                   | 1 +
 doc/bugs/html5_support.mdwn                        | 3 ---
 doc/todo/Add_label_to_search_form_input_field.mdwn | 2 ++
 templates/googleform.tmpl                          | 3 ++-
 templates/searchform.tmpl                          | 3 ++-
 7 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 85467fa0b..68cde261c 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -42,6 +42,7 @@ sub pagetemplate (@) {
 		if (! defined $form) {
 			my $searchform = template("googleform.tmpl", blind_cache => 1);
 			$searchform->param(url => $config{url});
+			$searchform->param(html5 => $config{html5});
 			$form=$searchform->output;
 		}
 
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index be39fdf1e..9e875c79c 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -58,6 +58,7 @@ sub pagetemplate (@) {
 		if (! defined $form) {
 			my $searchform = template("searchform.tmpl", blind_cache => 1);
 			$searchform->param(searchaction => $config{cgiurl});
+			$searchform->param(html5 => $config{html5});
 			$form=$searchform->output;
 		}
 
diff --git a/debian/changelog b/debian/changelog
index 8158429a0..c9fc2e657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
 
   * Add parameter to displaytime to specify that it is a pubdate,
     and in html5 mode, use time tag.
+  * Add placeholder text in search form (in html5 mode only).
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 386a3094a..5530b29db 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -64,11 +64,8 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > 
 > Other ideas:
 > 
-> * Add pubdate attribute to time elements as appropriate.
 > * Use aside for the sidebar? Or for the [[templates/note]] template?
 > * Use nav for the actionbar
-> * Use placeholder in the search box. Allows closing
->   [[this_todo|Add_label_to_search_form_input_field]]
 > * Use details tag instead of the javascript in the toggle plugin. 
 >   (Need to wait on browser support probably.)
 > 
diff --git a/doc/todo/Add_label_to_search_form_input_field.mdwn b/doc/todo/Add_label_to_search_form_input_field.mdwn
index 281ab48e2..514108fba 100644
--- a/doc/todo/Add_label_to_search_form_input_field.mdwn
+++ b/doc/todo/Add_label_to_search_form_input_field.mdwn
@@ -51,4 +51,6 @@ The patch below adds a label for the field to improve usability:
 > element. already works in eg, chromium. However, ikiwiki does not use
 > html5 yet. --[[Joey]] 
 
+>> [[Done]], placeholder added, in html5 mode only.
+
 [[!tag wishlist bugs/html5_support]]
diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl
index bcf1004a4..f39b46540 100644
--- a/templates/googleform.tmpl
+++ b/templates/googleform.tmpl
@@ -1,6 +1,7 @@
 <form method="get" action="http://www.google.com/search" id="searchform">
  <div>
   <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" />
-  <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text" />
+  <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text"
+  <TMPL_IF HTML5>placeholder="search"</TMPL_IF> />
  </div>
 </form>
diff --git a/templates/searchform.tmpl b/templates/searchform.tmpl
index afae2ebf5..cb65d124c 100644
--- a/templates/searchform.tmpl
+++ b/templates/searchform.tmpl
@@ -1,5 +1,6 @@
 <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform">
 <div>
-<input type="text" id="searchbox" name="P" value="" size="16" />
+<input type="text" id="searchbox" name="P" value="" size="16"
+<TMPL_IF HTML5>placeholder="search"</TMPL_IF> />
 </div>
 </form>
-- 
cgit v1.2.3


From 7517d34da928bb9612c65fcde87cc434b7b7d653 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 15:09:15 -0400
Subject: update

---
 doc/bugs/html5_support.mdwn | 37 ++++---------------------------------
 1 file changed, 4 insertions(+), 33 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 5530b29db..ef0ec1e70 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -30,40 +30,11 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > small start at doing that.
 > 
 > Some of your changes are obvious, like using the new `time` and
-> and `article` elements. Others less so, and I'm particularly
-> puzzled by these:
-> 
-> * Removing the value="Submit" from the button on the 
->   commentmoderation form.
-> * Removing feedlink.tmpl. What?!
-> * Using a `h2` for the header of inlinepage.tmpl and page.tmpl, rather
->   than the styled span. Ikiwiki has
->   [[a_reason|todo/Option_to_make_title_an_h1?]] for not
->   using real `hN` for the header atop a page and here.
->   AFAICS, html5 does not invalidate that.
-> * Removing Editurl from inlinepage.tmpl actions. I assume 
->   this is your own preference, needs to be removed from branch
->   before I can use it.
-> * Removing the pageheader, content, and footer divs
->   which are all used by style.css.
->   Perhaps, the style sheet needs to be updated to use
->   the new elements, like the `footer` and `header`.
-> * Removal of the favicon from page.tmpl. Surely html5 supports?
-> * Removal of BASEURL from page.tmpl, apparently a mistake.
-> * Removal of the `/` between wiki title and page title.
->   Personal preference.
-> * Removal of `comments` div, which is there to be styled.
-> * Why use a `p` rather than the `div` for `addcomments`?
-> * Moving the action bar to the bottom of the page.
->   Personal preference.
-> * Clearly searchquery.tmpl has no business using bad old `center`
->   tag, but something should still be done to replace it.
-> 
-> (BTW, it would be helpful if you could re-merge master into your branch
-> as it is a bit diverged now.) 
-> 
+> and `article` elements. Looks like I can't merge it as-is though
+> due to other changes.
+>
 > Other ideas:
-> 
+>  
 > * Use aside for the sidebar? Or for the [[templates/note]] template?
 > * Use nav for the actionbar
 > * Use details tag instead of the javascript in the toggle plugin. 
-- 
cgit v1.2.3


From d69f6057d1e1787fa3c19cc13c40eb3e9b822283 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 15:09:33 -0400
Subject: use html5 semantic markup in page.tmpl

This is a first pass, it avoids needing to change style.css
except where it refers to tag types.

This goes a bit off the rails at the pageheader with its nested header.
Semantically, there should be an article around the whole page
header, content, and footer. Just as there will be an article around a
whole comment or inlined page header, content, and footer.

But that will mean changing the css that currently refers to pageheader to
refer to the enclosing article instead.
---
 debian/changelog    |  3 +++
 doc/style.css       |  5 +----
 templates/page.tmpl | 49 +++++++++++++++++++++++++------------------------
 3 files changed, 29 insertions(+), 28 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index c9fc2e657..789fda1ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
   * Add parameter to displaytime to specify that it is a pubdate,
     and in html5 mode, use time tag.
   * Add placeholder text in search form (in html5 mode only).
+  * In html5 mode, use all the nice new semantic tags. Care was taken
+    to not change the id/class named used in the CSS, so only CSS
+    that refers to tag types needed to be changed.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
diff --git a/doc/style.css b/doc/style.css
index 7ffcf9fe2..69c7f80d8 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -60,15 +60,12 @@ div.inlinecontent {
 	clear: both;
 }
 
-.tags {
-}
-
 #pageinfo {
 	margin: 1em 0;
 	border-top: 1px solid #000;
 }
 
-div.tags {
+.tags {
 	margin-top: 1em;
 }
 
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 661d4a515..0176b0116 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 </TMPL_IF>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
 <meta http-equiv="Cache-Control" content="must-revalidate" />
 <title><TMPL_VAR TITLE></title>
 <TMPL_IF NAME="FAVICON">
@@ -26,8 +26,8 @@
 </head>
 <body>
 
-<div class="pageheader">
-<div class="header">
+<TMPL_IF HTML5><article class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF>
+<TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
 <span>
 <span class="parentlinks">
 <TMPL_LOOP NAME="PARENTLINKS">
@@ -40,14 +40,14 @@
 &nbsp;(<TMPL_VAR NAME="PERCENTTRANSLATED">%)
 </TMPL_IF>
 </span>
-</span><!--.header-->
+</span>
 <TMPL_IF NAME="SEARCHFORM">
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
-</div>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
 <TMPL_IF NAME="EDITURL">
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
@@ -72,11 +72,11 @@
 </TMPL_IF>
 </TMPL_IF>
 </ul>
-</div>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF NAME="OTHERLANGUAGES">
-<div id="otherlanguages">
+<TMPL_IF HTML5><nav class="otherlanguages"><TMPL_ELSE><div class="otherlanguages"></TMPL_IF>
 <ul>
 <TMPL_LOOP NAME="OTHERLANGUAGES">
 <li>
@@ -89,23 +89,22 @@
 </li>
 </TMPL_LOOP>
 </ul>
-</div> <!-- #otherlanguages -->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-</div> <!-- .pageheader -->
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF SIDEBAR>
-<div class="sidebar">
+<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
 <TMPL_VAR SIDEBAR>
-</div>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<div id="content">
+<TMPL_IF HTML5><article id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
 <TMPL_VAR CONTENT>
-</div>
 
 <TMPL_IF COMMENTS>
-<div id="comments">
+<TMPL_IF HTML5><aside id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
 <TMPL_VAR COMMENTS>
 <TMPL_IF ADDCOMMENTURL>
 <div class="addcomment">
@@ -114,23 +113,25 @@
 <TMPL_ELSE>
 <div class="addcomment">Comments on this page are closed.</div>
 </TMPL_IF>
-</div>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<div id="footer" class="pagefooter">
-<div id="pageinfo">
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
+<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
 <TMPL_IF NAME="TAGS">
-<div class="tags">
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
 Tags:
 <TMPL_LOOP NAME="TAGS">
 <TMPL_VAR LINK>
 </TMPL_LOOP>
-</div>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF NAME="BACKLINKS">
-<div id="backlinks">
+<TMPL_IF HTML5><nav id="backlinks"><TMPL_ELSE><div id="backlinks"></TMPL_IF>
 Links:
 <TMPL_LOOP NAME="BACKLINKS">
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
@@ -144,7 +145,7 @@ Links:
 </span>
 </span>
 </TMPL_IF>
-</div><!-- #backlinks -->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF COPYRIGHT>
@@ -166,10 +167,10 @@ Last edited <TMPL_VAR MTIME>
 <!-- Created <TMPL_VAR CTIME> -->
 </div>
 
-</div><!-- #pageinfo -->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 <!-- from <TMPL_VAR WIKINAME> -->
-</div><!-- .pagefooter #footer -->
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
 </body>
 </html>
-- 
cgit v1.2.3


From fa26c67b2a8842a57b551145d25c3719dcea2ccd Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Sun, 2 May 2010 19:19:33 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
new file mode 100644
index 000000000..2bae57806
--- /dev/null
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -0,0 +1,12 @@
+Look at these two blogs:
+1) http://ciffer.net/~svend/blog/
+2) http://upsilon.cc/~zack/blog/
+
+Well, i set up successfully my blog /i am using inline function in a wiki page) but i have manually to insert blog pos titles and the result is that of blog #2.
+Instead i would like to have blog post titles automatically inserted like blog #1 (and they are links too! I want them that way).
+I looked in git repo of the two blogs but i couldn't find the answer.
+Any help wuold be appreciated.
+
+Thanks
+
+Raf
-- 
cgit v1.2.3


From 40aba87965a3d59f59ef2c6a0c6751036cd4a351 Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Sun, 2 May 2010 19:20:37 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 2bae57806..f5da168a5 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -1,5 +1,7 @@
 Look at these two blogs:
+
 1) http://ciffer.net/~svend/blog/
+
 2) http://upsilon.cc/~zack/blog/
 
 Well, i set up successfully my blog /i am using inline function in a wiki page) but i have manually to insert blog pos titles and the result is that of blog #2.
-- 
cgit v1.2.3


From 9480dc44277ad9301f1e1eba5b09990b459e7b26 Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Sun, 2 May 2010 19:26:06 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index f5da168a5..4b5e21979 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -4,11 +4,11 @@ Look at these two blogs:
 
 2) http://upsilon.cc/~zack/blog/
 
-Well, i set up successfully my blog /i am using inline function in a wiki page) but i have manually to insert blog pos titles and the result is that of blog #2.
+Well, i set up successfully my blog (i am using inline function in a wiki page) but i have manually to insert blog pos titles and the result is that of blog #2.
 Instead i would like to have blog post titles automatically inserted like blog #1 (and they are links too! I want them that way).
 I looked in git repo of the two blogs but i couldn't find the answer.
-Any help wuold be appreciated.
+Any help would be really appreciated.
 
-Thanks
+Thanks!
 
 Raf
-- 
cgit v1.2.3


From 154732dc4235b7b31191975da50d780a2765fa02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 16:12:08 -0400
Subject: adapt comment.tmpl to html5

Note that I put comment-header in a <header> despite it being
below the comment. Using a <footer> would be confusing given
the class name. Also, the content is semantically closer to
a header than a footer.
---
 IkiWiki/Plugin/comments.pm |  1 +
 IkiWiki/Plugin/inline.pm   |  1 +
 doc/style.css              |  2 +-
 templates/comment.tmpl     | 29 ++++++++++++++---------------
 4 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 02f1d9301..89560c88b 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -673,6 +673,7 @@ sub previewcomment ($$$) {
 	my $template = template("comment.tmpl");
 	$template->param(content => $preview);
 	$template->param(ctime => displaytime($time, undef, 1));
+	$template->param(html5 => $config{html5});
 
 	IkiWiki::run_hooks(pagetemplate => sub {
 		shift->(page => $location,
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 2df59f414..933e30646 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -362,6 +362,7 @@ sub preprocess_inline (@) {
 				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
 				$template->param(first => 1) if $page eq $list[0];
 				$template->param(last => 1) if $page eq $list[$#list];
+				$template->param(html5 => $config{html5});
 	
 				if ($actions) {
 					my $file = $pagesources{$page};
diff --git a/doc/style.css b/doc/style.css
index 69c7f80d8..c857157b6 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -49,7 +49,7 @@
 	border-bottom: 1px solid #000;
 }
 
-div.inlinecontent {
+.inlinecontent {
 	margin-top: .4em;
 }
 
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index fb76ea004..39cba0ff9 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,20 +1,20 @@
-<div class="comment" id="<TMPL_VAR NAME=COMMENTID>">
+<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR NAME=COMMENTID>">
+<TMPL_ELSE><div class="comment" id="<TMPL_VAR NAME=COMMENTID>"></TMPL_IF>
 
-<div class="comment-subject">
+<TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF>
 <TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <TMPL_VAR TITLE>
 </TMPL_IF>
-</div>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<div class="inlinecontent">
+<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
 <TMPL_VAR CONTENT>
-</div>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div class="comment-header">
+<TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
 Comment by
-
 <TMPL_IF NAME="COMMENTUSER">
 <TMPL_IF NAME="COMMENTOPENID">
 <span class="author" title="OpenID">
@@ -29,10 +29,10 @@ Comment by
 </TMPL_IF>
 </span>
 </TMPL_IF>
-<TMPL_ELSE><!-- !COMMENTUSER -->
+<TMPL_ELSE>
 <TMPL_IF NAME=COMMENTIP>
 <span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
-<TMPL_ELSE><!-- !COMMENTIP -->
+<TMPL_ELSE>
 <span class="author" title="Unauthenticated, from unknown IP address">
 </TMPL_IF>
 <TMPL_IF NAME="AUTHORURL">
@@ -41,19 +41,18 @@ Comment by
 <TMPL_VAR NAME=AUTHOR>
 </TMPL_IF>
 </span>
-</TMPL_IF><!-- !COMMENTUSER -->
-
+</TMPL_IF>
 &mdash; <TMPL_VAR CTIME>
-</div>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
 <TMPL_IF NAME="REMOVEURL">
 <li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
 </TMPL_IF>
 </ul>
-</div><!--.actions-->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-</div><!--.comment-->
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
-- 
cgit v1.2.3


From 677d2af18aaafdfa1532e9eaff3c39107ec169f6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 16:36:10 -0400
Subject: adapt inlinepage.tmpl to html5

Needed to force tags to display inline, since <nav> is a block element.
---
 doc/style.css             |  4 ++++
 templates/inlinepage.tmpl | 30 ++++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index c857157b6..ea18ca0c3 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -69,6 +69,10 @@
 	margin-top: 1em;
 }
 
+.inlinepage .tags {
+        display: inline;
+}
+
 .mapparent {
 	text-decoration: none;
 }
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 3c0b93315..b32a7e497 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -1,7 +1,6 @@
-<div class="inlinepage">
-
-<div class="inlineheader">
+<TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF>
 
+<TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF>
 <TMPL_IF NAME="AUTHOR">
 <span class="author">
 <TMPL_IF NAME="AUTHORURL">
@@ -11,33 +10,32 @@
 </TMPL_IF>
 </span>
 </TMPL_IF>
-<span class="header">
+<TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF>
 <TMPL_IF NAME="PERMALINK">
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
 </TMPL_IF>
-</span>
+<TMPL_IF HTML5></span><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-</div><!--.inlineheader-->
-
-<div class="inlinecontent">
+<TMPL_IF HTML5><section id="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
 <TMPL_VAR CONTENT>
-</div><!--.inlinecontent-->
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div class="inlinefooter">
+<TMPL_IF HTML5><footer id="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF>
 
 <span class="pagedate">
 Posted <TMPL_VAR CTIME>
 </span>
 
 <TMPL_IF NAME="TAGS">
-<span class="tags">
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF>
 Tags:
 <TMPL_LOOP NAME="TAGS">
 <TMPL_VAR LINK>
 </TMPL_LOOP>
-</span>
+<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF COPYRIGHT>
@@ -53,7 +51,7 @@ License: <TMPL_VAR LICENSE>
 </TMPL_IF>
 
 <TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
 <TMPL_IF NAME="EDITURL">
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
@@ -66,9 +64,9 @@ License: <TMPL_VAR LICENSE>
 </TMPL_IF>
 </TMPL_IF>
 </ul>
-</div><!--.actions-->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-</div><!--.inlinefooter-->
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
-</div><!--.inlinepage-->
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
-- 
cgit v1.2.3


From 28dcb52a6c5b60302db285a13bf84e5e90c39cbc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 16:54:31 -0400
Subject: force article and header to display as blocks

iceweasel 3.5.9 does not know to display these as blocks, resulting
in bad displays of blogs
---
 doc/bugs/html5_support.mdwn | 11 +++++------
 doc/style.css               |  7 +++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index ef0ec1e70..0b15e64f6 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -29,14 +29,11 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 > It would probably not be too dreadful to put them in ifdefs. I've made a
 > small start at doing that.
 > 
-> Some of your changes are obvious, like using the new `time` and
-> and `article` elements. Looks like I can't merge it as-is though
-> due to other changes.
->
+> I've made ikiwiki use the time element and all the new semantic elements
+> in html5 mode.
+> 
 > Other ideas:
 >  
-> * Use aside for the sidebar? Or for the [[templates/note]] template?
-> * Use nav for the actionbar
 > * Use details tag instead of the javascript in the toggle plugin. 
 >   (Need to wait on browser support probably.)
 > 
@@ -89,6 +86,8 @@ This element is poorly supported by browsers. As a workaround, `style.css` needs
 
 Internet Explorer will display it as a block, though you can't seem to be able to further control the style.
 
+> done  (needed for header too) --[[Joey]] 
+
 ## Time element
 
 The [time element](http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#the-time-element) ideally needs the datatime= attribute set by a template variable with what [HTML5 defines as a valid datetime string](http://www.whatwg.org/specs/web-apps/current-work/multipage/infrastructure.html#valid-global-date-and-time-string).
diff --git a/doc/style.css b/doc/style.css
index ea18ca0c3..82de8fe6e 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -4,6 +4,13 @@
  * local.css and use it to override or change settings in this one.
  */
 
+article {
+	display: block;
+}
+header {
+	display: block;
+}
+
 .header {
 	margin: 0;
 	font-size: 22px;
-- 
cgit v1.2.3


From d37ff8d29993ccea880e36eba620e1ecdf91b80f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 17:01:28 -0400
Subject: ff also needs footer and nav forced to block

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

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 82de8fe6e..f2f558497 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -4,10 +4,10 @@
  * local.css and use it to override or change settings in this one.
  */
 
-article {
-	display: block;
-}
-header {
+article,
+header,
+footer,
+nav {
 	display: block;
 }
 
-- 
cgit v1.2.3


From 34076e398cb7662e3bf0659d591faa4208679882 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 17:16:15 -0400
Subject: html5 bug closure, and documentation

---
 doc/bugs/html5_support.mdwn |  6 ++++++
 doc/features.mdwn           |  2 +-
 doc/roadmap.mdwn            |  2 +-
 doc/tips/html5.mdwn         | 25 +++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 doc/tips/html5.mdwn

(limited to 'doc')

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 0b15e64f6..3d1689301 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -106,3 +106,9 @@ As a workaround:
 ## tidy plugin
 
 Will reformat html5 to html4.
+
+----
+
+
+Ok, I consider this [[done]], at least as a first pass. Html5 mode
+is experimental, but complete enough. --[[Joey]] 
diff --git a/doc/features.mdwn b/doc/features.mdwn
index 215c1cecd..1f8168703 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -72,7 +72,7 @@ you would care to syndicate.
 
 Ikiwiki aims to produce 
 [valid XHTML 1.0](http://validator.w3.org/check?url=referer).
-(Experimental HTML5 support is also available.)
+(Experimental [[tips/HTML5]] support is also available.)
 
 Ikiwiki generates html using [[templates]], and uses [[css]], so you
 can change the look and layout of all pages in any way you would like.
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 4b5f01c45..e257c21a2 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -80,7 +80,7 @@ Probably incomplete list:
 * YADA format setup files per default?
 * Enable tagbase by default (so that tag autocreation will work by default).
   Note that this is already done for wikis created by `auto-blog.setup`.
-* html5 on by default (some day..)
+* [[tips/html5]] on by default (some day..)
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn
new file mode 100644
index 000000000..9321aa401
--- /dev/null
+++ b/doc/tips/html5.mdwn
@@ -0,0 +1,25 @@
+First, if you just want to embed videos using the html5 `<video>` tag,
+you can do that without switching anything else to html5.
+However, if you want to fully enter the brave new world of html5, read on..
+
+Currently, ikiwiki does not use html5 by default. There is a `html5`
+setting that can be turned on, in your setup file. Rebuild with it set, and
+lots of fancy new semantic tags will be used all over the place.
+
+You may need to adapt your CSS for html5. While all the class and id names
+are the same, some of the `div` elements are changed to other things.
+Ikiwiki's default CSS will work in both modes.
+
+The html5 support is still experimental, and may break in some browsers.
+No care is taken to add backwards compatability hacks for browsers that
+are not html5 aware (like MSIE). If you want to include the javascript with
+those hacks, you can edit `page.tmpl` to do so. 
+[Dive Into HTML5](http://diveintohtml5.org/) is a good reference for
+current compatability issues and workarounds with html5.
+
+---
+
+Known ikiwiki-specific issues:
+
+* [[plugins/htmltidy]] uses `tidy`, which is not html5 aware, so if you
+  have that enabled, it will mangle it back to html4.
-- 
cgit v1.2.3


From 02a99875ff957f7acab6a1c6a14334a84f0ee9ea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 17:54:30 -0400
Subject: update

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

(limited to 'doc')

diff --git a/doc/tips/html5.mdwn b/doc/tips/html5.mdwn
index 9321aa401..945efc4bc 100644
--- a/doc/tips/html5.mdwn
+++ b/doc/tips/html5.mdwn
@@ -23,3 +23,4 @@ Known ikiwiki-specific issues:
 
 * [[plugins/htmltidy]] uses `tidy`, which is not html5 aware, so if you
   have that enabled, it will mangle it back to html4.
+* [[plugins/toc]] does not understand the html5 outline algorithm.
-- 
cgit v1.2.3


From bb70c15c598d1d35711369aa85cb39074beb64aa Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 18:55:21 -0400
Subject: on img and figure

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

(limited to 'doc')

diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn
index 3d1689301..ba67d532b 100644
--- a/doc/bugs/html5_support.mdwn
+++ b/doc/bugs/html5_support.mdwn
@@ -36,6 +36,9 @@ HTML5](http://www.w3.org/TR/html5-diff/).
 >  
 > * Use details tag instead of the javascript in the toggle plugin. 
 >   (Need to wait on browser support probably.)
+> * Use figure and figcaption for captions in img. However, I have not 
+>   managed to style it to look as good as the current table+caption
+>   approach.
 > 
 > --[[Joey]] 
 
-- 
cgit v1.2.3


From cfca3a70740619dcb2ff94137fe61f71dede2619 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 18:59:37 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 4b5e21979..4a505925e 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -12,3 +12,11 @@ Any help would be really appreciated.
 Thanks!
 
 Raf
+
+> Either name the blog post files with the full title you want them to 
+> have, or use [[ikiwiki/directive/meta]] title to set the title of a blog post.
+> 
+>	\[[!meta title="this is my blog post"]]
+> 
+> Either way, the title will automatically be displayed, clickable, at the top.
+> (zack has hacked his templates not to do that). --[[Joey]] 
-- 
cgit v1.2.3


From 78962ddfe6f4dcae29fa50fd4eb2a381c02bde87 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 22:03:28 -0400
Subject: add bug

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

(limited to 'doc')

diff --git a/doc/bugs/deletion_warnings.mdwn b/doc/bugs/deletion_warnings.mdwn
new file mode 100644
index 000000000..c8879379b
--- /dev/null
+++ b/doc/bugs/deletion_warnings.mdwn
@@ -0,0 +1,86 @@
+Seen while deleting a blog's calendar pages:
+
+--[[Joey]] 
+
+<pre>
+   427250f..ff6c054  master     -> origin/master
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
+Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/IkiWiki.pm line 668.
+Use of uninitialized value $base in exists at /usr/share/perl5/IkiWiki.pm line 692.
+</pre>
+
-- 
cgit v1.2.3


From 8784c08f6f0f785d9306f1cbd61cf7eac03660b5 Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Mon, 3 May 2010 07:25:54 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 4a505925e..804a122f8 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -20,3 +20,10 @@ Raf
 > 
 > Either way, the title will automatically be displayed, clickable, at the top.
 > (zack has hacked his templates not to do that). --[[Joey]] 
+
+>> Thanks for your answer.<br/>
+>> I looked in the [templates](http://git.upsilon.cc/cgi-bin/gitweb.cgi?p=zack-homepage.git;a=tree;f=templates;h=824100e62a06cee41b582ba84fcb9cdd982fe4be;hb=HEAD) folder of zack but couldn't see any hack of that kind.<br/>
+>> Anyway, I didn't hack my template...<br/>
+>> I will follow your suggestion of using [[ikiwiki/directive/meta]] title to set titles.<br/>
+>> Thanks a lot.<br/><br/>
+>> Raf<br/>
-- 
cgit v1.2.3


From 7606d3832d74f34d53d9f5e2ce1d00d8f816418c Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Mon, 3 May 2010 07:27:05 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 804a122f8..3e9291320 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -24,6 +24,6 @@ Raf
 >> Thanks for your answer.<br/>
 >> I looked in the [templates](http://git.upsilon.cc/cgi-bin/gitweb.cgi?p=zack-homepage.git;a=tree;f=templates;h=824100e62a06cee41b582ba84fcb9cdd982fe4be;hb=HEAD) folder of zack but couldn't see any hack of that kind.<br/>
 >> Anyway, I didn't hack my template...<br/>
->> I will follow your suggestion of using [[ikiwiki/directive/meta]] title to set titles.<br/>
+>> I will follow your suggestion of using \[[ikiwiki/directive/meta]] title to set titles.<br/>
 >> Thanks a lot.<br/><br/>
 >> Raf<br/>
-- 
cgit v1.2.3


From 0f9c5697f86c065cb8835282ef67d05a0bb884b5 Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Mon, 3 May 2010 07:27:35 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 3e9291320..6e939f868 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -25,5 +25,4 @@ Raf
 >> I looked in the [templates](http://git.upsilon.cc/cgi-bin/gitweb.cgi?p=zack-homepage.git;a=tree;f=templates;h=824100e62a06cee41b582ba84fcb9cdd982fe4be;hb=HEAD) folder of zack but couldn't see any hack of that kind.<br/>
 >> Anyway, I didn't hack my template...<br/>
 >> I will follow your suggestion of using \[[ikiwiki/directive/meta]] title to set titles.<br/>
->> Thanks a lot.<br/><br/>
->> Raf<br/>
+>> Thanks a lot. ---Raf
-- 
cgit v1.2.3


From 4733a1a9cd2182bf052ba8545e3a61242f8b94a9 Mon Sep 17 00:00:00 2001
From: raf <raf@web>
Date: Mon, 3 May 2010 07:28:40 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
index 6e939f868..68eb06c4c 100644
--- a/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
+++ b/doc/forum/how_to_add_post_titles_in_ikiwiki_blog__63__.mdwn
@@ -25,4 +25,4 @@ Raf
 >> I looked in the [templates](http://git.upsilon.cc/cgi-bin/gitweb.cgi?p=zack-homepage.git;a=tree;f=templates;h=824100e62a06cee41b582ba84fcb9cdd982fe4be;hb=HEAD) folder of zack but couldn't see any hack of that kind.<br/>
 >> Anyway, I didn't hack my template...<br/>
 >> I will follow your suggestion of using \[[ikiwiki/directive/meta]] title to set titles.<br/>
->> Thanks a lot. ---Raf
+>> Thanks a lot. --Raf
-- 
cgit v1.2.3


From 2f22ee85e547dfe408fc0ec520aed6a6e137e136 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 3 May 2010 12:15:40 -0400
Subject: Add ACTIONS variable to page.tmpl, which allows plugins to add
 arbitrary links to the action bar without modifying the template further.

(COMMENTSLINK and DISCUSSIONLINK could be folded into this, but are kept
separate for now to avoid breaking modified templates.)
---
 IkiWiki/Plugin/skeleton.pm.example | 9 +++++++++
 IkiWiki/Render.pm                  | 9 ++++++++-
 debian/changelog                   | 4 ++++
 doc/plugins/write.mdwn             | 9 +++++++++
 templates/page.tmpl                | 9 +++++++--
 5 files changed, 37 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index ddf2996d6..a404e24af 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -24,6 +24,7 @@ sub import {
 	hook(type => "format", id => "skeleton", call => \&format);
 	hook(type => "pagetemplate", id => "skeleton", call => \&pagetemplate);
 	hook(type => "templatefile", id => "skeleton", call => \&templatefile);
+	hook(type => "pageactions", id => "skeleton", call => \&pageactions);
 	hook(type => "delete", id => "skeleton", call => \&delete);
 	hook(type => "change", id => "skeleton", call => \&change);
 	hook(type => "cgi", id => "skeleton", call => \&cgi);
@@ -146,6 +147,14 @@ sub templatefile (@) {
 	debug("skeleton plugin running as a templatefile hook");
 }
 
+sub pageactions (@) {
+	my %params=@_;
+	my $page=$params{page};
+
+	debug("skeleton plugin running as a pageactions hook");
+	return ();
+}
+
 sub delete (@) {
 	my @files=@_;
 
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index cf6943e7d..a824ba539 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -112,7 +112,14 @@ sub genpage ($$) {
 		}
 	}
 
-	if ($actions) {
+	my @actions;
+	run_hooks(pageactions => sub {
+		push @actions, map { { action => $_ } } 
+			grep { defined } shift->(page => $page);
+	});
+	$template->param(actions => \@actions);
+
+	if ($actions || @actions) {
 		$template->param(have_actions => 1);
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 789fda1ce..e03375bd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
   * In html5 mode, use all the nice new semantic tags. Care was taken
     to not change the id/class named used in the CSS, so only CSS
     that refers to tag types needed to be changed.
+  * Add ACTIONS variable to page.tmpl, which allows plugins to add arbitrary
+    links to the action bar without modifying the template further.
+    (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
+    are kept separate for now to avoid breaking modified templates.)
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 5e7042c3b..3b1d770eb 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -319,6 +319,15 @@ should return the name of the template file to use (relative to the
 template directory), or undef if it doesn't want to change the default
 ("page.tmpl").
 
+### pageactions
+
+	hook(type => "pageactions", id => "foo", call => \&pageactions);
+
+This hook allows plugins to add arbitrary actions to the action bar on a
+page (next to Edit, RecentChanges, etc). The hook is passed a "page"
+parameter, and can return a list of html fragments to add to the action
+bar.
+
 ### sanitize
 
 	hook(type => "sanitize", id => "foo", call => \&sanitize);
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 195ce7886..8a9911fae 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -66,11 +66,16 @@
 <TMPL_IF NAME="PREFSURL">
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
+<TMPL_IF NAME="ACTIONS">
+<TMPL_LOOP NAME="ACTIONS">
+<li><TMPL_VAR ACTION></li>
+</TMPL_LOOP>
+</TMPL_IF>
 <TMPL_IF NAME="COMMENTSLINK">
-<li><TMPL_VAR COMMENTSLINK><br /></li>
+<li><TMPL_VAR COMMENTSLINK></li>
 <TMPL_ELSE>
 <TMPL_IF NAME="DISCUSSIONLINK">
-<li><TMPL_VAR DISCUSSIONLINK><br /></li>
+<li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </TMPL_IF>
 </ul>
-- 
cgit v1.2.3


From 9699f16b5186237ca98ebfc90a8644b672485245 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 3 May 2010 13:59:43 -0400
Subject: websetup: Only display Setup button on admins' preferences page.

Renamed it from "Wiki Setup" to just "Setup" for good measure.
---
 IkiWiki/Plugin/websetup.pm                          | 7 ++++---
 debian/changelog                                    | 1 +
 doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn | 2 +-
 doc/plugins/websetup.mdwn                           | 2 +-
 doc/setup.mdwn                                      | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index cb6a7e412..4d2e611eb 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -503,9 +503,10 @@ sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
-	if ($form->title eq "preferences") {
-		push @{$params{buttons}}, "Wiki Setup";
-		if ($form->submitted && $form->submitted eq "Wiki Setup") {
+	if ($form->title eq "preferences" &&
+	    IkiWiki::is_admin($params{session}->param("name"))) {
+		push @{$params{buttons}}, "Setup";
+		if ($form->submitted && $form->submitted eq "Setup") {
 			showform($params{cgi}, $params{session});
 			exit;
 		}
diff --git a/debian/changelog b/debian/changelog
index e03375bd3..9fb9607a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
     links to the action bar without modifying the template further.
     (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
     are kept separate for now to avoid breaking modified templates.)
+  * websetup: Only display Setup button on admins' preferences page. 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
diff --git a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn
index 7599e71e5..17c60c423 100644
--- a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn
+++ b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn
@@ -62,7 +62,7 @@ index 0bf100a..77b467a 100644
 
 >>>> So you can see if the two usernames/openids match. If the end is "0",
 >>>> they don't match. If nothing is logged, you have not enabled the websetup plugin.
->>>> If the end if "1" you should see the "Wiki Setup" button, if not the
+>>>> If the end if "1" you should see the "Setup" button, if not the
 >>>> problem is not in determining if you're an admin, but elsewhere..
 >>>> --[[Joey]]
 
diff --git a/doc/plugins/websetup.mdwn b/doc/plugins/websetup.mdwn
index b4d23ba9c..a20a32489 100644
--- a/doc/plugins/websetup.mdwn
+++ b/doc/plugins/websetup.mdwn
@@ -2,7 +2,7 @@
 [[!tag type/web]]
 
 This plugin allows wiki admins to configure the wiki using a web interface,
-rather than editing the setup file directly. A "Wiki Setup" button is added
+rather than editing the setup file directly. A "Setup" button is added
 to the admins' preferences page.
 
 Warning: This plugin rewrites your setup file. Any comments or unusual
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 2d4da5536..3ea0022cc 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -89,7 +89,7 @@ These range from changing the wiki's name, to enabling [[plugins]],
 to banning users and locking pages.
 
 If you log in as the admin user you configured earlier, and go to
-your Preferences page, you can click on "Wiki Setup" to customize many
+your Preferences page, you can click on "Setup" to customize many
 wiki settings and plugins.
 
 Some settings cannot be configured on the web, for security reasons or
-- 
cgit v1.2.3


From 6c0d2aa45608da7382289a34ac08e38b444ebe5b Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Mon, 3 May 2010 23:28:27 +0000
Subject: PERL5LIB setting question

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

(limited to 'doc')

diff --git a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
new file mode 100644
index 000000000..9dc539538
--- /dev/null
+++ b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
@@ -0,0 +1,17 @@
+What is the way to tell wrappers that PERL5LIB should include ~/bin directories?
+
+Having this in the wiki.setup doesn't help anymore:
+
+        # environment variables
+        ENV => {
+          PATH => '/home/user/bin/bin:/usr/local/bin:/usr/bin:/bin:/usr/games:/home/user/ikiwiki/usr/bin/:/home/user/ikiwiki/usr/sbin/:/home/user/bin/bin/:~/bin/bin/',
+          PERL5LIB => '/home/user/bin/share/perl/5.10.0:/home/user/bin/lib/perl/5.10.0'
+        },
+
+Or at least I get CGI errors and running ikiwiki.cgi manually fails too:
+
+        Use of uninitialized value $tainted in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 233.
+        Argument "" isn't numeric in umask at /usr/share/perl5/IkiWiki.pm line 139.
+        Undefined subroutine &IkiWiki::cgierror called at /home/user/bin/bin/ikiwiki line 199.
+
+Server has an older ikiwiki installed but I'd like to use a newer version from git, and I don't have root access.
-- 
cgit v1.2.3


From d5928778a89762b73ed6f4ddaec690d14d774537 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 4 May 2010 02:26:56 +0200
Subject: whishlist about two-way conversion.

---
 doc/todo/two-way_convert_of_wikis.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/todo/two-way_convert_of_wikis.mdwn

(limited to 'doc')

diff --git a/doc/todo/two-way_convert_of_wikis.mdwn b/doc/todo/two-way_convert_of_wikis.mdwn
new file mode 100644
index 000000000..61f02a30b
--- /dev/null
+++ b/doc/todo/two-way_convert_of_wikis.mdwn
@@ -0,0 +1,15 @@
+
+[[!tag wishlist]]
+
+Ok, the vision is this: Some of you will know git-svn. I want something like
+git-svn,, but for wikis. I want to be able to do the following:
+
+1. Convert a moinmoin (or whatever) wiki to a local ikiwiki on my laptop.
+2. Edit my local copy (offline).
+3. Preview the changes with my local ikiwki installation + browser.
+4. Push the changes back to moinmoin (or whatever) wiki.
+
+I know, I know, ikiwiki wasn't designed for that, but it would be really cool,
+and useful and people ask for that kind of thing too.
+
+--[[David_Riebenbauer]]
-- 
cgit v1.2.3


From bde13387daffaf5f1eb06ead1c0277fe616932f2 Mon Sep 17 00:00:00 2001
From: "http://www.clowersnet.net/~krc/" <http://www.clowersnet.net/~krc/@web>
Date: Tue, 4 May 2010 05:12:14 +0000
Subject: comment on html5

---
 doc/news/version_3.20100501/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/news/version_3.20100501/discussion.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100501/discussion.mdwn b/doc/news/version_3.20100501/discussion.mdwn
new file mode 100644
index 000000000..fbf767afb
--- /dev/null
+++ b/doc/news/version_3.20100501/discussion.mdwn
@@ -0,0 +1 @@
+Thanks a lot for the HTML5 support! I'll have to try it some time soon.
-- 
cgit v1.2.3


From 89e0669692eaf597596f1da36e8c385330c594ff Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Tue, 4 May 2010 16:39:50 +0100
Subject: split two graphviz bugs from one page; undo one of them

---
 doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn    | 23 +----------
 ...Problems_with_graphviz.pm_plug-in_previews.mdwn | 46 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 21 deletions(-)
 create mode 100644 doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn

(limited to 'doc')

diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
index c9f698158..bc80125ad 100644
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in.mdwn
@@ -9,31 +9,12 @@ The graphviz.pm plug-in currently attempts to read PNG data in UTF-8 mode, which
 
 It also generates image URLs relative to the page being rendered, which means the URLs wont work when previewing a graph from the CGI script.
 
+(preview bug split to [[Problems_with_graphviz.pm_plug-in_previews]])
+
 >> Here is an updated patch againt ikiwiki-2.5:
 
 >>> [[Applied|done]], thanks. --[[Joey]]
 
-    --- IkiWiki/Plugin/graphviz.pm.orig	2007-07-27 11:35:05.000000000 +0200
-    +++ IkiWiki/Plugin/graphviz.pm	2007-07-27 11:36:02.000000000 +0200
-    @@ -69,7 +69,12 @@ sub render_graph (\%) {
-     		}
-     	}
-     
-    -	return "<img src=\"".urlto($dest, $params{page})."\" />\n";
-    +	if ($params{preview}) {
-    +		return "<img src=\"".urlto($dest, "")."\" />\n";
-    +	}
-    +	else {
-    +		return "<img src=\"".urlto($dest, $params{page})."\" />\n";
-    +	}
-     }
-     
-     sub graph (@) {
-
-
->> --[[HenrikBrixAndersen]]
-
-
 The patch below fixes these two issues.
 
     --- graphviz.pm.orig	Thu Jun  7 15:45:16 2007
diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
new file mode 100644
index 000000000..3b77a48bb
--- /dev/null
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
@@ -0,0 +1,46 @@
+(split from [[Problems_with_graphviz.pm_plug-in]])
+
+[graphviz] generates image URLs relative to the page being rendered, which means the URLs wont work when previewing a graph from the CGI script.
+
+>> Here is an updated patch againt ikiwiki-2.5:
+
+>>> Applied, thanks. --[[Joey]]
+
+    --- IkiWiki/Plugin/graphviz.pm.orig	2007-07-27 11:35:05.000000000 +0200
+    +++ IkiWiki/Plugin/graphviz.pm	2007-07-27 11:36:02.000000000 +0200
+    @@ -69,7 +69,12 @@ sub render_graph (\%) {
+     		}
+     	}
+     
+    -	return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+    +	if ($params{preview}) {
+    +		return "<img src=\"".urlto($dest, "")."\" />\n";
+    +	}
+    +	else {
+    +		return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+    +	}
+     }
+     
+     sub graph (@) {
+
+
+>> --[[HenrikBrixAndersen]]
+
+>>> Despite this patch I am still experiencing the problem. Normal page source for a graph contains:
+
+    &lt;div id="content"&gt;
+    &lt;p&gt;&lt;img src="./graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /&gt;&lt;/p&gt;
+    
+    &lt;/div&gt;
+
+>>> preview contains
+
+    &lt;div id="preview"&gt;
+    &lt;p&gt;&lt;img src="./demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /&gt;&lt;/p&gt;
+    
+    &lt;/div&gt;
+
+>>> I don't quite understand why, this makes sense from the CGI path (in my
+>>> case from the root of the site). The browsers appear to be trying to fetch
+>>> `/demo/diagrams/demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png`
+>>> (i.e., prepending the required relpath twice). -- [[Jon]]
-- 
cgit v1.2.3


From 48b5b7feccb76f44c4eb2b21dbb049940331ef28 Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Tue, 4 May 2010 15:41:56 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
new file mode 100644
index 000000000..1a454d37d
--- /dev/null
+++ b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
@@ -0,0 +1,5 @@
+In particular, it's kind of annoying that using the sidebar plugin results in the creation of a free-standing sidebar.html (which in the simplest case of course includes a copy of *its own content* as a sidebar in the simplest case).  It would be nice if there were a way to tell Ikiwiki to treat a file like sidebar.mdwn as "inline only": allow its content to be inlined but not to render it separately nor allow linking to it.
+
+In reading through the code and associated docs, it appears that the ideal method is for the file to be removed from the $changed array by plugin's "needsbuild" hook.  Either the sidebar plugin could define such a hook, or perhaps a more general solution is the creation of a meta variable or config file regexp that would handle it according to the user's wishes.
+
+I'm about ready to code up such a change but want to find out if I'm thinking along the right lines.  --[[blipvert]]
-- 
cgit v1.2.3


From bd5c5f1f487e21d658dc85badc4e6ee492119cfe Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Tue, 4 May 2010 15:42:21 +0000
Subject:

---
 ...uppressing_output_of_pages_included_only_for_their_side_effects.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
index 1a454d37d..20139b140 100644
--- a/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
+++ b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
@@ -1,4 +1,4 @@
-In particular, it's kind of annoying that using the sidebar plugin results in the creation of a free-standing sidebar.html (which in the simplest case of course includes a copy of *its own content* as a sidebar in the simplest case).  It would be nice if there were a way to tell Ikiwiki to treat a file like sidebar.mdwn as "inline only": allow its content to be inlined but not to render it separately nor allow linking to it.
+In particular, it's kind of annoying that using the sidebar plugin results in the creation of a free-standing sidebar.html (which in the simplest case of course includes a copy of *its own content* as a sidebar).  It would be nice if there were a way to tell Ikiwiki to treat a file like sidebar.mdwn as "inline only": allow its content to be inlined but not to render it separately nor allow linking to it.
 
 In reading through the code and associated docs, it appears that the ideal method is for the file to be removed from the $changed array by plugin's "needsbuild" hook.  Either the sidebar plugin could define such a hook, or perhaps a more general solution is the creation of a meta variable or config file regexp that would handle it according to the user's wishes.
 
-- 
cgit v1.2.3


From 7060a818c108de5b5e2b1c2aa617f5e926bd5f86 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Tue, 4 May 2010 16:43:22 +0100
Subject: un-escape escaped chevrons

---
 doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
index 3b77a48bb..283a6ef08 100644
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
@@ -28,17 +28,17 @@
 
 >>> Despite this patch I am still experiencing the problem. Normal page source for a graph contains:
 
-    &lt;div id="content"&gt;
-    &lt;p&gt;&lt;img src="./graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /&gt;&lt;/p&gt;
+    <div id="content">
+    <p><img src="./graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /></p>
     
-    &lt;/div&gt;
+    </div>
 
 >>> preview contains
 
-    &lt;div id="preview"&gt;
-    &lt;p&gt;&lt;img src="./demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /&gt;&lt;/p&gt;
+    <div id="preview">
+    <p><img src="./demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png" /></p>
     
-    &lt;/div&gt;
+    </div>
 
 >>> I don't quite understand why, this makes sense from the CGI path (in my
 >>> case from the root of the site). The browsers appear to be trying to fetch
-- 
cgit v1.2.3


From 821a8aba2f582e617d34e649509533c240f51a1c Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Tue, 4 May 2010 15:43:23 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/users/blipvert.mdwn b/doc/users/blipvert.mdwn
new file mode 100644
index 000000000..18249f335
--- /dev/null
+++ b/doc/users/blipvert.mdwn
@@ -0,0 +1 @@
+Hello world.
-- 
cgit v1.2.3


From a43bc68eb33de5264f6103d92a2243214259063b Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Tue, 4 May 2010 15:46:40 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/users/blipvert.mdwn b/doc/users/blipvert.mdwn
index 18249f335..a0fb08da8 100644
--- a/doc/users/blipvert.mdwn
+++ b/doc/users/blipvert.mdwn
@@ -1 +1 @@
-Hello world.
+<img src="http://github.com/blipvert" />
-- 
cgit v1.2.3


From 28db9e38f78157edaefdc776913c8d85bc08ea6a Mon Sep 17 00:00:00 2001
From: blipvert <blipvert@web>
Date: Tue, 4 May 2010 15:47:42 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/users/blipvert.mdwn b/doc/users/blipvert.mdwn
index a0fb08da8..7c4a24ba1 100644
--- a/doc/users/blipvert.mdwn
+++ b/doc/users/blipvert.mdwn
@@ -1 +1 @@
-<img src="http://github.com/blipvert" />
+<http://github.com/blipvert>
-- 
cgit v1.2.3


From 35bd43aea3e6694cb474fc2e784113194c6865ba Mon Sep 17 00:00:00 2001
From: "http://zwol.livejournal.com/" <http://zwol.livejournal.com/@web>
Date: Tue, 4 May 2010 17:09:27 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
new file mode 100644
index 000000000..bbf8c7cd7
--- /dev/null
+++ b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
@@ -0,0 +1,17 @@
+I'm getting this error message when I refresh my wiki:
+
+    $ hg commit -u me -m "Minor corrections"
+    refreshing wiki..
+    scanning htmletc/moco-conf-rooms.mdwn
+    building htmletc/moco-conf-rooms.mdwn
+    Use of uninitialized value in concatenation (.) or string at /usr/local/lib/perl5/site_perl/5.8.9/Text/Typography.pm line 542.
+    building sidebar.mdwn, which depends on htmletc/moco-conf-rooms
+    building contact.mdwn, which depends on sidebar
+    building 500.mdwn, which depends on sidebar
+    Use of uninitialized value in concatenation (.) or string at /usr/local/lib/perl5/site_perl/5.8.9/Text/Typography.pm line 542.
+    building ceramics.mdwn, which depends on sidebar
+    building glossary.mdwn, which depends on sidebar
+    syntax error in pagespec "internal(glossary/comment_*)"
+    warning: post-commit hook exited with status 2
+
+But there is no error if I use `ikiwiki --rebuild` to regenerate the whole thing.
-- 
cgit v1.2.3


From ac2cc8f87d3dc0eefb5069fe1c9c189cd13fb33f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 16:22:27 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
index bbf8c7cd7..316ea7e9b 100644
--- a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
+++ b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
@@ -15,3 +15,14 @@ I'm getting this error message when I refresh my wiki:
     warning: post-commit hook exited with status 2
 
 But there is no error if I use `ikiwiki --rebuild` to regenerate the whole thing.
+
+> You neglect to say what version of ikiwiki this is,
+> or give any information to reproduce the bug.
+> 
+> My guess: A version older than 3.20100403, which  included
+> [this bugfix](http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=799b93d258bad917262ac160df74136f05d4a451),
+> which could lead to incorrect "syntax error in pagespec"
+> that only happened some of the time.
+> 
+> (The Text::Typography warning seems probably unrelated.)
+> --[[Joey]] 
-- 
cgit v1.2.3


From 74e0c83a951ea9d1b5b0a068374086f71a04b593 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 16:36:22 -0400
Subject: response

---
 .../PERL5LIB__44___wrappers_and_homedir_install.mdwn     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
index 9dc539538..988f261a7 100644
--- a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
+++ b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
@@ -15,3 +15,19 @@ Or at least I get CGI errors and running ikiwiki.cgi manually fails too:
         Undefined subroutine &IkiWiki::cgierror called at /home/user/bin/bin/ikiwiki line 199.
 
 Server has an older ikiwiki installed but I'd like to use a newer version from git, and I don't have root access.
+
+> You can't set `PERL5LIB` in `ENV` in a setup file, because ikiwiki is already
+> running before it reads that, and so it has little effect. Your error
+> messages do look like a new bin/ikiwiki is using an old version of
+> `IkiWiki.pm`.
+> 
+> The thing to do is set `INSTALL_BASE` when you're installing ikiwiki from
+> source. Like so:
+
+        cd ikiwiki
+        perl Makefile.PL INSTALL_BASE=$HOME PREFIX=
+	make install
+
+> Then `$HOME/bin/ikiwiki` will have hardcoded into it to look
+> for ikiwiki's perl modules in `$HOME/lib/perl5/`
+> (This is documented in the README file by the way.) --[[Joey]] 
-- 
cgit v1.2.3


From ddd7a766e27128f971fceba900d73982c686afbd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 16:46:18 -0400
Subject: response

---
 ..._output_of_pages_included_only_for_their_side_effects.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
index 20139b140..99784cdd2 100644
--- a/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
+++ b/doc/forum/suppressing_output_of_pages_included_only_for_their_side_effects.mdwn
@@ -3,3 +3,14 @@ In particular, it's kind of annoying that using the sidebar plugin results in th
 In reading through the code and associated docs, it appears that the ideal method is for the file to be removed from the $changed array by plugin's "needsbuild" hook.  Either the sidebar plugin could define such a hook, or perhaps a more general solution is the creation of a meta variable or config file regexp that would handle it according to the user's wishes.
 
 I'm about ready to code up such a change but want to find out if I'm thinking along the right lines.  --[[blipvert]]
+
+> Internal pages should be able to be used for this, as they are used for
+> comments. So you'd have
+> `sidebar._mdwn`. However, mwdn would need to be changed to register a
+> htmlize hook for the `_mdwn` extension for that to really work.
+> 
+> But, if there's no rendered sidebar page, how can users easily edit the page
+> in the web interface? In the specific case of the sidebar, It seems
+> better to have the page display something different when built standalone
+> than when built as the sidebar.
+> --[[Joey]]
-- 
cgit v1.2.3


From ab575a4b6985d38969069757bb374aa8f1013019 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 16:54:58 -0400
Subject: graphviz: Fix display of preexisting images in preview mode.

---
 IkiWiki/Plugin/graphviz.pm                               | 7 +------
 debian/changelog                                         | 1 +
 doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn | 8 ++++++++
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index bec122076..c91c92fec 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -79,12 +79,7 @@ sub render_graph (\%) {
 		}
 	}
 
-	if ($params{preview}) {
-		return "<img src=\"".urlto($dest, "")."\" />\n";
-	}
-	else {
-		return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
-	}
+	return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
 }
 
 sub graph (@) {
diff --git a/debian/changelog b/debian/changelog
index 9fb9607a3..31deaf9aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
     (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
     are kept separate for now to avoid breaking modified templates.)
   * websetup: Only display Setup button on admins' preferences page. 
+  * graphviz: Fix display of preexisting images in preview mode.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 
diff --git a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
index 283a6ef08..c77bbeeaf 100644
--- a/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
+++ b/doc/bugs/Problems_with_graphviz.pm_plug-in_previews.mdwn
@@ -44,3 +44,11 @@
 >>> case from the root of the site). The browsers appear to be trying to fetch
 >>> `/demo/diagrams/demo/diagrams/graph-c9fd2a197322feb417bdedbca5e99f5aa65b3f06.png`
 >>> (i.e., prepending the required relpath twice). -- [[Jon]]
+
+>>>> Yeah, that patch may have been right once, but it's wrong now;
+>>>> preview mode uses `<base>` to make urls work the same as they would
+>>>> when viewing the html page. 
+>>>>
+>>>> Perhaps this was not noticed for a while while because it only
+>>>> shows up if previewing an *unchanged* graph on a page that has already
+>>>> been built before. Fixed now. [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 73ebf2a9f258e1f83b5ba3ceba36233c0d6df817 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Tue, 4 May 2010 20:56:38 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
index 988f261a7..b6bf14af8 100644
--- a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
+++ b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
@@ -26,7 +26,7 @@ Server has an older ikiwiki installed but I'd like to use a newer version from g
 
         cd ikiwiki
         perl Makefile.PL INSTALL_BASE=$HOME PREFIX=
-	make install
+        make install
 
 > Then `$HOME/bin/ikiwiki` will have hardcoded into it to look
 > for ikiwiki's perl modules in `$HOME/lib/perl5/`
-- 
cgit v1.2.3


From 93f8000d584312049fac6b52d8eac4206aa1bedc Mon Sep 17 00:00:00 2001
From: "http://mcfrisk.myopenid.com/" <http://mcfrisk.myopenid.com/@web>
Date: Tue, 4 May 2010 21:17:54 +0000
Subject: solved

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

(limited to 'doc')

diff --git a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
index b6bf14af8..fba941efc 100644
--- a/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
+++ b/doc/forum/PERL5LIB__44___wrappers_and_homedir_install.mdwn
@@ -31,3 +31,8 @@ Server has an older ikiwiki installed but I'd like to use a newer version from g
 > Then `$HOME/bin/ikiwiki` will have hardcoded into it to look
 > for ikiwiki's perl modules in `$HOME/lib/perl5/`
 > (This is documented in the README file by the way.) --[[Joey]] 
+
+>> Ok, *perl Makefile.PL INSTALL_BASE=$HOME/bin PREFIX=* finally did it for me. I tried too many things with
+>> these paths so I wasn't sure which actually worked. After that I did 
+>> *$ ikiwiki --setup www.setup --wrappers --rebuild*. Somehow in this update mess I seem to have lost the user
+>> accounts, maybe the --rebuild was too much.
-- 
cgit v1.2.3


From 3ebd04a33b498d9ae4a1d8535b022704a687dfff Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 4 May 2010 20:37:11 -0400
Subject: add news item for ikiwiki 3.20100504

---
 doc/news/version_3.20100312.mdwn | 16 ----------------
 doc/news/version_3.20100403.mdwn | 30 ------------------------------
 doc/news/version_3.20100504.mdwn | 16 ++++++++++++++++
 3 files changed, 16 insertions(+), 46 deletions(-)
 delete mode 100644 doc/news/version_3.20100312.mdwn
 delete mode 100644 doc/news/version_3.20100403.mdwn
 create mode 100644 doc/news/version_3.20100504.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100312.mdwn b/doc/news/version_3.20100312.mdwn
deleted file mode 100644
index 10c34425d..000000000
--- a/doc/news/version_3.20100312.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-ikiwiki 3.20100312 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Fix utf8 issues in calls to md5\_hex.
-   * moderatedcomments: Added moderate\_pagespec that can be used
-     to control which users or comment locations are moderated.
-     This can be used, just for example, to moderate "user(http://myopenid.com/*)"
-     if you're getting a lot of spammers from one particular openid
-     provider (who should perhaps answer your emails about them),
-     while not moderating other users.
-   * moderatedcomments: The moderate\_users setting is deprecated. Instead,
-     set moderate\_pagespec to "!admin()" or "user(*)".
-   * Fix missing span on recentchanges page template.
-   * search: Avoid '$' in the wikiname appearing unescaped on omega's
-     query template, where it might crash omega.
-   * htmlscrubber: Security fix: In data:image/* uris, only allow a few
-     whitelisted image types. No svg."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100403.mdwn b/doc/news/version_3.20100403.mdwn
deleted file mode 100644
index 3e9063028..000000000
--- a/doc/news/version_3.20100403.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-ikiwiki 3.20100403 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * websetup: Add websetup\_unsafe to allow marking other settings
-     as unsafe.
-   * Improve openid url munging; do not display anchors and cgi parameters,
-     as used by yahoo and google urls.
-   * Add complete German basewiki and directives translation done by
-     Sebastian Kuhnert.
-   * Add a include setting, which can be used to make ikiwiki process
-     wiki source files, such as .htaccess, that would normally be skipped
-     for security or other reasons. Closes: #[447267](http://bugs.debian.org/447267)
-     (Thanks to Aaron Wilson for the original patch.)
-   * Add support for setup files written in YAML.
-   * Add --set-yaml switch for setting more complex config file options.
-   * filecheck: Fix bugs that prevented the pagespecs from matching when
-     not called by attachment plugin.
-   * Fix incorrect influence info returned by a failing link() pagespec,
-     that could lead to bad dependency handling in certain situations.
-   * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
-     if necessary for unusual install.
-   * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
-   * Allow wrappers to be built using tcc. (Workaround #452876)
-   * openid: Use Openid Simple Registration or OpenID Attribute Exchange
-     to get the user's email address and username. (Neither is yet
-     used, but they are available in the session object now.)
-   * page.tmpl: Add Cache-Control must-revalidate to ensure that users
-     (especially of Firefox) see fresh page content.
-   * htmlscrubber: Allow colons in urls after '?'
-   * template: Search for templates in the templatedir, if they are not
-     found as pages in the wiki."""]]
diff --git a/doc/news/version_3.20100504.mdwn b/doc/news/version_3.20100504.mdwn
new file mode 100644
index 000000000..5ed6b6b4f
--- /dev/null
+++ b/doc/news/version_3.20100504.mdwn
@@ -0,0 +1,16 @@
+ikiwiki 3.20100504 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Add parameter to displaytime to specify that it is a pubdate,
+     and in html5 mode, use time tag.
+   * Add placeholder text in search form (in html5 mode only).
+   * In html5 mode, use all the nice new semantic tags. Care was taken
+     to not change the id/class named used in the CSS, so only CSS
+     that refers to tag types needed to be changed.
+   * Add ACTIONS variable to page.tmpl, which allows plugins to add arbitrary
+     links to the action bar without modifying the template further.
+     (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
+     are kept separate for now to avoid breaking modified templates.)
+   * websetup: Only display Setup button on admins' preferences page.
+   * graphviz: Fix display of preexisting images in preview mode.
+   * Fixes a bug in skipping of illegal source files introduced in
+     3.20100427."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 66cc23a591f25344072deb07b2ccc7a4d4c89047 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 18:22:47 -0400
Subject: no more misc.tmpl

* Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
  a single template, page.tmpl.
* misc.tmpl will, however, still be read if a locally modified version
  exists. This is to avoid forcing users to update page.tmpl right now.
---
 IkiWiki.pm         | 22 +++++++++++++++-------
 debian/changelog   |  9 +++++++++
 doc/roadmap.mdwn   |  3 +++
 doc/templates.mdwn |  2 --
 4 files changed, 27 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c428de77f..d20a3709c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1742,21 +1742,29 @@ sub template ($;@) {
 
 sub misctemplate ($$;@) {
 	my $title=shift;
-	my $pagebody=shift;
+	my $content=shift;
 	
-	my $template=template("misc.tmpl");
+	my $template=template("misc.tmpl") || template("page.tmpl");
+
+	run_hooks(pagetemplate => sub {
+		shift->(page => "", destpage => "", template => $template);
+	});
+
 	$template->param(
 		title => $title,
-		indexlink => indexlink(),
 		wikiname => $config{wikiname},
-		pagebody => $pagebody,
+		content => $content,
 		baseurl => baseurl(),
 		html5 => $config{html5},
+		have_actions => 0, # force off
+		searchform => 0,   # ditto
+		parentlinks => [{  # override
+			url => $config{url},
+			page => $config{wikiname},
+		}],
 		@_,
 	);
-	run_hooks(pagetemplate => sub {
-		shift->(page => "", destpage => "", template => $template);
-	});
+
 	return $template->output;
 }
 
diff --git a/debian/changelog b/debian/changelog
index 43c907544..0c3a99f0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ikiwiki (3.20100505) UNRELEASED; urgency=low
+
+  * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
+    a single template, page.tmpl.
+  * misc.tmpl will, however, still be read if a locally modified version
+    exists. This is to avoid forcing users to update page.tmpl right now.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
+
 ikiwiki (3.20100504) unstable; urgency=low
 
   * Add parameter to displaytime to specify that it is a pubdate,
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index e257c21a2..729d22fb8 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -81,6 +81,9 @@ Probably incomplete list:
 * Enable tagbase by default (so that tag autocreation will work by default).
   Note that this is already done for wikis created by `auto-blog.setup`.
 * [[tips/html5]] on by default (some day..)
+* stop reading misc.tmpl if it exists (only done in case users have a customized
+  version, or an outdated version of page.tmpl that cannot be used by
+  misctemplate)
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 9208db0eb..2444cf14d 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -45,8 +45,6 @@ html out of ikiwiki and in the templates.
   key template to customize. [[!if test="enabled(pagetemplate)" then="""
   (The pagetemplate directive can be used to make a page use a
   different template than `page.tmpl`.)"""]]
-* `misc.tmpl` - Generic template used for any page that doesn't
-  have a custom template.
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
 * `atompage.tmpl` - Used for generating atom feeds for blogs.
-- 
cgit v1.2.3


From 83b907c35e3a03d097c004b0d66cc37f45a4410d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 18:43:49 -0400
Subject: remove misc.tmpl checking

Turns out that users with a modified page.tmpl need to modify it on
upgrade, at least to add the FORCEBASEURL (so edit preview works),
so there is no point in trying to retain compatability.
---
 IkiWiki.pm       | 2 +-
 debian/changelog | 4 ++--
 doc/roadmap.mdwn | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 54271becc..72f416489 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1744,7 +1744,7 @@ sub misctemplate ($$;@) {
 	my $title=shift;
 	my $content=shift;
 	
-	my $template=template("misc.tmpl") || template("page.tmpl");
+	my $template=template("page.tmpl");
 
 	run_hooks(pagetemplate => sub {
 		shift->(page => "", destpage => "", template => $template);
diff --git a/debian/changelog b/debian/changelog
index 0c3a99f0e..6b4ba7592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
 
   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
     a single template, page.tmpl.
-  * misc.tmpl will, however, still be read if a locally modified version
-    exists. This is to avoid forcing users to update page.tmpl right now.
+  * If you have a locally customised page.tmpl, it needs to be updated
+    to set <base> when BASEURL or FORCEBAREURL is set.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 729d22fb8..e257c21a2 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -81,9 +81,6 @@ Probably incomplete list:
 * Enable tagbase by default (so that tag autocreation will work by default).
   Note that this is already done for wikis created by `auto-blog.setup`.
 * [[tips/html5]] on by default (some day..)
-* stop reading misc.tmpl if it exists (only done in case users have a customized
-  version, or an outdated version of page.tmpl that cannot be used by
-  misctemplate)
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
-- 
cgit v1.2.3


From f52f395437a946478da2a126015c05e3e0afdc1f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 5 May 2010 21:08:41 -0400
Subject: consistently drop NAME= in templates

also add template syntax smoke test
---
 doc/ikiwiki/directive/template.mdwn |  8 ++---
 doc/templates.mdwn                  |  4 +--
 doc/templates/gitbranch.mdwn        |  2 +-
 doc/templates/note.mdwn             |  2 +-
 doc/templates/plugin.mdwn           |  2 +-
 doc/templates/popup.mdwn            |  2 +-
 templates/aggregatepost.tmpl        | 18 +++++------
 templates/archivepage.tmpl          |  6 ++--
 templates/atomitem.tmpl             | 24 +++++++-------
 templates/atompage.tmpl             | 10 +++---
 templates/blogpost.tmpl             |  8 ++---
 templates/change.tmpl               | 18 +++++------
 templates/comment.tmpl              | 30 ++++++++---------
 templates/commentmoderation.tmpl    |  4 +--
 templates/editcomment.tmpl          | 12 +++----
 templates/editpage.tmpl             | 12 +++----
 templates/feedlink.tmpl             |  8 ++---
 templates/googleform.tmpl           |  1 +
 templates/inlinepage.tmpl           | 18 +++++------
 templates/microblog.tmpl            |  4 +--
 templates/page.tmpl                 | 64 ++++++++++++++++++-------------------
 templates/pocreatepage.tmpl         |  4 +--
 templates/renamesummary.tmpl        |  4 +--
 templates/rssitem.tmpl              | 14 ++++----
 templates/titlepage.tmpl            |  2 +-
 25 files changed, 141 insertions(+), 140 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index 052ca7873..6c50fa32e 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -53,21 +53,21 @@ few things:
 * To insert the raw value of a variable, with wiki markup not yet converted
   to html, use `<TMPL_VAR raw_variable>`.
 * To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+  `<TMPL_IF variable>text</TMPL_IF>`.
 * To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+  use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
 
 Here's a sample template:
 
         <span class="infobox">
         Name: \[[<TMPL_VAR raw_name>]]<br />
         Age: <TMPL_VAR age><br />
-        <TMPL_IF NAME="color">
+        <TMPL_IF color>
         Favorite color: <TMPL_VAR color><br />
         <TMPL_ELSE>
         No favorite color.<br />
         </TMPL_IF>
-        <TMPL_IF NAME="notes">
+        <TMPL_IF notes>
         <hr />
         <TMPL_VAR notes>
         </TMPL_IF>
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 2444cf14d..8f6561fcf 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -12,9 +12,9 @@ easy to learn. All you really need to know to modify templates is this:
 
 * To insert the value of a template variable, use `<TMPL_VAR variable>`.
 * To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
+  `<TMPL_IF variable>text</TMPL_IF>`.
 * To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
+  use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
 
 [[!if test="enabled(template)" then="""
 ## template pages
diff --git a/doc/templates/gitbranch.mdwn b/doc/templates/gitbranch.mdwn
index fcce925d9..962420940 100644
--- a/doc/templates/gitbranch.mdwn
+++ b/doc/templates/gitbranch.mdwn
@@ -3,7 +3,7 @@ Available in a [[!taglink /git]] repository.<br />
 Branch: <TMPL_VAR branch><br />
 Author: <TMPL_VAR author><br />
 </span>
-<TMPL_UNLESS NAME="branch">
+<TMPL_UNLESS branch>
 This template is used to create an infobox for a git branch. It uses
 these parameters:
 
diff --git a/doc/templates/note.mdwn b/doc/templates/note.mdwn
index 4cc323c0e..9ef5ad942 100644
--- a/doc/templates/note.mdwn
+++ b/doc/templates/note.mdwn
@@ -1,7 +1,7 @@
 <div class="notebox">
 <TMPL_VAR text>
 </div>
-<TMPL_UNLESS NAME="text">
+<TMPL_UNLESS text>
 Use this template to insert a note into a page. The note will be styled to
 float to the right of other text on the page. This template has one
 parameter:
diff --git a/doc/templates/plugin.mdwn b/doc/templates/plugin.mdwn
index c1d1974d6..322c49445 100644
--- a/doc/templates/plugin.mdwn
+++ b/doc/templates/plugin.mdwn
@@ -8,7 +8,7 @@ Currently enabled: [[!if test="enabled(<TMPL_VAR name>)" then="yes" else="no"]]<
 </span>
 [[!if test="sourcepage(plugins/contrib/*)" then="""[[!meta title="<TMPL_VAR name> (third party plugin)"]]"""]]
 <TMPL_IF core>[[!tag plugins/type/core]]</TMPL_IF>
-<TMPL_UNLESS NAME="name">
+<TMPL_UNLESS name>
 This template is used to create an infobox for an ikiwiki plugin. It uses
 these parameters:
 <ul>
diff --git a/doc/templates/popup.mdwn b/doc/templates/popup.mdwn
index b355daa2e..92455eb21 100644
--- a/doc/templates/popup.mdwn
+++ b/doc/templates/popup.mdwn
@@ -1,4 +1,4 @@
-<TMPL_UNLESS NAME="mouseover">
+<TMPL_UNLESS mouseover>
 Use this template to create a popup window that is displayed when the mouse
 is over part of the page. This template has two parameters:
 <ul>
diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl
index 8b8936733..4e89efe32 100644
--- a/templates/aggregatepost.tmpl
+++ b/templates/aggregatepost.tmpl
@@ -1,15 +1,15 @@
 <TMPL_VAR CONTENT>
-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>
 [[!tag <TMPL_VAR TAG>]]
 </TMPL_LOOP>
-<TMPL_IF NAME="TITLE">
-[[!meta title="<TMPL_VAR NAME="TITLE" ESCAPE=HTML>"]]
+<TMPL_IF TITLE>
+[[!meta title="<TMPL_VAR TITLE ESCAPE=HTML>"]]
 </TMPL_IF>
-<TMPL_IF NAME="PERMALINK">
-[[!meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]]
+<TMPL_IF PERMALINK>
+[[!meta permalink="<TMPL_VAR PERMALINK ESCAPE=HTML>"]]
 </TMPL_IF>
-<TMPL_IF NAME="COPYRIGHT">
-[[!meta copyright="<TMPL_VAR NAME="COPYRIGHT" ESCAPE=HTML>"]]
+<TMPL_IF COPYRIGHT>
+[[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
 </TMPL_IF>
-[[!meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]]
-[[!meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>"]]
+[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
+[[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]]
diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl
index 28800e763..93bdd9ce0 100644
--- a/templates/archivepage.tmpl
+++ b/templates/archivepage.tmpl
@@ -1,14 +1,14 @@
 <p>
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
 </TMPL_IF>
 <i>
 Posted <TMPL_VAR CTIME>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 by <span class="author">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR AUTHOR>
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 87cbee9e0..4ed17bc62 100644
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -1,17 +1,17 @@
 <entry>
 	<title><TMPL_VAR TITLE></title>
-<TMPL_IF NAME="GUID">
+<TMPL_IF GUID>
 	<id><TMPL_VAR GUID></id>
 <TMPL_ELSE>
 	<id><TMPL_VAR URL></id>
 </TMPL_IF>
 	<link href="<TMPL_VAR PERMALINK>"/>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 	<author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
 </TMPL_IF>
-<TMPL_IF NAME="COPYRIGHT">
+<TMPL_IF COPYRIGHT>
 	<rights type="html" xml:lang="en">
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 		<TMPL_VAR LICENSE ESCAPE=HTML>
 		<TMPL_VAR COPYRIGHT ESCAPE=HTML>
 <TMPL_ELSE>
@@ -19,30 +19,30 @@
 </TMPL_IF>
 	</rights>
 <TMPL_ELSE>
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 	<rights type="html" xml:lang="en">
 	<TMPL_VAR LICENSE ESCAPE=HTML>
 	</rights>
 </TMPL_IF>
 </TMPL_IF>
-<TMPL_IF NAME="CATEGORIES">
-<TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
 	<category term="<TMPL_VAR CATEGORY>" />
 </TMPL_LOOP>
 </TMPL_IF>
 	<updated><TMPL_VAR MDATE_3339></updated>
 	<published><TMPL_VAR CDATE_3339></published>
-<TMPL_IF NAME="ENCLOSURE">
+<TMPL_IF ENCLOSURE>
 	<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
 <TMPL_ELSE>
 	<content type="html" xml:lang="en">
 	<TMPL_VAR CONTENT ESCAPE=HTML>
 	</content>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSURL">
-	<link rel="comments" href="<TMPL_VAR NAME="COMMENTSURL">" type="text/html" />
+<TMPL_IF COMMENTSURL>
+	<link rel="comments" href="<TMPL_VAR COMMENTSURL>" type="text/html" />
 </TMPL_IF>
-<TMPL_IF NAME="ATOMCOMMENTSURL">
-	<link rel="comments" href="<TMPL_VAR NAME="ATOMCOMMENTSURL">" type="application/atom+xml" />
+<TMPL_IF ATOMCOMMENTSURL>
+	<link rel="comments" href="<TMPL_VAR ATOMCOMMENTSURL>" type="application/atom+xml" />
 </TMPL_IF>
 </entry>
diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl
index fc0088ae8..e82b59827 100644
--- a/templates/atompage.tmpl
+++ b/templates/atompage.tmpl
@@ -5,15 +5,15 @@
 <link href="<TMPL_VAR PAGEURL>"/>
 <link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
 <author>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 <name><TMPL_VAR AUTHOR></name>
 <TMPL_ELSE>
 <name><TMPL_VAR WIKINAME></name>
 </TMPL_IF>
 </author>
-<TMPL_IF NAME="COPYRIGHT">
+<TMPL_IF COPYRIGHT>
 <rights type="html" xml:lang="en">
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 	<TMPL_VAR LICENSE>
 	<TMPL_VAR COPYRIGHT ESCAPE=HTML>
 <TMPL_ELSE>
@@ -21,13 +21,13 @@
 </TMPL_IF>
 </rights>
 <TMPL_ELSE>
-<TMPL_IF NAME="LICENSE">
+<TMPL_IF LICENSE>
 <rights type="html">
 	<TMPL_VAR LICENSE ESCAPE=HTML>
 </rights>
 </TMPL_IF>
 </TMPL_IF>
-<TMPL_IF NAME="GUID">
+<TMPL_IF GUID>
 <id><TMPL_VAR GUID></id>
 <TMPL_ELSE>
 <id><TMPL_VAR PAGEURL></id>
diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl
index 7eeede603..5a31e3f8a 100644
--- a/templates/blogpost.tmpl
+++ b/templates/blogpost.tmpl
@@ -1,10 +1,10 @@
 <form action="<TMPL_VAR CGIURL>" method="get">
 <div id="blogform">
-<TMPL_IF NAME="RSSURL">
-<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a>
+<TMPL_IF RSSURL>
+<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR RSSURL>">RSS</a>
 </TMPL_IF>
-<TMPL_IF NAME="ATOMURL">
-<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR NAME=ATOMURL>">Atom</a>
+<TMPL_IF ATOMURL>
+<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR ATOMURL>">Atom</a>
 </TMPL_IF>
 <input type="hidden" name="do" value="blog" />
 <input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>" />
diff --git a/templates/change.tmpl b/templates/change.tmpl
index 5f277a0fb..671b9e483 100644
--- a/templates/change.tmpl
+++ b/templates/change.tmpl
@@ -2,15 +2,15 @@
 <TMPL_IF AUTHORURL>
 [[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 </TMPL_IF>
-[[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
+[[!meta title="""change to<TMPL_LOOP PAGES> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
 <TMPL_IF PERMALINK>
 [[!meta permalink="<TMPL_VAR PERMALINK>"]]
 </TMPL_IF>
 <div id="change-<TMPL_VAR REV>" class="metadata">
 <span class="desc"><br />Changed pages:</span>
 <span class="pagelinks">
-<TMPL_LOOP NAME="PAGES">
-<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
+<TMPL_LOOP PAGES>
+<TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
 <TMPL_ELSE>
 <TMPL_VAR LINK>
 </TMPL_IF>
@@ -18,7 +18,7 @@
 </span>
 <span class="desc"><br />Changed by:</span>
 <span class="committer">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a>
 <TMPL_ELSE>
 <TMPL_VAR USER>
@@ -30,16 +30,16 @@
 <span class="changedate"><TMPL_VAR COMMITDATE></span>
 </div>
 <div class="changelog">
-<TMPL_LOOP NAME="MESSAGE">
-<TMPL_IF NAME="LINE">
-<TMPL_VAR NAME="LINE"><br />
+<TMPL_LOOP MESSAGE>
+<TMPL_IF LINE>
+<TMPL_VAR LINE><br />
 </TMPL_IF>
 </TMPL_LOOP>
 </div>
-<TMPL_IF NAME="DIFF">
+<TMPL_IF DIFF>
 <div class="diff">
 <pre>
-<TMPL_VAR NAME="DIFF">
+<TMPL_VAR DIFF>
 </pre>
 </div>
 </TMPL_IF>
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 39cba0ff9..fa90e6d26 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,5 +1,5 @@
-<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR NAME=COMMENTID>">
-<TMPL_ELSE><div class="comment" id="<TMPL_VAR NAME=COMMENTID>"></TMPL_IF>
+<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR COMMENTID>">
+<TMPL_ELSE><div class="comment" id="<TMPL_VAR COMMENTID>"></TMPL_IF>
 
 <TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF>
 <TMPL_IF PERMALINK>
@@ -15,40 +15,40 @@
 
 <TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
 Comment by
-<TMPL_IF NAME="COMMENTUSER">
-<TMPL_IF NAME="COMMENTOPENID">
+<TMPL_IF COMMENTUSER>
+<TMPL_IF COMMENTOPENID>
 <span class="author" title="OpenID">
-<a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a>
 </span>
 <TMPL_ELSE>
 <span class="author" title="Signed in">
-<TMPL_IF NAME="COMMENTAUTHORURL">
-<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<TMPL_IF COMMENTAUTHORURL>
+<a href="<TMPL_VAR COMMENTAUTHORURL>"><TMPL_VAR COMMENTAUTHOR></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=COMMENTAUTHOR>
+<TMPL_VAR COMMENTAUTHOR>
 </TMPL_IF>
 </span>
 </TMPL_IF>
 <TMPL_ELSE>
-<TMPL_IF NAME=COMMENTIP>
-<span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>">
+<TMPL_IF COMMENTIP>
+<span class="author" title="Unauthenticated, from <TMPL_VAR COMMENTIP>">
 <TMPL_ELSE>
 <span class="author" title="Unauthenticated, from unknown IP address">
 </TMPL_IF>
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
+<TMPL_VAR AUTHOR>
 </TMPL_IF>
 </span>
 </TMPL_IF>
 &mdash; <TMPL_VAR CTIME>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
+<TMPL_IF HAVE_ACTIONS>
 <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF NAME="REMOVEURL">
+<TMPL_IF REMOVEURL>
 <li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
 </TMPL_IF>
 </ul>
diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl
index 297886407..10f2b36df 100644
--- a/templates/commentmoderation.tmpl
+++ b/templates/commentmoderation.tmpl
@@ -1,4 +1,4 @@
-<TMPL_IF NAME="COMMENTS">
+<TMPL_IF COMMENTS>
 <br />
 <form action="<TMPL_VAR CGIURL>" method="post">
 <input type="hidden" name="do" value="commentmoderation" />
@@ -7,7 +7,7 @@
 <input type="checkbox" name="rejectalldefer" value="1" />
 <label for="rejectalldefer">Reject all comments marked <em>Defer</em></label>
 <br />
-<TMPL_LOOP NAME="COMMENTS">
+<TMPL_LOOP COMMENTS>
 <div>
 <div>
 <TMPL_VAR VIEW>
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index 32e8c392d..51ab10f2c 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -4,11 +4,11 @@
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
-<TMPL_UNLESS NAME=USERNAME>
-<TMPL_IF NAME=ALLOWAUTHOR>
-Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional, or
+<TMPL_UNLESS USERNAME>
+<TMPL_IF ALLOWAUTHOR>
+Name: <TMPL_VAR FIELD-AUTHOR> (optional, or
 <a href="<TMPL_VAR SIGNINURL>">signin</a>)<br />
-Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
+Website: <TMPL_VAR FIELD-URL> (optional)<br />
 <TMPL_ELSE>
 (You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)<br />
 </TMPL_IF>
@@ -16,10 +16,10 @@ Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
 Subject: <TMPL_VAR FIELD-SUBJECT><br />
 <TMPL_VAR FIELD-EDITCONTENT><br />
 <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
-<TMPL_VAR NAME="FORM-END">
+<TMPL_VAR FORM-END>
 <TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF NAME="PAGE_PREVIEW">
+<TMPL_IF PAGE_PREVIEW>
 <hr />
 <div class="header">
 <span>Comment preview:</span>
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index b1cf015a2..6d8a902a2 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -7,7 +7,7 @@
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
-<TMPL_IF NAME="PAGE_SELECT">
+<TMPL_IF PAGE_SELECT>
 Page location: <TMPL_VAR FIELD-PAGE>
 Page type: <TMPL_VAR FIELD-TYPE>
 <TMPL_ELSE>
@@ -16,21 +16,21 @@ Page type: <TMPL_VAR FIELD-TYPE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
 <TMPL_VAR FIELD-EDITCONTENT><br />
-<TMPL_IF NAME="CAN_COMMIT">
+<TMPL_IF CAN_COMMIT>
 Optional comment about this change:<br />
 <TMPL_VAR FIELD-COMMENTS><br />
 </TMPL_IF>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
-<TMPL_IF NAME="FIELD-ATTACHMENT">
+<TMPL_IF FIELD-ATTACHMENT>
 <a class="toggle" href="#attachments">Attachments</a>
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <table>
 <tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
-<TMPL_LOOP NAME="ATTACHMENT_LIST">
+<TMPL_LOOP ATTACHMENT_LIST>
 <tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
 </TMPL_LOOP>
-<TMPL_IF NAME="ATTACHMENT_LIST">
+<TMPL_IF ATTACHMENT_LIST>
 <tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
 </TMPL_IF>
 </table>
@@ -39,7 +39,7 @@ Optional comment about this change:<br />
 <TMPL_VAR FORM-END>
 <TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF NAME="PAGE_PREVIEW">
+<TMPL_IF PAGE_PREVIEW>
 <hr />
 <div class="header">
 <span>Page preview:</span>
diff --git a/templates/feedlink.tmpl b/templates/feedlink.tmpl
index 2963156c1..be8637f0f 100644
--- a/templates/feedlink.tmpl
+++ b/templates/feedlink.tmpl
@@ -1,8 +1,8 @@
 <div id="feedlink">
-<TMPL_IF NAME="RSSURL">
-<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a>
+<TMPL_IF RSSURL>
+<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR RSSURL>">RSS</a>
 </TMPL_IF>
-<TMPL_IF NAME="ATOMURL">
-<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR NAME=ATOMURL>">Atom</a>
+<TMPL_IF ATOMURL>
+<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR ATOMURL>">Atom</a>
 </TMPL_IF>
 </div>
diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl
index f39b46540..9468e062a 100644
--- a/templates/googleform.tmpl
+++ b/templates/googleform.tmpl
@@ -1,3 +1,4 @@
+
 <form method="get" action="http://www.google.com/search" id="searchform">
  <div>
   <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" />
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl
index 1e0a1674e..b0b53d041 100644
--- a/templates/inlinepage.tmpl
+++ b/templates/inlinepage.tmpl
@@ -1,9 +1,9 @@
 <TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF>
 
 <TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 <span class="author">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR AUTHOR>
@@ -11,7 +11,7 @@
 </span>
 </TMPL_IF>
 <TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF>
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
@@ -29,10 +29,10 @@
 Posted <TMPL_VAR CTIME>
 </span>
 
-<TMPL_IF NAME="TAGS">
+<TMPL_IF TAGS>
 <TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF>
 Tags:
-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>
 <TMPL_VAR LINK>
 </TMPL_LOOP>
 <TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
@@ -50,16 +50,16 @@ License: <TMPL_VAR LICENSE>
 </div>
 </TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
+<TMPL_IF HAVE_ACTIONS>
 <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF NAME="EDITURL">
+<TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSLINK">
+<TMPL_IF COMMENTSLINK>
 <li><TMPL_VAR COMMENTSLINK></li>
 <TMPL_ELSE>
-<TMPL_IF NAME="DISCUSSIONLINK">
+<TMPL_IF DISCUSSIONLINK>
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </TMPL_IF>
diff --git a/templates/microblog.tmpl b/templates/microblog.tmpl
index 2e84441cc..e22d65cce 100644
--- a/templates/microblog.tmpl
+++ b/templates/microblog.tmpl
@@ -6,9 +6,9 @@
 
 <div class="microblog-header">
 
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 <span class="author">
-<TMPL_IF NAME="AUTHORURL">
+<TMPL_IF AUTHORURL>
 <a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
 <TMPL_VAR AUTHOR>
diff --git a/templates/page.tmpl b/templates/page.tmpl
index eb76cafa6..9242ddfe3 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -6,7 +6,7 @@
 </TMPL_IF>
 <head>
 <TMPL_UNLESS ISPAGE>
-<TMPL_IF NAME="FORCEBASEURL">
+<TMPL_IF FORCEBASEURL>
 <base href="<TMPL_VAR FORCEBASEURL>" />
 <TMPL_ELSE>
 <TMPL_IF BASEURL>
@@ -17,21 +17,21 @@
 <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
 <meta http-equiv="Cache-Control" content="must-revalidate" />
 <title><TMPL_VAR TITLE></title>
-<TMPL_IF NAME="FAVICON">
+<TMPL_IF FAVICON>
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 </TMPL_IF>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<TMPL_IF NAME="LOCAL_CSS">
+<TMPL_IF LOCAL_CSS>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
 <TMPL_ELSE>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 </TMPL_IF>
-<TMPL_IF NAME="EDITURL">
+<TMPL_IF EDITURL>
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
-<TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
-<TMPL_IF NAME="RELVCS"><TMPL_VAR RELVCS></TMPL_IF>
-<TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
+<TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF>
+<TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF>
+<TMPL_IF META><TMPL_VAR META></TMPL_IF>
 </head>
 <body>
 
@@ -41,51 +41,51 @@
 <TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
 <span>
 <span class="parentlinks">
-<TMPL_LOOP NAME="PARENTLINKS">
+<TMPL_LOOP PARENTLINKS>
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/ 
 </TMPL_LOOP>
 </span>
 <span class="title">
 <TMPL_VAR TITLE>
-<TMPL_IF NAME="ISTRANSLATION">
-&nbsp;(<TMPL_VAR NAME="PERCENTTRANSLATED">%)
+<TMPL_IF ISTRANSLATION>
+&nbsp;(<TMPL_VAR PERCENTTRANSLATED>%)
 </TMPL_IF>
 </span>
 </span>
 <TMPL_IF ISPAGE>
-<TMPL_IF NAME="SEARCHFORM">
+<TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
 </TMPL_IF>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
+<TMPL_IF HAVE_ACTIONS>
 <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF NAME="EDITURL">
+<TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="RECENTCHANGESURL">
+<TMPL_IF RECENTCHANGESURL>
 <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="HISTORYURL">
+<TMPL_IF HISTORYURL>
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="GETSOURCEURL">
+<TMPL_IF GETSOURCEURL>
 <li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="PREFSURL">
+<TMPL_IF PREFSURL>
 <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="ACTIONS">
-<TMPL_LOOP NAME="ACTIONS">
+<TMPL_IF ACTIONS>
+<TMPL_LOOP ACTIONS>
 <li><TMPL_VAR ACTION></li>
 </TMPL_LOOP>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSLINK">
+<TMPL_IF COMMENTSLINK>
 <li><TMPL_VAR COMMENTSLINK></li>
 <TMPL_ELSE>
-<TMPL_IF NAME="DISCUSSIONLINK">
+<TMPL_IF DISCUSSIONLINK>
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
 </TMPL_IF>
@@ -93,16 +93,16 @@
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF NAME="OTHERLANGUAGES">
+<TMPL_IF OTHERLANGUAGES>
 <TMPL_IF HTML5><nav class="otherlanguages"><TMPL_ELSE><div class="otherlanguages"></TMPL_IF>
 <ul>
-<TMPL_LOOP NAME="OTHERLANGUAGES">
+<TMPL_LOOP OTHERLANGUAGES>
 <li>
-<a href="<TMPL_VAR NAME="URL">"><TMPL_VAR NAME="LANGUAGE"></a>
-<TMPL_IF NAME="MASTER">
+<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
+<TMPL_IF MASTER>
 (master)
 <TMPL_ELSE>
-&nbsp;(<TMPL_VAR NAME="PERCENT">%)
+&nbsp;(<TMPL_VAR PERCENT>%)
 </TMPL_IF>
 </li>
 </TMPL_LOOP>
@@ -139,25 +139,25 @@
 <TMPL_IF ISPAGE>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
-<TMPL_IF NAME="TAGS">
+<TMPL_IF TAGS>
 <TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
 Tags:
-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>
 <TMPL_VAR LINK>
 </TMPL_LOOP>
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF NAME="BACKLINKS">
+<TMPL_IF BACKLINKS>
 <TMPL_IF HTML5><nav id="backlinks"><TMPL_ELSE><div id="backlinks"></TMPL_IF>
 Links:
-<TMPL_LOOP NAME="BACKLINKS">
+<TMPL_LOOP BACKLINKS>
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
 </TMPL_LOOP>
-<TMPL_IF NAME="MORE_BACKLINKS">
+<TMPL_IF MORE_BACKLINKS>
 <span class="popup">...
 <span class="balloon">
-<TMPL_LOOP NAME="MORE_BACKLINKS">
+<TMPL_LOOP MORE_BACKLINKS>
 <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
 </TMPL_LOOP>
 </span>
diff --git a/templates/pocreatepage.tmpl b/templates/pocreatepage.tmpl
index 96c8fdd78..f22ee5092 100644
--- a/templates/pocreatepage.tmpl
+++ b/templates/pocreatepage.tmpl
@@ -1,3 +1,3 @@
 <p>
-<b>WARNING</b> this page must be written in <TMPL_VAR NAME="LANG">.
-</p>
\ No newline at end of file
+<b>WARNING</b> this page must be written in <TMPL_VAR LANG>.
+</p>
diff --git a/templates/renamesummary.tmpl b/templates/renamesummary.tmpl
index 60f81b35b..7a8dc9229 100644
--- a/templates/renamesummary.tmpl
+++ b/templates/renamesummary.tmpl
@@ -11,14 +11,14 @@
 <TMPL_IF FIXEDLINKS>
 The following pages have been automatically modified to update their links to <TMPL_VAR DEST>:
 <ul>
-<TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
+<TMPL_LOOP FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
 </ul>
 </TMPL_IF>
 <TMPL_IF BROKENLINKS_CHECKED>
 <TMPL_IF BROKENLINKS>
 The following pages still link to <TMPL_VAR SRC>:
 <ul>
-<TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
+<TMPL_LOOP BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
 </ul>
 </TMPL_IF>
 </TMPL_IF>
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 069ae1997..a64a4ebd7 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,29 +1,29 @@
 <item>
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 	<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
 	<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
 <TMPL_ELSE>
 	<title><TMPL_VAR TITLE></title>
 </TMPL_IF>
-<TMPL_IF NAME="GUID">
+<TMPL_IF GUID>
 	<guid isPermaLink="no"><TMPL_VAR GUID></guid>
 <TMPL_ELSE>
 	<guid><TMPL_VAR URL></guid>
 </TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
-<TMPL_IF NAME="CATEGORIES">
-<TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
 	<category><TMPL_VAR CATEGORY></category>
 </TMPL_LOOP>
 </TMPL_IF>
 	<pubDate><TMPL_VAR CDATE_822></pubDate>
 	<dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
-<TMPL_IF NAME="ENCLOSURE">
+<TMPL_IF ENCLOSURE>
 	<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
 <TMPL_ELSE>
 	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
 </TMPL_IF>
-<TMPL_IF NAME="COMMENTSURL">
-	<comments><TMPL_VAR NAME="COMMENTSURL"></comments>
+<TMPL_IF COMMENTSURL>
+	<comments><TMPL_VAR COMMENTSURL></comments>
 </TMPL_IF>
 </item>
diff --git a/templates/titlepage.tmpl b/templates/titlepage.tmpl
index 8a11e693e..6326bab72 100644
--- a/templates/titlepage.tmpl
+++ b/templates/titlepage.tmpl
@@ -1,5 +1,5 @@
 <p>
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
-- 
cgit v1.2.3


From 511b9c85085768197f8f595c16747982125a4909 Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <http://ptecza.myopenid.com/@web>
Date: Thu, 6 May 2010 10:51:32 +0000
Subject: * Typo

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

(limited to 'doc')

diff --git a/doc/news/version_3.20100427.mdwn b/doc/news/version_3.20100427.mdwn
index 1701fd670..61cf67141 100644
--- a/doc/news/version_3.20100427.mdwn
+++ b/doc/news/version_3.20100427.mdwn
@@ -8,7 +8,7 @@ Allowing untrusted users to upload attachments with the ".tmpl"
 extension is not recommended, as that allows anyone to change
 a wiki's templates.
 
-The --getctime switch is renamed to --gettimes, and it also gets the 
+The --getctime switch is renamed to --gettime, and it also gets the 
 file modification time. And it's a lot faster (when using git). But
 the really important change is, you don't have to remember to use this
 switch. Now ikiwiki will do it when it needs to.
-- 
cgit v1.2.3


From f0b83af9aadfb5c4755fe9079f1dc97112f49d95 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 17:18:08 -0400
Subject: add

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

(limited to 'doc')

diff --git a/doc/bugs/comments_not_searchable.mdwn b/doc/bugs/comments_not_searchable.mdwn
new file mode 100644
index 000000000..72f7bf30f
--- /dev/null
+++ b/doc/bugs/comments_not_searchable.mdwn
@@ -0,0 +1,17 @@
+The text of comments (and other internal pages) does not get indexed by the
+search plugin.
+
+Search indexes content passed to the postscan hook.
+Comments are inlined, but inline's speed hack avoids adding inlined
+content to the page until the format hook.
+
+And hmm, that's somewhat desirable, because we don't want searches
+to find content that is inlined onto another page.
+
+That suggests that the fix could be to call the postscan hook
+for internal pages. 
+
+However, the search postscan hook tells xapian the page url,
+and uses `urlto($page)` to do it. And that won't work for
+an internal page. Guess it could be modified to tell xapian the
+permalink. --[[Joey]] 
-- 
cgit v1.2.3


From 3f925ac7351bcee9a8cbbcae881681e68087de50 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 17:28:47 -0400
Subject: new todo

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

(limited to 'doc')

diff --git a/doc/todo/comment_moderation_feed.mdwn b/doc/todo/comment_moderation_feed.mdwn
new file mode 100644
index 000000000..267706b1b
--- /dev/null
+++ b/doc/todo/comment_moderation_feed.mdwn
@@ -0,0 +1,9 @@
+There should be a way to generate a feed that is updated whenever a new
+comment needs moderation. Otherwise, it can be hard to remember to check
+sites, which may rarely get comments.
+
+The feed should not include the comment subject or body, but could mention
+the author. It would be especially handy if it was generated statically.
+One way would be to generate internal pages corresponding to each comment
+that needs moderation; then the feed could be constructed via a usual
+inline.
-- 
cgit v1.2.3


From 7f64ff2ae0e2f2769cf0d0c0c9bc4b370a94b0b7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 17:32:19 -0400
Subject: url to myopenid affiliate program has changed

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

(limited to 'doc')

diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 91fc7cddc..cd05bb1ad 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -16,7 +16,7 @@ to the url of a third-party site where users can sign up for an OpenID. If
 it's set, the signin page will link to that site.
 
 This plugin supports the
-[myopenid.com affiliate program](http://myopenid.com/affiliate_welcome),
+[myopenid.com affiliate program](http://myopenid.com/affiliate),
 which can be used to help users sign up for an OpenID and log into your
 site in a single, unified process. When you create the affiliate, specify a
 login url like `http://example.com/ikiwiki.cgi?do=continue`. Once the
-- 
cgit v1.2.3


From d9d910f6765de6ba07508ab56a5a0f93edb4c8ad Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 19:19:51 -0400
Subject: moved comments pending moderation

* comments: Comments pending moderation are now stored in the srcdir
  alongside accepted comments, but with a `._comment_pending` extension.
* This allows easier byhand moderation, as the "_pending" need
  only be stripped off and the comment be committed to version control.
* The `comment_pending()` pagespec can be used to match such unmoderated
  comments, which makes it easy to add a feed of them, or a counter
  indicating how many there are.
* Belatedly added a `comment()` pagespec.
---
 IkiWiki.pm                  |   4 +-
 IkiWiki/Plugin/comments.pm  | 130 +++++++++++++++++++++++++++++++-------------
 debian/NEWS                 |   6 ++
 debian/changelog            |   8 +++
 doc/ikiwiki/pagespec.mdwn   |   2 +
 doc/plugins/comments.mdwn   |   4 +-
 doc/tips/comments_feed.mdwn |   9 ++-
 ikiwiki.spec                |   2 +-
 8 files changed, 121 insertions(+), 44 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 43995fc96..11cfcdfd2 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2342,12 +2342,12 @@ sub match_glob ($$;@) {
 }
 
 sub match_internal ($$;@) {
-	return match_glob($_[0], $_[1], @_, internal => 1)
+	return match_glob(shift, shift, @_, internal => 1)
 }
 
 sub match_page ($$;@) {
 	my $page=shift;
-	my $match=match_glob($page, $_[1], @_);
+	my $match=match_glob($page, shift, @_);
 	if ($match && ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
 		return IkiWiki::FailReason->new("$page is not a page");
 	}
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 89560c88b..448ef02f7 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -26,8 +26,11 @@ sub import {
 	hook(type => "preprocess", id => '_comment', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
 	hook(type => "htmlize", id => "_comment", call => \&htmlize);
+	hook(type => "htmlize", id => "_comment_pending",
+		call => \&htmlize_pending);
 	hook(type => "pagetemplate", id => "comments", call => \&pagetemplate);
-	hook(type => "formbuilder_setup", id => "comments", call => \&formbuilder_setup);
+	hook(type => "formbuilder_setup", id => "comments",
+		call => \&formbuilder_setup);
 	# Load goto to fix up user page links for logged-in commenters
 	IkiWiki::loadplugin("goto");
 	IkiWiki::loadplugin("inline");
@@ -104,6 +107,14 @@ sub htmlize {
 	return $params{content};
 }
 
+sub htmlize_pending {
+	my %params = @_;
+	return sprintf(gettext("comment pending %s"),
+		'<a href="'.
+		IkiWiki::cgiurl(do => "commentmoderation").'">'.
+		gettext("moderation").'</a>');
+}
+
 # FIXME: copied verbatim from meta
 sub safeurl ($) {
 	my $url=shift;
@@ -462,9 +473,15 @@ sub editcomment ($$) {
 		$postcomment=0;
 
 		if (! $ok) {
-			my $penddir=$config{wikistatedir}."/comments_pending";
-			$location=unique_comment_location($page, $content, $penddir);
-			writefile("$location._comment", $penddir, $content);
+			$location=unique_comment_location($page, $content, $config{srcdir});
+			writefile("$location._comment_pending", $config{srcdir}, $content);
+
+			# Refresh so anything that deals with pending
+			# comments can be updated.
+			require IkiWiki::Render;
+			IkiWiki::refresh();
+			IkiWiki::saveindex();
+
 			IkiWiki::printheader($session);
 			print IkiWiki::misctemplate(gettext(gettext("comment stored for moderation")),
 				"<p>".
@@ -540,21 +557,24 @@ sub commentmoderation ($$) {
 		my %vars=$cgi->Vars;
 		my $added=0;
 		foreach my $id (keys %vars) {
-			if ($id =~ /(.*)\Q._comment\E$/) {
+			if ($id =~ /(.*)\Q._comment(?:_pending)?\E$/) {
 				my $action=$cgi->param($id);
 				next if $action eq 'Defer' && ! $rejectalldefer;
 
 				# Make sure that the id is of a legal
-				# pending comment before untainting.
-				my ($f)= $id =~ /$config{wiki_file_regexp}/;
+				# pending comment.
+				my ($f) = $id =~ /$config{wiki_file_regexp}/;
 				if (! defined $f || ! length $f ||
 				    IkiWiki::file_pruned($f)) {
 					error("illegal file");
 				}
 
-				my $page=IkiWiki::possibly_foolish_untaint(IkiWiki::dirname($1));
-				my $file="$config{wikistatedir}/comments_pending/".
-					IkiWiki::possibly_foolish_untaint($id);
+				my $page=IkiWiki::dirname($f);
+				my $file="$config{srcdir}/$f";
+				if (! -e $file) {
+					# old location
+					$file="$config{wikistatedir}/comments_pending/".$f;
+				}
 
 				if ($action eq 'Accept') {
 					my $content=eval { readfile($file) };
@@ -567,9 +587,6 @@ sub commentmoderation ($$) {
 					$added++;
 				}
 
-				# This removes empty subdirs, so the
-				# .ikiwiki/comments_pending dir will
-				# go away when all are moderated.
 				require IkiWiki::Render;
 				IkiWiki::prune($file);
 			}
@@ -596,15 +613,14 @@ sub commentmoderation ($$) {
 	}
 
 	my @comments=map {
-		my ($id, $ctime)=@{$_};
-		my $file="$config{wikistatedir}/comments_pending/$id";
-		my $content=readfile($file);
+		my ($id, $dir, $ctime)=@{$_};
+		my $content=readfile("$dir/$id");
 		my $preview=previewcomment($content, $id,
-			IkiWiki::dirname($_), $ctime);
+			$id, $ctime);
 		{
 			id => $id,
 			view => $preview,
-		} 
+		}
 	} sort { $b->[1] <=> $a->[1] } comments_pending();
 
 	my $template=template("commentmoderation.tmpl");
@@ -635,26 +651,35 @@ sub formbuilder_setup (@) {
 }
 
 sub comments_pending () {
-	my $dir="$config{wikistatedir}/comments_pending/";
-	return unless -d $dir;
-
 	my @ret;
+
 	eval q{use File::Find};
 	error($@) if $@;
-	find({
-		no_chdir => 1,
-		wanted => sub {
-			my $file=decode_utf8($_);
-			$file=~s/^\Q$dir\E\/?//;
-			return if ! length $file || IkiWiki::file_pruned($file)
-				|| -l $_ || -d _ || $file !~ /\Q._comment\E$/;
-			my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-			if (defined $f) {
-				my $ctime=(stat($_))[10];
-				push @ret, [$f, $ctime];
+
+	my $find_comments=sub {
+		my $dir=shift;
+		my $extension=shift;
+		return unless -d $dir;
+		find({
+			no_chdir => 1,
+			wanted => sub {
+				my $file=decode_utf8($_);
+				$file=~s/^\Q$dir\E\/?//;
+				return if ! length $file || IkiWiki::file_pruned($file)
+					|| -l $_ || -d _ || $file !~ /\Q$extension\E$/;
+				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+				if (defined $f) {
+					my $ctime=(stat($_))[10];
+					push @ret, [$f, $dir, $ctime];
+				}
 			}
-		}
-	}, $dir);
+		}, $dir);
+	};
+	
+	$find_comments->($config{srcdir}, "._comment_pending");
+	# old location
+	$find_comments->("$config{wikistatedir}/comments_pending/",
+		"._comment");
 
 	return @ret;
 }
@@ -689,7 +714,7 @@ sub previewcomment ($$$) {
 sub commentsshown ($) {
 	my $page=shift;
 
-	return ! pagespec_match($page, "internal(*/$config{comments_pagename}*)",
+	return ! pagespec_match($page, "comment(*)",
 	                        location => $page) &&
 	       pagespec_match($page, $config{comments_pagespec},
 	                      location => $page);
@@ -719,7 +744,7 @@ sub pagetemplate (@) {
 		my $comments = undef;
 		if ($shown) {
 			$comments = IkiWiki::preprocess_inline(
-				pages => "internal($page/$config{comments_pagename}*)",
+				pages => "comment($page)",
 				template => 'comment',
 				show => 0,
 				reverse => 'yes',
@@ -847,7 +872,8 @@ sub unique_comment_location ($$$) {
 	do {
 		$i++;
 		$location = "$page/$config{comments_pagename}${i}_${content_md5}";
-	} while (-e "$dir/$location._comment");
+	} while (-e "$dir/$location._comment" ||
+	         -e "$dir/$location._comment_pending");
 
 	return $location;
 }
@@ -873,7 +899,35 @@ sub match_postcomment ($$;@) {
 	if (! $postcomment) {
 		return IkiWiki::FailReason->new("not posting a comment");
 	}
-	return match_glob($page, $glob);
+	return match_glob($page, $glob, @_);
+}
+
+sub match_comment ($$;@) {
+	my $page = shift;
+	my $glob = shift;
+
+	my $match=match_glob($page, "$glob/*", @_);
+	if ($match) {
+		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+		if ($type ne "_comment") {
+			return IkiWiki::FailReason->new("$page is not a comment");
+		}
+	}
+	return $match;
+}
+
+sub match_comment_pending ($$;@) {
+	my $page = shift;
+	my $glob = shift;
+
+	my $match=match_glob($page, "$glob/*", @_);
+	if ($match) {
+		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+		if ($type ne "_comment_pending") {
+			return IkiWiki::FailReason->new("$page is not a pending comment");
+		}
+	}
+	return $match;
 }
 
 1
diff --git a/debian/NEWS b/debian/NEWS
index 4e0c7810b..b751f1478 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,5 +1,11 @@
 ikiwiki (3.20100505) UNRELEASED; urgency=low
 
+  There is a new "comment()" pagespec, that can be used to match a comment
+  on a page. It is recommended it be used instead of the old
+  method of using a pagespec such as "internal(comment_*)" to match
+  things that looked like comments. The old pagespec will now also match
+  comments that are held for moderation; likely not what you want.
+
   There is a significant change to the page.tmpl template in this version.
   If you have locally modified versions of that template, you will need
   to update it to contain the following in the HTML <head>:
diff --git a/debian/changelog b/debian/changelog
index 6b4ba7592..5b51a74f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,14 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     a single template, page.tmpl.
   * If you have a locally customised page.tmpl, it needs to be updated
     to set <base> when BASEURL or FORCEBAREURL is set.
+  * comments: Comments pending moderation are now stored in the srcdir
+    alongside accepted comments, but with a `._comment_pending` extension.
+  * This allows easier byhand moderation, as the "_pending" need
+    only be stripped off and the comment be committed to version control.
+  * The `comment_pending()` pagespec can be used to match such unmoderated
+    comments, which makes it easy to add a feed of them, or a counter
+    indicating how many there are.
+  * Belatedly added a `comment()` pagespec.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 1c99aefac..c66395f84 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -51,6 +51,8 @@ Some more elaborate limits can be added to what matches using these functions:
   wiki admins.
 * "`ip(address)`" - tests whether a modification is being made from the
   specified IP address.
+* "`comment(glob)`" - matches comments to a page matching the glob.
+* "`comment_pending(glob)`" - matches unmoderated, pending comments.
 * "`postcomment(glob)`" - matches only when comments are being 
   posted to a page matching the specified glob
 
diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn
index 775ef75a0..14bd28a04 100644
--- a/doc/plugins/comments.mdwn
+++ b/doc/plugins/comments.mdwn
@@ -49,5 +49,5 @@ held for moderation. (Or with the [[moderatedcomments]] plugin, all
 comments will be held.) Wiki admins can access the comment moderation queue
 via a button on their Preferences page.
 
-The comments are stored in `.ikiwiki/comments_pending/`, and can be
-deleted, or moved into the wiki's srcdir to be posted.
+The unmoderated comments are stored in the `srcdir` with a filename ending
+in "._comment_pending". They are not checked into revision control.
diff --git a/doc/tips/comments_feed.mdwn b/doc/tips/comments_feed.mdwn
index 6d4dbb803..3d6a8c449 100644
--- a/doc/tips/comments_feed.mdwn
+++ b/doc/tips/comments_feed.mdwn
@@ -3,8 +3,15 @@ blog can have comments added to them. Pages with comments even have special
 feeds that can be used to subscribe to those comments. But you'd like to
 add a feed that contains all the comments posted to any page. Here's how:
 
-	\[[!inline pages="internal(*/comment_*)" template=comment]]
+	\[[!inline pages="comment(*)" template=comment]]
 
 The special [[ikiwiki/PageSpec]] matches all comments. The
 [[template|templates]] causes the comments to be displayed formatted
 nicely.
+
+---
+
+It's also possible to make a feed of comments that are held pending
+moderation.
+
+	\[[!inline pages="comment_pending(*)" template=comment]]
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 76398e9fb..b2b5af3dc 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100504
+Version: 3.20100505
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
-- 
cgit v1.2.3


From 931045301a3a5be917b775277f2a3088209a00f2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 21:45:17 -0400
Subject: Gave comment and page editing forms some CSS and accessability love.

In particular, added <label> tags.

(However, could not find a good way to add a label tag for the main
page edit textarea.)
---
 debian/changelog           |  1 +
 doc/style.css              | 14 ++++++++++++++
 templates/editcomment.tmpl | 33 ++++++++++++++++++++++++---------
 templates/editpage.tmpl    | 28 +++++++++++++++++-----------
 4 files changed, 56 insertions(+), 20 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 6b4ba7592..77fd13826 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     a single template, page.tmpl.
   * If you have a locally customised page.tmpl, it needs to be updated
     to set <base> when BASEURL or FORCEBAREURL is set.
+  * Gave comment and page editing forms some CSS and accessability love.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/style.css b/doc/style.css
index f2f558497..393f40135 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -419,6 +419,20 @@ span.color {
 	padding: 3px;
 }
 
+label.block {    
+	display: block;   
+}
+label.inline {    
+	display: inline;
+}
+ol.form {
+	list-style: none;
+	padding: 0;
+}
+li.form {
+	padding-bottom: 1em;
+}
+
 /* Used by the highlight plugin. */
 pre.hl { color:#000000; background-color:#ffffff; }
 .hl.num { color:#2928ff; }
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index 51ab10f2c..f3a8e7395 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -4,22 +4,37 @@
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
-<TMPL_UNLESS USERNAME>
-<TMPL_IF ALLOWAUTHOR>
-Name: <TMPL_VAR FIELD-AUTHOR> (optional, or
-<a href="<TMPL_VAR SIGNINURL>">signin</a>)<br />
-Website: <TMPL_VAR FIELD-URL> (optional)<br />
+<ol class="form">
+<TMPL_UNLESS NAME=USERNAME>
+<TMPL_IF NAME=ALLOWAUTHOR>
+<li>
+<label for="author" class="block">Name:</label>
+<TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>)
+</li>
+<li>
+<label for="url" class="block">Website:</label>
+<TMPL_VAR NAME=FIELD-URL> (optional)
+</li>
 <TMPL_ELSE>
-(You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)<br />
+<li>
+(You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)
+</li>
 </TMPL_IF>
 </TMPL_UNLESS>
-Subject: <TMPL_VAR FIELD-SUBJECT><br />
+<li>
+<label for="subject" class="block">Subject:</label>
+<TMPL_VAR FIELD-SUBJECT><br />
+</li>
+<li>
+<label for="editcontent" class="block">Comment:</label>
 <TMPL_VAR FIELD-EDITCONTENT><br />
+</li>
+</ol>
 <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
-<TMPL_VAR FORM-END>
+<TMPL_VAR NAME="FORM-END">
 <TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF PAGE_PREVIEW>
+<TMPL_IF NAME="PAGE_PREVIEW">
 <hr />
 <div class="header">
 <span>Comment preview:</span>
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 6d8a902a2..1e2d070ed 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,4 +1,3 @@
-<br />
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
 <TMPL_VAR FORM-START>
@@ -7,30 +6,37 @@
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
-<TMPL_IF PAGE_SELECT>
-Page location: <TMPL_VAR FIELD-PAGE>
-Page type: <TMPL_VAR FIELD-TYPE>
+<ol class="form">
+<TMPL_IF NAME="PAGE_SELECT">
+<li>
+<label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE>
+<label for="type" class="inline">Page type:</label><TMPL_VAR FIELD-TYPE>
+</li>
 <TMPL_ELSE>
-<br />
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
+<li>
 <TMPL_VAR FIELD-EDITCONTENT><br />
-<TMPL_IF CAN_COMMIT>
-Optional comment about this change:<br />
+</li>
+<TMPL_IF NAME="CAN_COMMIT">
+<li>
+<label for="comments" class="block">Optional comment about this change:</label>
 <TMPL_VAR FIELD-COMMENTS><br />
+</li>
 </TMPL_IF>
+</ol>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
-<TMPL_IF FIELD-ATTACHMENT>
+<TMPL_IF NAME="FIELD-ATTACHMENT">
 <a class="toggle" href="#attachments">Attachments</a>
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <table>
 <tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
-<TMPL_LOOP ATTACHMENT_LIST>
+<TMPL_LOOP NAME="ATTACHMENT_LIST">
 <tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
 </TMPL_LOOP>
-<TMPL_IF ATTACHMENT_LIST>
+<TMPL_IF NAME="ATTACHMENT_LIST">
 <tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
 </TMPL_IF>
 </table>
@@ -39,7 +45,7 @@ Optional comment about this change:<br />
 <TMPL_VAR FORM-END>
 <TMPL_VAR WMD_PREVIEW>
 
-<TMPL_IF PAGE_PREVIEW>
+<TMPL_IF NAME="PAGE_PREVIEW">
 <hr />
 <div class="header">
 <span>Page preview:</span>
-- 
cgit v1.2.3


From a47e835f3a97c9f490622f21562b32fbf527ef1b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 21:55:26 -0400
Subject: reordered some sections

---
 doc/style.css | 217 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 98 insertions(+), 119 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 393f40135..5f77037e4 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -4,6 +4,7 @@
  * local.css and use it to override or change settings in this one.
  */
 
+/* html5 compat */
 article,
 header,
 footer,
@@ -164,7 +165,6 @@ div.recentchanges {
 	width: 60%;
 }
 
-/* Used for adding a blog page. */
 #blogform {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
@@ -189,53 +189,6 @@ div.recentchanges {
 	color: #C00;
 }
 
-/* Used for invalid form fields. */
-.fb_invalid {
-	color: red;
-	background: white !important;
-}
-
-/* Used for required form fields. */
-.fb_required {
-	font-weight: bold;
-}
-
-/* Orange feed button. */
-.feedbutton {
-	background: #ff6600;
-	color: white !important;
-	border-left: 1px solid #cc9966;
-	border-top: 1px solid #ccaa99;
-	border-right: 1px solid #993300;
-	border-bottom: 1px solid #331100;
-	padding: 0px 0.5em 0px 0.5em;
-	font-family: sans-serif;
-	font-weight: bold;
-	font-size: small;
-	text-decoration: none;
-	margin-top: 1em;
-}
-.feedbutton:hover {
-	color: white !important;
-	background: #ff9900;
-}
-
-/* Tag cloud. */
-.pagecloud {
-	float: right;
-	width: 30%;
-	text-align: center;
-	padding: 10px 10px;
-	border: 1px solid #aaa;
-	background: #eee;
-	color: black !important;
-}
-.smallestPC { font-size: 70%; }
-.smallPC { font-size: 85%; }
-.normalPC { font-size: 100%; }
-.bigPC { font-size: 115%; }
-.biggestPC { font-size: 130%; }
-
 .sidebar {
 	width: 30ex;
 	float: right;
@@ -248,32 +201,6 @@ div.recentchanges {
 	color: black !important;
 }
 
-/* outlines */
-li.L1 {
-	list-style: upper-roman;
-}
-li.L2 {
-	list-style: decimal;
-}
-li.L3 {
-	list-style: lower-alpha;
-}
-li.L4 {
-	list-style: disc;
-}
-li.L5 {
-	list-style: square;
-}
-li.L6 {
-	list-style: circle;
-}
-li.L7 {
-	list-style: lower-roman;
-}
-li.L8 {
-	list-style: upper-alpha;
-}
-
 hr.poll {
 	height: 10pt;
 	color: white !important;
@@ -287,6 +214,27 @@ div.poll {
 	border: 1px solid #aaa;
 }
 
+span.color {
+	padding: 2px;
+}
+
+.comment-header,
+.microblog-header {
+	font-style: italic;
+	margin-top: .3em;
+}
+.comment .author,
+.microblog .author {
+	font-weight: bold;
+}
+.comment-subject {
+	font-weight: bold;
+}
+.comment {
+	border: 1px solid #aaa;
+	padding: 3px;
+}
+
 div.progress {
 	margin-top: 1ex;
 	margin-bottom: 1ex;
@@ -303,23 +251,7 @@ div.progress-done {
 	padding: 1px;
 }
 
-input#openid_url {
-	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 0 50%;
-	color: #000;
-	padding-left: 18px;
-}
-
-input#searchbox {
-	background: url(wikiicons/search-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 100% 50%;
-	color: #000;
-	padding-right: 16px;
-}
-
-/* Things to hide in printouts. */
+/* things to hide in printouts */
 @media print {
 	.actions { display: none; }
 	.tags { display: none; }
@@ -329,7 +261,7 @@ input#searchbox {
 	#backlinks { display: none; }
 }
 
-/* Provided for use by template plugin for floating info boxes. */
+/* infobox template */
 .infobox {
 	float: right;
 	margin-left: 2ex;
@@ -341,7 +273,7 @@ input#searchbox {
 	color: black !important;
 }
 
-/* Provided for use by template plugin for floating note boxes. */
+/* notebox template */
 .notebox {
 	float: right;
 	margin-left: 2ex;
@@ -354,7 +286,7 @@ input#searchbox {
 	color: black !important;
 }
 
-/* Used by the popup template and for backlinks hiding. */
+/* popup template and backlinks hiding */
 .popup {
 	border-bottom: 1px dotted #366;
 	color: #366;
@@ -375,7 +307,7 @@ input#searchbox {
 	color: black;
 }
 
-/* Formbuilder styling */
+/* form styling */
 fieldset {
 	margin: 1ex 0;
 	border: 1px solid black;
@@ -397,28 +329,6 @@ legend {
 	background: #eee; 
 	color: black !important;
 }
-
-span.color {
-	padding: 2px;
-}
-
-.comment-header,
-.microblog-header {
-	font-style: italic;
-	margin-top: .3em;
-}
-.comment .author,
-.microblog .author {
-	font-weight: bold;
-}
-.comment-subject {
-	font-weight: bold;
-}
-.comment {
-	border: 1px solid #aaa;
-	padding: 3px;
-}
-
 label.block {    
 	display: block;   
 }
@@ -432,8 +342,31 @@ ol.form {
 li.form {
 	padding-bottom: 1em;
 }
+input#openid_url {
+	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 0 50%;
+	color: #000;
+	padding-left: 18px;
+}
+input#searchbox {
+	background: url(wikiicons/search-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 100% 50%;
+	color: #000;
+	padding-right: 16px;
+}
+/* invalid form fields */
+.fb_invalid {
+	color: red;
+	background: white !important;
+}
+/* required form fields */
+.fb_required {
+	font-weight: bold;
+}
 
-/* Used by the highlight plugin. */
+/* highlight plugin */
 pre.hl { color:#000000; background-color:#ffffff; }
 .hl.num { color:#2928ff; }
 .hl.esc { color:#ff00ff; }
@@ -450,7 +383,7 @@ pre.hl { color:#000000; background-color:#ffffff; }
 .hl.kwc { color:#000000; font-weight:bold; }
 .hl.kwd { color:#010181; }
 
-/* For the calendar plugin. */
+/* calendar plugin */
 .month-calendar-day-this-day { background-color: #eee; }
 .year-calendar-this-month { background-color: #eee; }
 .month-calendar-arrow A:link,
@@ -461,3 +394,49 @@ pre.hl { color:#000000; background-color:#ffffff; }
 	font-weight: normal;
 	font-size: 150%;
 }
+
+/* outlines */
+li.L1 { list-style: upper-roman; }
+li.L2 { list-style: decimal; }
+li.L3 { list-style: lower-alpha; }
+li.L4 { list-style: disc; }
+li.L5 { list-style: square; }
+li.L6 { list-style: circle; }
+li.L7 { list-style: lower-roman; }
+li.L8 { list-style: upper-alpha; }
+
+/* tag cloud */
+.pagecloud {
+	float: right;
+	width: 30%;
+	text-align: center;
+	padding: 10px 10px;
+	border: 1px solid #aaa;
+	background: #eee;
+	color: black !important;
+}
+.smallestPC { font-size: 70%; }
+.smallPC { font-size: 85%; }
+.normalPC { font-size: 100%; }
+.bigPC { font-size: 115%; }
+.biggestPC { font-size: 130%; }
+
+/* orange feed button */
+.feedbutton {
+	background: #ff6600;
+	color: white !important;
+	border-left: 1px solid #cc9966;
+	border-top: 1px solid #ccaa99;
+	border-right: 1px solid #993300;
+	border-bottom: 1px solid #331100;
+	padding: 0px 0.5em 0px 0.5em;
+	font-family: sans-serif;
+	font-weight: bold;
+	font-size: small;
+	text-decoration: none;
+	margin-top: 1em;
+}
+.feedbutton:hover {
+	color: white !important;
+	background: #ff9900;
+}
-- 
cgit v1.2.3


From 121e2ffc2f25bf264a68d35e80a9386995fa9e5a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 23:07:08 -0400
Subject: Renamed postscan hook to indexhtml, to reflect its changed position.

Probably only the search plugin uses it, so this seemed safe.
---
 IkiWiki/Plugin/search.pm                                      | 2 +-
 IkiWiki/Plugin/skeleton.pm.example                            | 6 +++---
 IkiWiki/Render.pm                                             | 2 +-
 debian/changelog                                              | 2 ++
 doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn | 2 +-
 doc/plugins/po/discussion.mdwn                                | 2 +-
 doc/plugins/write.mdwn                                        | 6 +++---
 7 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 9e875c79c..b1f4747fe 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -10,7 +10,7 @@ sub import {
 	hook(type => "getsetup", id => "search", call => \&getsetup);
 	hook(type => "checkconfig", id => "search", call => \&checkconfig);
 	hook(type => "pagetemplate", id => "search", call => \&pagetemplate);
-	hook(type => "postscan", id => "search", call => \&index);
+	hook(type => "indexhtml", id => "search", call => \&index);
 	hook(type => "delete", id => "search", call => \&delete);
 	hook(type => "cgi", id => "search", call => \&cgi);
 }
diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example
index a404e24af..34713c73b 100644
--- a/IkiWiki/Plugin/skeleton.pm.example
+++ b/IkiWiki/Plugin/skeleton.pm.example
@@ -20,7 +20,7 @@ sub import {
 	hook(type => "scan", id => "skeleton", call => \&scan);
 	hook(type => "htmlize", id => "skeleton", call => \&htmlize);
 	hook(type => "sanitize", id => "skeleton", call => \&sanitize);
-	hook(type => "postscan", id => "skeleton", call => \&postscan);
+	hook(type => "indexhtml", id => "skeleton", call => \&indexhtml);
 	hook(type => "format", id => "skeleton", call => \&format);
 	hook(type => "pagetemplate", id => "skeleton", call => \&pagetemplate);
 	hook(type => "templatefile", id => "skeleton", call => \&templatefile);
@@ -118,10 +118,10 @@ sub sanitize (@) {
 	return $params{content};
 }
 
-sub postscan (@) {
+sub indexhtml (@) {
 	my %params=@_;
 	
-	debug("skeleton plugin running as postscan");
+	debug("skeleton plugin running as indexhtml");
 }
 
 sub format (@) {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e5ba0079b..30e3d4199 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -62,7 +62,7 @@ sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
 	
-	run_hooks(postscan => sub {
+	run_hooks(indexhtml => sub {
 		shift->(page => $page, content => $content);
 	});
 
diff --git a/debian/changelog b/debian/changelog
index 77fd13826..eb67c2bde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * If you have a locally customised page.tmpl, it needs to be updated
     to set <base> when BASEURL or FORCEBAREURL is set.
   * Gave comment and page editing forms some CSS and accessability love.
+  * Renamed postscan hook to indexhtml, to reflect its changed position,
+    and typical use.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
index be14e5126..c6e3cd4fd 100644
--- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
+++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn
@@ -144,7 +144,7 @@ So, looking at your meta branch: --[[Joey]]
   has no title, then A will display the link as "B". Now page B is modified
   and a title is added. Nothing updates "A".
   The added overhead of rebuilding every page that links to B when B is
-  changed (as the `postscan` hook of the po plugin does) is IMHO a killer.
+  changed (as the `indexhtml` hook of the po plugin does) is IMHO a killer.
   That could be hundreds or thousands of pages, making interactive editing
   way slow. This is probably the main reason I had not attempted this whole
   thing myself. IMHO this calls for some kind of intellegent dependency
diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn
index ab822e76c..27683f1ea 100644
--- a/doc/plugins/po/discussion.mdwn
+++ b/doc/plugins/po/discussion.mdwn
@@ -513,7 +513,7 @@ finish it at some point in the first quarter of 2009. --[[intrigeri]]
 >>>>
 >>>>> Done. --[[intrigeri]]
 >>> 
-> * I'm very fearful of the `add_depends` in `postscan`. 
+> * I'm very fearful of the `add_depends` in `indexhtml`. 
 >   Does this make every page depend on every page that links
 >   to it? Won't this absurdly bloat the dependency pagespecs
 >   and slow everything down? And since nicepagetitle is given
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 3b1d770eb..7180237a4 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -39,7 +39,7 @@ built.
 Now that it knows what pages it needs to build, ikiwiki runs two
 compile passes. First, it runs `scan` hooks, which collect metadata about
 the pages. Then it runs a page rendering pipeline, by calling in turn these
-hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `postscan`,
+hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `indexhtml`,
 `pagetemplate`, `sanitize`, `format`.
 
 After all necessary pages are built, it calls the `change` hook. Finally,
@@ -282,9 +282,9 @@ like `Makefile` that have no extension.
 If `hook` is passed an optional "longname" parameter, this value is used
 when prompting a user to choose a page type on the edit page form.
 
-### postscan
+### indexhtml
 
-	hook(type => "postscan", id => "foo", call => \&postscan);
+	hook(type => "indexhtml", id => "foo", call => \&indexhtml);
 
 This hook is called once the page has been converted to html (but before
 the generated html is put in a template). The most common use is to
-- 
cgit v1.2.3


From ea4967f184bf0a27eaa2dc81da1084780756156a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 23:20:48 -0400
Subject: inline: Call indexhtml when inlining internal pages, so their text
 can be indexed for searching.

---
 IkiWiki/Plugin/inline.pm | 7 +++++++
 IkiWiki/Plugin/search.pm | 6 +++---
 IkiWiki/Render.pm        | 2 +-
 debian/changelog         | 2 ++
 doc/plugins/write.mdwn   | 4 ++--
 5 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 933e30646..715a3d652 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -476,6 +476,13 @@ sub get_inline_content ($$) {
 		       filter($page, $destpage,
 		       readfile(srcfile($file))))));
 		$nested--;
+		if (isinternal($page)) {
+			# make inlined text of internal pages searchable
+			run_hooks(indexhtml => sub {
+				shift->(page => $page, destpage => $page,
+					content => $ret);
+			});
+		}
 	}
 	
 	if ($cached_destpage ne $destpage) {
diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index b1f4747fe..c578b44ab 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -10,7 +10,7 @@ sub import {
 	hook(type => "getsetup", id => "search", call => \&getsetup);
 	hook(type => "checkconfig", id => "search", call => \&checkconfig);
 	hook(type => "pagetemplate", id => "search", call => \&pagetemplate);
-	hook(type => "indexhtml", id => "search", call => \&index);
+	hook(type => "indexhtml", id => "search", call => \&indexhtml);
 	hook(type => "delete", id => "search", call => \&delete);
 	hook(type => "cgi", id => "search", call => \&cgi);
 }
@@ -68,7 +68,7 @@ sub pagetemplate (@) {
 
 my $scrubber;
 my $stemmer;
-sub index (@) {
+sub indexhtml (@) {
 	my %params=@_;
 
 	setupfiles();
@@ -117,7 +117,7 @@ sub index (@) {
 	eval q{use HTML::Entities};
 	error $@ if $@;
 	$doc->set_data(
-		"url=".urlto($params{page}, "")."\n".
+		"url=".urlto($params{destpage}, "")."\n".
 		"sample=".decode_entities($sample)."\n".
 		"caption=".decode_entities($caption)."\n".
 		"modtime=$IkiWiki::pagemtime{$params{page}}\n".
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 30e3d4199..b0bd8dee0 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -63,7 +63,7 @@ sub genpage ($$) {
 	my $content=shift;
 	
 	run_hooks(indexhtml => sub {
-		shift->(page => $page, content => $content);
+		shift->(page => $page, destpage => $page, content => $content);
 	});
 
 	my $templatefile;
diff --git a/debian/changelog b/debian/changelog
index eb67c2bde..10a4912af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * Gave comment and page editing forms some CSS and accessability love.
   * Renamed postscan hook to indexhtml, to reflect its changed position,
     and typical use.
+  * inline: Call indexhtml when inlining internal pages, so their
+    text can be indexed for searching.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 7180237a4..193005565 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -290,8 +290,8 @@ This hook is called once the page has been converted to html (but before
 the generated html is put in a template). The most common use is to
 update search indexes. Added in ikiwiki 2.54.
 
-The function is passed named parameters "page" and "content". Its return
-value is ignored.
+The function is passed named parameters "page", "destpage", and "content".
+Its return value is ignored.
 
 ### pagetemplate
 
-- 
cgit v1.2.3


From 300001184ea60895de9a63537951c41b21486f11 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 23:28:54 -0400
Subject: done

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

(limited to 'doc')

diff --git a/doc/bugs/comments_not_searchable.mdwn b/doc/bugs/comments_not_searchable.mdwn
index 72f7bf30f..6fda89bd2 100644
--- a/doc/bugs/comments_not_searchable.mdwn
+++ b/doc/bugs/comments_not_searchable.mdwn
@@ -15,3 +15,5 @@ However, the search postscan hook tells xapian the page url,
 and uses `urlto($page)` to do it. And that won't work for
 an internal page. Guess it could be modified to tell xapian the
 permalink. --[[Joey]] 
+
+> [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From da366390cdcf21aa4482bcc805e34049f104a8d3 Mon Sep 17 00:00:00 2001
From: markd <markd@web>
Date: Fri, 7 May 2010 10:48:39 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 06acc9cec..024a48272 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -25,4 +25,4 @@ The [[forum]] is open for discussions.
 can be submitted and tracked using this wiki.
 
 Ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]].
+and is [[FreeSoftware]]
-- 
cgit v1.2.3


From 43e27cc25140e4541509558b9c7a51afea58166c Mon Sep 17 00:00:00 2001
From: markd <markd@web>
Date: Fri, 7 May 2010 10:50:55 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/consultants.mdwn b/doc/consultants.mdwn
index ee0915600..2ff769136 100644
--- a/doc/consultants.mdwn
+++ b/doc/consultants.mdwn
@@ -6,4 +6,4 @@ available to do consulting or other work on ikiwiki.
 
 * [[Joey]] wrote ikiwiki. He is available for consulting on a part-time basis.
 
-Feel free to add yourself to this list.
+Feel free to add yourself to this list
-- 
cgit v1.2.3


From c9f8fef594e3d820ce4251737e3152e4ffaae528 Mon Sep 17 00:00:00 2001
From: "http://peter-simons.myopenid.com/"
 <http://peter-simons.myopenid.com/@web>
Date: Fri, 7 May 2010 13:34:29 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/users/KarlMW/discussion.mdwn b/doc/users/KarlMW/discussion.mdwn
index 9117abcab..4a111a3f9 100644
--- a/doc/users/KarlMW/discussion.mdwn
+++ b/doc/users/KarlMW/discussion.mdwn
@@ -23,3 +23,5 @@ things that need changing then I will probably need help/guidance.
 >> I suspect that asciidoc can't really be made to play nice to the extent that I would want casual users/abusers to have it as a markup option on a live wiki - it's fine for a personal site where you can look at the output before putting it online, but I think it would be a hideously gaping integrity hole for anything more than that.  However, for a personal site (as I am using it), it does seem to have its uses.
 
 >> I'll keep an eye on the format_escape plugin, and assuming it is accepted into ikiwiki, will see if I can apply it to asciidoc. --[[KarlMW]]
+
+Is there any way to enable latexmath rendering? It semes that ikiwiki strips the necessary javascript and/or style sheet information from the HTML page generated by asciidoc. --Peter
-- 
cgit v1.2.3


From 25033d91145d0f102c6f6889f04e80e31b218684 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 12:18:43 -0400
Subject: Revert markd changes

spammer testing?
---
 doc/consultants.mdwn | 2 +-
 doc/index.mdwn       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/consultants.mdwn b/doc/consultants.mdwn
index 2ff769136..ee0915600 100644
--- a/doc/consultants.mdwn
+++ b/doc/consultants.mdwn
@@ -6,4 +6,4 @@ available to do consulting or other work on ikiwiki.
 
 * [[Joey]] wrote ikiwiki. He is available for consulting on a part-time basis.
 
-Feel free to add yourself to this list
+Feel free to add yourself to this list.
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 024a48272..06acc9cec 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -25,4 +25,4 @@ The [[forum]] is open for discussions.
 can be submitted and tracked using this wiki.
 
 Ikiwiki is developed by [[Joey]] and many contributors,
-and is [[FreeSoftware]]
+and is [[FreeSoftware]].
-- 
cgit v1.2.3


From f9553a06ab0a13140c62a90a59c566faeedfa9d6 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Fri, 7 May 2010 16:56:45 +0000
Subject: patch

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

(limited to 'doc')

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
new file mode 100644
index 000000000..96bdab9cd
--- /dev/null
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -0,0 +1,11 @@
+[[!tag patch]]
+[[!template id=gitbranch branch=smcv/ready/no-tags author="[[smcv]]"]]
+
+The `gitremotes` script picks up tags from any repository, including those
+used for local .debs that were never actually present in Debian:
+
+    smcv@reptile% git tag | grep -c nmu
+    52
+
+This can be avoided with the `tagopt = --no-tags` option in .git/config;
+see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/ready/no-tags>
-- 
cgit v1.2.3


From 5dfcaf1f7f3c2ae8304465bdc10bd82bb862fa09 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:04:00 -0400
Subject: applied

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

(limited to 'doc')

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
index 96bdab9cd..eb37aee1b 100644
--- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -9,3 +9,5 @@ used for local .debs that were never actually present in Debian:
 
 This can be avoided with the `tagopt = --no-tags` option in .git/config;
 see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/ready/no-tags>
+
+> [[done]] thanks. Also cleared propigated tags out of origin. --[[Joey]] 
-- 
cgit v1.2.3


From 888ac35e11a22fe254127f2c39d71909038494c9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:13:57 -0400
Subject: a bug?

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

(limited to 'doc')

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
index eb37aee1b..32cf419e8 100644
--- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -10,4 +10,9 @@ used for local .debs that were never actually present in Debian:
 This can be avoided with the `tagopt = --no-tags` option in .git/config;
 see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/ready/no-tags>
 
-> [[done]] thanks. Also cleared propigated tags out of origin. --[[Joey]] 
+> [[done]] thanks. Also cleared propigated tags out of origin. 
+> 
+> Hmm, in testing I still see tags get pulled the first time a remote
+> is added. If those are then locally deleted, it doesn't pull them again
+> with the `--no-tags`.
+> --[[Joey]] 
-- 
cgit v1.2.3


From 4549a4aaa81fa9dbed87954def3eec5bca974157 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:22:20 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_login_as_admin.mdwn b/doc/forum/how_to_login_as_admin.mdwn
new file mode 100644
index 000000000..67ee9e377
--- /dev/null
+++ b/doc/forum/how_to_login_as_admin.mdwn
@@ -0,0 +1 @@
+I even managed to set up ikiwiki so it works fine with git; but how on earth do I log in as an administrator? In the .setup file the admin user is set to 'zimek' but when I go and register 'zimek' on the web it appears as normal user not the administrator. What am I missing?
-- 
cgit v1.2.3


From b01a2274c3f96541b8b48f9ebb883ee8b7451fa3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:25:32 -0400
Subject: fix undef warning when page() tests a deleted file

---
 IkiWiki.pm                      | 3 ++-
 doc/bugs/deletion_warnings.mdwn | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 11cfcdfd2..d76b5edb4 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2348,7 +2348,8 @@ sub match_internal ($$;@) {
 sub match_page ($$;@) {
 	my $page=shift;
 	my $match=match_glob($page, shift, @_);
-	if ($match && ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
+	if ($match && ! (exists $IkiWiki::pagesources{$page}
+	    && defined IkiWiki::pagetype($IkiWiki::pagesources{$page}))) {
 		return IkiWiki::FailReason->new("$page is not a page");
 	}
 	else {
diff --git a/doc/bugs/deletion_warnings.mdwn b/doc/bugs/deletion_warnings.mdwn
index c8879379b..668626b49 100644
--- a/doc/bugs/deletion_warnings.mdwn
+++ b/doc/bugs/deletion_warnings.mdwn
@@ -2,6 +2,9 @@ Seen while deleting a blog's calendar pages:
 
 --[[Joey]] 
 
+[[done]] -- the new `page()` pagespec needed to check if there was a source
+file for the page, and was leaking undef.
+
 <pre>
    427250f..ff6c054  master     -> origin/master
 Use of uninitialized value $file in pattern match (m//) at /usr/share/perl5/IkiWiki.pm line 688.
-- 
cgit v1.2.3


From c420e057f36b39b8ba4599cc95de7e90407e43ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 13:32:43 -0400
Subject: response

---
 doc/forum/how_to_login_as_admin.mdwn | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/forum/how_to_login_as_admin.mdwn b/doc/forum/how_to_login_as_admin.mdwn
index 67ee9e377..e960d66b3 100644
--- a/doc/forum/how_to_login_as_admin.mdwn
+++ b/doc/forum/how_to_login_as_admin.mdwn
@@ -1 +1,14 @@
-I even managed to set up ikiwiki so it works fine with git; but how on earth do I log in as an administrator? In the .setup file the admin user is set to 'zimek' but when I go and register 'zimek' on the web it appears as normal user not the administrator. What am I missing?
+I even managed to set up ikiwiki so it works fine with git; but how on earth do
+I log in as an administrator? In the .setup file the admin user is set to
+'zimek' but when I go and register 'zimek' on the web it appears as normal user
+not the administrator. What am I missing?
+
+> That's really all there is to it. The [[automatic_setup|setup]] script
+> registers the admin user for you before the wiki goes live. If you didn't
+> use it, registering the right account name will get you the admin account.
+> 
+> The name is case sensative, perhaps you really spelled one of them `Zimek`?
+> 
+> Or maybe you're the admin, and don't know it? Everything looks the same for the admin,
+> except they can edit even locked pages, and can access the websetup interface from their
+> Preferences page, if you have that plugin enabled. --[[Joey]] 
-- 
cgit v1.2.3


From 682a6480d9dc0256c021fea7565e63c7372d5991 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:39:34 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_login_as_admin.mdwn b/doc/forum/how_to_login_as_admin.mdwn
index e960d66b3..0f32dc428 100644
--- a/doc/forum/how_to_login_as_admin.mdwn
+++ b/doc/forum/how_to_login_as_admin.mdwn
@@ -12,3 +12,5 @@ not the administrator. What am I missing?
 > Or maybe you're the admin, and don't know it? Everything looks the same for the admin,
 > except they can edit even locked pages, and can access the websetup interface from their
 > Preferences page, if you have that plugin enabled. --[[Joey]] 
+
+>> Maybe I'm indeed. I know that I've disabled all the plugins while installing ikiwiki. Checking it now ;-)
-- 
cgit v1.2.3


From 941782168040c00d46e9bdf7a1b5014972973ef5 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:46:39 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_login_as_admin.mdwn b/doc/forum/how_to_login_as_admin.mdwn
index 0f32dc428..b4e704a80 100644
--- a/doc/forum/how_to_login_as_admin.mdwn
+++ b/doc/forum/how_to_login_as_admin.mdwn
@@ -14,3 +14,5 @@ not the administrator. What am I missing?
 > Preferences page, if you have that plugin enabled. --[[Joey]] 
 
 >> Maybe I'm indeed. I know that I've disabled all the plugins while installing ikiwiki. Checking it now ;-)
+
+>> Yup, I'm the God of my ikiwiki.
-- 
cgit v1.2.3


From 9b18bdf1e1b5176c100dc1cbee4853d0538c3a71 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:48:43 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_to_login_as_admin.mdwn b/doc/forum/how_to_login_as_admin.mdwn
index b4e704a80..807f82501 100644
--- a/doc/forum/how_to_login_as_admin.mdwn
+++ b/doc/forum/how_to_login_as_admin.mdwn
@@ -15,4 +15,4 @@ not the administrator. What am I missing?
 
 >> Maybe I'm indeed. I know that I've disabled all the plugins while installing ikiwiki. Checking it now ;-)
 
->> Yup, I'm the God of my ikiwiki.
+>> Yup, I'm the God of my ikiwiki. (Thanks)
-- 
cgit v1.2.3


From 93ad589b463259916f3d1c2db4e6ff590b6ae9e2 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:51:53 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn b/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn
new file mode 100644
index 000000000..38e486c73
--- /dev/null
+++ b/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn
@@ -0,0 +1 @@
+Why do all the pages are preceded with a double forward slash in the address bar... ie. http://example.org//ikiwiki/pagespec/ .. maybe someone knows?
-- 
cgit v1.2.3


From 6a83be26471ac6615bad48a1a365a7e62e972a7b Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 17:56:06 +0000
Subject:

---
 ...ouble_forward_slash___39____47____47____39___in_the_address_bar.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn b/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn
index 38e486c73..b5fb2aa18 100644
--- a/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn
+++ b/doc/forum/double_forward_slash___39____47____47____39___in_the_address_bar.mdwn
@@ -1 +1,3 @@
 Why do all the pages are preceded with a double forward slash in the address bar... ie. http://example.org//ikiwiki/pagespec/ .. maybe someone knows?
+
+> Sorted, base url in the .setup file had the unnecessary '/' suffix.
-- 
cgit v1.2.3


From 70f121af025764bda665767d2566b9fa2f66ea91 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 14:12:14 -0400
Subject: switch to use comments(), and add a count (and a feed) of comments
 pending moderation

---
 doc/examples/blog/comments.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 0b503ba01..32ffa5537 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,3 +1,7 @@
 This page will show recent comments made to posts in the [[blog|index]].
 
-[[!inline pages="./posts/*/Discussion or internal(./posts/*/comment_*)"]]
+There are [[!pagecount pages="comment_pending(/posts/*)"]] comments
+in the moderation queue.
+[[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
+
+[[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
-- 
cgit v1.2.3


From be2669e1e1e51ccf1514ce60697e1ba7ed05497e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 15:00:45 -0400
Subject: todo

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

(limited to 'doc')

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index e257c21a2..cdec6e7e8 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -81,6 +81,7 @@ Probably incomplete list:
 * Enable tagbase by default (so that tag autocreation will work by default).
   Note that this is already done for wikis created by `auto-blog.setup`.
 * [[tips/html5]] on by default (some day..)
+* Remove support for old `.ikiwiki/comments_pending` from comment plugin.
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
-- 
cgit v1.2.3


From 79b309b3580a6a96aa11c8a59c9734912bec0156 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 21:56:56 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
new file mode 100644
index 000000000..e5b3cf338
--- /dev/null
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -0,0 +1 @@
+I'm just in the process of deploying ikiwiki and I'd love to use it in the html5 mode instead of in XHTML. Any chance that the ikiwiki's .deb in debian backports will be updated any time soon?
-- 
cgit v1.2.3


From 9541defa69b967d50d3abd8e34e3d5d40e73b358 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 7 May 2010 21:59:05 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
new file mode 100644
index 000000000..a26bc9448
--- /dev/null
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -0,0 +1 @@
+Puzzled a bit :-/
-- 
cgit v1.2.3


From 378c64776856ee1313c030375a921e8acb4ff1ef Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 19:10:50 -0400
Subject: patch hidden field setting code

Fixes http://code.google.com/p/openid-selector/issues/detail?id=11#c3
---
 IkiWiki/Plugin/openid.pm                           | 82 ++++++++++++++++++----
 debian/changelog                                   |  2 +
 debian/copyright                                   |  7 ++
 doc/templates.mdwn                                 |  4 +-
 templates/openid-selector.tmpl                     | 30 ++++++++
 .../ikiwiki/openid-selector/openid-jquery.js       |  8 +--
 6 files changed, 114 insertions(+), 19 deletions(-)
 create mode 100644 templates/openid-selector.tmpl

(limited to 'doc')

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 7b1a17831..0ad8697d8 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
+	hook(type => "checkconfig", id => "openid", call => \&checkconfig);
 	hook(type => "getopt", id => "openid", call => \&getopt);
 	hook(type => "getsetup", id => "openid", call => \&getsetup);
 	hook(type => "auth", id => "openid", call => \&auth);
@@ -14,6 +15,18 @@ sub import {
 		call => \&formbuilder_setup, last => 1);
 }
 
+sub checkconfig () {
+	if ($config{cgi}) {
+		# Intercept normal signin form, so the openid selector
+		# can be displayed.
+		require IkiWiki::CGI;
+		my $real_cgi_signin=\&IkiWiki::cgi_signin;
+		inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
+				openid_selector($real_cgi_signin, @_);
+		});
+	}
+}
+
 sub getopt () {
 	eval q{use Getopt::Long};
 	error($@) if $@;
@@ -37,6 +50,39 @@ sub getsetup () {
 		},
 }
 
+sub openid_selector {
+	my $real_cgi_signin=shift;
+        my $q=shift;
+        my $session=shift;
+
+	my $openid_url=$q->param('openid_url');
+	my $openid_error;
+
+	if (defined $q->param("action") && $q->param("action") eq "verify") {
+		validate($q, $session, $openid_url, sub {
+			$openid_error=shift;
+		});
+	}
+	elsif ($q->param("do") eq "signin" || ! load_openid_module()) {
+		$real_cgi_signin->($q, $session);
+		exit;
+	}
+
+	my $template=IkiWiki::template("openid-selector.tmpl");
+	$template->param(
+		cgiurl => $config{cgiurl},
+		(defined $openid_error ? (openid_error => $openid_error) : ()),
+		(defined $openid_url ? (openid_url => $openid_url) : ()),
+		# TODO only if other auth methods are available
+		nonopenidurl => IkiWiki::cgiurl(do => "signin"),
+		loginlabel => loginlabel(),
+	);
+
+	IkiWiki::printheader($session);
+	print IkiWiki::misctemplate("signin", $template->output);
+	exit;
+}
+
 sub formbuilder_setup (@) {
 	my %params=@_;
 
@@ -45,13 +91,7 @@ sub formbuilder_setup (@) {
 	my $cgi=$params{cgi};
 	
 	if ($form->title eq "signin") {
-		# Give up if module is unavailable to avoid
-		# needing to depend on it.
-		eval q{use Net::OpenID::Consumer};
-		if ($@) {
-			debug("unable to load Net::OpenID::Consumer, not enabling OpenID login ($@)");
-			return;
-		}
+		return unless load_openid_module();
 
 		# This avoids it displaying a redundant label for the
 		# OpenID fieldset.
@@ -59,7 +99,7 @@ sub formbuilder_setup (@) {
 
 		$form->field(
 			name => "openid_url",
-			label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
+			label => loginlabel(),
 			fieldset => "OpenID",
 			size => 30,
 			comment => ($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")
@@ -72,7 +112,10 @@ sub formbuilder_setup (@) {
 			$form->field(
 				name => "openid_url",
 				validate => sub {
-					validate($cgi, $session, shift, $form);
+					validate($cgi, $session, shift, sub {
+						# Display error in the form.
+						$form->field(name => "openid_url", comment => shift);
+					});
 				},
 			);
 			# Skip all other required fields in this case.
@@ -98,15 +141,14 @@ sub validate ($$$;$) {
 	my $q=shift;
 	my $session=shift;
 	my $openid_url=shift;
-	my $form=shift;
+	my $errhandler=shift;
 
 	my $csr=getobj($q, $session);
 
 	my $claimed_identity = $csr->claimed_identity($openid_url);
 	if (! $claimed_identity) {
-		if ($form) {
-			# Put the error in the form and fail validation.
-			$form->field(name => "openid_url", comment => $csr->err);
+		if ($errhandler) {
+			$errhandler->($csr->err);
 			return 0;
 		}
 		else {
@@ -230,4 +272,18 @@ sub getobj ($$) {
 	);
 }
 
+sub load_openid_module {
+	# Give up if module is unavailable to avoid needing to depend on it.
+	eval q{use Net::OpenID::Consumer};
+	if ($@) {
+		debug("unable to load Net::OpenID::Consumer, not enabling OpenID login ($@)");
+		return;
+	}
+	return 1;
+}
+
+sub loginlabel {
+	return gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1);
+}
+
 1
diff --git a/debian/changelog b/debian/changelog
index 31d64e237..c335030ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * inline: Call indexhtml when inlining internal pages, so their
     text can be indexed for searching.
   * Delete hooks are passed deleted internal pages. 
+  * openid: Incorporated a fancy openid-selector signin form
+    (http://code.google.com/p/openid-selector/).
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/debian/copyright b/debian/copyright
index d4bb1009f..b6dd3782b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -191,6 +191,13 @@ License: GPL-2+
 
 Files: cvs.pm
 Copyright: © 2009 Amitai Schlair
+License: BSD-C2
+
+Files: underlays/javascript/ikiwiki/openid-selector/*
+Copyright: © 2008-2010 andyjm, david.j.boden
+License: BSD-C2
+  From http://code.google.com/p/openid-selector/
+
 License: BSD-C2
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 8f6561fcf..22b9345ef 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -71,7 +71,7 @@ html out of ikiwiki and in the templates.
 * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
   `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
   `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
-  `passwordmail.tmpl` - Parts of ikiwiki's user interface; do not
-  normally need to be customised.
+  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user
+  interface; do not normally need to be customised.
 
 [[!meta robots="noindex, follow"]]
diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
new file mode 100644
index 000000000..76c4051ed
--- /dev/null
+++ b/templates/openid-selector.tmpl
@@ -0,0 +1,30 @@
+<script type="text/javascript" src="ikiwiki/openid-selector/jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/openid-selector/openid-jquery.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+	openid.init('openid_url');
+});
+</script>
+	
+<TMPL_IF OPENID_ERROR>
+<div class="error"><TMPL_VAR OPENID_ERROR></span>
+</TMPL_IF>
+</div>
+
+<form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
+	<input type="hidden" name="do" value="signin" />
+	<input type="hidden" name="action" value="verify" />
+ 	<div id="openid_choice">
+		<p><TMPL_VAR LOGINLABEL>:</p>
+		<div id="openid_btns">
+		</div>
+		<TMPL_IF NONOPENIDURL>
+		<a href="<TMPL_VAR NONOPENIDURL>">local account</a>
+		</TMPL_IF>
+	</div>
+	
+	<span id="openid_input_area">
+		<input id="openid_url" name="openid_url" type="text" value="<TMPL_VAR OPENID_URL>"/>
+		<input id="openid_submit" type="submit" value="Login"/>
+	</span>
+</form>
diff --git a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
index 3b60827b6..f39fff842 100644
--- a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
+++ b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
@@ -170,11 +170,11 @@ var openid = {
     },
     setOpenIdUrl: function (url) {
     
-    	var hidden = document.getElementById(this.input_id);
-    	if (hidden != null) {
-    		hidden.value = url;
+	var hidden = $('#'+this.input_id);
+	if (hidden.length > 0) {
+		hidden.value = url;
     	} else {
-    		$('#openid_form').append('<input type="hidden" id="' + this.input_id + '" name="' + this.input_id + '" value="'+url+'"/>');
+		$('#openid_form').append('<input style="display:none" id="' + this.input_id + '" name="' + this.input_id + '" value="'+url+'"/>');
     	}
     },
     highlight: function (box_id) {
-- 
cgit v1.2.3


From 1fb9db21807d5136794e3d88bb3c453c03401b00 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Sat, 8 May 2010 00:02:04 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index e5b3cf338..b3fbf1adc 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -1 +1,5 @@
 I'm just in the process of deploying ikiwiki and I'd love to use it in the html5 mode instead of in XHTML. Any chance that the ikiwiki's .deb in debian backports will be updated any time soon?
+
+> Formerer does a good job keeping the backport up-to-date with whatever is in Debian testing. 
+> Which is the policy of what Backports should contain. So, I just need to stop releasing ikiwiki
+> for 2 weeks. :) --[[Joey]]
-- 
cgit v1.2.3


From e196bd3f3a2b1b48fbd19f1014bf03b044c4e829 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Sat, 8 May 2010 00:02:59 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index a26bc9448..a4644ff64 100644
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -1 +1,3 @@
 Puzzled a bit :-/
+
+> There is no explicit interface for reverting edits. Most of us use `git revert`. --[[Joey]]
-- 
cgit v1.2.3


From f8c2a67b3cdbce81bbb661e05411a129b07414ce Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 20:14:25 -0400
Subject: pretty openid login

* openid: Incorporated a fancy openid-selector signin form.
  (http://code.google.com/p/openid-selector/)
* openid: Use "openid_identifier" as the form field, as required
  by OpenID Authentication v2.0 spec.
---
 IkiWiki/Plugin/openid.pm                           |  68 ++----
 debian/changelog                                   |   6 +-
 debian/copyright                                   |   6 +-
 doc/style.css                                      |  57 +++--
 t/openiduser.t                                     |   2 +-
 t/permalink.t                                      |   2 +-
 templates/openid-selector.tmpl                     |  37 ++--
 .../javascript/ikiwiki/openid-selector/jquery.js   |  32 ---
 .../ikiwiki/openid-selector/openid-jquery.js       | 240 ---------------------
 underlays/openid-selector/ikiwiki/openid/jquery.js |  32 +++
 .../ikiwiki/openid/openid-jquery.js                | 240 +++++++++++++++++++++
 11 files changed, 363 insertions(+), 359 deletions(-)
 delete mode 100644 underlays/javascript/ikiwiki/openid-selector/jquery.js
 delete mode 100644 underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
 create mode 100644 underlays/openid-selector/ikiwiki/openid/jquery.js
 create mode 100644 underlays/openid-selector/ikiwiki/openid/openid-jquery.js

(limited to 'doc')

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 0ad8697d8..e722c68ba 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
+	add_underlay("openid-selector");
 	hook(type => "checkconfig", id => "openid", call => \&checkconfig);
 	hook(type => "getopt", id => "openid", call => \&getopt);
 	hook(type => "getsetup", id => "openid", call => \&getsetup);
@@ -19,10 +20,16 @@ sub checkconfig () {
 	if ($config{cgi}) {
 		# Intercept normal signin form, so the openid selector
 		# can be displayed.
-		require IkiWiki::CGI;
-		my $real_cgi_signin=\&IkiWiki::cgi_signin;
+		# 
+		# When other auth hooks are registered, give the selector
+		# a reference to the normal signin form.
+		my $real_cgi_signin;
+		if (keys %{$IkiWiki::hooks{auth}} > 1) {
+			require IkiWiki::CGI;
+			$real_cgi_signin=\&IkiWiki::cgi_signin;
+		}
 		inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
-				openid_selector($real_cgi_signin, @_);
+			openid_selector($real_cgi_signin, @_);
 		});
 	}
 }
@@ -55,15 +62,21 @@ sub openid_selector {
         my $q=shift;
         my $session=shift;
 
-	my $openid_url=$q->param('openid_url');
+	my $openid_url=$q->param('openid_identifier');
 	my $openid_error;
 
-	if (defined $q->param("action") && $q->param("action") eq "verify") {
+	if (! load_openid_module()) {
+		if ($real_cgi_signin) {
+			$real_cgi_signin->($q, $session);
+		}
+		error(sprintf(gettext("failed to load openid module: "), @_));
+	}
+	elsif (defined $q->param("action") && $q->param("action") eq "verify") {
 		validate($q, $session, $openid_url, sub {
 			$openid_error=shift;
 		});
 	}
-	elsif ($q->param("do") eq "signin" || ! load_openid_module()) {
+	elsif ($q->param("do") eq "signin" && $real_cgi_signin) {
 		$real_cgi_signin->($q, $session);
 		exit;
 	}
@@ -73,8 +86,7 @@ sub openid_selector {
 		cgiurl => $config{cgiurl},
 		(defined $openid_error ? (openid_error => $openid_error) : ()),
 		(defined $openid_url ? (openid_url => $openid_url) : ()),
-		# TODO only if other auth methods are available
-		nonopenidurl => IkiWiki::cgiurl(do => "signin"),
+		($real_cgi_signin ? (nonopenidurl => IkiWiki::cgiurl(do => "signin")) : ()),
 		loginlabel => loginlabel(),
 	);
 
@@ -90,45 +102,9 @@ sub formbuilder_setup (@) {
 	my $session=$params{session};
 	my $cgi=$params{cgi};
 	
-	if ($form->title eq "signin") {
-		return unless load_openid_module();
-
-		# This avoids it displaying a redundant label for the
-		# OpenID fieldset.
-		$form->fieldsets("OpenID");
-
-		$form->field(
-			name => "openid_url",
-			label => loginlabel(),
-			fieldset => "OpenID",
-			size => 30,
-			comment => ($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")
-		);
-
-		# Handle submission of an OpenID as validation.
-		if ($form->submitted && $form->submitted eq "Login" &&
-		    defined $form->field("openid_url") && 
-		    length $form->field("openid_url")) {
-			$form->field(
-				name => "openid_url",
-				validate => sub {
-					validate($cgi, $session, shift, sub {
-						# Display error in the form.
-						$form->field(name => "openid_url", comment => shift);
-					});
-				},
-			);
-			# Skip all other required fields in this case.
-			foreach my $field ($form->field) {
-				next if $field eq "openid_url";
-				$form->field(name => $field, required => 0,
-					validate => '/.*/');
-			}
-		}
-	}
-	elsif ($form->title eq "preferences" &&
+	if ($form->title eq "preferences" &&
 	       IkiWiki::openiduser($session->param("name"))) {
-		$form->field(name => "openid_url", disabled => 1,
+		$form->field(name => "openid_identifier", disabled => 1,
 			label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
 			value => $session->param("name"), 
 			size => 50, force => 1,
diff --git a/debian/changelog b/debian/changelog
index c335030ed..3f20aec1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * inline: Call indexhtml when inlining internal pages, so their
     text can be indexed for searching.
   * Delete hooks are passed deleted internal pages. 
-  * openid: Incorporated a fancy openid-selector signin form
-    (http://code.google.com/p/openid-selector/).
+  * openid: Incorporated a fancy openid-selector signin form.
+    (http://code.google.com/p/openid-selector/)
+  * openid: Use "openid_identifier" as the form field, as required
+    by OpenID Authentication v2.0 spec.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/debian/copyright b/debian/copyright
index b6dd3782b..7ef266151 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -193,11 +193,15 @@ Files: cvs.pm
 Copyright: © 2009 Amitai Schlair
 License: BSD-C2
 
-Files: underlays/javascript/ikiwiki/openid-selector/*
+Files: underlays/openid-selector/ikiwiki/openid/*
 Copyright: © 2008-2010 andyjm, david.j.boden
 License: BSD-C2
   From http://code.google.com/p/openid-selector/
 
+Files: underlays/openid-selector/ikiwiki/openid/jquery.js
+Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer
+License: GPL-2
+
 License: BSD-C2
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/doc/style.css b/doc/style.css
index 5f77037e4..75aa28407 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -319,16 +319,6 @@ legend {
 	float: left;
 	margin: 2px 0;
 }
-#signin_openid_url_label {
-	float: left;
-	margin-right: 1ex;
-}
-#signin_openid {
-	padding: 10px 10px;
-	border: 1px solid #aaa;
-	background: #eee; 
-	color: black !important;
-}
 label.block {    
 	display: block;   
 }
@@ -342,13 +332,6 @@ ol.form {
 li.form {
 	padding-bottom: 1em;
 }
-input#openid_url {
-	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 0 50%;
-	color: #000;
-	padding-left: 18px;
-}
 input#searchbox {
 	background: url(wikiicons/search-bg.gif) no-repeat;
 	background-color: #fff;
@@ -440,3 +423,43 @@ li.L8 { list-style: upper-alpha; }
 	color: white !important;
 	background: #ff9900;
 }
+
+/* openid selector */
+#openid_choice {
+	display: none;
+}
+#openid_input_area {
+	clear: both;
+	padding: 10px;
+}
+#openid_btns, #openid_btns br {
+	clear: both;
+}
+#openid_highlight {
+	padding: 3px;
+	background-color: #FFFCC9;
+	float: left;
+}
+.openid_large_btn {
+	width: 100px;
+	height: 60px;
+	border: 1px solid #DDD;
+	margin: 3px;
+	float: left;
+}
+.openid_small_btn {
+	width: 24px;
+	height: 24px;
+	border: 1px solid #DDD;
+	margin: 3px;
+	float: left;
+}
+a.openid_large_btn:focus {
+	outline: none;
+}
+a.openid_large_btn:focus {
+	-moz-outline-style: none;
+}
+.openid_selected {
+	border: 4px solid #DDD;
+}
diff --git a/t/openiduser.t b/t/openiduser.t
index caabbcefc..746090103 100755
--- a/t/openiduser.t
+++ b/t/openiduser.t
@@ -12,7 +12,7 @@ BEGIN {
 	else {
 		eval q{use Test::More tests => 11};
 	}
-	use_ok("IkiWiki::Plugin::openid");
+	use_ok("IkiWiki");
 }
 
 # Some typical examples:
diff --git a/t/permalink.t b/t/permalink.t
index b49b98338..adb8648b4 100755
--- a/t/permalink.t
+++ b/t/permalink.t
@@ -5,7 +5,7 @@ use Test::More 'no_plan';
 
 ok(! system("mkdir t/tmp"));
 ok(! system("make -s ikiwiki.out"));
-ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -templatedir=templates t/tinyblog t/tmp/out"));
+ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates t/tinyblog t/tmp/out"));
 # This guid should never, ever change, for any reason whatsoever!
 my $guid="http://example.com/post/";
 ok(length `grep '<guid>$guid</guid>' t/tmp/out/index.rss`);
diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl
index 76c4051ed..393479865 100644
--- a/templates/openid-selector.tmpl
+++ b/templates/openid-selector.tmpl
@@ -1,30 +1,29 @@
-<script type="text/javascript" src="ikiwiki/openid-selector/jquery.js"></script>
-<script type="text/javascript" src="ikiwiki/openid-selector/openid-jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/openid/jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-	openid.init('openid_url');
+	openid.init('openid_identifier');
 });
 </script>
 	
-<TMPL_IF OPENID_ERROR>
-<div class="error"><TMPL_VAR OPENID_ERROR></span>
-</TMPL_IF>
-</div>
-
 <form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
 	<input type="hidden" name="do" value="signin" />
 	<input type="hidden" name="action" value="verify" />
- 	<div id="openid_choice">
-		<p><TMPL_VAR LOGINLABEL>:</p>
-		<div id="openid_btns">
+	<fieldset>
+		<legend><TMPL_VAR LOGINLABEL></legend>
+		<div id="openid_choice">
+			<div id="openid_btns">
+			</div>
+			<TMPL_IF NONOPENIDURL>
+			<a href="<TMPL_VAR NONOPENIDURL>">local account</a>
+			</TMPL_IF>
 		</div>
-		<TMPL_IF NONOPENIDURL>
-		<a href="<TMPL_VAR NONOPENIDURL>">local account</a>
+		<div id="openid_input_area">
+			<input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR OPENID_URL>"/>
+			<input id="openid_submit" type="submit" value="Login"/>
+		</div>
+		<TMPL_IF OPENID_ERROR>
+		<div class="error"><TMPL_VAR OPENID_ERROR></div>
 		</TMPL_IF>
-	</div>
-	
-	<span id="openid_input_area">
-		<input id="openid_url" name="openid_url" type="text" value="<TMPL_VAR OPENID_URL>"/>
-		<input id="openid_submit" type="submit" value="Login"/>
-	</span>
+	</fieldset>
 </form>
diff --git a/underlays/javascript/ikiwiki/openid-selector/jquery.js b/underlays/javascript/ikiwiki/openid-selector/jquery.js
deleted file mode 100644
index 82b98e1d7..000000000
--- a/underlays/javascript/ikiwiki/openid-selector/jquery.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * jQuery 1.2.6 - New Wave Javascript
- *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
- * $Rev: 5685 $
- */
-(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
-return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
-return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
-selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
-return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
-this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
-return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
-jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
-script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
-for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
-for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
-jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
-ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
-while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
-while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
-for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
-jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
-xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
-jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
-for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
-s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
-e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
\ No newline at end of file
diff --git a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
deleted file mode 100644
index f39fff842..000000000
--- a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-Simple OpenID Plugin
-http://code.google.com/p/openid-selector/
-
-This code is licenced under the New BSD License.
-*/
-
-var providers_large = {
-    google: {
-        name: 'Google',
-        url: 'https://www.google.com/accounts/o8/id'
-    },
-    yahoo: {
-        name: 'Yahoo',      
-        url: 'http://me.yahoo.com/'
-    },    
-    aol: {
-        name: 'AOL',     
-        label: 'Enter your AOL screenname.',
-        url: 'http://openid.aol.com/{username}'
-    },
-    verisign: {
-        name: 'Verisign',
-        label: 'Your Verisign username',
-        url: 'http://{username}.pip.verisignlabs.com/'
-    },
-    openid: {
-        name: 'OpenID',     
-        label: 'Enter your OpenID.',
-        url: null
-    }
-};
-var providers_small = {
-    myopenid: {
-        name: 'MyOpenID',
-        label: 'Enter your MyOpenID username.',
-        url: 'http://{username}.myopenid.com/'
-    },
-    livejournal: {
-        name: 'LiveJournal',
-        label: 'Enter your Livejournal username.',
-        url: 'http://{username}.livejournal.com/'
-    },
-    flickr: {
-        name: 'Flickr',        
-        label: 'Enter your Flickr username.',
-        url: 'http://flickr.com/{username}/'
-    },
-    technorati: {
-        name: 'Technorati',
-        label: 'Enter your Technorati username.',
-        url: 'http://technorati.com/people/technorati/{username}/'
-    },
-    wordpress: {
-        name: 'Wordpress',
-        label: 'Enter your Wordpress.com username.',
-        url: 'http://{username}.wordpress.com/'
-    },
-    blogger: {
-        name: 'Blogger',
-        label: 'Your Blogger account',
-        url: 'http://{username}.blogspot.com/'
-    },
-    vidoop: {
-        name: 'Vidoop',
-        label: 'Your Vidoop username',
-        url: 'http://{username}.myvidoop.com/'
-    },
-    claimid: {
-        name: 'ClaimID',
-        label: 'Your ClaimID username',
-        url: 'http://claimid.com/{username}'
-    }
-};
-var providers = $.extend({}, providers_large, providers_small);
-
-var openid = {
-
-	demo: false,
-	ajaxHandler: null,
-	cookie_expires: 6*30,	// 6 months.
-	cookie_name: 'openid_provider',
-	cookie_path: '/',
-	
-	img_path: 'images/',
-	
-	input_id: null,
-	provider_url: null,
-	provider_id: null,
-	
-    init: function(input_id) {
-        
-        var openid_btns = $('#openid_btns');
-        
-        this.input_id = input_id;
-        
-        $('#openid_choice').show();
-        $('#openid_input_area').empty();
-        
-        // add box for each provider
-        for (id in providers_large) {
-        
-           	openid_btns.append(this.getBoxHTML(providers_large[id], 'large', '.gif'));
-        }
-        if (providers_small) {
-        	openid_btns.append('<br/>');
-        	
-	        for (id in providers_small) {
-	        
-	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small', '.ico'));
-	        }
-        }
-        
-        $('#openid_form').submit(this.submit);
-        
-        var box_id = this.readCookie();
-        if (box_id) {
-        	this.signin(box_id, true);
-        }  
-    },
-    getBoxHTML: function(provider, box_size, image_ext) {
-            
-        var box_id = provider["name"].toLowerCase();
-        return '<a title="'+provider["name"]+'" href="javascript: openid.signin(\''+ box_id +'\');"' +
-        		' style="background: #FFF url(' + this.img_path + box_id + image_ext+') no-repeat center center" ' + 
-        		'class="' + box_id + ' openid_' + box_size + '_btn"></a>';    
-    
-    },
-    /* Provider image click */
-    signin: function(box_id, onload) {
-    
-    	var provider = providers[box_id];
-  		if (! provider) {
-  			return;
-  		}
-		
-		this.highlight(box_id);
-		this.setCookie(box_id);
-		
-		this.provider_id = box_id;
-		this.provider_url = provider['url'];
-		
-		// prompt user for input?
-		if (provider['label']) {
-			this.useInputBox(provider);
-		} else {
-			$('#openid_input_area').empty();
-			if (! onload) {
-				$('#openid_form').submit();
-			}
-		}
-    },
-    /* Sign-in button click */
-    submit: function() {
-        
-    	var url = openid.provider_url; 
-    	if (url) {
-    		url = url.replace('{username}', $('#openid_username').val());
-    		openid.setOpenIdUrl(url);
-    	}
-    	if(openid.ajaxHandler) {
-    		openid.ajaxHandler(openid.provider_id, document.getElementById(openid.input_id).value);
-    		return false;
-    	}
-    	if(openid.demo) {
-    		alert("In client demo mode. Normally would have submitted OpenID:\r\n" + document.getElementById(openid.input_id).value);
-    		return false;
-    	}
-    	return true;
-    },
-    setOpenIdUrl: function (url) {
-    
-	var hidden = $('#'+this.input_id);
-	if (hidden.length > 0) {
-		hidden.value = url;
-    	} else {
-		$('#openid_form').append('<input style="display:none" id="' + this.input_id + '" name="' + this.input_id + '" value="'+url+'"/>');
-    	}
-    },
-    highlight: function (box_id) {
-    	
-    	// remove previous highlight.
-    	var highlight = $('#openid_highlight');
-    	if (highlight) {
-    		highlight.replaceWith($('#openid_highlight a')[0]);
-    	}
-    	// add new highlight.
-    	$('.'+box_id).wrap('<div id="openid_highlight"></div>');
-    },
-    setCookie: function (value) {
-    
-		var date = new Date();
-		date.setTime(date.getTime()+(this.cookie_expires*24*60*60*1000));
-		var expires = "; expires="+date.toGMTString();
-		
-		document.cookie = this.cookie_name+"="+value+expires+"; path=" + this.cookie_path;
-    },
-    readCookie: function () {
-		var nameEQ = this.cookie_name + "=";
-		var ca = document.cookie.split(';');
-		for(var i=0;i < ca.length;i++) {
-			var c = ca[i];
-			while (c.charAt(0)==' ') c = c.substring(1,c.length);
-			if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
-		}
-		return null;
-    },
-    useInputBox: function (provider) {
-   	
-		var input_area = $('#openid_input_area');
-		
-		var html = '';
-		var id = 'openid_username';
-		var value = '';
-		var label = provider['label'];
-		var style = '';
-		
-		if (label) {
-			html = '<p>' + label + '</p>';
-		}
-		if (provider['name'] == 'OpenID') {
-			id = this.input_id;
-			value = 'http://';
-			style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;';
-		}
-		html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
-					'<input id="openid_submit" type="submit" value="Sign-In"/>';
-		
-		input_area.empty();
-		input_area.append(html);
-
-		$('#'+id).focus();
-    },
-    setDemoMode: function (demoMode) {
-    	this.demo = demoMode;
-    },
-    setAjaxHandler: function (ajaxFunction) {
-    	this.ajaxHandler = ajaxFunction;
-    }
-};
diff --git a/underlays/openid-selector/ikiwiki/openid/jquery.js b/underlays/openid-selector/ikiwiki/openid/jquery.js
new file mode 100644
index 000000000..82b98e1d7
--- /dev/null
+++ b/underlays/openid-selector/ikiwiki/openid/jquery.js
@@ -0,0 +1,32 @@
+/*
+ * jQuery 1.2.6 - New Wave Javascript
+ *
+ * Copyright (c) 2008 John Resig (jquery.com)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
+ * $Rev: 5685 $
+ */
+(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
+return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
+return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
+selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
+return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
+this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
+return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
+jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
+script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
+for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
+for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
+jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
+ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
+while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
+while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
+for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
+jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
+xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
+jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
+for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
+s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
+e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
\ No newline at end of file
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
new file mode 100644
index 000000000..f39fff842
--- /dev/null
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -0,0 +1,240 @@
+/*
+Simple OpenID Plugin
+http://code.google.com/p/openid-selector/
+
+This code is licenced under the New BSD License.
+*/
+
+var providers_large = {
+    google: {
+        name: 'Google',
+        url: 'https://www.google.com/accounts/o8/id'
+    },
+    yahoo: {
+        name: 'Yahoo',      
+        url: 'http://me.yahoo.com/'
+    },    
+    aol: {
+        name: 'AOL',     
+        label: 'Enter your AOL screenname.',
+        url: 'http://openid.aol.com/{username}'
+    },
+    verisign: {
+        name: 'Verisign',
+        label: 'Your Verisign username',
+        url: 'http://{username}.pip.verisignlabs.com/'
+    },
+    openid: {
+        name: 'OpenID',     
+        label: 'Enter your OpenID.',
+        url: null
+    }
+};
+var providers_small = {
+    myopenid: {
+        name: 'MyOpenID',
+        label: 'Enter your MyOpenID username.',
+        url: 'http://{username}.myopenid.com/'
+    },
+    livejournal: {
+        name: 'LiveJournal',
+        label: 'Enter your Livejournal username.',
+        url: 'http://{username}.livejournal.com/'
+    },
+    flickr: {
+        name: 'Flickr',        
+        label: 'Enter your Flickr username.',
+        url: 'http://flickr.com/{username}/'
+    },
+    technorati: {
+        name: 'Technorati',
+        label: 'Enter your Technorati username.',
+        url: 'http://technorati.com/people/technorati/{username}/'
+    },
+    wordpress: {
+        name: 'Wordpress',
+        label: 'Enter your Wordpress.com username.',
+        url: 'http://{username}.wordpress.com/'
+    },
+    blogger: {
+        name: 'Blogger',
+        label: 'Your Blogger account',
+        url: 'http://{username}.blogspot.com/'
+    },
+    vidoop: {
+        name: 'Vidoop',
+        label: 'Your Vidoop username',
+        url: 'http://{username}.myvidoop.com/'
+    },
+    claimid: {
+        name: 'ClaimID',
+        label: 'Your ClaimID username',
+        url: 'http://claimid.com/{username}'
+    }
+};
+var providers = $.extend({}, providers_large, providers_small);
+
+var openid = {
+
+	demo: false,
+	ajaxHandler: null,
+	cookie_expires: 6*30,	// 6 months.
+	cookie_name: 'openid_provider',
+	cookie_path: '/',
+	
+	img_path: 'images/',
+	
+	input_id: null,
+	provider_url: null,
+	provider_id: null,
+	
+    init: function(input_id) {
+        
+        var openid_btns = $('#openid_btns');
+        
+        this.input_id = input_id;
+        
+        $('#openid_choice').show();
+        $('#openid_input_area').empty();
+        
+        // add box for each provider
+        for (id in providers_large) {
+        
+           	openid_btns.append(this.getBoxHTML(providers_large[id], 'large', '.gif'));
+        }
+        if (providers_small) {
+        	openid_btns.append('<br/>');
+        	
+	        for (id in providers_small) {
+	        
+	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small', '.ico'));
+	        }
+        }
+        
+        $('#openid_form').submit(this.submit);
+        
+        var box_id = this.readCookie();
+        if (box_id) {
+        	this.signin(box_id, true);
+        }  
+    },
+    getBoxHTML: function(provider, box_size, image_ext) {
+            
+        var box_id = provider["name"].toLowerCase();
+        return '<a title="'+provider["name"]+'" href="javascript: openid.signin(\''+ box_id +'\');"' +
+        		' style="background: #FFF url(' + this.img_path + box_id + image_ext+') no-repeat center center" ' + 
+        		'class="' + box_id + ' openid_' + box_size + '_btn"></a>';    
+    
+    },
+    /* Provider image click */
+    signin: function(box_id, onload) {
+    
+    	var provider = providers[box_id];
+  		if (! provider) {
+  			return;
+  		}
+		
+		this.highlight(box_id);
+		this.setCookie(box_id);
+		
+		this.provider_id = box_id;
+		this.provider_url = provider['url'];
+		
+		// prompt user for input?
+		if (provider['label']) {
+			this.useInputBox(provider);
+		} else {
+			$('#openid_input_area').empty();
+			if (! onload) {
+				$('#openid_form').submit();
+			}
+		}
+    },
+    /* Sign-in button click */
+    submit: function() {
+        
+    	var url = openid.provider_url; 
+    	if (url) {
+    		url = url.replace('{username}', $('#openid_username').val());
+    		openid.setOpenIdUrl(url);
+    	}
+    	if(openid.ajaxHandler) {
+    		openid.ajaxHandler(openid.provider_id, document.getElementById(openid.input_id).value);
+    		return false;
+    	}
+    	if(openid.demo) {
+    		alert("In client demo mode. Normally would have submitted OpenID:\r\n" + document.getElementById(openid.input_id).value);
+    		return false;
+    	}
+    	return true;
+    },
+    setOpenIdUrl: function (url) {
+    
+	var hidden = $('#'+this.input_id);
+	if (hidden.length > 0) {
+		hidden.value = url;
+    	} else {
+		$('#openid_form').append('<input style="display:none" id="' + this.input_id + '" name="' + this.input_id + '" value="'+url+'"/>');
+    	}
+    },
+    highlight: function (box_id) {
+    	
+    	// remove previous highlight.
+    	var highlight = $('#openid_highlight');
+    	if (highlight) {
+    		highlight.replaceWith($('#openid_highlight a')[0]);
+    	}
+    	// add new highlight.
+    	$('.'+box_id).wrap('<div id="openid_highlight"></div>');
+    },
+    setCookie: function (value) {
+    
+		var date = new Date();
+		date.setTime(date.getTime()+(this.cookie_expires*24*60*60*1000));
+		var expires = "; expires="+date.toGMTString();
+		
+		document.cookie = this.cookie_name+"="+value+expires+"; path=" + this.cookie_path;
+    },
+    readCookie: function () {
+		var nameEQ = this.cookie_name + "=";
+		var ca = document.cookie.split(';');
+		for(var i=0;i < ca.length;i++) {
+			var c = ca[i];
+			while (c.charAt(0)==' ') c = c.substring(1,c.length);
+			if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+		}
+		return null;
+    },
+    useInputBox: function (provider) {
+   	
+		var input_area = $('#openid_input_area');
+		
+		var html = '';
+		var id = 'openid_username';
+		var value = '';
+		var label = provider['label'];
+		var style = '';
+		
+		if (label) {
+			html = '<p>' + label + '</p>';
+		}
+		if (provider['name'] == 'OpenID') {
+			id = this.input_id;
+			value = 'http://';
+			style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;';
+		}
+		html += '<input id="'+id+'" type="text" style="'+style+'" name="'+id+'" value="'+value+'" />' + 
+					'<input id="openid_submit" type="submit" value="Sign-In"/>';
+		
+		input_area.empty();
+		input_area.append(html);
+
+		$('#'+id).focus();
+    },
+    setDemoMode: function (demoMode) {
+    	this.demo = demoMode;
+    },
+    setAjaxHandler: function (ajaxFunction) {
+    	this.ajaxHandler = ajaxFunction;
+    }
+};
-- 
cgit v1.2.3


From 62edf97941860cd242c08fa8dede3625ee1acb8b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:20:50 -0400
Subject: openid signin style changes

---
 doc/style.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 75aa28407..5f1a8e63a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -441,15 +441,12 @@ li.L8 { list-style: upper-alpha; }
 	float: left;
 }
 .openid_large_btn {
-	width: 100px;
-	height: 60px;
+	padding: 1em 1em;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
 }
 .openid_small_btn {
-	width: 24px;
-	height: 24px;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
-- 
cgit v1.2.3


From 8f6cfbfade6018732495addce11f6d5e93e0b723 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:33:27 -0400
Subject: Removed the openidsignup option.

---
 IkiWiki/Plugin/openid.pm | 15 ---------------
 debian/changelog         |  1 +
 doc/plugins/openid.mdwn  | 12 ------------
 3 files changed, 1 insertion(+), 27 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 7e4d0844a..36002371a 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -9,7 +9,6 @@ use IkiWiki 3.00;
 sub import {
 	add_underlay("openid-selector");
 	hook(type => "checkconfig", id => "openid", call => \&checkconfig);
-	hook(type => "getopt", id => "openid", call => \&getopt);
 	hook(type => "getsetup", id => "openid", call => \&getsetup);
 	hook(type => "auth", id => "openid", call => \&auth);
 	hook(type => "formbuilder_setup", id => "openid",
@@ -34,13 +33,6 @@ sub checkconfig () {
 	}
 }
 
-sub getopt () {
-	eval q{use Getopt::Long};
-	error($@) if $@;
-	Getopt::Long::Configure('pass_through');
-	GetOptions("openidsignup=s" => \$config{openidsignup});
-}
-
 sub getsetup () {
 	return
 		plugin => {
@@ -48,13 +40,6 @@ sub getsetup () {
 			rebuild => 0,
 			section => "auth",
 		},
-		openidsignup => {
-			type => "string",
-			example => "http://myopenid.com/",
-			description => "an url where users can signup for an OpenID",
-			safe => 1,
-			rebuild => 0,
-		},
 }
 
 sub openid_selector {
diff --git a/debian/changelog b/debian/changelog
index 3f20aec1a..595b8a2b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     (http://code.google.com/p/openid-selector/)
   * openid: Use "openid_identifier" as the form field, as required
     by OpenID Authentication v2.0 spec.
+  * Removed the openidsignup option.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index cd05bb1ad..7da2f8575 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -11,17 +11,5 @@ The [[!cpan LWPx::ParanoidAgent]] perl module is used if available, for
 added security. Finally, the [[!cpan Crypt::SSLeay]] perl module is needed
 to support users entering "https" OpenID urls.
 
-This plugin has a configuration option. You can set `--openidsignup`
-to the url of a third-party site where users can sign up for an OpenID. If
-it's set, the signin page will link to that site.
-
-This plugin supports the
-[myopenid.com affiliate program](http://myopenid.com/affiliate),
-which can be used to help users sign up for an OpenID and log into your
-site in a single, unified process. When you create the affiliate, specify a
-login url like `http://example.com/ikiwiki.cgi?do=continue`. Once the
-affiliate is created, set `openidsignup` to point to the affiliate's signup
-url.
-
 This plugin is enabled by default, but can be turned off if you want to
 only use some other form of authentication, such as [[passwordauth]].
-- 
cgit v1.2.3


From 3a1d81bd9c5a866aed0dd7890a4174f0ff6b1e78 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 21:54:58 -0400
Subject: avoid scaling favicons

chromium's rather impressive jaggy-free scaling spoiled me, but in
iceweasel, scaled favicons look crap
---
 doc/style.css                                             | 1 +
 underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 5f1a8e63a..78756481e 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -447,6 +447,7 @@ li.L8 { list-style: upper-alpha; }
 	float: left;
 }
 .openid_small_btn {
+	padding: 4px 4px;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 43d2ef668..8137f232f 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -114,7 +114,7 @@ var openid = {
         		'<a href="' + localloginurl + '"' +
         		' style="background: #FFF" ' +
         		'class="openid_large_btn">' +
-			'<img alt="" width="24" height="24" src="favicon.ico" />' +
+			'<img alt="" width="16" height="16" src="favicon.ico" />' +
 			' Local Account' +
 			'</a>'
 		);
@@ -148,7 +148,7 @@ var openid = {
         return '<a' + title +' href="javascript: openid.signin(\''+ box_id +'\');"' +
         		' style="background: #FFF" ' + 
         		'class="' + box_id + ' openid_' + box_size + '_btn">' +
-			'<img alt="" width="24" height="24" src="' + provider["icon"] + '" />' +
+			'<img alt="" width="16" height="16" src="' + provider["icon"] + '" />' +
 			label +
 			'</a>';
     
-- 
cgit v1.2.3


From f1f6973d2d05e2cfc7f463df8568de07314e1720 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 7 May 2010 22:21:48 -0400
Subject: update

---
 doc/ikiwiki/openid.mdwn | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/openid.mdwn b/doc/ikiwiki/openid.mdwn
index 318928139..2fa972ede 100644
--- a/doc/ikiwiki/openid.mdwn
+++ b/doc/ikiwiki/openid.mdwn
@@ -9,15 +9,10 @@
 that allows you to have one login that you can use on a growing number of
 websites.
 
-To sign up for an OpenID, visit one of the following identity providers:
+If you have an account with some of the larger web service providers,
+you might already have an OpenID. 
+[Directory of OpenID providers](http://openiddirectory.com/openid-providers-c-1.html)
 
-* [MyOpenID](https://www.myopenid.com/)
-* [GetOpenID](https://getopenid.com/)
-* [LiveJournal](http://www.livejournal.com/openid/)
-* [TrustBearer](https://openid.trustbearer.com/)
-* or any of the [many others out there](http://openiddirectory.com/openid-providers-c-1.html)
-
-Your OpenID is the URL that you are given when you sign up.
 [[!if test="enabled(openid)" then="""
 To sign in to this wiki using OpenID, just enter it in the OpenID field in the
 signin form. You do not need to give this wiki a password or go through any
-- 
cgit v1.2.3


From d50de130e8f9c1183ae958a3dc902829ab72c3bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 00:00:03 -0400
Subject: conditionalize use of sidebar

---
 doc/examples/blog/index.mdwn | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index a22c40c72..220c1b3e3 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,6 +1,11 @@
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
+"""]]
+
 [[!inline pages="./posts/* and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
 
-[[!sidebar]]
 
 This blog is powered by [ikiwiki](http://ikiwiki.info).
-- 
cgit v1.2.3


From ac8a91fe06808191b4eded829cf118d70be2c585 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 00:40:36 -0400
Subject: improve selector layout

---
 doc/style.css                                          |  2 +-
 .../openid-selector/ikiwiki/openid/openid-jquery.js    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 78756481e..d8b48bcd0 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -441,7 +441,7 @@ li.L8 { list-style: upper-alpha; }
 	float: left;
 }
 .openid_large_btn {
-	padding: 1em 1em;
+	padding: 1em 1.5em;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 067d68f3f..4dfb7420b 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -97,24 +97,24 @@ var openid = {
            	openid_btns.append(this.getBoxHTML(providers_large[id], 'large'));
         }
 
+        if (providers_small) {
+        	openid_btns.append('<br/>');
+        	
+	        for (id in providers_small) {
+	        
+	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
+	        }
+        }
 	if (localloginurl != "") {
            	openid_btns.append(
         		'<a href="' + localloginurl + '"' +
         		' style="background: #FFF" ' +
-        		'class="openid_large_btn">' +
+        		'class="openid_small_btn">' +
 			'<img alt="" width="16" height="16" src="favicon.ico" />' +
 			' Local Account' +
 			'</a>'
 		);
 	}
-        if (providers_small) {
-        	openid_btns.append('<br/>');
-        	
-	        for (id in providers_small) {
-	        
-	           	openid_btns.append(this.getBoxHTML(providers_small[id], 'small'));
-	        }
-        }
         
         $('#openid_form').submit(this.submit);
         
-- 
cgit v1.2.3


From 5570d144418267f910112fe8f26bd61e1cd0cd15 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 01:00:25 -0400
Subject: improve selector highlight

---
 doc/style.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index d8b48bcd0..6832194b2 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -436,8 +436,7 @@ li.L8 { list-style: upper-alpha; }
 	clear: both;
 }
 #openid_highlight {
-	padding: 3px;
-	background-color: #FFFCC9;
+	background-color: black;
 	float: left;
 }
 .openid_large_btn {
-- 
cgit v1.2.3


From 4298c809e540a7556d886f57341d3e5456a9c92f Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E@web>
Date: Sat, 8 May 2010 05:54:29 +0000
Subject: make an edit with the new login thinger

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

(limited to 'doc')

diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index 03c52b6aa..ed3332bf9 100644
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -1,3 +1,5 @@
 [Amitai Schlair](http://www.netbsd.org/~schmonz/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing:
 
 [[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"]]
+
+In progress: a plugin for [WIND authentication](http://www.columbia.edu/acis/rad/authmethods/wind/).
-- 
cgit v1.2.3


From b945299706bf06b70415fa1c1a91fad30aa9f179 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 8 May 2010 06:01:27 +0000
Subject: edit using the fancy jquery login thingy, update user page

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

(limited to 'doc')

diff --git a/doc/users/simonraven.mdwn b/doc/users/simonraven.mdwn
index 5fc24711e..13681a674 100644
--- a/doc/users/simonraven.mdwn
+++ b/doc/users/simonraven.mdwn
@@ -1,8 +1,7 @@
 ## personal/site info
 
-New ikiwiki site at my web site, blog, kisikew.org home site, for indigenews, and our indigenous-centric wiki (mostly East Coast/Woodlands area). Mediawiki stuff was imported successfully (as noted on this web site).
-
+Have several ikiwiki-based sites at my web site, blog, kisikew.org home site, for indigenews, and our indigenous-centric wiki (mostly East Coast/Woodlands area).
 ## ikiwiki branch at github
 
-Maintain my own branch, partly to learn about VCS, git, ikiwiki, Debian packaging, and Perl. I don't recommend anyone pull from it, as I use third-party plugins included on this site that people may not want in a default installation of ikiwiki. This is why I don't push to Joey's -- so it's nothing personal, I just don't want to mess things up for other people, from my mistakes and stumbles.
+Maintain my own branch, partly to learn about VCS, git, ikiwiki, Debian packaging, and Perl. Thinking of removing most 3rd-party plugins (found in contrib/). Have some custom plugins to support dual bottom-of-the-page "sidebars" and an attempt at supporting HTTPBL (see projecthoneypot.org).
 
-- 
cgit v1.2.3


From 32a79523bbb4051a9a528a148a6db82e9fdd20d6 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 02:38:54 -0400
Subject: add gmail button

It uses the google profile openid url, which results in a nicer openid
than the o8/id url.
---
 doc/style.css                                         |  2 +-
 .../openid-selector/ikiwiki/openid/openid-jquery.js   | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 6832194b2..171a68474 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -440,7 +440,7 @@ li.L8 { list-style: upper-alpha; }
 	float: left;
 }
 .openid_large_btn {
-	padding: 1em 1.5em;
+	padding: 1em 1.75em;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 59a59c084..544ba8936 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -30,18 +30,24 @@ var providers_small = {
         label: 'Enter your Livejournal username:',
         url: 'http://{username}.livejournal.com/'
     },
-    flickr: {
-	name: 'Flickr',        
-	icon: 'http://flickr.com/favicon.ico',
-	label: 'Enter your Flickr username:',
-	url: 'http://flickr.com/photos/{username}/'
-    },
     wordpress: {
         name: 'Wordpress',
 	icon: 'https://ddgw.s3.amazonaws.com/wordpress.org.ico',
         label: 'Enter your Wordpress.com username:',
         url: 'http://{username}.wordpress.com/'
     },
+    gmail: {
+	name: 'Gmail',
+	icon: 'http://mail.google.com/favicon.ico',
+	label: 'Enter your Gmail address:',
+	url: 'http://google.com/profiles/{email_username}/'
+    },
+    flickr: {
+	name: 'Flickr',
+	icon: 'http://www.flickr.com/favicon.ico',
+	label: 'Enter your Flickr username:',
+	url: 'http://flickr.com/photos/{username}/'
+    },
     myopenid: {
         name: 'MyOpenID',
 	icon: 'http://myopenid.com/favicon.ico',
@@ -172,6 +178,7 @@ var openid = {
     	var url = openid.provider_url; 
     	if (url) {
     		url = url.replace('{username}', $('#openid_username').val());
+    		url = url.replace('{email_username}', $('#openid_username').val().split('@')[0]);
     		openid.setOpenIdUrl(url);
     	}
     	if(openid.ajaxHandler) {
-- 
cgit v1.2.3


From f0914b386b026035d0055812a43dbd4a6ae528f7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 02:53:18 -0400
Subject: Revert "add gmail button"

This reverts commit 32a79523bbb4051a9a528a148a6db82e9fdd20d6.

Buggy and I need sleep.
---
 doc/style.css                                         |  2 +-
 .../openid-selector/ikiwiki/openid/openid-jquery.js   | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 171a68474..6832194b2 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -440,7 +440,7 @@ li.L8 { list-style: upper-alpha; }
 	float: left;
 }
 .openid_large_btn {
-	padding: 1em 1.75em;
+	padding: 1em 1.5em;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 544ba8936..59a59c084 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -30,24 +30,18 @@ var providers_small = {
         label: 'Enter your Livejournal username:',
         url: 'http://{username}.livejournal.com/'
     },
+    flickr: {
+	name: 'Flickr',        
+	icon: 'http://flickr.com/favicon.ico',
+	label: 'Enter your Flickr username:',
+	url: 'http://flickr.com/photos/{username}/'
+    },
     wordpress: {
         name: 'Wordpress',
 	icon: 'https://ddgw.s3.amazonaws.com/wordpress.org.ico',
         label: 'Enter your Wordpress.com username:',
         url: 'http://{username}.wordpress.com/'
     },
-    gmail: {
-	name: 'Gmail',
-	icon: 'http://mail.google.com/favicon.ico',
-	label: 'Enter your Gmail address:',
-	url: 'http://google.com/profiles/{email_username}/'
-    },
-    flickr: {
-	name: 'Flickr',
-	icon: 'http://www.flickr.com/favicon.ico',
-	label: 'Enter your Flickr username:',
-	url: 'http://flickr.com/photos/{username}/'
-    },
     myopenid: {
         name: 'MyOpenID',
 	icon: 'http://myopenid.com/favicon.ico',
@@ -178,7 +172,6 @@ var openid = {
     	var url = openid.provider_url; 
     	if (url) {
     		url = url.replace('{username}', $('#openid_username').val());
-    		url = url.replace('{email_username}', $('#openid_username').val().split('@')[0]);
     		openid.setOpenIdUrl(url);
     	}
     	if(openid.ajaxHandler) {
-- 
cgit v1.2.3


From f4cfae1466558ab2163263f300d7f698182229b7 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Sat, 8 May 2010 08:08:13 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index b3fbf1adc..46b0aca6b 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -3,3 +3,5 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5
 > Formerer does a good job keeping the backport up-to-date with whatever is in Debian testing. 
 > Which is the policy of what Backports should contain. So, I just need to stop releasing ikiwiki
 > for 2 weeks. :) --[[Joey]]
+
+>> And are there any chances you doing it... or rather not doing it?
-- 
cgit v1.2.3


From 6578dc2c2b2bc8e1947ba50b914cacd48c30c860 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Sat, 8 May 2010 08:15:41 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index a4644ff64..c326b8205 100644
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -1,3 +1,5 @@
 Puzzled a bit :-/
 
 > There is no explicit interface for reverting edits. Most of us use `git revert`. --[[Joey]]
+
+>> That's a blow; I was planning on appointing no techies to keep law and order on our pages :-/ Is there a plugin or at least a plan to add such a 'in demand' feature?
-- 
cgit v1.2.3


From 0f778849c6df237f2219de6e1fa237cf2bc9955f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 12:45:21 -0400
Subject: calendar: Allow negative month to be specified. -1 is last month,
 etc. (And also negaitve years.)

---
 IkiWiki/Plugin/calendar.pm           | 27 +++++++++++++++++++++++----
 debian/changelog                     |  2 ++
 doc/ikiwiki/directive/calendar.mdwn  |  6 +++---
 doc/plugins/calendar/discussion.mdwn | 11 ++++++++++-
 4 files changed, 38 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index aeb5f3d29..02f41070e 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -386,8 +386,19 @@ sub preprocess (@) {
 	$params{year}  = $thisyear	unless defined $params{year};
 	$params{month} = $thismonth	unless defined $params{month};
 
+	my $relativemonth=0;
+	if ($params{month} < 1) {
+		$params{month}=$thismonth+$params{month};
+		$relativemonth=1;
+	}
+	my $relativeyear=0;
+	if ($params{year} < 1) {
+		$params{year}=$thisyear+$params{year};
+		$relativeyear=1;
+	}
+	
 	$params{month} = sprintf("%02d", $params{month});
-			
+	
 	if ($params{type} eq 'month' && $params{year} == $thisyear
 	    && $params{month} == $thismonth) {
 		# calendar for current month, updates next midnight
@@ -404,8 +415,11 @@ sub preprocess (@) {
 		$pagestate{$params{destpage}}{calendar}{nextchange}=
 			timelocal(0, 0, 0, 1, $params{month}-1, $params{year});
 	}
-	elsif ($params{type} eq 'year' && $params{year} == $thisyear) {
-		# calendar for current year, updates 1st of next month
+	elsif (($params{type} eq 'year' && $params{year} == $thisyear) ||
+	       $relativemonth) {
+		# Calendar for current year updates 1st of next month.
+		# Any calendar relative to the current month also updates
+		# then.
 		if ($thismonth < 12) {
 			$pagestate{$params{destpage}}{calendar}{nextchange}=
 				timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year});
@@ -415,6 +429,12 @@ sub preprocess (@) {
 				timelocal(0, 0, 0, 1, 1-1, $params{year}+1);
 		}
 	}
+	elsif ($relativeyear) {
+		# Any calendar relative to the current year updates 1st
+		# of next year.
+		$pagestate{$params{destpage}}{calendar}{nextchange}=
+			timelocal(0, 0, 0, 1, 1-1, $thisyear+1);
+	}
 	elsif ($params{type} eq 'year' && $params{year} > $thisyear) {
 		# calendar for upcoming year, updates 1st of that year
 		$pagestate{$params{destpage}}{calendar}{nextchange}=
@@ -426,7 +446,6 @@ sub preprocess (@) {
 		delete $pagestate{$params{destpage}}{calendar};
 	}
 
-	# Calculate month names for next month, and previous months
 	my $calendar="";
 	if ($params{type} eq 'month') {
 		$calendar=format_month(%params);
diff --git a/debian/changelog b/debian/changelog
index f74e9929f..795f02822 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
     leave passwordauth enabled and let people who don't have an openid use it.
     The openid selector form avoids the UI annoyance of having both openid
     and passwordauth on one form.
+  * calendar: Allow negative month to be specified. -1 is last month, etc.
+    (And also negaitve years.)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn
index 198da9d51..e9216e11f 100644
--- a/doc/ikiwiki/directive/calendar.mdwn
+++ b/doc/ikiwiki/directive/calendar.mdwn
@@ -47,14 +47,14 @@ An example crontab:
   "2010". These pages can be automatically created using the
   `ikiwiki-calendar` program. 
 * `year` - The year for which the calendar is requested. Defaults to the
-  current year.
+  current year. Can also use -1 to refer to last year, and so on.
 * `month` - The numeric month for which the calendar is requested, in the
   range 1..12. Used only for the month view calendar, and defaults to the
-  current month.
+  current month. Can also use -1 to refer to last month, and so on.
 * `week_start_day` - A number, in the range 0..6, which represents the day
   of the week that the month calendar starts with. 0 is Sunday, 1 is Monday,
   and so on. Defaults to 0, which is Sunday.
-* `months_per_row` - In the annual calendar, number of months to place in
+* `months_per_row` - In the year calendar, number of months to place in
   each row. Defaults to 3.
 
 [[!meta robots="noindex, follow"]]
diff --git a/doc/plugins/calendar/discussion.mdwn b/doc/plugins/calendar/discussion.mdwn
index 9d57b7a1e..bb76a9d8b 100644
--- a/doc/plugins/calendar/discussion.mdwn
+++ b/doc/plugins/calendar/discussion.mdwn
@@ -1,6 +1,15 @@
 It would be nice if the "month" type calendar could collect all of the 
 matching pages on a given date in some inline type way. --[[DavidBremner]]
 
+> I agree, but I have not come up with good html to display them. Seems 
+> it might need some sort of popup.
+
 Is it possible to get the calendar to link to pages based not on their timestamp (as I understand that it does now, or have I misunderstood this?) and instead on for example their location in a directory hierarchy. That way the calendar could be used as a planning / timeline device which I think would be great. --[[Alexander]]
 
-I would like the ability to specify relative previous months. This way I could have a sidebar with the last three months by specifying no month, then 'month="-1"' and 'month="-2"'. Negative numbers for the month would otherwise be invalid, so this shouldn't produce any conflicts with expected behavior. (Right?) -- [[StevenBlack]]
+I would like the ability to specify relative previous months. This way I
+could have a sidebar with the last three months by specifying no month,
+then 'month="-1"' and 'month="-2"'. Negative numbers for the month would
+otherwise be invalid, so this shouldn't produce any conflicts with expected
+behavior. (Right?) -- [[StevenBlack]]
+
+> Great idea! Just implemented that and also relative years. --[[Joey]] 
-- 
cgit v1.2.3


From d238fd1b04b41b17cc9cb444d6dcee498d6a14c5 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 8 May 2010 23:38:35 +0000
Subject: bug with pubdate, in process of testing fix

---
 ...e_wrong_when_using_xhtml5___34__mode__34__.mdwn | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn

(limited to 'doc')

diff --git a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
new file mode 100644
index 000000000..c55b3f62d
--- /dev/null
+++ b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
@@ -0,0 +1,40 @@
+Hi,
+
+XML error:
+
+    Created <time datetime="2009-03-24T18:02:14Z" pubdate class="relativedate" title="Tue, 24 Mar 2009 14:02:14 -0400">2009-03-24</time>
+
+The pubdate REQUIRES a date, so e.g. `pubdate="2009-03-24T18:02:14Z"`
+
+Otherwise the XML parser chokes.
+
+<http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#attr-time-pubdate>
+
+<pre>
+diff --git a/IkiWiki.pm b/IkiWiki.pm
+index 1f2ab07..6ab5b56 100644
+--- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -1004,7 +1004,7 @@ sub displaytime ($;$$) {
+    my $time=formattime($_[0], $_[1]);
+    if ($config{html5}) {
+        return '<time datetime="'.date_3339($_[0]).'"'.
+-         ($_[2] ? ' pubdate' : '').
++           ($_[2] ? ' pubdate="'.date_3339($_[0]).'"' : '').
+            '>'.$time.'</time>';
+    }
+    else {
+diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
+index fe8ef09..8c4a1b4 100644
+--- a/IkiWiki/Plugin/relativedate.pm
++++ b/IkiWiki/Plugin/relativedate.pm
+@@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) {
+ 
+    if ($config{html5}) {
+        return '<time datetime="'.IkiWiki::date_3339($time).'"'.
+-         ($pubdate ? ' pubdate' : '').$mid.'</time>';
++           ($pubdate ? ' pubdate="'.IkiWiki::date_3339($time).'"' : '').$mid.'</time>';
+    }
+    else {
+        return '<span'.$mid.'</span>';
+</pre>
-- 
cgit v1.2.3


From 6512423f159a0917137b2caca3fa244147dd0131 Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 8 May 2010 23:42:45 +0000
Subject: fixed patch display...

---
 ...e_wrong_when_using_xhtml5___34__mode__34__.mdwn | 54 +++++++++++-----------
 1 file changed, 28 insertions(+), 26 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
index c55b3f62d..2dd0d945f 100644
--- a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
+++ b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
@@ -10,31 +10,33 @@ Otherwise the XML parser chokes.
 
 <http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#attr-time-pubdate>
 
+(indented exactly 4 spaces)
+
 <pre>
-diff --git a/IkiWiki.pm b/IkiWiki.pm
-index 1f2ab07..6ab5b56 100644
---- a/IkiWiki.pm
-+++ b/IkiWiki.pm
-@@ -1004,7 +1004,7 @@ sub displaytime ($;$$) {
-    my $time=formattime($_[0], $_[1]);
-    if ($config{html5}) {
-        return '<time datetime="'.date_3339($_[0]).'"'.
--         ($_[2] ? ' pubdate' : '').
-+           ($_[2] ? ' pubdate="'.date_3339($_[0]).'"' : '').
-            '>'.$time.'</time>';
-    }
-    else {
-diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
-index fe8ef09..8c4a1b4 100644
---- a/IkiWiki/Plugin/relativedate.pm
-+++ b/IkiWiki/Plugin/relativedate.pm
-@@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) {
- 
-    if ($config{html5}) {
-        return '<time datetime="'.IkiWiki::date_3339($time).'"'.
--         ($pubdate ? ' pubdate' : '').$mid.'</time>';
-+           ($pubdate ? ' pubdate="'.IkiWiki::date_3339($time).'"' : '').$mid.'</time>';
-    }
-    else {
-        return '<span'.$mid.'</span>';
+    diff --git a/IkiWiki.pm b/IkiWiki.pm
+    index 1f2ab07..6ab5b56 100644
+    --- a/IkiWiki.pm
+    +++ b/IkiWiki.pm
+    @@ -1004,7 +1004,7 @@ sub displaytime ($;$$) {
+        my $time=formattime($_[0], $_[1]);
+        if ($config{html5}) {
+            return '&lt;time datetime="'.date_3339($_[0]).'"'.
+    -         ($_[2] ? ' pubdate' : '').
+    +           ($_[2] ? ' pubdate="'.date_3339($_[0]).'"' : '').
+                '>'.$time.'&lt;/time&gt;';
+        }
+        else {
+    diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
+    index fe8ef09..8c4a1b4 100644
+    --- a/IkiWiki/Plugin/relativedate.pm
+    +++ b/IkiWiki/Plugin/relativedate.pm
+    @@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) {
+     
+        if ($config{html5}) {
+            return '&lt;time datetime="'.IkiWiki::date_3339($time).'"'.
+    -         ($pubdate ? ' pubdate' : '').$mid.'&lt;/time&gt;';
+    +           ($pubdate ? ' pubdate="'.IkiWiki::date_3339($time).'"' : '').$mid.'&lt;/time&gt;';
+        }
+        else {
+            return '&lt;span'.$mid.'&lt;/span&gt;';
 </pre>
-- 
cgit v1.2.3


From bc0aa4d40e10238f6b83e285869caab3dfeca395 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 19:45:02 -0400
Subject: Use xhtml friendly pubdate setting.

---
 IkiWiki.pm                                                             | 2 +-
 IkiWiki/Plugin/relativedate.pm                                         | 2 +-
 debian/changelog                                                       | 1 +
 ...lement__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d76b5edb4..33e4e1d1f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1004,7 +1004,7 @@ sub displaytime ($;$$) {
 	my $time=formattime($_[0], $_[1]);
 	if ($config{html5}) {
 		return '<time datetime="'.date_3339($_[0]).'"'.
-			($_[2] ? ' pubdate' : '').
+			($_[2] ? ' pubdate="pubdate"' : '').
 			'>'.$time.'</time>';
 	}
 	else {
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index fe8ef0901..179f9238c 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) {
 
 	if ($config{html5}) {
 		return '<time datetime="'.IkiWiki::date_3339($time).'"'.
-			($pubdate ? ' pubdate' : '').$mid.'</time>';
+			($pubdate ? ' pubdate="pubdate"' : '').$mid.'</time>';
 	}
 	else {
 		return '<span'.$mid.'</span>';
diff --git a/debian/changelog b/debian/changelog
index 730cae1e2..e6c5e42ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
   * calendar: Allow negative month to be specified. -1 is last month, etc.
     (And also negative years.)
   * calendar: Display year in title of month calendar.
+  * Use xhtml friendly pubdate setting.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
 
diff --git a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
index 2dd0d945f..1f6bdb333 100644
--- a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
+++ b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
@@ -6,6 +6,9 @@ XML error:
 
 The pubdate REQUIRES a date, so e.g. `pubdate="2009-03-24T18:02:14Z"`
 
+> No, `pubdate="pubdate"`. It's a boolean attribute. applied && [[done]]
+> --[[Joey]] 
+
 Otherwise the XML parser chokes.
 
 <http://www.whatwg.org/specs/web-apps/current-work/multipage/text-level-semantics.html#attr-time-pubdate>
-- 
cgit v1.2.3


From d379d8ab9dc999da6dcd3212634e9d2dc97d7a3e Mon Sep 17 00:00:00 2001
From: simonraven <simonraven@web>
Date: Sat, 8 May 2010 23:55:47 +0000
Subject:

---
 ..._element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
index 1f6bdb333..def5bcc2a 100644
--- a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
+++ b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn
@@ -8,6 +8,7 @@ The pubdate REQUIRES a date, so e.g. `pubdate="2009-03-24T18:02:14Z"`
 
 > No, `pubdate="pubdate"`. It's a boolean attribute. applied && [[done]]
 > --[[Joey]] 
+>> awesome, thanks for fixing my fix ;) --[[simonraven]]
 
 Otherwise the XML parser chokes.
 
-- 
cgit v1.2.3


From 7cb31560a584cf8f62723e0a142fddafa637f09e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 8 May 2010 23:07:15 -0400
Subject: dropped old html branch

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

(limited to 'doc')

diff --git a/doc/git.mdwn b/doc/git.mdwn
index a0b9c950f..c0f42a704 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -76,8 +76,6 @@ Some of the branches included in the main repository include:
 * `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
   due to license issues.  Also some bits need to be tweaked to make it
   work with the current *master* branch again.
-* `html` is an unfinished attempt at making ikiwiki output HTML 4.01
-  instead of xhtml.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
 * `debian-stable` is used for updates to the old version included in
-- 
cgit v1.2.3


From 0badce2ec03d9db1f6034546eabef097a5d7354d Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 9 May 2010 15:46:11 +0000
Subject: bugfix - only fetch after tags are disabled

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

(limited to 'doc')

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
index 32cf419e8..f9f086793 100644
--- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -10,9 +10,11 @@ used for local .debs that were never actually present in Debian:
 This can be avoided with the `tagopt = --no-tags` option in .git/config;
 see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/ready/no-tags>
 
-> [[done]] thanks. Also cleared propigated tags out of origin. 
+> *done* thanks. Also cleared propigated tags out of origin. 
 > 
 > Hmm, in testing I still see tags get pulled the first time a remote
 > is added. If those are then locally deleted, it doesn't pull them again
 > with the `--no-tags`.
 > --[[Joey]] 
+
+>> Oh, I see why. Try the same branch again... --[[smcv]]
-- 
cgit v1.2.3


From b5aa42d3e0f54649c8e5d3842ad0025279ba38a5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 9 May 2010 12:56:42 -0400
Subject: remerged

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

(limited to 'doc')

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
index f9f086793..9bd8938c5 100644
--- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
+++ b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
@@ -18,3 +18,5 @@ see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/read
 > --[[Joey]] 
 
 >> Oh, I see why. Try the same branch again... --[[smcv]]
+
+>>> [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 27cb77cd1919d5c61ba67333a349ab6e54ed5976 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 9 May 2010 18:11:51 +0000
Subject: updated branch, using add_autopage to spawn viewer pages

---
 doc/plugins/contrib/album.mdwn | 173 ++++++++++++++++++++++++++---------------
 1 file changed, 110 insertions(+), 63 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn
index 395c99bce..0393d26dc 100644
--- a/doc/plugins/contrib/album.mdwn
+++ b/doc/plugins/contrib/album.mdwn
@@ -9,9 +9,11 @@ thoughts about this plugin).
 This plugin formats a collection of images into a photo album,
 in the same way as many websites: good examples include the
 PHP application [Gallery](http://gallery.menalto.com/), Flickr,
-and Facebook's Photos "application". I've called it `album`
-to distinguish it from [[contrib/gallery|plugins/contrib/gallery]],
-although `gallery` might well be a better name for this functionality.
+and Facebook's Photos "application".
+
+I've called it `album` to distinguish it from
+[[contrib/gallery|plugins/contrib/gallery]], although `gallery` might well be
+a better name for this functionality.
 
 The web UI I'm trying to achieve consists of one
 [HTML page of thumbnails](http://www.pseudorandom.co.uk/2008/2008-03-08-panic-cell-gig/)
@@ -26,83 +28,128 @@ individual photos can't be bookmarked in a meaningful way, and
 the best it can do as a fallback for non-Javascript browsers
 is to provide a direct link to the image.)
 
-## Writing the viewers
+<h2 id="album"><code>album</code> directive</h2>
+
+Each page containing an `album` directive is treated as a photo album.
+
+Every image attached to an album or its subpages is considered to be part of
+the album. A "viewer" page, with the wiki's default page extension, will be
+generated to display the image, if there isn't already a page of the same
+name as the image: for instance, if `debconf` is an album and
+`debconf/tuesday/p100.jpg` exists, then `debconf/tuesday/p100.mdwn` might
+be created.
+
+There's currently a hard-coded list of extensions that are treated as images:
+`png`, `gif`, `jpg`, `jpeg` or `mov` files. More image and video types could
+be added in future. Videos aren't currently handled very well;
+ideally, something like totem-video-thumbnailer would be used.
+
+The `album` directive also produces an [[ikiwiki/directive/inline]] which
+automatically includes all the viewers for this album, except those that
+will appear in an <a href="#albumsection">albumsection</a> (if every image
+is in a section, then the `album` directive won't have any visible effect).
 
-    \[[!albumimage image=foo.jpg album=myalbum
-        title=...
-        caption=...
-        copyright=...
-        size=...
-        viewertemplate=...
-    ]]
+The `inline` is in `archive` and `quick` mode, but can include some
+extra information about the images, including file size and a thumbnail made
+using [[ikiwiki/directive/img]]). The default template is `albumitem.tmpl`,
+which takes advantage of these things.
 
-Each viewer contains one `\[[!albumimage]]` directive. This
-sets the `image` filename, the `album` in which this image appears,
-and an optional `caption`, and can override the `size` at which to
-display the image and the `viewertemplate` to use to display the
-image.
+<h2 id="albumsection"><code>albumsection</code> directive</h2>
 
-It can also have `title`, `copyright` and `date` parameters, which
-are short-cuts for [[ikiwiki/directive/meta]] directives.
+The `albumsection` directive is used to split an album into sections. It can
+only appear on a page that also has the <a href="#album">album</a> directive.
+
+The `filter` parameter is a [[ikiwiki/PageSpec]] against which viewer pages
+are matched. The `albumsection` directive displays all the images that match
+the filter, and the `album` directive displays any leftover images, like
+this:
+
+    # Holiday photos
+
+    \[[!album]]
+    <!-- replaced with a list of any uncategorized photos, which might be
+         empty -->
 
-The viewer can also have any other content, but typically the
-directive will be the only thing there.
+    ## People
 
-Eventually, there will be a specialized CGI user interface to
-edit all the photos of an album at once, upload a new photo
-(which will attach the photo but also write out a viewer page
-for it), or mark an already-uploaded photo as a member of an
-album (which is done by writing out a viewer page for it).
+    \[[!albumsection filter="tagged(people)"]]
+    <!-- replaced with a list of photos tagged 'people', including
+         any that are also tagged 'landscapes' -->
 
-The `\[[!albumimage]]` directive is replaced by an
+    ## Landscapes
+
+    \[[!albumsection filter="tagged(landscapes)"]]
+    <!-- replaced with a list of photos tagged 'landscapes', including
+         any that are also tagged 'people' -->
+
+<h2 id="albumimage"><code>albumimage</code> directive</h2>
+
+Each viewer page produced by the <a href="#album">album</a> directive
+contains an `albumimage` directive, which is replaced by an
 [[ikiwiki/directive/img]], wrapped in some formatting using a
-template (by default `albumviewer.tmpl`). The template can (and
-should) also include "next photo", "previous photo" and
-"up to gallery" links.
+template (by default it's `albumviewer.tmpl`). That template can also include
+links to the next photo, the previous photo and the album it's in; the default
+template has all of these.
 
-The next/previous links are themselves implemented by
-[[inlining|ikiwiki/directive/inline]] the next or previous
-photo, using a special template (by default `albumnext.tmpl`
-or `albumprev.tmpl`), in `archive`/`quick` mode.
+The next/previous links are themselves implemented by evaluating a template,
+either `albumnext.tmpl` or `albumprev.tmpl` by default.
 
-> With hindsight, using an inline here is wrong - I should just
-> run hooks and fill in the template within the album plugin.
-> inline has some specialized functionality that's overkill
-> here, and its delayed HTML substitution breaks the ability
-> to have previous/up/next links both above and below the
-> photo, for instance. --[[smcv]]
+The directive can also have parameters:
 
-## Writing the album
+* `title`, `copyright` and `date` are short-cuts for the corresponding
+  [[ikiwiki/directive/meta]] directives
 
-The album contains one `\[[!album]]` directive. It may also
-contain any number of `\[[!albumsection]]` directives, for
-example the demo album linked above could look like:
+* `caption` sets a caption which is displayed in the album and viewer
+  pages
 
-    \[[!album]]
-    <!-- replaced with one uncategorized photo -->
+The viewer page can also have other contents before or after the actual
+image viewer.
+
+## Bugs
+
+* The plugin doesn't do anything special to handle albums that are subpages
+  of each other. If, say, `debconf` and `debconf/monday` are both albums,
+  then `debconf/monday/p100.jpg` will currently be assigned to one or the
+  other, arbitrarily.
+
+* The plugin doesn't do anything special to handle photos with similar names.
+  If you have `p100.jpg` and `p100.png`, one will get a viewer page called
+  `p100` and the other will be ignored.
+
+* If there's no `albumimage` in a viewer page, one should probably be appended
+  automatically.
 
-    ## Gamarra
+## TODO
 
-    \[[!albumsection filter="link(gamarra)"]]
-    <!-- all the Gamarra photos -->
+* The documentation should mention how to replicate the appearance of
+  `album` and `albumsection` using an `inline` of viewer pages.
 
-    ## Smokescreen
+* The documentation should mention all the template variables and
+  all the parameters.
 
-    \[[!albumsection filter="link(smokescreen)"]]
-    <!-- all the Smokescreen photos -->
+* The generated viewer page should include most or all of the possible
+  parameters to the `albumimage` directive, with empty values, as a
+  template for editing.
 
-    ...
+* The generated viewer page should extract as much metadata as possible from
+  the photo's EXIF tags (creation/modification dates, author, title, caption,
+  copyright). [[smcv]] has a half-written implementation which runs
+  `scanimage` hooks, and has an `exiftool` plugin using [[!cpan Image::ExifTool]].
 
-The `\[[!album]]` directive is replaced by an
-[[ikiwiki/directive/inline]] which automatically includes every
-page that has an `\[[!albumimage]]` directive linking it to this
-album, except those that will appear in an `\[[!albumsection]]`.
+* There should be an option to reduce the size of photos and write them into
+  an underlay, for this workflow:
 
-The `inline` is in `archive`/`quick` mode, but includes some
-extra information about the images, including file size and a
-thumbnail (again, made using [[ikiwiki/directive/img]]). The
-default template is `albumitem.tmpl`, which takes advantage
-of these things.
+  * your laptop's local ikiwiki has two underlays, `photos` and `webphotos`
+  * `photos` contains full resolution photos with EXIF tags
+  * for each photo that exists in `photos` but not in `webphotos`, the album
+    plugin automatically resamples it down to a web-compatible resolution
+    ([[smcv]] uses up to 640x640), optimizes it with `jpegoptim`, strips out
+    all EXIF tags, and and writes it into the corresponding location
+    in `webphotos`
+  * `webphotos` is what you rsync to the web server
+  * the web server's ikiwiki only has `webphotos` as an underlay
 
-Each `\[[!albumsection]]` is replaced by a similar inline, which
-selects a subset of the photos in the album.
+* Eventually, there could be a specialized CGI user interface to batch-edit
+  all the photos of an album (so for each photo, you get an edit box each for
+  title, author, copyright etc.) - this would work by making programmatic
+  edits to all the `albumimage` directives.
-- 
cgit v1.2.3


From 0594ea04a811a59120ea7e91e94c3389ffcd33ca Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 9 May 2010 18:13:05 +0000
Subject: clarify

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn
index 0393d26dc..3cfcb68d4 100644
--- a/doc/plugins/contrib/album.mdwn
+++ b/doc/plugins/contrib/album.mdwn
@@ -134,7 +134,8 @@ image viewer.
 * The generated viewer page should extract as much metadata as possible from
   the photo's EXIF tags (creation/modification dates, author, title, caption,
   copyright). [[smcv]] has a half-written implementation which runs
-  `scanimage` hooks, and has an `exiftool` plugin using [[!cpan Image::ExifTool]].
+  `scanimage` hooks, and has an `exiftool` plugin using [[!cpan Image::ExifTool]]
+  as a reference implementation of that hook.
 
 * There should be an option to reduce the size of photos and write them into
   an underlay, for this workflow:
-- 
cgit v1.2.3


From 3f7ef01ca22963dc253d76a27a711dd18998606c Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Sun, 9 May 2010 18:27:58 +0000
Subject: respond with better design

---
 doc/plugins/contrib/album/discussion.mdwn | 41 +++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/album/discussion.mdwn b/doc/plugins/contrib/album/discussion.mdwn
index 9720589b4..0356860d8 100644
--- a/doc/plugins/contrib/album/discussion.mdwn
+++ b/doc/plugins/contrib/album/discussion.mdwn
@@ -46,6 +46,10 @@ secondly: barring the CGI interface for editing the album, which would be great,
 >
 > --[[smcv]]
 
+>> In the current version of the branch, the viewer pages are
+>> generated automatically if you didn't generate them yourself,
+>> so `ikiwiki-album` is no longer needed. --[[smcv]]
+
 i'm new to ikiwiki, apologies if this is dealt with elsewhere.  -brush
 
 > This plugin is pretty ambitious, and is unfinished, so I'd recommend
@@ -80,6 +84,10 @@ code or tried it yet, but here goes. --[[Joey]]
 >> an image with a strange extension to a differing target filename
 >> with the normal extension, respectively). -s
 
+>>> Now that we have `add_autofile` I can just create viewer pages
+>>> whenever there's an image to view. The current version of the
+>>> branch does that. -s
+
 * With each viewer page having next/prev links, I can see how you
   were having the scalability issues with ikiwiki's data structures
   earlier! -J
@@ -94,6 +102,8 @@ code or tried it yet, but here goes. --[[Joey]]
 >> (Unless you use img to make the thumbnails for those links, then it
 >> would rebuild the thumbnails anyway. Have not looked at the code.) --[[Joey]]
 
+>>> I do use img. -s
+
 * And doesn't each viewer page really depend on every other page in the
   same albumsection? If a new page is added, the next/prev links
   may need to be updated, for example. If so, there will be much
@@ -142,13 +152,20 @@ code or tried it yet, but here goes. --[[Joey]]
 > one album: if they're subpages of 2+ nested albums then they're only
 > considered to be in the deepest-nested one (i.e. longest URL), and if
 > they're not in any album then that's a usage error. This would
-> also make prev/next links sane.
->
+> also make prev/next links sane. -s
+
+>> The current version constrains images to be in at most one album,
+>> choosing one arbitrarily (dependent on scan order) if albums are
+>> nested. -s
+
 > If you want to reference images from elsewhere in the wiki and display
 > them as if in an album, then you can use an ordinary inline with
 > the same template that the album would use, and I'll make sure the
-> templates are set up so this works.
->
+> templates are set up so this works. -s
+
+>> Still needs documenting, I've put it on the TODO list on the main
+>> page. -s
+
 > (Implementation detail: this means that an image X/Y/Z/W/V, where X and
 > Y are albums, Z does not exist and W exists but is not an album,
 > would have a content dependency on Y, a presence dependency on Z
@@ -158,6 +175,12 @@ code or tried it yet, but here goes. --[[Joey]]
 > subpages of the album, although that would mean breaking some URLs
 > on the existing website I'm doing all this work for... -s
 
+>> The current version of the branch doesn't have this restriction;
+>> perhaps it's a worthwhile simplification, or perhaps it's too
+>> restrictive? I fairly often use directory hierarchies like
+>> `a_festival/saturday/foo.jpg` within an album, which makes
+>> it very easy to write `albumsection` filters. -s
+
 * Putting a few of the above thoughts together, my ideal album system
   seems to be one where I can just drop the images into a directory and
   have them appear in the album index, as well as each generate their own wiki
@@ -195,6 +218,10 @@ code or tried it yet, but here goes. --[[Joey]]
 >> upload-and-rename.
 >> -s
 
+>>> I believe the current branch meets your requirements, by having
+>>> first-class wiki pages spring into existence using `add_autofile`
+>>> to be viewer pages for photos. -s
+
 > In a way, what you really want for metadata is to have it in the album
 > page, so you can batch-edit the whole lot by editing one file (this
 > does mean that editing the album necessarily causes each of its viewers
@@ -214,6 +241,9 @@ code or tried it yet, but here goes. --[[Joey]]
 >> (That's apparently good enough for Bugzilla, but not really
 >> for ikiwiki). -s
 
+>>> This is now in the main page's TODO list; if/when I implement this,
+>>> I intend to make it a specialized CGI interface. -s
+
 >> Yes, [all metadata in one file] would make some sense.. It also allows putting one image in
 >> two albums, with different caption etc. (Maybe for different audiences.)
 >> --[[Joey]]
@@ -229,7 +259,8 @@ code or tried it yet, but here goes. --[[Joey]]
 
 ----
 
-Trying to use the "special extension" design:
+'''I think the "special extension" design is a dead-end, but here's what
+happened when I tried to work out how it would work. --[[smcv]]'''
 
 Suppose that each viewer is a JPEG-or-GIF-or-something, with extension
 ".albumimage". We have a gallery "memes" with three images, badger,
-- 
cgit v1.2.3


From 28bba0c4bab95228343ecccb33d94e028858a9e3 Mon Sep 17 00:00:00 2001
From: ImRajja <ImRajja@web>
Date: Mon, 10 May 2010 14:25:25 +0000
Subject: dsf sdfvsd

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

(limited to 'doc')

diff --git a/doc/Test_Post.mdwn b/doc/Test_Post.mdwn
new file mode 100644
index 000000000..e8dfce394
--- /dev/null
+++ b/doc/Test_Post.mdwn
@@ -0,0 +1 @@
+this is a test page..
-- 
cgit v1.2.3


From a855fa1d1846fd1c72254130e8cbcaa0f98bd200 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 10 May 2010 15:56:57 -0400
Subject: bring back input#openid_url styling

Still used on prefs page.
---
 doc/style.css | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 6832194b2..cb02f812a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -332,6 +332,13 @@ ol.form {
 li.form {
 	padding-bottom: 1em;
 }
+input#openid_url {
+	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 0 50%;
+	color: #000;
+	padding-left: 18px;
+}
 input#searchbox {
 	background: url(wikiicons/search-bg.gif) no-repeat;
 	background-color: #fff;
-- 
cgit v1.2.3


From 378cae14bbd540aa1cd6b165bee408c0add169c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 10 May 2010 16:12:55 -0400
Subject: openid_url was renamed to openid_identifier

---
 doc/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index cb02f812a..4ea77573a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -332,7 +332,7 @@ ol.form {
 li.form {
 	padding-bottom: 1em;
 }
-input#openid_url {
+input#openid_identifier {
 	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
 	background-color: #fff;
 	background-position: 0 50%;
-- 
cgit v1.2.3


From 4ceae1761b6f190a6115c106713d28f0a94e9191 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawngPXAGrxk1pbqnum3O4I_VPRgNj_TZR1I"
 <https://www.google.com/accounts/o8/id?id=AItOawngPXAGrxk1pbqnum3O4I_VPRgNj_TZR1I@web>
Date: Tue, 11 May 2010 21:52:38 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
index 316ea7e9b..e89545955 100644
--- a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
+++ b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn
@@ -25,4 +25,8 @@ But there is no error if I use `ikiwiki --rebuild` to regenerate the whole thing
 > that only happened some of the time.
 > 
 > (The Text::Typography warning seems probably unrelated.)
-> --[[Joey]] 
+> --[[Joey]]
+
+>> I'm sorry, I don't know what I was thinking there.  It's ikiwiki 3.20100212, and manually applying the patch you linked to made the bug go away.  (Upgrading ikiwiki is a pain on nearlyfreespeech, especially if you don't want to keep the build directory around -- please consider making ikiwiki runnable directly from a git clone.)
+
+[[!meta link="done"]]
-- 
cgit v1.2.3


From 4c22562ec10bed4d8e499f226b2b3ba8a18a6489 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 11 May 2010 19:18:35 -0400
Subject: remove

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

(limited to 'doc')

diff --git a/doc/Test_Post.mdwn b/doc/Test_Post.mdwn
deleted file mode 100644
index e8dfce394..000000000
--- a/doc/Test_Post.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-this is a test page..
-- 
cgit v1.2.3


From 978416a2e60edea6d3d2c9ede80b8f6ef27fcecc Mon Sep 17 00:00:00 2001
From: BerndZeimetz <BerndZeimetz@web>
Date: Tue, 11 May 2010 23:41:38 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/users/BerndZeimetz.mdwn b/doc/users/BerndZeimetz.mdwn
new file mode 100644
index 000000000..cf21dc585
--- /dev/null
+++ b/doc/users/BerndZeimetz.mdwn
@@ -0,0 +1,8 @@
+See [wiki.debian.org/BerndZeimetz](http://wiki.debian.org/BerndZeimetz) for details.
+
+<pre>
+ Bernd Zeimetz                            Debian GNU/Linux Developer
+ http://bzed.de                                http://www.debian.org
+ GPG Fingerprints: 06C8 C9A2 EAAD E37E 5B2C BE93 067A AD04 C93B FF79
+                   ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
+</pre>
-- 
cgit v1.2.3


From 85dea5786a5fee835b9677e5267d487813104018 Mon Sep 17 00:00:00 2001
From: BerndZeimetz <BerndZeimetz@web>
Date: Tue, 11 May 2010 23:57:45 +0000
Subject: Add bzed's git repo to the list of repositories to pull from

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

(limited to 'doc')

diff --git a/doc/git.mdwn b/doc/git.mdwn
index c0f42a704..88608d4b5 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -64,6 +64,7 @@ think about merging them. This is recommended. :-)
 * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
 * [[privat]] `git://github.com/privat/ikiwiki.git`
 * [[blipvert]] `git://github.com/blipvert/ikiwiki.git`
+* [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git`
 
 ## branches
 
-- 
cgit v1.2.3


From 72d7b8dc54d4dccc3100fddc23b9a245f62d3521 Mon Sep 17 00:00:00 2001
From: BerndZeimetz <BerndZeimetz@web>
Date: Wed, 12 May 2010 09:20:31 +0000
Subject: Add short page about contrib / tracking plugin

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/tracking.mdwn b/doc/plugins/contrib/tracking.mdwn
new file mode 100644
index 000000000..ee01b261b
--- /dev/null
+++ b/doc/plugins/contrib/tracking.mdwn
@@ -0,0 +1,30 @@
+[[!template id=plugin name=ftemplate author="[[BerndZeimetz]]"]]
+[[!toc]]
+[[!tag plugins]] [[!tag patch]] [[!tag wishlist]]
+
+## NAME
+
+IkiWiki::Plugin::tracking - enable google/piwik visitor tracking
+
+## SYNOPSIS
+
+    # activate the plugin
+    add_plugins => [qw{goodstuff tracking ....}],
+
+    # to use Piwik:
+    piwik_id => '1',
+    piwik_https_url => "https://ssl.example.com/piwik/",
+    piwik_http_url => "http://www.example.com/piwik/",
+
+    # to use Google Analytics:
+    google_analytics_id => "UA-xxxxxx-x"
+
+## DESCRIPTION
+
+This plugin includes the necessary tracking codes for Piwik and/or Google Analytics on all pages. Tracking codes will only be included if the necessary config options are set. The plugin could be enhanced to support goals/profiles and similar things, but I do not plan to do so.
+
+## DOWNLOAD
+
+* single files: [tracking.pm](http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=blob;f=IkiWiki/Plugin/tracking.pm;hb=refs/heads/tracking) [piwik.tmpl](http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=blob;f=templates/piwik.tmpl;hb=refs/heads/tracking) [google_analytics.tmpl](http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=blob;f=templates/google_analytics.tmpl;hb=refs/heads/tracking)
+* browse repository: <http://git.recluse.de/?p=users/bzed/ikiwiki.git;a=shortlog;h=refs/heads/tracking>
+* git repo: `git://git.recluse.de/users/bzed/ikiwiki.git` or <http://git.recluse.de/repos/users/bzed/ikiwiki.git> (Use the tracking branch)
-- 
cgit v1.2.3


From 1805bfbb5dd24ed23418ceee00524f4dd658993e Mon Sep 17 00:00:00 2001
From: BerndZeimetz <BerndZeimetz@web>
Date: Wed, 12 May 2010 09:21:40 +0000
Subject: ... choose the right name....

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/tracking.mdwn b/doc/plugins/contrib/tracking.mdwn
index ee01b261b..06d4120cd 100644
--- a/doc/plugins/contrib/tracking.mdwn
+++ b/doc/plugins/contrib/tracking.mdwn
@@ -1,4 +1,4 @@
-[[!template id=plugin name=ftemplate author="[[BerndZeimetz]]"]]
+[[!template id=plugin name=tracking author="[[BerndZeimetz]]"]]
 [[!toc]]
 [[!tag plugins]] [[!tag patch]] [[!tag wishlist]]
 
-- 
cgit v1.2.3


From 7112da3ed10a95e170fb197d473444a92009c223 Mon Sep 17 00:00:00 2001
From: "http://blog.farnz.org.uk/" <http://blog.farnz.org.uk/@web>
Date: Wed, 12 May 2010 19:21:54 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index c323153c8..1c746c190 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -79,3 +79,4 @@ Hmm, can I dig it?
 Test
 test2
 
+I assume this triggers a checkin and recompile?
-- 
cgit v1.2.3


From 3f2f447cb57acbcf2bf767c19160426a5efe5d75 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 12 May 2010 15:42:28 -0400
Subject: responses

---
 .../debian_backports_update_someone_please.mdwn    |  5 +++++
 ...ow_do_I_revert_edits_in_the_web_mode__63__.mdwn | 24 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index 46b0aca6b..f1854762e 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -5,3 +5,8 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5
 > for 2 weeks. :) --[[Joey]]
 
 >> And are there any chances you doing it... or rather not doing it?
+
+>>> Sure, I'm busily not doing it right now. Should reach testing in 3
+>>> days. I generally schedule things so a new ikiwiki reaches testing
+>>> every 2 weeks to month. Getting important new features and bugfixes out
+>>> can take priority though. --[[Joey]] 
diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index c326b8205..eca572c70 100644
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -3,3 +3,27 @@ Puzzled a bit :-/
 > There is no explicit interface for reverting edits. Most of us use `git revert`. --[[Joey]]
 
 >> That's a blow; I was planning on appointing no techies to keep law and order on our pages :-/ Is there a plugin or at least a plan to add such a 'in demand' feature?
+
+>>> A lot of things complicate adding that feature to the web interface.
+>>>
+>>> First, ikiwiki happily uses whatever the VCS's best of breed web
+>>> history interface is. (ie, viewvcs, gitweb). To allow reverting
+>>> past the bottom of the RecentChanges page, it would need to have its 
+>>> own history browser. Not sure I want to go there.
+>>>
+>>> And the mechanics of handling reverting can quickly get complex. 
+>>> Web reverting should only allow users to revert things they can edit,
+>>> but reverting a whole commit in git might touch multiple files.
+>>> Some files may not be editable over the web at all. (The
+>>> [[tips/untrusted_git_push]] also has to deal with those issues.)
+>>> Finally, a revert can fail with a conflict. The revert could touch 
+>>> multiple files, and multiple ones could conflict. The conflict may
+>>> involve non-page files that can't be diffed. So an interface for
+>>> resolving such a conflict could be hard.
+>>> 
+>>> Probably web-based reverting would need to be limited to reverting 
+>>> single file changes, not whole commits, and not having very good
+>>> conflict handling. And maybe only being accessible for changes
+>>> still visible on RecentChanges. With those limitations, it's certianly
+>>> doable (as a plugin even), but given how excellent `git revert` is in
+>>> comparison, I have not had a real desire to do so. --[[Joey]]
-- 
cgit v1.2.3


From 50c9851ddc834f6261da0df525374efd867f731d Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E@web>
Date: Thu, 13 May 2010 00:07:54 +0000
Subject: comments

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

(limited to 'doc')

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index eca572c70..510e93077 100644
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -27,3 +27,7 @@ Puzzled a bit :-/
 >>> still visible on RecentChanges. With those limitations, it's certianly
 >>> doable (as a plugin even), but given how excellent `git revert` is in
 >>> comparison, I have not had a real desire to do so. --[[Joey]]
+
+>>>> Web edits are single-file anyway, so I wouldn't expect web reverts
+>>>> to handle the multi-file case. OTOH, I've sometimes wished ikiwiki
+>>>> had its own history browser (somewhere down my todo list). --[[schmonz]]
-- 
cgit v1.2.3


From 7edd9e7ef3aec48f2b5206d307781378521d16f0 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 14 May 2010 14:00:39 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index f1854762e..66f5eb0c5 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -10,3 +10,5 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5
 >>> days. I generally schedule things so a new ikiwiki reaches testing
 >>> every 2 weeks to month. Getting important new features and bugfixes out
 >>> can take priority though. --[[Joey]] 
+
+>>>> Great! Thanks.
-- 
cgit v1.2.3


From 4611c77696496287385f19301bcdf301393c6a61 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 14 May 2010 14:02:25 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
index 510e93077..7686a7a08 100644
--- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
+++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn
@@ -31,3 +31,5 @@ Puzzled a bit :-/
 >>>> Web edits are single-file anyway, so I wouldn't expect web reverts
 >>>> to handle the multi-file case. OTOH, I've sometimes wished ikiwiki
 >>>> had its own history browser (somewhere down my todo list). --[[schmonz]]
+
+>>>> Yup, having a possibility to revert a single file would suffice.
-- 
cgit v1.2.3


From 01d28878d70b3a854fb683afaa81706f5b76b597 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 14 May 2010 14:11:04 +0000
Subject:

---
 ...o_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn

(limited to 'doc')

diff --git a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
new file mode 100644
index 000000000..9f70bf442
--- /dev/null
+++ b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
@@ -0,0 +1 @@
+OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in <frameset> mode?
-- 
cgit v1.2.3


From f09cd4b7363b5ff8bdaf71fa6aad56747cf6c734 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 14 May 2010 14:12:03 +0000
Subject:

---
 ..._load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
index 9f70bf442..0475d126f 100644
--- a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
+++ b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
@@ -1 +1 @@
-OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in <frameset> mode?
+OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in *frameset* mode?
-- 
cgit v1.2.3


From c9699ef0652bee261e03ff684dfe26b2bd791bd9 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 14 May 2010 16:14:29 +0000
Subject:

---
 ...sallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn

(limited to 'doc')

diff --git a/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn b/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn
new file mode 100644
index 000000000..c86c35da4
--- /dev/null
+++ b/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn
@@ -0,0 +1 @@
+As in title, I'd like to allow editing only some pages on my wiki. Rest by default is not editable by users except admin. Thanks
-- 
cgit v1.2.3


From 68b91528dd66c1e29147babc0647647cc0e0a958 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E@web>
Date: Fri, 14 May 2010 19:01:35 +0000
Subject: lockedit

---
 ...allow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn b/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn
index c86c35da4..fbc5c58e2 100644
--- a/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn
+++ b/doc/forum/what_is_the_easiest_way_to_implement_order:_disallow_all__44___allow_chosen__95__few_page_editing_policy__63__.mdwn
@@ -1 +1,3 @@
 As in title, I'd like to allow editing only some pages on my wiki. Rest by default is not editable by users except admin. Thanks
+
+> See [[plugins/lockedit]]. --[[schmonz]]
-- 
cgit v1.2.3


From 5071347e2b08c21206ed3d0dc30eebb4f499efe5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 14 May 2010 23:02:29 -0400
Subject: tweak actionvar

for visual consistentcy when there are no actions
---
 doc/style.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 4ea77573a..2cd7a9652 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -29,12 +29,13 @@ nav {
 
 .actions ul {
 	margin: 0;
-	padding: 6px;
+	padding: 6px .4em;
+	height: 1em;
 	list-style-type: none;
 }
 .actions li {
 	display: inline;
-	padding: .2em .4em;
+	padding: .2em;
 }
 .pageheader .actions ul {
 	border-bottom: 1px solid #000;
-- 
cgit v1.2.3


From e650b084a3651b4f49b60c6397501dea01723a51 Mon Sep 17 00:00:00 2001
From: "https://mukund.startssl.com/" <https://mukund.startssl.com/@web>
Date: Sat, 15 May 2010 09:53:32 +0000
Subject: Remove Banu

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index edf36b5c6..94dc00b25 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -53,7 +53,6 @@ Projects & Organizations
 * [Debian Costa Rica](http://cr.debian.net/)
 * [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 * [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
-* [Banu](https://www.banu.com/)
 
 Personal sites and blogs
 ========================
-- 
cgit v1.2.3


From 0287fe29ac7b2e38f8887ad0a5b0f6e98986809f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 22:23:44 -0400
Subject: reword comment count to avoid pluralisation issues

---
 doc/examples/blog/comments.mdwn | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 32ffa5537..f8569a549 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,7 +1,6 @@
-This page will show recent comments made to posts in the [[blog|index]].
-
-There are [[!pagecount pages="comment_pending(/posts/*)"]] comments
-in the moderation queue.
 [[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
+Comments in the moderation queue:
+[[!pagecount pages="comment_pending(/posts/*)"]]
 
+Recent comments on posts in the [[blog|index]]:
 [[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
-- 
cgit v1.2.3


From 758cd909e9cc7bf9b46679131808132a397c8770 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:01:40 -0400
Subject: move moderation info to sidebar

---
 doc/examples/blog/comments.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index f8569a549..1873fb9ac 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,6 +1,8 @@
+[[!sidebar content="""
 [[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
 Comments in the moderation queue:
 [[!pagecount pages="comment_pending(/posts/*)"]]
+"""]]
 
 Recent comments on posts in the [[blog|index]]:
 [[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
-- 
cgit v1.2.3


From 0ab4496237e42a0044116477d0358b2faaa95675 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:06:19 -0400
Subject: fix comment feed filename

---
 doc/examples/blog/comments.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 1873fb9ac..f600ae183 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,5 +1,6 @@
 [[!sidebar content="""
-[[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
+[[!inline pages="comment_pending(/posts/*)" feedfile=pendingmoderation
+description="comments pending moderation" show=-1]]
 Comments in the moderation queue:
 [[!pagecount pages="comment_pending(/posts/*)"]]
 """]]
-- 
cgit v1.2.3


From 405f5f09d0caaa2208a8da311df78911e01455dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:39:54 -0400
Subject: add news item for ikiwiki 3.20100515

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

(limited to 'doc')

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
new file mode 100644
index 000000000..de7145c8d
--- /dev/null
+++ b/doc/news/version_3.20100515.mdwn
@@ -0,0 +1,54 @@
+News for ikiwiki 3.20100515:
+
+   There are two significant changes to the page.tmpl template in this version.
+   If you have a locally modified version of that template, you will need to
+   update it at least to contain the following in the HTML &lt;head&gt;:
+     &lt;TMPL\_IF DYNAMIC&gt;
+     &lt;TMPL\_IF FORCEBASEURL&gt;&lt;base href="&lt;TMPL\_VAR FORCEBASEURL&gt;" /&gt;&lt;TMPL\_ELSE&gt;
+     &lt;TMPL\_IF BASEURL&gt;&lt;base href="&lt;TMPL\_VAR BASEURL&gt;" /&gt;&lt;/TMPL\_IF&gt;
+     &lt;/TMPL\_IF&gt;
+     &lt;/TMPL\_IF&gt;
+   Also, the footer should be wrapped in &lt;TMPL\_UNLESS DYNAMIC&gt; ... &lt;/TMPL\_UNLESS&gt;
+   There is a new "comment()" pagespec, that can be used to match a
+   comment on a page. It is recommended it be used instead of the old
+   method of using a pagespec such as "internal(comment\_*)" to match
+   things that looked like comments. The old pagespec will now also match
+   comments that are held for moderation; likely not what you want.
+   There have also been some changes to the style.css in this version,
+   particularly to support the new openid selector. If you have a modified
+   version, of style.css, updating it (or moving it to local.css) is
+   recommended.
+
+ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
+     a single template, page.tmpl.
+   * If you have a locally customised page.tmpl, it needs to be updated
+     to set &lt;base&gt; when BASEURL or FORCEBAREURL is set.
+   * comments: Comments pending moderation are now stored in the srcdir
+     alongside accepted comments, but with a `.\_comment\_pending` extension.
+     This allows easier byhand moderation, as the "\_pending" need
+     only be stripped off and the comment be committed to version control.
+   * The `comment\_pending()` pagespec can be used to match such unmoderated
+     comments, which makes it easy to add a feed of them, or a counter
+     indicating how many there are.
+   * Belatedly added a `comment()` pagespec.
+   * Gave comment and page editing forms some CSS and accessability love.
+   * Renamed postscan hook to indexhtml, to reflect its changed position,
+     and typical use.
+   * inline: Call indexhtml when inlining internal pages, so their
+     text can be indexed for searching.
+   * Delete hooks are passed deleted internal pages.
+   * openid: Incorporated a fancy openid-selector signin form.
+     (Based on http://code.google.com/p/openid-selector/)
+   * openid: Use "openid\_identifier" as the form field, as required
+     by OpenID Authentication v2.0 spec.
+   * Removed the openidsignup option. Instead, my recommendation is to
+     leave passwordauth enabled and let people who don't have an openid use it.
+     The openid selector form avoids the UI annoyance of having both openid
+     and passwordauth on one form.
+   * calendar: Allow negative month to be specified. -1 is last month, etc.
+     (And also negative years.)
+   * calendar: Display year in title of month calendar.
+   * Use xhtml friendly pubdate setting.
+   * remove, rename: Add guards against XSRF attacks."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 3d43768b52e0f435333a46fbbe948be9ef0ccd06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:41:59 -0400
Subject: formatting

---
 doc/news/version_3.20100515.mdwn | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
index de7145c8d..172b45521 100644
--- a/doc/news/version_3.20100515.mdwn
+++ b/doc/news/version_3.20100515.mdwn
@@ -2,18 +2,22 @@ News for ikiwiki 3.20100515:
 
    There are two significant changes to the page.tmpl template in this version.
    If you have a locally modified version of that template, you will need to
-   update it at least to contain the following in the HTML &lt;head&gt;:
-     &lt;TMPL\_IF DYNAMIC&gt;
-     &lt;TMPL\_IF FORCEBASEURL&gt;&lt;base href="&lt;TMPL\_VAR FORCEBASEURL&gt;" /&gt;&lt;TMPL\_ELSE&gt;
-     &lt;TMPL\_IF BASEURL&gt;&lt;base href="&lt;TMPL\_VAR BASEURL&gt;" /&gt;&lt;/TMPL\_IF&gt;
-     &lt;/TMPL\_IF&gt;
-     &lt;/TMPL\_IF&gt;
-   Also, the footer should be wrapped in &lt;TMPL\_UNLESS DYNAMIC&gt; ... &lt;/TMPL\_UNLESS&gt;
+   update it at least to contain the following in the HTML `<head>`:
+
+	<TMPL_IF DYNAMIC>
+	<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
+	<TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
+	</TMPL_IF>
+	</TMPL_IF>
+
+   Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL\_UNLESS>
+
    There is a new "comment()" pagespec, that can be used to match a
    comment on a page. It is recommended it be used instead of the old
    method of using a pagespec such as "internal(comment\_*)" to match
    things that looked like comments. The old pagespec will now also match
    comments that are held for moderation; likely not what you want.
+
    There have also been some changes to the style.css in this version,
    particularly to support the new openid selector. If you have a modified
    version, of style.css, updating it (or moving it to local.css) is
@@ -51,4 +55,4 @@ ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
      (And also negative years.)
    * calendar: Display year in title of month calendar.
    * Use xhtml friendly pubdate setting.
-   * remove, rename: Add guards against XSRF attacks."""]]
\ No newline at end of file
+   * remove, rename: Add guards against XSRF attacks."""]]
-- 
cgit v1.2.3


From 1e36ed1fe8cc4dd79a9b1831aec9690769952d92 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:43:55 -0400
Subject: formatting

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

(limited to 'doc')

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
index 172b45521..0405f0f3d 100644
--- a/doc/news/version_3.20100515.mdwn
+++ b/doc/news/version_3.20100515.mdwn
@@ -10,7 +10,7 @@ News for ikiwiki 3.20100515:
 	</TMPL_IF>
 	</TMPL_IF>
 
-   Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL\_UNLESS>
+   Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL_UNLESS>`
 
    There is a new "comment()" pagespec, that can be used to match a
    comment on a page. It is recommended it be used instead of the old
-- 
cgit v1.2.3


From cf7c47dea3c97c4e674087f890754339163f7792 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:44:54 -0400
Subject: formatting

---
 doc/news/version_3.20100515.mdwn | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
index 0405f0f3d..7eafa0be0 100644
--- a/doc/news/version_3.20100515.mdwn
+++ b/doc/news/version_3.20100515.mdwn
@@ -30,10 +30,10 @@ ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
    * If you have a locally customised page.tmpl, it needs to be updated
      to set &lt;base&gt; when BASEURL or FORCEBAREURL is set.
    * comments: Comments pending moderation are now stored in the srcdir
-     alongside accepted comments, but with a `.\_comment\_pending` extension.
+     alongside accepted comments, but with a `._comment_pending` extension.
      This allows easier byhand moderation, as the "\_pending" need
      only be stripped off and the comment be committed to version control.
-   * The `comment\_pending()` pagespec can be used to match such unmoderated
+   * The `comment_pending()` pagespec can be used to match such unmoderated
      comments, which makes it easy to add a feed of them, or a counter
      indicating how many there are.
    * Belatedly added a `comment()` pagespec.
@@ -44,7 +44,7 @@ ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
      text can be indexed for searching.
    * Delete hooks are passed deleted internal pages.
    * openid: Incorporated a fancy openid-selector signin form.
-     (Based on http://code.google.com/p/openid-selector/)
+     (Based on <http://code.google.com/p/openid-selector/>)
    * openid: Use "openid\_identifier" as the form field, as required
      by OpenID Authentication v2.0 spec.
    * Removed the openidsignup option. Instead, my recommendation is to
-- 
cgit v1.2.3


From 595a783e56cc9bbade002baeff95c0e60d6b3572 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 23:47:55 -0400
Subject: fixup pagespecs to work relative too

---
 doc/examples/blog/comments.mdwn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index f600ae183..f59b44390 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,8 +1,8 @@
 [[!sidebar content="""
-[[!inline pages="comment_pending(/posts/*)" feedfile=pendingmoderation
+[[!inline pages="comment_pending(./posts/*)" feedfile=pendingmoderation
 description="comments pending moderation" show=-1]]
 Comments in the moderation queue:
-[[!pagecount pages="comment_pending(/posts/*)"]]
+[[!pagecount pages="comment_pending(./posts/*)"]]
 """]]
 
 Recent comments on posts in the [[blog|index]]:
-- 
cgit v1.2.3


From 3830a3868b5b3c0a3d840f228c3e85ce686d0705 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sun, 16 May 2010 11:02:31 +0000
Subject: formulation (Did not sound right. (But I am non-native English
 speaker. So please revert if my change is incorrect.)

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

(limited to 'doc')

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
index 7eafa0be0..c6d08b6f0 100644
--- a/doc/news/version_3.20100515.mdwn
+++ b/doc/news/version_3.20100515.mdwn
@@ -13,7 +13,7 @@ News for ikiwiki 3.20100515:
    Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL_UNLESS>`
 
    There is a new "comment()" pagespec, that can be used to match a
-   comment on a page. It is recommended it be used instead of the old
+   comment on a page. It is recommended to use it instead of the old
    method of using a pagespec such as "internal(comment\_*)" to match
    things that looked like comments. The old pagespec will now also match
    comments that are held for moderation; likely not what you want.
-- 
cgit v1.2.3


From 26cf8d386fbdd0c16b732ae6ed1a866eb133a0d2 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E@web>
Date: Sun, 16 May 2010 12:55:22 +0000
Subject: s/FORCEBAREURL/FORCEBASEURL/

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

(limited to 'doc')

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
index c6d08b6f0..043346c88 100644
--- a/doc/news/version_3.20100515.mdwn
+++ b/doc/news/version_3.20100515.mdwn
@@ -28,7 +28,7 @@ ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
    * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
      a single template, page.tmpl.
    * If you have a locally customised page.tmpl, it needs to be updated
-     to set &lt;base&gt; when BASEURL or FORCEBAREURL is set.
+     to set &lt;base&gt; when BASEURL or FORCEBASEURL is set.
    * comments: Comments pending moderation are now stored in the srcdir
      alongside accepted comments, but with a `._comment_pending` extension.
      This allows easier byhand moderation, as the "\_pending" need
-- 
cgit v1.2.3


From 87c4b603c3095033f27a3bfadcafd385fb318d76 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Sun, 16 May 2010 13:50:15 +0000
Subject:

---
 ..._load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
index 0475d126f..f245e3807 100644
--- a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
+++ b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
@@ -1 +1,3 @@
 OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in *frameset* mode?
+
+> I think I'll have to use [[pagetemplate]] and this <http://stackoverflow.com/questions/153152/resizing-an-iframe-based-on-content> solution
-- 
cgit v1.2.3


From cf559160fa3ee65a99b303d0b483ae9481e4a2c7 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Sun, 16 May 2010 13:51:50 +0000
Subject:

---
 ..._load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
index f245e3807..a747911a5 100644
--- a/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
+++ b/doc/forum/how_to_load_an_external_page_and_still_have_it_under_ikiwiki_template.mdwn
@@ -1,3 +1,3 @@
 OK, probably title is bit confusing. Basically I'd like to be able to keep my left hand side menu, which is part of the template, and at the same time load let's say forum on the right hand side, which sits on a separate domain. Is it possible then to construct template that for some special links it runs as lets say in *frameset* mode?
 
-> I think I'll have to use [[pagetemplate]] and this <http://stackoverflow.com/questions/153152/resizing-an-iframe-based-on-content> solution
+> I think I'll have to use [[ikiwiki/directive/pagetemplate]] and this <http://stackoverflow.com/questions/153152/resizing-an-iframe-based-on-content> solution
-- 
cgit v1.2.3


From c5495420bd78882b90869551a7f79e548eb500f0 Mon Sep 17 00:00:00 2001
From: jwalck <jwalck@web>
Date: Sun, 16 May 2010 17:05:09 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 94dc00b25..cd0550ea8 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -53,6 +53,7 @@ Projects & Organizations
 * [Debian Costa Rica](http://cr.debian.net/)
 * [Fvwm Wiki](http://fvwmwiki.xteddy.org)
 * [Serialist](http://serialist.net/)'s static pages (documentation, blog).  We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template.
+* [Apua IT](http://apua.se/)
 
 Personal sites and blogs
 ========================
@@ -143,6 +144,7 @@ Personal sites and blogs
 * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
 * [Gustaf Thorslund's blog](http://blog.thorslund.org)
 * [Ertug Karamatli](http://pages.karamatli.com)
+* [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 2451d3927863534a863b84d9d90bf277e42711b2 Mon Sep 17 00:00:00 2001
From: jwalck <jwalck@web>
Date: Mon, 17 May 2010 04:03:03 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn
new file mode 100644
index 000000000..d40465971
--- /dev/null
+++ b/doc/plugins/contrib/flattr.mdwn
@@ -0,0 +1,45 @@
+[[!template id=plugin name=flattr author="[[jaywalk]]"]]
+
+[flattr.com](http://flattr.com/) is a flatrate micropayment service, which revolves around the idea of having flattr buttons everywhere that people visiting your site can use to "flattr" you.
+
+This plugin makes it easier to put flattr buttons in ikiwiki. It supports both the static kind as well as the counting dynamic javascript version. The dynamic version does not work if [[htmlscrubber|/plugins/htmlscrubber]] is active on the page.
+
+The dynamic button does not require creation of the page on flattr before being added to a page, the static one does.
+
+I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwiki/plugins/flattr/) and put the source here: [flattr.pm](http://jonatan.walck.se/software/ikiwiki/flattr.pm)
+
+This plugin is licensed under CC0.
+
+# Usage #
+
+    # [[!flattr args]] where args are in the form of arg=value.
+    # Possible args:
+    # type - static or dynamic. Defaults to static.
+
+    # vars in static mode:
+    # --------------------
+    # Required:
+    # url - URL to flattr page,
+    # e.g. http://flattr.com/thing/1994/jaywalks-weblog
+    # Optional: 
+    # btn - Set to compact for compact button.
+
+    # vars in dynamic mode:
+    # ---------------------
+    # Required:
+    # None.
+    # Optional:
+    # uid - Set the default in the plugin, override if needed.
+    # tle - The title defaults to $wikiname/some/path (like on the top of
+    #   the wiki).
+    # dsc - A description of the content. Defaults to " ".
+    # cat - Category, this can be text, images, video, audio, software or
+    #   rest. Defaults to text.
+    # lng - Language, list of available choises is on
+    #   https://flattr.com/support/integrate/languages. Defaults to en_GB.
+    # tag - A list of comma separated tags. Empty per default.
+    # url - URL to thing to flattred,
+    #   e.g. http://jonatan.walck.se/weblog
+    # btn - Set it to compact to get the small button, big for any other
+    #   value including empty.
+    
-- 
cgit v1.2.3


From f2304367f6820813e699eaeafaad4804de033753 Mon Sep 17 00:00:00 2001
From: jwalck <jwalck@web>
Date: Mon, 17 May 2010 04:04:50 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn
index d40465971..76d4d7b1d 100644
--- a/doc/plugins/contrib/flattr.mdwn
+++ b/doc/plugins/contrib/flattr.mdwn
@@ -22,7 +22,7 @@ This plugin is licensed under CC0.
     # url - URL to flattr page,
     # e.g. http://flattr.com/thing/1994/jaywalks-weblog
     # Optional: 
-    # btn - Set to compact for compact button.
+    # style - Set to compact for compact button.
 
     # vars in dynamic mode:
     # ---------------------
@@ -30,16 +30,16 @@ This plugin is licensed under CC0.
     # None.
     # Optional:
     # uid - Set the default in the plugin, override if needed.
-    # tle - The title defaults to $wikiname/some/path (like on the top of
+    # title - The title defaults to $wikiname/some/path (like on the top of
     #   the wiki).
-    # dsc - A description of the content. Defaults to " ".
+    # desc - A description of the content. Defaults to " ".
     # cat - Category, this can be text, images, video, audio, software or
     #   rest. Defaults to text.
-    # lng - Language, list of available choises is on
+    # lang - Language, list of available choises is on
     #   https://flattr.com/support/integrate/languages. Defaults to en_GB.
     # tag - A list of comma separated tags. Empty per default.
     # url - URL to thing to flattred,
     #   e.g. http://jonatan.walck.se/weblog
-    # btn - Set it to compact to get the small button, big for any other
+    # style - Set it to compact to get the small button, big for any other
     #   value including empty.
     
-- 
cgit v1.2.3


From 7cae2951248245cb8b4da69d0f28065c394b31a2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 00:42:52 -0400
Subject: on javascript, plugins, and htmlscrubber

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/flattr/discussion.mdwn b/doc/plugins/contrib/flattr/discussion.mdwn
new file mode 100644
index 000000000..98b7771c5
--- /dev/null
+++ b/doc/plugins/contrib/flattr/discussion.mdwn
@@ -0,0 +1,4 @@
+FWIW, it is possible for a plugin like this to add javascript to pages that
+are protected by htmlscrubber. Just return a token in your preprocess hook,
+and then have a format hook that replaces the token with the javascript.
+--[[Joey]] 
-- 
cgit v1.2.3


From 744919eba0448c2d7494f57b89afa2d27dde5fbd Mon Sep 17 00:00:00 2001
From: jwalck <jwalck@web>
Date: Mon, 17 May 2010 04:52:27 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/flattr/discussion.mdwn b/doc/plugins/contrib/flattr/discussion.mdwn
index 98b7771c5..586139e9c 100644
--- a/doc/plugins/contrib/flattr/discussion.mdwn
+++ b/doc/plugins/contrib/flattr/discussion.mdwn
@@ -2,3 +2,8 @@ FWIW, it is possible for a plugin like this to add javascript to pages that
 are protected by htmlscrubber. Just return a token in your preprocess hook,
 and then have a format hook that replaces the token with the javascript.
 --[[Joey]] 
+
+> Thanks, That's good to know. I'll try to continue the development of this
+> plugin later, for now I just needed it to work. :) It will most likely
+> evolve as my page does too.
+> --[[jaywalk]]
-- 
cgit v1.2.3


From ddb4f2410486f46255c4909bbb43b75c4b08f308 Mon Sep 17 00:00:00 2001
From: jwalck <jwalck@web>
Date: Mon, 17 May 2010 04:56:44 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/flattr/jaywalk.mdwn b/doc/plugins/contrib/flattr/jaywalk.mdwn
new file mode 100644
index 000000000..31b3e0c4d
--- /dev/null
+++ b/doc/plugins/contrib/flattr/jaywalk.mdwn
@@ -0,0 +1,5 @@
+Jonatan Walck. Home page: [jonatan.walck.se](http://jonatan.walck.se)
+
+## Contact ##
+* jonatan at walck dot se
+* [I2P-Bote key](http://jonatan.walck.i2p/docs/i2p-bote.txt) [what is this?](http://i2pbote.i2p.to/)
-- 
cgit v1.2.3


From 4bb245df90965898b3e572d67c4fda25b0be84c5 Mon Sep 17 00:00:00 2001
From: Changaco <Changaco@web>
Date: Mon, 17 May 2010 16:46:28 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn
index c09a9595f..6d1632b4c 100644
--- a/doc/todo/multiple_template_directories.mdwn
+++ b/doc/todo/multiple_template_directories.mdwn
@@ -11,3 +11,5 @@ ought to do the trick.
 > global dir when it cannot find a template. For me, this is good enough.
 > And it is even documented in the man page. Sigh. I guess this could be 
 > considered [[done]].  
+
+I have a use case for this, a site composed of blogs and wikis, templates divided in three categories : common, blog and wiki. The only solution I found is maintaining hard links, being able to have multiple template dirs would obviously be better. -- Changaco
-- 
cgit v1.2.3


From b7777931e2ade5e71b7e1b82e5ab12138e63ec96 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 17 May 2010 17:12:22 +0000
Subject: fix link

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn
index 76d4d7b1d..fb532f44c 100644
--- a/doc/plugins/contrib/flattr.mdwn
+++ b/doc/plugins/contrib/flattr.mdwn
@@ -6,7 +6,7 @@ This plugin makes it easier to put flattr buttons in ikiwiki. It supports both t
 
 The dynamic button does not require creation of the page on flattr before being added to a page, the static one does.
 
-I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwiki/plugins/flattr/) and put the source here: [flattr.pm](http://jonatan.walck.se/software/ikiwiki/flattr.pm)
+I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwiki/plugin/flattr/) and put the source here: [flattr.pm](http://jonatan.walck.se/software/ikiwiki/flattr.pm)
 
 This plugin is licensed under CC0.
 
-- 
cgit v1.2.3


From 4de7cdf2aaa7f35a33178da23e793e79ff073225 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 13:13:11 -0400
Subject: fix location

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/flattr/jaywalk.mdwn b/doc/plugins/contrib/flattr/jaywalk.mdwn
deleted file mode 100644
index 31b3e0c4d..000000000
--- a/doc/plugins/contrib/flattr/jaywalk.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-Jonatan Walck. Home page: [jonatan.walck.se](http://jonatan.walck.se)
-
-## Contact ##
-* jonatan at walck dot se
-* [I2P-Bote key](http://jonatan.walck.i2p/docs/i2p-bote.txt) [what is this?](http://i2pbote.i2p.to/)
diff --git a/doc/users/jaywalk.mdwn b/doc/users/jaywalk.mdwn
new file mode 100644
index 000000000..31b3e0c4d
--- /dev/null
+++ b/doc/users/jaywalk.mdwn
@@ -0,0 +1,5 @@
+Jonatan Walck. Home page: [jonatan.walck.se](http://jonatan.walck.se)
+
+## Contact ##
+* jonatan at walck dot se
+* [I2P-Bote key](http://jonatan.walck.i2p/docs/i2p-bote.txt) [what is this?](http://i2pbote.i2p.to/)
-- 
cgit v1.2.3


From 4518fbe1c101ed3a4a70d6c569ee0b5e0573835e Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 17 May 2010 17:13:17 +0000
Subject: link CC0 (I'd never heard of it)

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn
index fb532f44c..f8f005c31 100644
--- a/doc/plugins/contrib/flattr.mdwn
+++ b/doc/plugins/contrib/flattr.mdwn
@@ -8,7 +8,7 @@ The dynamic button does not require creation of the page on flattr before being
 
 I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwiki/plugin/flattr/) and put the source here: [flattr.pm](http://jonatan.walck.se/software/ikiwiki/flattr.pm)
 
-This plugin is licensed under CC0.
+This plugin is licensed under [CC0](http://creativecommons.org/publicdomain/zero/1.0/) (public domain).
 
 # Usage #
 
-- 
cgit v1.2.3


From eb28db2ad5d38110e7678012aaabce22f89063a2 Mon Sep 17 00:00:00 2001
From: "http://jmtd.livejournal.com/" <http://jmtd.livejournal.com/@web>
Date: Mon, 17 May 2010 17:18:58 +0000
Subject: how do people like to hack on ikiwiki?

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

(limited to 'doc')

diff --git a/doc/forum/ikiwiki_development_environment_tips.mdwn b/doc/forum/ikiwiki_development_environment_tips.mdwn
new file mode 100644
index 000000000..d0dd01425
--- /dev/null
+++ b/doc/forum/ikiwiki_development_environment_tips.mdwn
@@ -0,0 +1,3 @@
+I haven't settled on a comfortable/flexible/quick development environment for hacking on ikiwiki.  The VM I host my web pages on is not fast enough to use for RAD and ikiwiki. For developing plugins, it seems a bit heavy-weight to clone the entire ikiwiki repository. I haven't managed to get into a habit of running a cloned version of ikiwiki from it's own dir, rather than installing it (If that's even possible).  The ikiwiki site source (source ./doc) is quite large and not a great testbed for hacking (e.g. if you are working on a plugin you need a tailored test suite for that plugin).
+
+Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]]
-- 
cgit v1.2.3


From d63553b39b4afb18a5b3ee32131095699582529c Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E"
 <https://www.google.com/accounts/o8/id?id=AItOawlcaGfdn9Kye1Gc8aGb67PDVQW4mKbQD7E@web>
Date: Mon, 17 May 2010 17:31:55 +0000
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/ikiwiki_development_environment_tips.mdwn b/doc/forum/ikiwiki_development_environment_tips.mdwn
index d0dd01425..9fa3595ed 100644
--- a/doc/forum/ikiwiki_development_environment_tips.mdwn
+++ b/doc/forum/ikiwiki_development_environment_tips.mdwn
@@ -1,3 +1,5 @@
 I haven't settled on a comfortable/flexible/quick development environment for hacking on ikiwiki.  The VM I host my web pages on is not fast enough to use for RAD and ikiwiki. For developing plugins, it seems a bit heavy-weight to clone the entire ikiwiki repository. I haven't managed to get into a habit of running a cloned version of ikiwiki from it's own dir, rather than installing it (If that's even possible).  The ikiwiki site source (source ./doc) is quite large and not a great testbed for hacking (e.g. if you are working on a plugin you need a tailored test suite for that plugin).
 
 Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]]
+
+> I've just been setting `libdir` in an existing wiki's setup file. When the plugin's in a decent state, I copy it over to a git checkout and commit. For the plugins I've been working on (auth and VCS), this has been just fine. Are you looking for something more? --[[schmonz]]
-- 
cgit v1.2.3


From f864b74859d8b0197f59d7dfe7d45063dc887cd1 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Mon, 17 May 2010 17:34:40 +0000
Subject: an example of somewhere where the old functionality is actually
 needed

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

(limited to 'doc')

diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn
index 6d1632b4c..0f8f5c880 100644
--- a/doc/todo/multiple_template_directories.mdwn
+++ b/doc/todo/multiple_template_directories.mdwn
@@ -13,3 +13,35 @@ ought to do the trick.
 > considered [[done]].  
 
 I have a use case for this, a site composed of blogs and wikis, templates divided in three categories : common, blog and wiki. The only solution I found is maintaining hard links, being able to have multiple template dirs would obviously be better. -- Changaco
+
+> [[plugins/underlay]] used to allow adding extra templatedirs, but Joey
+> removed that functionality when he made templates search the wiki's
+> own `templates` directory.
+>
+> You can get a 3-level hierarchy like this:
+>
+> * instance-specific overrides: $srcdir/templates
+> * common to the entire site: a directory that is the value of all
+>   instances' `templatedir` parameters
+> * common to every ikiwiki in the world: /usr/share/ikiwiki/templates
+>   (implicitly searched)
+>
+> (by "instance" I mean an instance of ikiwiki - a .setup file, basically.)
+>
+> For a more complex hierarchy you'd need the old [[plugins/underlay]]
+> functionality, i.e. you'd need to (ask Joey to) revert the patch that
+> removed it. For instance, if anyone has a hierarchy like this, then
+> they need the old functionality back in order to split the template
+> search path for the things marked `(???)`:
+>
+>     every ikiwiki in the world (/usr/share/ikiwiki/templates)
+>     \--- your site (???)
+>         \--- your blogs (???)
+>              \--- travel blog ($srcdir/templates)
+>              \--- code blog ($srcdir/templates)
+>         \--- your wikis (???)
+>              \--- travel wiki ($srcdir/templates)
+>              \--- code wiki ($srcdir/templates)
+>
+> This looks pretty hypothetical to me, though...
+> --[[smcv]]
-- 
cgit v1.2.3


From 5e515605749684f5867857885043b4e25378a374 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 15:42:20 -0400
Subject: new todo

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

(limited to 'doc')

diff --git a/doc/todo/anon_push_of_comments.mdwn b/doc/todo/anon_push_of_comments.mdwn
new file mode 100644
index 000000000..bb5d04670
--- /dev/null
+++ b/doc/todo/anon_push_of_comments.mdwn
@@ -0,0 +1,6 @@
+It should be possible to use anonymous git push to post comments
+(created, say, by a ikiwiki-comment program). Currently, that is not
+allowed, because users cannot edit, or create internal page files.
+But, comments in allowed locations are an exception to that rule, and 
+that exception should be communicated somehow to `IkiWiki::Receive`.
+--[[Joey]] 
-- 
cgit v1.2.3


From 3298902443128f68e21f4ad349a7a3a9e0f03bce Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 15:46:07 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn
index 0f8f5c880..fe1951d51 100644
--- a/doc/todo/multiple_template_directories.mdwn
+++ b/doc/todo/multiple_template_directories.mdwn
@@ -45,3 +45,8 @@ I have a use case for this, a site composed of blogs and wikis, templates divide
 >
 > This looks pretty hypothetical to me, though...
 > --[[smcv]]
+
+>> The reason I removed it is because the same functionality of having
+>> multiple template directories is still present. Just put them in 
+>> the templates/ subdirectory of multiple underlay directories instead.
+>> --[[Joey]]
-- 
cgit v1.2.3


From 533c8e62c5043e8e10dbd6203bb1a5ebe8a0d87e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 15:55:17 -0400
Subject: why this is hard..

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

(limited to 'doc')

diff --git a/doc/todo/anon_push_of_comments.mdwn b/doc/todo/anon_push_of_comments.mdwn
index bb5d04670..b472ea13f 100644
--- a/doc/todo/anon_push_of_comments.mdwn
+++ b/doc/todo/anon_push_of_comments.mdwn
@@ -4,3 +4,11 @@ allowed, because users cannot edit, or create internal page files.
 But, comments in allowed locations are an exception to that rule, and 
 that exception should be communicated somehow to `IkiWiki::Receive`.
 --[[Joey]] 
+
+> Complications include: 
+> 
+> * Hard to see a way to prevent users from committing a comment that
+>   claims to be written by someone else.
+> * `checkcontent` hooks need to be run, but can't accept a comment
+>   for later moderation, since it's coming in as part of a commit.
+>   Best they could do is reject the commit.
-- 
cgit v1.2.3


From 47bc6105326ce76327f2accb6d6ae34d2cb1429e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Mon, 17 May 2010 22:46:23 +0200
Subject: please pull

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

(limited to 'doc')

diff --git a/doc/todo/allow_displaying_number_of_comments.mdwn b/doc/todo/allow_displaying_number_of_comments.mdwn
new file mode 100644
index 000000000..8e479bc85
--- /dev/null
+++ b/doc/todo/allow_displaying_number_of_comments.mdwn
@@ -0,0 +1,9 @@
+My `numcomments` Git branch adds a `NUMCOMMENTS` `TMPL_VAR`, which is
+useful to add to the `forumpage.tmpl` template to emulate (the nice
+bits of) a more usual webforum.
+
+Please review... and pull :)
+
+-- [[intrigeri]]
+
+[[patch]]
-- 
cgit v1.2.3


From 2b1bc9c7297dc4bf36f4fc91205ad13eaf1513ca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 17:13:53 -0400
Subject: review

---
 doc/todo/allow_displaying_number_of_comments.mdwn | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/allow_displaying_number_of_comments.mdwn b/doc/todo/allow_displaying_number_of_comments.mdwn
index 8e479bc85..7e8802210 100644
--- a/doc/todo/allow_displaying_number_of_comments.mdwn
+++ b/doc/todo/allow_displaying_number_of_comments.mdwn
@@ -5,5 +5,23 @@ bits of) a more usual webforum.
 Please review... and pull :)
 
 -- [[intrigeri]]
+ 
+> How is having this variable for showing a count of the comments 
+> better (or more forum-ish) than the COMMENTSLINK variable which
+> includes a count and a link to the comments, and is already displayed
+> in inlinepage.tmpl?
+> 
+> `num_comments` will never return undef.
+> 
+> I see no need to add a second pagetemplate hook.
+> The existing one can be added to. Probably inside its `if ($shown)`
+> block.
+> 
+> It may also be a good idea to either combine the calls to `num_comments`
+> used for this and for the commentslink, 
+> or to memoize it. I'm thinking generally memoizing it may be a good idea
+> since the comments for a page will typically be counted twice when it's
+> inlined.
+> --[[Joey]] 
 
 [[patch]]
-- 
cgit v1.2.3


From 1f974b3517b3601e5014fcb0a383f980b4953a8c Mon Sep 17 00:00:00 2001
From: Changaco <Changaco@web>
Date: Mon, 17 May 2010 23:36:16 +0000
Subject: problem solved

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

(limited to 'doc')

diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn
index fe1951d51..b8b9651b9 100644
--- a/doc/todo/multiple_template_directories.mdwn
+++ b/doc/todo/multiple_template_directories.mdwn
@@ -50,3 +50,5 @@ I have a use case for this, a site composed of blogs and wikis, templates divide
 >> multiple template directories is still present. Just put them in 
 >> the templates/ subdirectory of multiple underlay directories instead.
 >> --[[Joey]]
+
+>>>Thanks, I didn't realize this was possible. Problem solved. -- Changaco
-- 
cgit v1.2.3


From 284038fbbf09a55ae23ebeca03f8ff4487ce7ef6 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Tue, 18 May 2010 09:23:23 +0000
Subject: tag as done

---
 doc/todo/multiple_template_directories.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/multiple_template_directories.mdwn b/doc/todo/multiple_template_directories.mdwn
index b8b9651b9..6a474b4f3 100644
--- a/doc/todo/multiple_template_directories.mdwn
+++ b/doc/todo/multiple_template_directories.mdwn
@@ -52,3 +52,22 @@ I have a use case for this, a site composed of blogs and wikis, templates divide
 >> --[[Joey]]
 
 >>>Thanks, I didn't realize this was possible. Problem solved. -- Changaco
+
+>>>> We can consider this [[done]], then. For reference, the solution
+>>>> to the hierarchy I mentioned above would be:
+>>>>
+>>>>     all your sites have $your_underlay as an underlay
+>>>>
+>>>>     the blogs and wikis all have $blog_underlay or $wiki_underlay
+>>>>     (as appropriate) as a higher priority underlay
+>>>>
+>>>>     every ikiwiki in the world (/usr/share/ikiwiki/templates)
+>>>>     \--- your site ($your_underlay/templates, or templatedir)
+>>>>         \--- your blogs ($blog_underlay/templates)
+>>>>              \--- travel blog ($srcdir/templates)
+>>>>              \--- code blog ($srcdir/templates)
+>>>>         \--- your wikis ($wiki_underlay/templates)
+>>>>              \--- travel wiki ($srcdir/templates)
+>>>>              \--- code wiki ($srcdir/templates)
+>>>>
+>>>> --[[smcv]]
-- 
cgit v1.2.3


From c71ea2337d56b7fe7fde7a4b2fb43a510fb5f05f Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Tue, 18 May 2010 11:47:28 +0100
Subject: response: shortcomings

---
 doc/forum/ikiwiki_development_environment_tips.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/ikiwiki_development_environment_tips.mdwn b/doc/forum/ikiwiki_development_environment_tips.mdwn
index 9fa3595ed..32da4a1cd 100644
--- a/doc/forum/ikiwiki_development_environment_tips.mdwn
+++ b/doc/forum/ikiwiki_development_environment_tips.mdwn
@@ -3,3 +3,17 @@ I haven't settled on a comfortable/flexible/quick development environment for ha
 Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]]
 
 > I've just been setting `libdir` in an existing wiki's setup file. When the plugin's in a decent state, I copy it over to a git checkout and commit. For the plugins I've been working on (auth and VCS), this has been just fine. Are you looking for something more? --[[schmonz]]
+
+>> I think this suffers from two problems. Firstly, unless you are tracking git
+>> master in your existing wiki, there's the possibility that your plugin will
+>> not work with a more modern version of ikiwiki (or that it would benefit
+>> from using a newly added utility subroutine or similar). Second, sometimes I
+>> find that even writing a plugin can involve making minor changes outside of
+>> the plugin code (bug fixes, or moving functionality about). So, I think
+>> having some kind of environment built around a git checkout is best.
+>> 
+>> However, this does not address the issue of the tedium writing/maintaining a
+>> setup file for testing things.
+>>
+>> I think I might personally benefit from a more consistent environment (I
+>> move from machine-to-machine frequently). -- [[Jon]]
-- 
cgit v1.2.3


From 529141779fe8492defbfa3e879c15bc81b3907dd Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 18 May 2010 16:11:45 +0200
Subject: response

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

(limited to 'doc')

diff --git a/doc/todo/allow_displaying_number_of_comments.mdwn b/doc/todo/allow_displaying_number_of_comments.mdwn
index 7e8802210..02d55fc9b 100644
--- a/doc/todo/allow_displaying_number_of_comments.mdwn
+++ b/doc/todo/allow_displaying_number_of_comments.mdwn
@@ -25,3 +25,6 @@ Please review... and pull :)
 > --[[Joey]] 
 
 [[patch]]
+
+>> Well, the COMMENTSLINK variable fits my needs. Sorry for
+>> the disturbance. [[done]] --[[intrigeri]]
-- 
cgit v1.2.3


From a35d8caf276ddfdc268c9d0e8b546db32d3bf43b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 13:42:37 -0400
Subject: add news item for ikiwiki 3.20100518

---
 doc/news/version_3.20100427.mdwn | 119 ---------------------------------------
 doc/news/version_3.20100518.mdwn |   6 ++
 2 files changed, 6 insertions(+), 119 deletions(-)
 delete mode 100644 doc/news/version_3.20100427.mdwn
 create mode 100644 doc/news/version_3.20100518.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100427.mdwn b/doc/news/version_3.20100427.mdwn
deleted file mode 100644
index 61cf67141..000000000
--- a/doc/news/version_3.20100427.mdwn
+++ /dev/null
@@ -1,119 +0,0 @@
-This version of ikiwiki has a lot of changes that you need to know about.
-
-Now you can include customised versions of templates in the source
-of your wiki. (For example, templates/page.tmpl.) When these templates
-are changed, ikiwiki will automatically rebuild pages that use them.
-
-Allowing untrusted users to upload attachments with the ".tmpl"
-extension is not recommended, as that allows anyone to change
-a wiki's templates.
-
-The --getctime switch is renamed to --gettime, and it also gets the 
-file modification time. And it's a lot faster (when using git). But
-the really important change is, you don't have to remember to use this
-switch. Now ikiwiki will do it when it needs to.
-
-At last, the "tagged()" pagespec only matches tags, not regular wikilinks.
-If your wiki accidentially relied on the old, buggy behavior, you might
-need to change its pagespecs to use "link()".
-
-Many of your wishes have been answered: Now tag pages can automatically be
-created when new tags are used. This feature is enabled by default if you
-have configured a tagbase. It can be turned on or off using the
-`tag_autocreate` setting.
-
-These changes may also affect some users:
-
-* The `title_natural` sort method (as used by the inline directive, etc)
-  has been moved to the new sortnaturally plugin, which is not enabled
-  by default since it requires the Sort::Naturally perl module.
-
-* `TMPL_INCLUDE` is no longer supported in any template used by ikiwiki.
-  It used to be allowed in certian templates, but not in others.
-
-* The `add_templates` option has been removed from the underlay plugin.
-  If you used this option, you can instead use templates/ subdirectories
-  inside underlay directories added by the `add_underlays` option.
-
-Due to the above and other changes, all wikis need to be rebuilt on
-upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist
-this will be done automatically when the Debian package is upgraded. Or
-use ikiwiki-mass-rebuild to force a rebuild.
-
-ikiwiki 3.20100427 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * [ Joey Hess ]
-   * tag: Automatic creation of tag pages can now be enabled using
-     the tag\_autocreate setting. (David Riebenbauer)
-   * Customised templates can now be included in the source of wikis
-     (and also in underlays), and dependencies on them are tracked.
-   * TMPL\_INCLUDE is no longer supported in any template.
-   * underlay: Removed the add\_templates option.
-   * Add template\_depends function to plugin API.
-   * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
-   * comments: Fix missing entity encoding in title.
-   * txt: Add a special case for robots.txt.
- * [ Simon McVittie ]
-   * Add support for link types, and make the the tagged() pagespec only
-     match tags, not regular links (a bugfix).
-   * Rebuild wikis on upgrade to this version to get tag link types recorded
-     correctly.
-   * Revamp sorting system; allow new sort methods to be added by plugins,
-     and add a "sortspec" syntax that can combine, reverse, etc sort methods.
-   * meta: Add `meta(author)`, `meta(title)` etc sortspecs to allow sorting
-     by metadata.
-   * meta: Add optional sortas parameter to author and title meta directives.
-     This can be used to get names sorted by last name without displaying
-     them last name first.
-   * sortnaturally: New plugin; the title\_natural sort method has moved here.
-   * meta: store fields consistently unescaped, and escape on use.
-     (A wiki rebuild is also needed due to this change.)
- * [ Joey Hess ]
-   * Update dependency for git-core to git transition.
-   * po: Check that translated underlay directories exist before using them
-     for master language.
-   * po: Configuring the same language as master and slave confuses processing;
-     so filter out such a misconfiguration.
-   * calendar: Add archive\_pagespec, which is used by ikiwiki-calendar to
-     specify which pages to include on the calendar archive pages.
-     (The pagespec can still also be specified on the ikiwiki-calendar command
-     line.)
-   * pagestats: Class parameter can be used to override default class for
-     custom styling.
-   * pagestats: Use style=list to get a list of tags, scaled by use like
-     in a tag cloud. This is useful to put in a sidebar.
-   * Rework example blog front page.
-   * CSS and templates for sidebar changed to use a class, not an id.
-   * sidebar: Now a sidebar directive can be used to override the sidebar
-     shown on a page.
-   * Enable calendar and sidebar in auto-blog.setup.
-   * sidebar: Add global\_sidebars setting.
-   * conditional: Fix bug that forced "all" mode off by default.
-   * calendarmonth.tmpl: The month calendar is now put in a sidebar.
-   * calendar: Improved display of arrows.
-   * Rename --getctime to --gettime. (The old name still works for
-     backwards compatibility.)
-   * --gettime now also looks up last modification time.
-   * Automatically run --gettime the first time ikiwiki is run on
-     a given srcdir. (Use --no-gettime to disable.)
-   * Add rcs\_getmtime to plugin API; currently only implemented
-     for git and svn.
-   * Optimise --gettime for git, so it's appropriately screamingly
-     fast. (This could be done for most other backends too.)
-   * However, --gettime for git no longer follows renames. That would
-     be slow, and whether a renamed wiki page is the same page is really
-     an iffy thing.
-   * Use above to fix up timestamps on docwiki, as well as ensure that
-     timestamps on basewiki files shipped in the deb are sane.
-   * autoindex: Switch to using %wikistate instead of abusing
-     $pagestate{index}.
-   * bzr: Support rcs\_getmtime, and fix rcs\_getctime implementation
-     (Jelmer Vernooij)
-   * Quite a lot of new optimisations, and one major fix to a recent
-     performance regression.
-   * Moved javascript files under the ikiwiki/ directory, to avoid cluttering
-     the top of the web root. This is another things that requires a wiki
-     rebuild on upgrade to this version.
-   * Fix removal of rendered files in rebuild mode.
-   * Add page() PageSpec, which is like glob() but matches only pages,
-     not other files."""]]
diff --git a/doc/news/version_3.20100518.mdwn b/doc/news/version_3.20100518.mdwn
new file mode 100644
index 000000000..f622a4be9
--- /dev/null
+++ b/doc/news/version_3.20100518.mdwn
@@ -0,0 +1,6 @@
+ikiwiki 3.20100518 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * page.tmpl: Accidentially broke po plugin's otherlanguages list styling
+     when modifying for html5; now fixed.
+   * Fix a bug that prevented matching deleted comments, and so did not update
+     pages that had contained them."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From fa354167bb9addab130e6a89eb845d5bc798c35e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 14:11:11 -0400
Subject: response

---
 .../ikiwiki_development_environment_tips.mdwn      | 27 +++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/forum/ikiwiki_development_environment_tips.mdwn b/doc/forum/ikiwiki_development_environment_tips.mdwn
index 32da4a1cd..91ccc6d6e 100644
--- a/doc/forum/ikiwiki_development_environment_tips.mdwn
+++ b/doc/forum/ikiwiki_development_environment_tips.mdwn
@@ -7,7 +7,13 @@ Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]
 >> I think this suffers from two problems. Firstly, unless you are tracking git
 >> master in your existing wiki, there's the possibility that your plugin will
 >> not work with a more modern version of ikiwiki (or that it would benefit
->> from using a newly added utility subroutine or similar). Second, sometimes I
+>> from using a newly added utility subroutine or similar). 
+
+>>> Unlikely. I don't make changes to the plugin interface that break
+>>> existing plugins. (Might change non-exported `IkiWiki::` things
+>>> from time to time.) --[[Joey]] 
+
+>> Second, sometimes I
 >> find that even writing a plugin can involve making minor changes outside of
 >> the plugin code (bug fixes, or moving functionality about). So, I think
 >> having some kind of environment built around a git checkout is best.
@@ -17,3 +23,22 @@ Does anyone have a comfortable setup or tips they would like to share? -- [[Jon]
 >>
 >> I think I might personally benefit from a more consistent environment (I
 >> move from machine-to-machine frequently). -- [[Jon]]
+
+> If you set `libdir` to point to a checkout of ikiwiki's git repository,
+> it will override use of the installed version of ikiwiki, so ikiwiki will
+> immediatly use any changed or new `.pm` files (with the exception of
+> IkiWiki.pm), and you can use git to manage it all without an installation
+> step. If I am modifying IkiWiki.pm, I generally symlink it from
+> `/usr/share/perl5/IkiWiki.pm` to my git reporisitory. Granted, not ideal.
+> 
+> I often use my laptop's local version of my personal wiki for testing.
+> It has enough stuff that I can easily test most things, and if I need
+> a test page I just dump test cases on the sandbox. I can make
+> any changes necessary during testing and then `git reset --hard
+> origin/master` to avoid publishing them.
+> 
+> If the thing I'm testing involves templates, or underlays, 
+> I will instead use ikiwiki's `docwiki.setup` for testing, modifying it as
+> needed, since it is preconfigured to use the templates and underlays
+> from ikiwiki's source repository.
+> --[[Joey]]
-- 
cgit v1.2.3


From 29cd4616fbdf25b7a4042376483f58d658c78140 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 18 May 2010 14:22:12 -0400
Subject: add news item for ikiwiki 3.20100518.2

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

(limited to 'doc')

diff --git a/doc/news/version_3.20100518.2.mdwn b/doc/news/version_3.20100518.2.mdwn
new file mode 100644
index 000000000..64ce3f863
--- /dev/null
+++ b/doc/news/version_3.20100518.2.mdwn
@@ -0,0 +1,3 @@
+ikiwiki 3.20100518.2 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix a typo in the last release."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From f463cde12eb814945cdce798dfdf675d4945fb11 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:18:35 +0000
Subject: new version

---
 doc/plugins/contrib/field.mdwn | 127 +++++++++++++++++++++++++++++++++--------
 1 file changed, 104 insertions(+), 23 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/field.mdwn b/doc/plugins/contrib/field.mdwn
index 09646d28a..dce2d891c 100644
--- a/doc/plugins/contrib/field.mdwn
+++ b/doc/plugins/contrib/field.mdwn
@@ -13,9 +13,22 @@ IkiWiki::Plugin::field - front-end for per-page record fields.
     # simple registration
     field_register => [qw{meta}],
 
+    # simple registration with priority
+    field_register => {
+	meta => 'last'
+	foo => 'DD'
+    },
+
     # allow the config to be queried as a field
     field_allow_config => 1,
 
+    # flag certain fields as "tags"
+    field_tags => {
+	BookAuthor => '/books/authors',
+	BookGenre => '/books/genres',
+	MovieGenre => '/movies/genres',
+    }
+
 ## DESCRIPTION
 
 This plugin is meant to be used in conjunction with other plugins
@@ -25,13 +38,14 @@ are fields in that record.  This can include the meta-data for that page,
 such as the page title.
 
 Plugins can register a function which will return the value of a "field" for
-a given page.  This can be used in three ways:
+a given page.  This can be used in a few ways:
 
 * In page templates; all registered fields will be passed to the page template in the "pagetemplate" processing.
 * In PageSpecs; the "field" function can be used to match the value of a field in a page.
+* In SortSpecs; the "field" function can be used for sorting pages by the value of a field in a page.
 * By other plugins, using the field_get_value function, to get the value of a field for a page, and do with it what they will.
 
-## OPTIONS
+## CONFIGURATION OPTIONS
 
 The following options can be set in the ikiwiki setup file.
 
@@ -46,28 +60,77 @@ keys of the config hash are the field names.
 
     field_register => [qw{meta}],
 
-A list of plugin-IDs to register.  This assumes that the plugins in
-question store data in the %pagestatus hash using the ID of that plugin,
-and thus the field values are looked for there.
+    field_register => {
+	meta => 'last'
+	foo => 'DD'
+    },
+
+A hash of plugin-IDs to register.  The keys of the hash are the names of the
+plugins, and the values of the hash give the order of lookup of the field
+values.  The order can be 'first', 'last', 'middle', or an explicit order
+sequence between 'AA' and 'ZZ'.  If the simpler type of registration is used,
+then the order will be 'middle'.
+
+This assumes that the plugins in question store data in the %pagestatus hash
+using the ID of that plugin, and thus the field values are looked for there.
 
 This is the simplest form of registration, but the advantage is that it
 doesn't require the plugin to be modified in order for it to be
 registered with the "field" plugin.
 
-## PageSpec
+**field_tags**
+
+    field_tags => {
+	BookAuthor => '/books/authors',
+	BookGenre => '/books/genres',
+	MovieGenre => '/movies/genres',
+    }
 
-The "field" PageSpec function can be used to match the value of a field for a page.
+A hash of fields and their associated pages.  This provides a faceted
+tagging system.
 
-**field(*name* *glob*)**
+The way this works is that a given field-name will be associated with a given
+page, and the values of that field will be linked to sub-pages of that page.
 
 For example:
 
-field(bar Foo*) will match if the "bar" field starts with "Foo".
+	BookGenre: SF
+
+will link to "/books/genres/SF", with a link-type of "bookgenre".
 
-**destfield(*name* *glob*)**
+## PageSpec
+
+The `field` plugin provides a few PageSpec functions to match values
+of fields for pages.
+
+* field
+  * **field(*name* *glob*)**
+  * field(bar Foo\*) will match if the "bar" field starts with "Foo".
+* destfield
+  * **destfield(*name* *glob*)**
+  * as for "field" but matches against the destination page (i.e when the source page is being included in another page).
+* field_item
+  * **field_item(*name* *glob*)**
+  * field_item(bar Foo) will match if one of the values of the "bar" field is "Foo".
+* destfield_item
+  * **destfield_item(*name* *glob*)**
+  * as for "field_item" but matches against the destination page.
+* field_tagged
+  * **field_tagged(*name* *glob*)**
+  * like `tagged`, but this uses the tag-bases and link-types defined in the `field_tags` configuration option.
+* destfield_tagged
+  * **destfield_tagged(*name* *glob*)**
+  * as for "field_tagged" but matches against the destination page.
+
+## SortSpec
+
+The "field" SortSpec function can be used to sort a page depending on the value of a field for that page.  This is used for directives that take sort parameters, such as **inline** or **report**.
+
+field(*name*)
 
-is the same, except that it tests the destination page (that is, in cases
-when the source page is being included in another page).
+For example:
+
+sort="field(bar)" will sort by the value og the "bar" field.
 
 ## FUNCTIONS
 
@@ -75,16 +138,18 @@ when the source page is being included in another page).
 
 field_register(id=>$id);
 
-Register a plugin as having field data.  The above form is the simplest, where the field value
-is looked up in the %pagestatus hash under the plugin-id.
+Register a plugin as having field data.  The above form is the simplest, where
+the field value is looked up in the %pagestatus hash under the plugin-id.
 
 Additional Options:
 
 **call=>&myfunc**
 
-A reference to a function to call rather than just looking up the value in the %pagestatus hash.
-It takes two arguments: the name of the field, and the name of the page.  It is expected to return
-the value of that field, or undef if there is no field by that name.
+A reference to a function to call rather than just looking up the value in the
+%pagestatus hash.  It takes two arguments: the name of the field, and the name
+of the page.  It is expected to return (a) an array of the values of that field
+if "wantarray" is true, or (b) a concatenation of the values of that field
+if "wantarray" is not true, or (c) undef if there is no field by that name.
 
     sub myfunc ($$) {
 	my $field = shift;
@@ -92,22 +157,38 @@ the value of that field, or undef if there is no field by that name.
 
 	...
 
-	return $value;
+	return (wantarray ? @values : $value);
     }
 
 **first=>1**
 
-Set this to be called first in the sequence of calls looking for values.  Since the first found
-value is the one which is returned, ordering is significant.
+Set this to be called first in the sequence of calls looking for values.  Since
+the first found value is the one which is returned, ordering is significant.
+This is equivalent to "order=>'first'".
 
 **last=>1**
 
-Set this to be called last in the sequence of calls looking for values.  Since the first found
-value is the one which is returned, ordering is significant.
+Set this to be called last in the sequence of calls looking for values.  Since
+the first found value is the one which is returned, ordering is significant.
+This is equivalent to "order=>'last'".
+
+**order=>$order**
+
+Set the explicit ordering in the sequence of calls looking for values.  Since
+the first found value is the one which is returned, ordering is significant.
+
+The values allowed for this are "first", "last", "middle", or a two-character
+ordering-sequence between 'AA' and 'ZZ'.
 
 ### field_get_value($field, $page)
 
-Returns the value of the field for that page, or undef if none is found.
+    my @values = field_get_value($field, $page);
+
+    my $value = field_get_value($field, $page);
+
+Returns the values of the field for that page, or undef if none is found.
+Note that it will return an array of values if you ask for an array,
+and a scalar value if you ask for a scalar.
 
 ## DOWNLOAD
 
-- 
cgit v1.2.3


From 9b45264c1c3e83b991d74de6df652a2f2e8749d8 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:20:44 +0000
Subject: new version

---
 doc/plugins/contrib/ftemplate.mdwn | 83 ++++----------------------------------
 1 file changed, 7 insertions(+), 76 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/ftemplate.mdwn b/doc/plugins/contrib/ftemplate.mdwn
index fba51e1c2..d82867f94 100644
--- a/doc/plugins/contrib/ftemplate.mdwn
+++ b/doc/plugins/contrib/ftemplate.mdwn
@@ -1,85 +1,16 @@
 [[!template id=plugin name=ftemplate author="[[rubykat]]"]]
 [[!tag type/meta type/format]]
-[[!toc]]
-## NAME
 
-IkiWiki::Plugin::ftemplate - field-aware structured template plugin
+This plugin provides the [[ikiwiki/directive/ftemplate]] directive.
 
-## SYNOPSIS
+This is like the [[ikiwiki/directive/template]] directive, with the addition
+that one does not have to provide all the values in the call to the template,
+because ftemplate can query structured data ("fields") using the [[field]]
+plugin.
 
-    # activate the plugin
-    add_plugins => [qw{goodstuff ftemplate ....}],
-
-## DESCRIPTION
-
-This plugin provides the **ftemplate** directive.  This is like
-the [[ikiwiki/directive/template]] directive, with the addition that one does not
-have to provide all the values in the call to the template,
-because ftemplate can query structured data ("fields") using
-the [[field]] plugin.
-
-Templates are files that can be filled out and inserted into pages in
-the wiki, by using the ftemplate directive. The directive has an id
-parameter that identifies the template to use.
-
-Additional parameters can be used to fill out the template, in
-addition to the "field" values.  Passed-in values override the
-"field" values.
-
-There are two places where template files can live.  One is, as with the
-[[plugins/template]] plugin, in the /templates directory on the wiki.  These
-templates are wiki pages, and can be edited from the web like other wiki
-pages.
-
-The second place where template files can live is in the global
-templates directory (the same place where the page.tmpl template lives).
-This is a useful place to put template files if you want to prevent
-them being edited from the web, and you don't want to have to make
-them work as wiki pages.
-
-### EXAMPLES
-
-#### Example 1
-
-PageA:
-
-    \[[!meta title="I Am Page A"]]
-    \[[!meta description="A is for Apple."]]
-    \[[!meta author="Fred Nurk"]]
-    \[[!ftemplate id="mytemplate"]]
-
-Template "mytemplate":
+## Activate the plugin
 
-    # <TMPL_VAR NAME="TITLE">
-    by <TMPL_VAR NAME="AUTHOR">
-
-    **Summary:** <TMPL_VAR NAME="DESCRIPTION">
-
-This will give:
-
-    <h1>I Am Page A</h1>
-    <p>by Fred Nurk</p>
-    <p><strong>Summary:</strong> A is for Apple.
-
-#### Example 2: Overriding values
-
-PageB:
-
-    \[[!meta title="I Am Page B"]]
-    \[[!meta description="B is for Banana."]]
-    \[[!meta author="Fred Nurk"]]
-    \[[!ftemplate id="mytemplate" title="Bananananananas"]]
-
-This will give:
-
-    <h1>Bananananananas</h1>
-    <p>by Fred Nurk</p>
-    <p><strong>Summary:</strong> B is for Banana.
-
-### LIMITATIONS
-
-One cannot query the values of fields on pages other than the current
-page.
+    add_plugins => [qw{goodstuff ftemplate ....}],
 
 ## PREREQUISITES
 
-- 
cgit v1.2.3


From 824a1a1599035d45e5428e1203bb02373a8ac3b3 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:22:13 +0000
Subject: put ftemplate directive info under directives; new version of
 ftemplate, with LOOPS!

---
 doc/ikiwiki/directive/ftemplate.mdwn | 106 +++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 doc/ikiwiki/directive/ftemplate.mdwn

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/ftemplate.mdwn b/doc/ikiwiki/directive/ftemplate.mdwn
new file mode 100644
index 000000000..3009fc830
--- /dev/null
+++ b/doc/ikiwiki/directive/ftemplate.mdwn
@@ -0,0 +1,106 @@
+The `ftemplate` directive is supplied by the [[!iki plugins/contrib/ftemplate desc=ftemplate]] plugin.
+
+This is like the [[ikiwiki/directive/template]] directive, with the addition
+that one does not have to provide all the values in the call to the template,
+because ftemplate can query structured data ("fields") using the
+[[plugins/contrib/field]] plugin.
+
+Templates are files that can be filled out and inserted into pages in
+the wiki, by using the ftemplate directive. The directive has an id
+parameter that identifies the template to use.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One is in the /templates
+directory on the wiki.  These templates are wiki pages, and can be edited from
+the web like other wiki pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+### EXAMPLES
+
+#### Example 1
+
+PageA:
+
+    \[[!meta title="I Am Page A"]]
+    \[[!meta description="A is for Apple."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate"]]
+
+Template "mytemplate":
+
+    # <TMPL_VAR NAME="TITLE">
+    by <TMPL_VAR NAME="AUTHOR">
+
+    **Summary:** <TMPL_VAR NAME="DESCRIPTION">
+
+This will give:
+
+    <h1>I Am Page A</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> A is for Apple.
+
+#### Example 2: Overriding values
+
+PageB:
+
+    \[[!meta title="I Am Page B"]]
+    \[[!meta description="B is for Banana."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate" title="Bananananananas"]]
+
+This will give:
+
+    <h1>Bananananananas</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> B is for Banana.
+
+#### Example 3: Loops
+
+(this example uses the [[plugins/contrib/ymlfront]] plugin)
+
+Page C:
+
+    ---
+    BookAuthor: Georgette Heyer
+    BookTitle: Black Sheep
+    BookGenre:
+      - Historical
+      - Romance
+    ---
+    \[[ftemplate id="footemplate"]]
+
+    I like this book.
+
+Template "footemplate":
+
+    # <TMPL_VAR BOOKTITLE>
+    by <TMPL_VAR BOOKAUTHOR>
+
+    <TMPL_IF BOOKGENRE>(
+    <TMPL_LOOP GENRE_LOOP><TMPL_VAR BOOKGENRE>
+    <TMPL_UNLESS __last__>, </TMPL_UNLESS>
+    </TMPL_LOOP>
+    )</TMPL_IF>
+
+This will give:
+
+    <h1>Black Sheep</h1>
+    <p>by Georgette Heyer</p>
+
+    <p>(Historical, Romance)</p>
+
+    <p>I like this book.</p>
+
+### LIMITATIONS
+
+One cannot query the values of fields on pages other than the current
+page.  If you want to do that, check out the [[plugins/contrib/report]]
+plugin.
-- 
cgit v1.2.3


From cc84a2dacdc85e3ca8e5e652464bfd5ce4f0c725 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:25:43 +0000
Subject: new version; splitting docs between plugin and directive pages

---
 doc/plugins/contrib/report.mdwn | 154 ++--------------------------------------
 1 file changed, 7 insertions(+), 147 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/report.mdwn b/doc/plugins/contrib/report.mdwn
index c364d4a3a..0bd5392c6 100644
--- a/doc/plugins/contrib/report.mdwn
+++ b/doc/plugins/contrib/report.mdwn
@@ -1,157 +1,17 @@
 [[!template id=plugin name=report author="[[rubykat]]"]]
 [[!tag type/meta type/format]]
-[[!toc]]
-## NAME
-
 IkiWiki::Plugin::report - Produce templated reports from page field data.
 
-## SYNOPSIS
-
-    # activate the plugin
-    add_plugins => [qw{goodstuff report ....}],
-
-    \[[!report template="blog_summary"
-    pages="blog/*"
-    sort="mtime"]]
-
-## DESCRIPTION
-
-This plugin provides the **report** directive.  This enables one to report on
-the structured data ("field" values) of multiple pages; the output is formatted
-via a template.  This depends on the [[plugins/contrib/field]] plugin.
-
-The pages to report on are selected by a PageSpec given by the "pages"
-parameter.  The template is given by the "template" parameter.
-The template expects the data from a single page; it is applied
-to each matching page separately, one after the other.
-
-Additional parameters can be used to fill out the template, in
-addition to the "field" values.  Passed-in values override the
-"field" values.
-
-There are two places where template files can live.  One, as with the
-[[plugins/template]] plugin, is in the /templates directory on the wiki.  These
-templates are wiki pages, and can be edited from the web like other wiki
-pages.
-
-The second place where template files can live is in the global
-templates directory (the same place where the page.tmpl template lives).
-This is a useful place to put template files if you want to prevent
-them being edited from the web, and you don't want to have to make
-them work as wiki pages.
-
-## OPTIONS
-
-**template**: The template to use for the report.
-
-**pages**: A PageSpec to determine the pages to report on.
-
-**sort**: How the matching pages should be sorted.  Sorting criteria are separated by spaces.
-
-The possible values for sorting are:
-
-* **page**: Sort by the full page ID.
-* **pagename**: Sort by the base page name.
-* **pagename_natural**: Sort by the base page name, using Sort::Naturally if it is installed.
-* **mtime**: Sort by the page modification time.
-* **age**: Sort by the page creation time, newest first.
-
-Any other value is taken to be a field name to sort by.
-If a sort value begins with a minus (-) then the order for that field is reversed.
-
-### Headers
-
-An additional option is the "headers" option.  This is a space-separated
-list of field names which are to be used as headers in the report.  This
-is a way of getting around one of the limitations of HTML::Template, that
-is, not being able to do tests such as
-"if this-header is not equal to previous-header".
-
-Instead, that logic is performed inside the plugin.  The template is
-given parameters "HEADER1", "HEADER2" and so on, for each header.
-If the value of a header field is the same as the previous value,
-then HEADER**N** is set to be empty, but if the value of the header
-field is new, then HEADER**N** is given that value.
-
-#### Example
+This plugin provides the [[ikiwiki/directive/report]] directive.  This enables
+one to report on the structured data ("field" values) of multiple pages; the
+output is formatted via a template.  This depends on the
+[[plugins/contrib/field]] plugin.
 
-Suppose you're writing a blog in which you record "moods", and you
-want to display your blog posts by mood.
 
-    \[[!report template="mood_summary"
-    pages="blog/*"
-    sort="Mood Date title"
-    headers="Mood"]]
+## Activate the plugin
 
-The "mood_summary" template might be like this:
-
-    <TMPL_IF NAME="HEADER1">
-    ## <TMPL_VAR NAME="HEADER1">
-    </TMPL_IF>
-    ### <TMPL_VAR NAME="TITLE">
-    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]]
-    <TMPL_VAR NAME="DESCRIPTION">
-    
-### Advanced Options
-
-The following options are used to improve efficiency when dealing
-with large numbers of pages; most people probably won't need them.
-
-**trail**:
-
-A page or pages to use as a "trail" page.  When a trail page is used,
-the matching pages are limited to (a subset of) the pages which that
-page links to; the "pages" pagespec in this case, rather than selecting
-pages from the entire wiki, will select pages from within the set of pages
-given by the trail page.
-
-**doscan**:
-
-Whether this report should be called in "scan" mode; if it is, then
-the pages which match the pagespec are added to the list of links from
-this page.  This can be used by *another* report by setting this
-page to be a "trail" page in *that* report.
-It is not possible to use "trail" and "doscan" at the same time.
-By default, "doscan" is false.
-
-## TEMPLATE PARAMETERS
-
-The templates are in HTML::Template format, just as [[plugins/template]] and
-[[ftemplate]] are.  The parameters passed in to the template are as follows:
-
-***fields***:
-
-The structured data from the current matching page.  This includes
-"title" and "description" if they are defined.
-
-***common values***:
-
-Values known for all pages: "page", "destpage".  Also "basename" (the base name of the page).
-
-***passed-in values***:
-
-Any additional parameters to the report directive are passed to the
-template; a parameter will override the matching "field" value.
-For example, if you have a "Mood" field, and you pass Mood="bad" to
-the report, then that will be the Mood which is given for the whole
-report.
-
-Generally this is useful if one wishes to make a more generic
-template and hide or show portions of it depending on what
-values are passed in the report directive call.
-
-For example, one could have a "hide_mood" parameter which would hide
-the "Mood" section of your template when it is true, which one could
-use when the Mood is one of the headers.
-
-***headers***:
-
-See the section on Headers.
-
-***first and last***:
-
-If this is the first page-record in the report, then "first" is true.
-If this is the last page-record in the report, then "last" is true.
+    # activate the plugin
+    add_plugins => [qw{goodstuff report ....}],
 
 ## PREREQUISITES
 
-- 
cgit v1.2.3


From 136499da62f453f8eede16d564fae1e4788c63bf Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:27:19 +0000
Subject: new version; prev_, next_, here_only, and loops

---
 doc/ikiwiki/directive/report.mdwn | 148 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 doc/ikiwiki/directive/report.mdwn

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/report.mdwn b/doc/ikiwiki/directive/report.mdwn
new file mode 100644
index 000000000..c6e70e960
--- /dev/null
+++ b/doc/ikiwiki/directive/report.mdwn
@@ -0,0 +1,148 @@
+The `report` directive is supplied by the [[!iki plugins/contrib/report desc=report]] plugin.
+
+This enables one to report on the structured data ("field" values) of
+multiple pages; the output is formatted via a template.  This depends
+on the [[plugins/contrib/field]] plugin.
+
+The pages to report on are selected by a PageSpec given by the "pages"
+parameter.  The template is given by the "template" parameter.
+The template expects the data from a single page; it is applied
+to each matching page separately, one after the other.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One is in the
+/templates directory on the wiki.  These templates are wiki pages, and
+can be edited from the web like other wiki pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+## OPTIONS
+
+**template**: The template to use for the report.
+
+**pages**: A PageSpec to determine the pages to report on.
+
+**trail**: A page or pages to use as a "trail" page.
+
+When a trail page is used, the matching pages are limited to (a subset
+of) the pages which that page links to; the "pages" pagespec in this
+case, rather than selecting pages from the entire wiki, will select
+pages from within the set of pages given by the trail page.
+
+Additional space-separated trail pages can be given in this option.
+For example:
+
+    trail="animals/cats animals/dogs"
+
+This will take the links from both the "animals/cats" page and the
+"animals/dogs" page as the set of pages to apply the PageSpec to.
+
+**sort**: A SortSpec to determine how the matching pages should be sorted.
+
+**here_only**: Report on the current page only.
+
+This is useful in combination with "prev_" and "next_" variables to
+make a navigation trail.
+If the current page doesn't match the pagespec, then no pages will
+be reported on.
+
+### Headers
+
+An additional option is the "headers" option.  This is a space-separated
+list of field names which are to be used as headers in the report.  This
+is a way of getting around one of the limitations of HTML::Template, that
+is, not being able to do tests such as
+"if this-header is not equal to previous-header".
+
+Instead, that logic is performed inside the plugin.  The template is
+given parameters "HEADER1", "HEADER2" and so on, for each header.
+If the value of a header field is the same as the previous value,
+then HEADER**N** is set to be empty, but if the value of the header
+field is new, then HEADER**N** is given that value.
+
+#### Example
+
+Suppose you're writing a blog in which you record "moods", and you
+want to display your blog posts by mood.
+
+    \[[!report template="mood_summary"
+    pages="blog/*"
+    sort="Mood Date title"
+    headers="Mood"]]
+
+The "mood_summary" template might be like this:
+
+    <TMPL_IF NAME="HEADER1">
+    ## <TMPL_VAR NAME="HEADER1">
+    </TMPL_IF>
+    ### <TMPL_VAR NAME="TITLE">
+    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]]
+    <TMPL_VAR NAME="DESCRIPTION">
+    
+### Advanced Options
+
+The following options are used to improve efficiency when dealing
+with large numbers of pages; most people probably won't need them.
+
+**doscan**:
+
+Whether this report should be called in "scan" mode; if it is, then
+the pages which match the pagespec are added to the list of links from
+this page.  This can be used by *another* report by setting this
+page to be a "trail" page in *that* report.
+It is not possible to use "trail" and "doscan" at the same time.
+By default, "doscan" is false.
+
+## TEMPLATE PARAMETERS
+
+The templates are in HTML::Template format, just as [[plugins/template]] and
+[[ftemplate]] are.  The parameters passed in to the template are as follows:
+
+### Fields
+
+The structured data from the current matching page.  This includes
+"title" and "description" if they are defined.
+
+### Common values
+
+Values known for all pages: "page", "destpage".  Also "basename" (the
+base name of the page).
+
+### Passed-in values
+
+Any additional parameters to the report directive are passed to the
+template; a parameter will override the matching "field" value.
+For example, if you have a "Mood" field, and you pass Mood="bad" to
+the report, then that will be the Mood which is given for the whole
+report.
+
+Generally this is useful if one wishes to make a more generic
+template and hide or show portions of it depending on what
+values are passed in the report directive call.
+
+For example, one could have a "hide_mood" parameter which would hide
+the "Mood" section of your template when it is true, which one could
+use when the Mood is one of the headers.
+
+### Prev_ And Next_ Items
+
+Any of the above variables can be prefixed with "prev_" or "next_"
+and that will give the previous or next value of that variable; that is,
+the value from the previous or next page that this report is reporting on.
+This is mainly useful for a "here_only" report.
+
+### Headers
+
+See the section on Headers.
+
+### First and Last
+
+If this is the first page-record in the report, then "first" is true.
+If this is the last page-record in the report, then "last" is true.
-- 
cgit v1.2.3


From 3f5fce1091794521ea57f8ff7469441e4afb4a86 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:28:10 +0000
Subject: added toc

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

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/report.mdwn b/doc/ikiwiki/directive/report.mdwn
index c6e70e960..8f8e6b4e8 100644
--- a/doc/ikiwiki/directive/report.mdwn
+++ b/doc/ikiwiki/directive/report.mdwn
@@ -1,3 +1,4 @@
+[[!toc]]
 The `report` directive is supplied by the [[!iki plugins/contrib/report desc=report]] plugin.
 
 This enables one to report on the structured data ("field" values) of
-- 
cgit v1.2.3


From 2f7a909bbc0b58714bd2effd03f15d41ded77fcf Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:29:45 +0000
Subject: new version to go with new version of field

---
 doc/plugins/contrib/ymlfront.mdwn | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/ymlfront.mdwn b/doc/plugins/contrib/ymlfront.mdwn
index f4438f23c..6dd8ed532 100644
--- a/doc/plugins/contrib/ymlfront.mdwn
+++ b/doc/plugins/contrib/ymlfront.mdwn
@@ -42,7 +42,7 @@ That will be htmlized using the page-type of the page-file.
 
 ### Accessing the Data
 
-There are three ways to access the data given in the YAML section.
+There are a few ways to access the data given in the YAML section.
 
 * [[getfield]] plugin
 
@@ -83,6 +83,10 @@ There are three ways to access the data given in the YAML section.
 
     	When running on the Sprongle system, the Foo function returns incorrect data.
 
+* [[report]] plugin
+
+  The **report** plugin is like the [[ftemplate]] plugin, but it reports on multiple pages, rather than just the current page.
+
 * write your own plugin
 
   In conjunction with the [[field]] plugin, you can write your own plugin to access the data.
-- 
cgit v1.2.3


From c1f68a8cff3217fb81052043d897b25aae677513 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:30:35 +0000
Subject: reply

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

(limited to 'doc')

diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn
index 3ad02af29..b5c08fedd 100644
--- a/doc/plugins/contrib/ymlfront/discussion.mdwn
+++ b/doc/plugins/contrib/ymlfront/discussion.mdwn
@@ -9,3 +9,5 @@ Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]]
 >> Sorry, I accidentally removed `field-etc` by pushing with `--mirror` from a
 >> different checkout. I've put it back; it's a branch from your `ikiplugins.git`,
 >> so yes, the code should be in `IkiWiki/Plugin`. --[[smcv]]
+
+>>> Done a while back, but now I've actually pushed to my repo. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 1bce0656755344977e020a985c4c06479f035f77 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Wed, 19 May 2010 11:36:30 +0000
Subject: new versions which address some of these issues

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

(limited to 'doc')

diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn
index a8ee6755c..3e9f8feaa 100644
--- a/doc/todo/Multiple_categorization_namespaces.mdwn
+++ b/doc/todo/Multiple_categorization_namespaces.mdwn
@@ -91,3 +91,13 @@ Where this approach is limiting is on the kind of data that is passed to (templa
 
 One possibility could be to have the `queries` configuration allow a hash mapping query names to functions that would transform the data. Lacking that possibility, we might have to leave some predefined fields to have custom Perl-side treatment and leave custom fields to be untransformable.
 
+-----
+
+I've now updated the [[plugins/contrib/field]] plugin to have:
+
+* arrays (multi-valued fields)
+* the "linkbase" option as mentioned above (called field_tags), where the linktype is the field name.
+
+I've also updated [[plugins/contrib/ftemplate]] and [[plugins/contrib/report]] to be able to use multi-valued fields, and [[plugins/contrib/ymlfront]] to correctly return multi-valued fields when they are requested.
+
+--[[KathrynAndersen]]
-- 
cgit v1.2.3


From 1fdab877d8233c0c49e78369a98e0f18147386ec Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Wed, 19 May 2010 21:04:34 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index 66f5eb0c5..a1366872f 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -12,3 +12,5 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5
 >>> can take priority though. --[[Joey]] 
 
 >>>> Great! Thanks.
+
+>>>> Still not available in the backports; did you break the silence on the wire and got back to work [[Joey]]? 
-- 
cgit v1.2.3


From 70fca0592e08ac63a0c59e35aa43e0ae91b4ec75 Mon Sep 17 00:00:00 2001
From: tupyakov_vladimr <tupyakov_vladimr@web>
Date: Thu, 20 May 2010 09:33:51 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/__126__tupyakov__95__vladimir.mdwn b/doc/__126__tupyakov__95__vladimir.mdwn
new file mode 100644
index 000000000..39ea90873
--- /dev/null
+++ b/doc/__126__tupyakov__95__vladimir.mdwn
@@ -0,0 +1 @@
+Dctv ghbdtn
-- 
cgit v1.2.3


From 04b83cf38c11d9947b0c452c586a58482163beba Mon Sep 17 00:00:00 2001
From: tupyakov_vladimr <tupyakov_vladimr@web>
Date: Thu, 20 May 2010 09:34:29 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/tupyakov_vladimir.mdwn b/doc/tupyakov_vladimir.mdwn
new file mode 100644
index 000000000..95f85adc2
--- /dev/null
+++ b/doc/tupyakov_vladimir.mdwn
@@ -0,0 +1 @@
+всем привет!
-- 
cgit v1.2.3


From febfb1751c2cb3fb0826b76b55d86fb956d62466 Mon Sep 17 00:00:00 2001
From: Jon Dowland <jmtd@debian.org>
Date: Thu, 20 May 2010 15:26:55 +0100
Subject: move tupyakov's page under users/ (says 'hello' in Russian), remove
 surplus page

---
 doc/__126__tupyakov__95__vladimir.mdwn | 1 -
 doc/tupyakov_vladimir.mdwn             | 1 -
 doc/users/tupyakov_vladimir.mdwn       | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 doc/__126__tupyakov__95__vladimir.mdwn
 delete mode 100644 doc/tupyakov_vladimir.mdwn
 create mode 100644 doc/users/tupyakov_vladimir.mdwn

(limited to 'doc')

diff --git a/doc/__126__tupyakov__95__vladimir.mdwn b/doc/__126__tupyakov__95__vladimir.mdwn
deleted file mode 100644
index 39ea90873..000000000
--- a/doc/__126__tupyakov__95__vladimir.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Dctv ghbdtn
diff --git a/doc/tupyakov_vladimir.mdwn b/doc/tupyakov_vladimir.mdwn
deleted file mode 100644
index 95f85adc2..000000000
--- a/doc/tupyakov_vladimir.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-всем привет!
diff --git a/doc/users/tupyakov_vladimir.mdwn b/doc/users/tupyakov_vladimir.mdwn
new file mode 100644
index 000000000..95f85adc2
--- /dev/null
+++ b/doc/users/tupyakov_vladimir.mdwn
@@ -0,0 +1 @@
+всем привет!
-- 
cgit v1.2.3


From 93385347a94c92fd74083e63f4b5aa5637580606 Mon Sep 17 00:00:00 2001
From: "http://jblevins.org/" <http://jblevins.org/@web>
Date: Fri, 21 May 2010 16:56:31 +0000
Subject: Revise/archive user page

---
 doc/users/jasonblevins.mdwn | 68 ++++++++++++++++-----------------------------
 1 file changed, 24 insertions(+), 44 deletions(-)

(limited to 'doc')

diff --git a/doc/users/jasonblevins.mdwn b/doc/users/jasonblevins.mdwn
index b50e4844a..e4a459e30 100644
--- a/doc/users/jasonblevins.mdwn
+++ b/doc/users/jasonblevins.mdwn
@@ -1,66 +1,46 @@
 [[!meta title="Jason Blevins"]]
 
-I'm currently hosting a private ikiwiki for keeping research notes
-which, with some patches and a plugin (below), will
-convert inline [[todo/LaTeX]] expressions to [[MathML]].  I'm working towards a
-patchset and instructions for others to do the same.
-
-I've setup a test ikiwiki [here](http://xbeta.org/colab/) where I've
-started keeping a few notes on my progress.  There is an example of
-inline [[todo/SVG]] on the homepage (note that the logo scales along with the
-font size).  There are a few example mathematical expressions in the
-[sandbox](http://xbeta.org/colab/sandbox/).  The MathML is generated
-automatically from inline LaTeX expressions using an experimental
-plugin I'm working on.
-
-My (also MathML-enabled) homepage: <http://jblevins.org/> (still using
-Blosxom...maybe one day I'll convert it to ikiwiki...)
-
-Current ikiwki issues of interest:
-
- * [[bugs/recentchanges_feed_links]]
- * [[bugs/HTML_inlined_into_Atom_not_necessarily_well-formed]]
- * [[plugins/toc/discussion]]
- * [[todo/BibTeX]]
- * [[todo/svg]]
- * [[todo/Option_to_make_title_an_h1?]]
- * [[bugs/SVG_files_not_recognized_as_images]]
+I am a former Ikiwiki user who wrote several plugins and patches
+related to MathML, [[SVG|todo/svg]], and [[todo/syntax highlighting]].
+Some related links and notes are archived below.
+
+Homepage: <http://jblevins.org/>
 
 ## Plugins
 
-These plugins are experimental.  Use them at your own risk.  Read the
-perldoc documentation for more details.  Patches and suggestions are
-welcome.
+The following [plugins](http://jblevins.org/projects/ikiwiki/)
+are no longer maintained, but please feel free to use, modify, and
+redistribute them.  Read the corresponding perldoc documentation for
+more details.
 
- * [mdwn_itex][] - Works with the [[`mdwn`|plugins/mdwn]] plugin to convert inline [[todo/LaTeX]]
-   expressions to [[MathML]] using `itex2MML`.
+ * [mdwn_itex][] - Works with the [[`mdwn`|plugins/mdwn]] plugin to convert
+   inline [[todo/LaTeX]] expressions to MathML using `itex2MML`.
 
  * [h1title][] - If present, use the leading level 1 Markdown header to
    set the page title and remove it from the page body.
 
  * [code][] - Whole file and inline code snippet [[todo/syntax highlighting]]
    via GNU Source-highlight.  The list of supported file extensions is
-   configurable.  There is also some preliminary [documentation][code-doc].
-   See the [FortranWiki](http://fortranwiki.org) for examples.
+   configurable.
 
- * [metamail][] - a plugin for loading metadata from [[email]]-style
+ * [metamail][] - a plugin for loading metadata from email-style
    headers at top of a file (e.g., `title: Page Title` or
    `date: November 2, 2008 11:14 EST`).
 
- * [pandoc][] - [[ikiwiki/Markdown]] page processing via [Pandoc](http://johnmacfarlane.net/pandoc/) (a Haskell library for converting from one markup format to another).  [[todo/LaTeX]] and
+ * [pandoc][] - [[ikiwiki/Markdown]] page processing via
+   [Pandoc](http://johnmacfarlane.net/pandoc/) (a Haskell library for
+   converting from one markup format to another).  [[todo/LaTeX]] and
    [[reStructuredText|plugins/rst]] are optional.
 
  * [path][] - Provides path-specific template conditionals such as
    `IS_HOMEPAGE` and `IN_DIR_SUBDIR`.
 
- [mdwn_itex]: http://code.jblevins.org/ikiwiki/plugins.git/plain/mdwn_itex.pm
- [h1title]: http://code.jblevins.org/ikiwiki/plugins.git/plain/h1title.pm
- [code]: http://code.jblevins.org/ikiwiki/plugins.git/plain/code.pm
- [code-doc]: http://code.jblevins.org/ikiwiki/plugins.git/plain/code.text
- [metamail]: http://code.jblevins.org/ikiwiki/plugins.git/plain/metamail.pm
- [pandoc]: http://code.jblevins.org/ikiwiki/plugins.git/plain/pandoc.pm
- [path]: http://code.jblevins.org/ikiwiki/plugins.git/plain/path.pm
-
+ [mdwn_itex]: http://jblevins.org/git/ikiwiki/plugins.git/plain/mdwn_itex.pm
+ [h1title]: http://jblevins.org/git/ikiwiki/plugins.git/plain/h1title.pm
+ [code]: http://jblevins.org/projects/ikiwiki/code
+ [metamail]: http://jblevins.org/git/ikiwiki/plugins.git/plain/metamail.pm
+ [pandoc]: http://jblevins.org/git/ikiwiki/plugins.git/plain/pandoc.pm
+ [path]: http://jblevins.org/git/ikiwiki/plugins.git/plain/path.pm
 
 ## MathML and SVG support
 
@@ -105,5 +85,5 @@ optimal solution is to force users to preview the page before saving.
 That way if someone introduces invalid XHTML then they can't save the
 page in the first place (unless they post directly to the right URL).
 
- [template-patch]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blobdiff;f=templates/page.tmpl;h=380ef699fa72223744eb5c1ee655fb79aa6bce5b;hp=9084ba7e11e92a10528b2ab12c9b73cf7b0f40a7;hb=416d5d1b15b94e604442e4e209a30dee4b77b684;hpb=ececf4fb8766a4ff7eff943b3ef600be81a0df49
- [cgi-patch]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=commitdiff;h=fa538c375250ab08f396634135f7d79fce2a9d36
+ [template-patch]: http://jblevins.org/git/ikiwiki.git/commit/?h=xbeta&id=416d5d1b15b94e604442e4e209a30dee4b77b684
+ [cgi-patch]: http://jblevins.org/git/ikiwiki.git/commit/?id=fa538c375250ab08f396634135f7d79fce2a9d36
-- 
cgit v1.2.3


From 9467b2176a31e6162ef76321278320eaeda0999c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 21 May 2010 13:53:20 -0400
Subject: yaml setup files

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

(limited to 'doc')

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index cdec6e7e8..134ebcb7b 100644
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -82,6 +82,8 @@ Probably incomplete list:
   Note that this is already done for wikis created by `auto-blog.setup`.
 * [[tips/html5]] on by default (some day..)
 * Remove support for old `.ikiwiki/comments_pending` from comment plugin.
+* Use yaml formatted setup files by default. (Not too compatability breaking
+  really.)
 
 In general, we try to use [[ikiwiki-transition]] or forced rebuilds on
 upgrade to deal with changes that break compatability. Some things that
-- 
cgit v1.2.3


From 8f6f75204e4cc16183872fe4f0ae05097f5d43dc Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Sat, 22 May 2010 07:05:28 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/debian_backports_update_someone_please.mdwn b/doc/forum/debian_backports_update_someone_please.mdwn
index a1366872f..7102d12a1 100644
--- a/doc/forum/debian_backports_update_someone_please.mdwn
+++ b/doc/forum/debian_backports_update_someone_please.mdwn
@@ -14,3 +14,5 @@ I'm just in the process of deploying ikiwiki and I'd love to use it in the html5
 >>>> Great! Thanks.
 
 >>>> Still not available in the backports; did you break the silence on the wire and got back to work [[Joey]]? 
+
+>>>> I was blinded by my stupidity... thanks!
-- 
cgit v1.2.3


From 70d507bb81a49b49a6fe939d038923fbab8c8fb5 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jrojasr@integracionsocial.gov.co>
Date: Mon, 24 May 2010 20:10:32 -0500
Subject: new post - link completion in vim

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

(limited to 'doc')

diff --git a/doc/forum/link_autocompletion_in_vim.mdwn b/doc/forum/link_autocompletion_in_vim.mdwn
new file mode 100644
index 000000000..e7caca745
--- /dev/null
+++ b/doc/forum/link_autocompletion_in_vim.mdwn
@@ -0,0 +1,17 @@
+I extended the functionality of the [ikiwiki-nav plugin](TODO)
+(see [[here|tips/follow_wikilinks_from_inside_vim]]) to allow completion of
+wikilinks from inside vim, through the omnicompletion mechanism.
+
+It still has some bugs, but is usable, and will not destroy your data. It can
+only complete links whose definition (text) is on a single line, and still can't
+handle "named links" (`[[text|link]]`).
+
+I'd love to hear suggestions for improvement for it, and bug reports ;) For
+example, regarding how are sorted and presented the available completions
+(dates, alphabetically, etc).
+
+You can find a tarball for it
+[here](http://devnull.li/~jerojasro/ikiwiki-nav-dev.tar.gz). To install it,
+extract the tarball contents in your `.vim` directory.
+
+--[[jerojasro]]
-- 
cgit v1.2.3


From 09793a2aafe3cdb153d5a202c09d8b6fedfab406 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jrojasr@integracionsocial.gov.co>
Date: Mon, 24 May 2010 20:14:05 -0500
Subject: typos  and missing link

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

(limited to 'doc')

diff --git a/doc/forum/link_autocompletion_in_vim.mdwn b/doc/forum/link_autocompletion_in_vim.mdwn
index e7caca745..7d3ed8b02 100644
--- a/doc/forum/link_autocompletion_in_vim.mdwn
+++ b/doc/forum/link_autocompletion_in_vim.mdwn
@@ -1,10 +1,10 @@
-I extended the functionality of the [ikiwiki-nav plugin](TODO)
+I extended the functionality of the [ikiwiki-nav plugin](http://www.vim.org/scripts/script.php?script_id=2968)
 (see [[here|tips/follow_wikilinks_from_inside_vim]]) to allow completion of
 wikilinks from inside vim, through the omnicompletion mechanism.
 
 It still has some bugs, but is usable, and will not destroy your data. It can
 only complete links whose definition (text) is on a single line, and still can't
-handle "named links" (`[[text|link]]`).
+handle "named links" (`\[\[text|link\]\]`).
 
 I'd love to hear suggestions for improvement for it, and bug reports ;) For
 example, regarding how are sorted and presented the available completions
-- 
cgit v1.2.3


From 73d7635bcbf4fe48527697e61481e32b8ac99a5e Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 26 May 2010 12:12:57 +0000
Subject: Removed redundant "configure'

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

(limited to 'doc')

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 3ea0022cc..03fed3aa9 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -47,7 +47,7 @@ Now you can go to the url it told you, and edit pages in your new wiki
 using the web interface.
 
 (If the web interface doesn't seem to allow editing or login, you may
-need to configure [[configure_the_web_server|tips/dot_cgi]].)
+need to [[configure_the_web_server|tips/dot_cgi]].)
 
 ## Checkout and edit wiki source
 
-- 
cgit v1.2.3


From a3ae4ebe55ec4cc0a46aa159e5b2447d888a1bf9 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 26 May 2010 15:24:08 +0000
Subject: Added example.

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

(limited to 'doc')

diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn
index 9e742c211..d21beb2e5 100644
--- a/doc/ikiwiki-makerepo.mdwn
+++ b/doc/ikiwiki-makerepo.mdwn
@@ -24,6 +24,14 @@ ikiwiki wrapper.
 Note that for monotone, you are assumed to already have run "mtn genkey"
 to generate a key.
 
+
+# EXAMPLE 
+
+ikiwiki-makerepo git /var/www/wiki /home/user/wiki/
+
+The above command creates a new git repo in /home/user/wiki as well as a new git repo in the /var/www/wiki directory. 
+It then initializes the /home/user/wiki git repo and makes the /var/www/wiki a clone. 
+
 # AUTHOR
 
 Joey Hess <joey@ikiwiki.info>
-- 
cgit v1.2.3


From de7197d9923fa789896be735ce0da40cba3adaea Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 26 May 2010 15:24:54 +0000
Subject: Code formatting.

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

(limited to 'doc')

diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn
index d21beb2e5..acb1211de 100644
--- a/doc/ikiwiki-makerepo.mdwn
+++ b/doc/ikiwiki-makerepo.mdwn
@@ -27,7 +27,7 @@ to generate a key.
 
 # EXAMPLE 
 
-ikiwiki-makerepo git /var/www/wiki /home/user/wiki/
+`ikiwiki-makerepo git /var/www/wiki /home/user/wiki/`
 
 The above command creates a new git repo in /home/user/wiki as well as a new git repo in the /var/www/wiki directory. 
 It then initializes the /home/user/wiki git repo and makes the /var/www/wiki a clone. 
-- 
cgit v1.2.3


From 37a4cf13744ee6e96338409fe1e35debeee91f4d Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 26 May 2010 15:26:13 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwiki-makerepo/discussion.mdwn b/doc/ikiwiki-makerepo/discussion.mdwn
new file mode 100644
index 000000000..0b844adb5
--- /dev/null
+++ b/doc/ikiwiki-makerepo/discussion.mdwn
@@ -0,0 +1 @@
+Not sure how well I described. :-/ -- Jeremiah
-- 
cgit v1.2.3


From 3a868b6e7a53b8d6830cc0e51c967d3fb1045f81 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 26 May 2010 15:26:34 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwiki-makerepo/discussion.mdwn b/doc/ikiwiki-makerepo/discussion.mdwn
index 0b844adb5..660823fbb 100644
--- a/doc/ikiwiki-makerepo/discussion.mdwn
+++ b/doc/ikiwiki-makerepo/discussion.mdwn
@@ -1 +1 @@
-Not sure how well I described. :-/ -- Jeremiah
+Not sure how well I described the example. :-/ -- Jeremiah
-- 
cgit v1.2.3


From c9a6b91c5528882be6574e46b2f9eee937fe0616 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmC_nMjWfriv8nVMOwnvYhgmzwvVP4OVjU"
 <https://www.google.com/accounts/o8/id?id=AItOawmC_nMjWfriv8nVMOwnvYhgmzwvVP4OVjU@web>
Date: Fri, 28 May 2010 09:01:29 +0000
Subject: delete me

---
 ...267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 "doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"

(limited to 'doc')

diff --git "a/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" "b/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
new file mode 100644
index 000000000..05f17c8f3
--- /dev/null
+++ "b/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
@@ -0,0 +1 @@
+主要看看url如何显示。
-- 
cgit v1.2.3


From 052887296570bd8e4750862293fd36424f153fbd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 28 May 2010 06:17:57 -0400
Subject: Revert "delete me"

---
 ...267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 "doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"

(limited to 'doc')

diff --git "a/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn" "b/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
deleted file mode 100644
index 05f17c8f3..000000000
--- "a/doc/examples/blog/posts/\346\265\213\350\257\225\344\270\255\346\226\207english\346\267\267\345\220\210\345\234\250\351\242\230\347\233\256\344\270\255.mdwn"
+++ /dev/null
@@ -1 +0,0 @@
-主要看看url如何显示。
-- 
cgit v1.2.3


From 1cac22523718596a272ecf39c1ba309306f0177b Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawkyQYf6i3PckNGm2TOHxWCr_xTfcjhMRlA"
 <https://www.google.com/accounts/o8/id?id=AItOawkyQYf6i3PckNGm2TOHxWCr_xTfcjhMRlA@web>
Date: Sat, 29 May 2010 17:20:15 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index cd0550ea8..fc66bcef9 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -134,6 +134,7 @@ Personal sites and blogs
 * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
 * [Nico Schottelius' homepage](http://www.nico.schottelius.org)
 * [Andreas Zwinkaus homepage](http://beza1e1.tuxen.de)
+* [Salient Dream](http://salient.dre.am)
 * [Walden Effect](http://waldeneffect.org)
 * [Avian Aqua Miser](http://www.avianaquamiser.com/)
 * [Cosmic Cookout](http://www.cosmiccookout.com/)
-- 
cgit v1.2.3


From 8a86537e74cd4a8cdfaf4eb8dd7eeb7262b37c98 Mon Sep 17 00:00:00 2001
From: "https://me.yahoo.com/a/GW5gpVY2rtV75mSWRhA0MUVlKe.y846L#d4eeb"
 <https://me.yahoo.com/a/GW5gpVY2rtV75mSWRhA0MUVlKe.y846L#d4eeb@web>
Date: Wed, 2 Jun 2010 05:26:09 +0000
Subject: Just trying an edit.

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1c746c190..de0eaa692 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -16,6 +16,8 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v
 >
 > Back to the first level.
 
+"I'm sitting in the middle of a rather muddy puddle."
+
 Numbered list 
 
 1. First item.
-- 
cgit v1.2.3


From dd10c2fddda92762070abadcdce923c0affa6bb3 Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <http://weakish.myopenid.com/@web>
Date: Thu, 3 Jun 2010 10:21:36 +0000
Subject: The script uses the [BeautifulSoup][] module.

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

(limited to 'doc')

diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn
index ecc6ae505..af8e4005d 100644
--- a/doc/tips/Importing_posts_from_Wordpress.mdwn
+++ b/doc/tips/Importing_posts_from_Wordpress.mdwn
@@ -4,6 +4,10 @@ Use case: You want to move away from Wordpress to Ikiwiki as your blogging/websi
 
 WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned.
 
+The script uses the [BeautifulSoup][] module.
+
+[BeautifulSoup]: http://www.crummy.com/software/BeautifulSoup/
+
 -----
 
 I include a modified version of this script. This version includes the ability to write \[[!tag foo]] directives, which the original intended, but didn't actually do.
-- 
cgit v1.2.3


From f0f4073a17cf8a860cf7b04a2157a89e72ae0be2 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0"
 <https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0@web>
Date: Mon, 7 Jun 2010 03:34:34 +0000
Subject: add bug about locale dependance of plugins/relativedate

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

(limited to 'doc')

diff --git a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
new file mode 100644
index 000000000..1f4dc8e2d
--- /dev/null
+++ b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
@@ -0,0 +1,3 @@
+[[plugins/relativedate]] does not works when russian locale defined at setup file (locale => 'ru_RU.UTF-8'). This is happen because javascript for this plugin takes either elements title or content itself. If russian locale is turned on then title generated on russian language and JS can't convert it into Date object. innerHTML is language independent (YYYY-MM-DD HH:mm) always.
+
+If I switch locale to en_US.UTF-8 then this plugin correctly parses text date and print relative date. But when I mouseover on date I see unusual formating of the date (it uses AM/PM format while russians use 24-h notation).
-- 
cgit v1.2.3


From 75cae954cf4c244d9f7a8c5c9ef20d57fee10a2f Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0"
 <https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0@web>
Date: Mon, 7 Jun 2010 03:39:14 +0000
Subject: Add note about date formating

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

(limited to 'doc')

diff --git a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
index 1f4dc8e2d..db009fa19 100644
--- a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
+++ b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
@@ -1,3 +1,5 @@
 [[plugins/relativedate]] does not works when russian locale defined at setup file (locale => 'ru_RU.UTF-8'). This is happen because javascript for this plugin takes either elements title or content itself. If russian locale is turned on then title generated on russian language and JS can't convert it into Date object. innerHTML is language independent (YYYY-MM-DD HH:mm) always.
 
 If I switch locale to en_US.UTF-8 then this plugin correctly parses text date and print relative date. But when I mouseover on date I see unusual formating of the date (it uses AM/PM format while russians use 24-h notation).
+
+P.S. All pages but RecentChanges show well-formated date. RecentChanges show date formated using locale. Anyway, plugin does not work without en_US locale.
-- 
cgit v1.2.3


From 3fb80f3900ce116d8c2c240afb5d70151b5cfbd6 Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Mon, 7 Jun 2010 13:32:45 +0000
Subject:

---
 doc/templates/discussion.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn
index 220d36455..96e6ea25f 100644
--- a/doc/templates/discussion.mdwn
+++ b/doc/templates/discussion.mdwn
@@ -6,3 +6,11 @@ note and popups are templates? But they're not in the templates directory, and i
 > your personal wiki sources. The note and popup template pages are
 > installed there, typically in `/usr/share/ikiwiki/basewiki/templates/`
 > --[[Joey]]
+
+
+Is there a list of the TMPL_VAR-Variables that are defined by ikiwiki?
+
+What I'm trying to achieve is to print the URL of every page on the page itself and therefore I would need the corresponding value in the Template.
+
+Am I missing something?  --[[jwalzer]]
+
-- 
cgit v1.2.3


From 8496dd9fb405eda149995615ead0a94a83298b91 Mon Sep 17 00:00:00 2001
From: "http://smcv.pseudorandom.co.uk/" <http://smcv.pseudorandom.co.uk/@web>
Date: Mon, 7 Jun 2010 13:40:55 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/templates/discussion.mdwn b/doc/templates/discussion.mdwn
index 96e6ea25f..4ddc48ac3 100644
--- a/doc/templates/discussion.mdwn
+++ b/doc/templates/discussion.mdwn
@@ -14,3 +14,6 @@ What I'm trying to achieve is to print the URL of every page on the page itself
 
 Am I missing something?  --[[jwalzer]]
 
+> If there isn't a suitable variable (I don't think there is a list at
+> the moment), a [[plugin|plugins/write]] to add one would be about 10
+> lines of perl - you'd just need to define a `pagetemplate` hook. --[[smcv]]
-- 
cgit v1.2.3


From 1567fbe4eedeedebe129d76ddcd656c733ba7cf4 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Mon, 7 Jun 2010 15:10:04 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox/sidebar.mdwn b/doc/sandbox/sidebar.mdwn
new file mode 100644
index 000000000..9daeafb98
--- /dev/null
+++ b/doc/sandbox/sidebar.mdwn
@@ -0,0 +1 @@
+test
-- 
cgit v1.2.3


From a93db71eb66aa486d22de6f0271d693550d438f0 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Mon, 7 Jun 2010 15:13:43 +0000
Subject: test sidebar content

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index de0eaa692..230152fc9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,3 +1,10 @@
+[[!sidebar  content="""
+This is my custom sidebar for this page.
+
+\[[!calendar pages="posts/*"]]
+"""]]
+
+
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
 [[Testing 1 2 3| test]]
-- 
cgit v1.2.3


From f40c6f6557e5d37c433e3398e68dcf1428d23070 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Mon, 7 Jun 2010 15:23:58 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 230152fc9..6e9cfe48e 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,8 +1,4 @@
-[[!sidebar  content="""
-This is my custom sidebar for this page.
-
-\[[!calendar pages="posts/*"]]
-"""]]
+[[!sidebar]]
 
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
-- 
cgit v1.2.3


From b10d353490197b576ef7bf2e8bf8016039efbd2d Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Tue, 8 Jun 2010 00:09:20 +0000
Subject:

---
 doc/forum/formating:_how_to_align_text_to_the_right.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/formating:_how_to_align_text_to_the_right.mdwn

(limited to 'doc')

diff --git a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
new file mode 100644
index 000000000..832a8cea3
--- /dev/null
+++ b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
@@ -0,0 +1 @@
+as in title, how to align text to the right?
-- 
cgit v1.2.3


From 9dd91b393da6fa4aa48eb8e7d722afcd28de4690 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Tue, 8 Jun 2010 09:21:43 +0000
Subject: File issue.

---
 .../Git:_changed_behavior_w.r.t._timestamps.mdwn   | 180 +++++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn

(limited to 'doc')

diff --git a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
new file mode 100644
index 000000000..5d5b9fc23
--- /dev/null
+++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
@@ -0,0 +1,180 @@
+After some months, I just updated my local ikiwiki sources, and rebuilt
+the Hurd web pages, <http://git.savannah.gnu.org/cgit/hurd/web.git/>.
+
+I was confused, having switched to the new automatic (thanks!) --gettime
+mechanism, why on some pages the timestamps had changed compared to my
+previous use of --getctime and setting files' mtimes (using a script)
+according to the last Git commit.  For example:
+
+community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.html
+
+old:
+
+    Last edited <span class="date">2008-09-11 18:11:53 UTC</span>
+    <!-- Created <span class="date">2008-09-11 17:47:08 UTC</span> -->
+
+new:
+
+    Last edited <span class="date">2008-09-11 18:12:22 UTC</span>
+    <!-- Created <span class="date">2008-09-11 17:47:50 UTC</span> -->
+
+
+I had a look at what git.pm is doing, and began to manually replay /
+investigate:
+
+    $ git log --pretty=fuller --name-only --relative -- community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    commit 8f1b97bfe45b2f173e3a7d55dee226a9e289a695
+    Author:     arnebab <arne_bab@web.de>
+    AuthorDate: Thu Sep 11 20:11:53 2008 +0200
+    Commit:     arnebab <arne_bab@web.de>
+    CommitDate: Thu Sep 11 20:11:53 2008 +0200
+    
+        Added a link to the X.org guide in this wiki.
+    
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    commit 3ef8b7d80d80572c436c4c60c71879bc74409816
+    Author:     arnebab <arne_bab@web.de>
+    AuthorDate: Thu Sep 11 19:47:08 2008 +0200
+    Commit:     arnebab <arne_bab@web.de>
+    CommitDate: Thu Sep 11 19:47:08 2008 +0200
+    
+        Minor update on the enty trying to get X working -> 'watch this place for updates'
+    
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+
+OK, these are my old dates.
+
+    $ git log --pretty=format:%ci --name-only --relative -- community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn 
+    2008-09-11 20:11:53 +0200
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    2008-09-11 19:47:08 +0200
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    $ git log --pretty=format:%ct --name-only --relative -- community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn 
+    1221156713
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    1221155228
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    $ date -d @1221156713
+    Thu Sep 11 18:11:53 UTC 2008
+    $ date -d @1221155228
+    Thu Sep 11 17:47:08 UTC 2008
+
+That's all consistent.
+
+
+But:
+
+    $ perl -le 'use Storable; my $index=Storable::retrieve("indexdb"); use Data::Dumper; print Dumper $index'
+    [...]
+                          'community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn' => {
+                                                                                        'ctime' => '1221155270',
+                                                                                        'dest' => [
+                                                                                                    'community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.html'
+                                                                                                  ],
+                                                                                        'typedlinks' => {
+                                                                                                          'tag' => {}
+                                                                                                        },
+                                                                                        'mtime' => 1221156742,
+                                                                                        'depends_simple' => {
+                                                                                                              'sidebar' => 1
+                                                                                                            },
+                                                                                        'links' => [
+                                                                                                     'community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x/discussion',
+                                                                                                     'Hurd/DebianXorg'
+                                                                                                   ],
+                                                                                        'state' => {
+    [...]
+
+    $ date -d @1221156742
+    Thu Sep 11 18:12:22 UTC 2008
+    $ date -d @1221155270
+    Thu Sep 11 17:47:50 UTC 2008
+
+That's different, and it matches what the new ikiwiki writes into the
+HTML file.
+
+
+Back to Git again, this time without specifying the file:
+
+    $ git log --pretty=format:%ct --name-only --relative
+    [...]
+    1221255713
+    1221255655
+    unsorted/PortingIssues.mdwn
+    
+    1221156742 [Thu Sep 11 18:12:22 UTC 2008]
+    1221156713 [Thu Sep 11 18:11:53 UTC 2008]
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    1221156267
+    1221156235
+    index.mdwn
+    
+    1221156122
+    1221156091
+    index.mdwn
+    
+    1221155942
+    1221155910
+    index.mdwn
+    
+    1221155270 [Thu Sep 11 17:47:50 UTC 2008]
+    1221155228 [Thu Sep 11 17:47:08 UTC 2008]
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    
+    1221154986
+    community/gsoc.mdwn
+    community/gsoc/project_ideas.mdwn
+    
+    1221147244
+    whatsnew.html
+    [...]
+
+Aha!
+
+... and some more detail:
+
+    $ git log --pretty=fuller --name-only --relative
+    [...]
+    commit e4e89e1683012c879012522105a3471a00714613
+    Author:     Samuel Thibault <samuel.thibault@ens-lyon.org>
+    AuthorDate: Fri Sep 12 23:40:55 2008 +0200
+    Commit:     Samuel Thibault <samuel.thibault@ens-lyon.org>
+    CommitDate: Fri Sep 12 23:40:55 2008 +0200
+    
+        MSG_NOSIGNAL and IPV6_PKTINFO got fixed
+    
+    unsorted/PortingIssues.mdwn
+    
+    commit c389fae98dff86527be62f895ff7272e4ab1932c
+    Merge: 0339e3e 8f1b97b
+    Author:     GNU Hurd wiki engine <web-hurd@gnu.org>
+    AuthorDate: Thu Sep 11 18:12:22 2008 +0000
+    Commit:     GNU Hurd wiki engine <web-hurd@gnu.org>
+    CommitDate: Thu Sep 11 18:12:22 2008 +0000
+    
+        Merge branch 'master' of wiki@192.168.10.50:wiki
+    
+    commit 8f1b97bfe45b2f173e3a7d55dee226a9e289a695
+    Author:     arnebab <arne_bab@web.de>
+    AuthorDate: Thu Sep 11 20:11:53 2008 +0200
+    Commit:     arnebab <arne_bab@web.de>
+    CommitDate: Thu Sep 11 20:11:53 2008 +0200
+    
+        Added a link to the X.org guide in this wiki.
+    
+    community/weblogs/ArneBab/2008-08-02-gnu_hurd_and_x.mdwn
+    [...]
+
+So, merges are involved there.
+
+What (the new) ikiwiki code does, is use the timestamp when the merge was
+done instead of the timestamp when the commit was done.  Is this
+intentional?  Otherwise I could supply a patch.
+
+--[[tschwinge]]
-- 
cgit v1.2.3


From 2513f0ea6b65e1b866c01647454062ceb6bbfb7d Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Tue, 8 Jun 2010 09:23:05 +0000
Subject: File issue.

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

(limited to 'doc')

diff --git a/doc/bugs/pagemtime_in_refresh_mode.mdwn b/doc/bugs/pagemtime_in_refresh_mode.mdwn
new file mode 100644
index 000000000..97146f805
--- /dev/null
+++ b/doc/bugs/pagemtime_in_refresh_mode.mdwn
@@ -0,0 +1,14 @@
+I'd like a way to always ask the RCS (Git) to update a file's mtime in
+refresh mode.  This is currently only done on the first build, and later
+for `--gettime --rebuild`.  But always rebuilding is too heavy-weight for
+this use-case.  My options are to either manually set the mtime before
+refreshing, or to have ikiwiki do it at command.  I used to do the
+former, but would now like the latter, as ikiwiki now generally does this
+timestamp handling.
+
+From a quick look, the code in `IkiWiki/Render.pm:find_new_files` is
+relevant: `if (! $pagemtime{$page}) { [...]`.
+
+How would you like to tackle this?
+
+--[[tschwinge]]
-- 
cgit v1.2.3


From 9a18ea18e3ee0b5bbc0a20a075862af14f5860ad Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Tue, 8 Jun 2010 10:06:47 +0000
Subject: File issue.

---
 doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn

(limited to 'doc')

diff --git a/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
new file mode 100644
index 000000000..8678249bb
--- /dev/null
+++ b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
@@ -0,0 +1,3 @@
+The autotag functionality of the tag plugin committed (when doing its
+first commit) all changes that have been staged (in Git).  I suggest it
+should be restricted to the specific file only.  --[[tschwinge]]
-- 
cgit v1.2.3


From cc6ead1d81eacc75914eedb49c8773d6624cca33 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Tue, 8 Jun 2010 14:04:00 +0000
Subject: File issue.

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

(limited to 'doc')

diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
new file mode 100644
index 000000000..c29eb994f
--- /dev/null
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -0,0 +1,10 @@
+With the current HEAD (b10d353490197b576ef7bf2e8bf8016039efbd2d),
+globbing in `tagged()` pagespecs doesn't work for me.  For example,
+`tagged(*)` doesn't match any pages.  (It does in this wiki installation
+here, though.)
+
+I did not yet do any testing to figure out when this broke.
+
+--[[tschwinge]]
+
+[[!map pages="*/a* and tagged(*ose)"]]
-- 
cgit v1.2.3


From 2be6660a8f3f523905e7c0ba4c36f579ed0d2493 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 14:43:21 -0400
Subject: response

---
 doc/bugs/pagemtime_in_refresh_mode.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/pagemtime_in_refresh_mode.mdwn b/doc/bugs/pagemtime_in_refresh_mode.mdwn
index 97146f805..f926ec86c 100644
--- a/doc/bugs/pagemtime_in_refresh_mode.mdwn
+++ b/doc/bugs/pagemtime_in_refresh_mode.mdwn
@@ -12,3 +12,17 @@ relevant: `if (! $pagemtime{$page}) { [...]`.
 How would you like to tackle this?
 
 --[[tschwinge]]
+
+> This could be done via a `needsbuild` hook. The hook is passed 
+> the list of changed files, and it should be safe to call `rcs_getmtime`
+> and update the `pagemtime` for each.
+> 
+> That lets the feature be done by a plugin, which seems good, since
+> `rcs_getmtime` varies between very slow and not very fast, depending on 
+> VCS.
+> 
+> AFAICS, the only use case for doing this is if you commit changes and
+> then delay pushing them to a DVCS repo. Since then the file mtime will
+> be when the change was pushed, not when it was committed. But I've
+> generally felt that recording when a change was published to the repo
+> of a wiki as its mtime is good enough. --[[Joey]] 
-- 
cgit v1.2.3


From c911b4b998992a69b5eea167658fb00c52a064a1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 14:46:54 -0400
Subject: response

---
 doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
index 5d5b9fc23..6abe203a3 100644
--- a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
+++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
@@ -178,3 +178,12 @@ done instead of the timestamp when the commit was done.  Is this
 intentional?  Otherwise I could supply a patch.
 
 --[[tschwinge]]
+
+> In order to be nice and fast, the git backend runs git log once
+> and records data for all files. Rather than looking at the log for a
+> given file. So amoung other things, it does not follow renames.
+> 
+> AFAICS, git log only shows merges modifying files if it was a conflicted
+> merge. As the file is then actually modified to resolve the merge
+> I think it makes sense to count the merge as the last modification in
+> that case. --[[Joey]] 
-- 
cgit v1.2.3


From 868f5a94bfdf03ccb720d561cf99185d7182cb77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 14:50:24 -0400
Subject: response

---
 doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
index 8678249bb..2419cf75f 100644
--- a/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
+++ b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
@@ -1,3 +1,14 @@
 The autotag functionality of the tag plugin committed (when doing its
 first commit) all changes that have been staged (in Git).  I suggest it
 should be restricted to the specific file only.  --[[tschwinge]]
+
+> This is not specific to the tag plugin. Same can happen
+> if you rename a file, or post a comment, or remove a file
+> via web interface. All of these use `rcs_commit_staged`.
+> 
+> This is why ikiwiki is supposed to have a checkout of 
+> the repository that it uses for its own purposes, and nobody else
+> should mess with. There are various notes about that being needed here
+> and there; you're free to not give ikiwiki its own repo, but you have to
+> be aware that it can fight with you if you're making changes to the same
+> repo. [[done]] --[[Joey]] 
-- 
cgit v1.2.3


From 73bb42ccf0e3240f8fecc9a543bfff435bb27a02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 14:53:22 -0400
Subject: response

---
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index c29eb994f..76bf740fb 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -8,3 +8,9 @@ I did not yet do any testing to figure out when this broke.
 --[[tschwinge]]
 
 [[!map pages="*/a* and tagged(*ose)"]]
+
+> Are you sure that `tagged()` ever matches pages there? Take globbing
+> out of the equasion.
+> 
+> This could be as simple as you having not rebuilt the wiki 
+> on upgrade to the version that tracks tagged links. --[[Joey]]
-- 
cgit v1.2.3


From 7f3c809fe8c9691a54cb065f0e331c7d041ed611 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 15:00:58 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
index 832a8cea3..0b3343649 100644
--- a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
+++ b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
@@ -1 +1,13 @@
 as in title, how to align text to the right?
+
+> Add to your local.css a class that aligns text to the right:
+
+	.alignright { text-align: right; }
+
+> And then you just just use `<span class="alignright">` around
+> other html.
+> 
+> You can refine that, and allow right-aligning markdowned text
+> by using the [[ikiwiki/directive/template]]
+> directive, with a template that contains the html. The 
+> [[templates/note]] template does something similar. --[[Joey]]
-- 
cgit v1.2.3


From ee11d4ca8f7ba9bf9c5d5d0cb4bca60a52b0272e Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Tue, 8 Jun 2010 23:23:32 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
index 0b3343649..2b56bd70b 100644
--- a/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
+++ b/doc/forum/formating:_how_to_align_text_to_the_right.mdwn
@@ -11,3 +11,5 @@ as in title, how to align text to the right?
 > by using the [[ikiwiki/directive/template]]
 > directive, with a template that contains the html. The 
 > [[templates/note]] template does something similar. --[[Joey]]
+
+>> Thanks!
-- 
cgit v1.2.3


From 8028a900302fe5cf73a1f11ab372ed07d88f01c9 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Tue, 8 Jun 2010 23:30:28 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/img_plugin_and_missing_heigth_value.mdwn b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
new file mode 100644
index 000000000..5fbae6272
--- /dev/null
+++ b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
@@ -0,0 +1 @@
+When I set up my picture page with `[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
-- 
cgit v1.2.3


From 3da443396accdc3996a6601b3059ea7c9ad0d780 Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Tue, 8 Jun 2010 23:31:22 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/img_plugin_and_missing_heigth_value.mdwn b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
index 5fbae6272..7da4625ae 100644
--- a/doc/forum/img_plugin_and_missing_heigth_value.mdwn
+++ b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
@@ -1 +1 @@
-When I set up my picture page with `[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
+When I set up my picture page with `\[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `\[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
-- 
cgit v1.2.3


From 8423a8bb9cb9e8b971bef8ab5da05a70f58bae21 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 21:07:38 -0400
Subject: isabug

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

(limited to 'doc')

diff --git a/doc/forum/img_plugin_and_missing_heigth_value.mdwn b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
index 7da4625ae..a82e2a7d7 100644
--- a/doc/forum/img_plugin_and_missing_heigth_value.mdwn
+++ b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
@@ -1 +1,3 @@
 When I set up my picture page with `\[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `\[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
+
+> This is a bug. --[[Joey]]
-- 
cgit v1.2.3


From eff7fac985b41d038b071ab68cfe8bc0f428441b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 21:07:45 -0400
Subject: move bug to bugs

---
 doc/bugs/img_plugin_and_missing_heigth_value.mdwn  | 3 +++
 doc/forum/img_plugin_and_missing_heigth_value.mdwn | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 doc/bugs/img_plugin_and_missing_heigth_value.mdwn
 delete mode 100644 doc/forum/img_plugin_and_missing_heigth_value.mdwn

(limited to 'doc')

diff --git a/doc/bugs/img_plugin_and_missing_heigth_value.mdwn b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
new file mode 100644
index 000000000..a82e2a7d7
--- /dev/null
+++ b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
@@ -0,0 +1,3 @@
+When I set up my picture page with `\[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `\[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
+
+> This is a bug. --[[Joey]]
diff --git a/doc/forum/img_plugin_and_missing_heigth_value.mdwn b/doc/forum/img_plugin_and_missing_heigth_value.mdwn
deleted file mode 100644
index a82e2a7d7..000000000
--- a/doc/forum/img_plugin_and_missing_heigth_value.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-When I set up my picture page with `\[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `\[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
-
-> This is a bug. --[[Joey]]
-- 
cgit v1.2.3


From 0ccf21daafa76fd182df5e6bc156f22873fe062d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Jun 2010 21:13:37 -0400
Subject: img: Fill in missing height or width when scaling image.

---
 IkiWiki/Plugin/img.pm                             | 6 +++---
 debian/changelog                                  | 1 +
 doc/bugs/img_plugin_and_missing_heigth_value.mdwn | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index f06121578..63dfa9019 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -115,9 +115,6 @@ sub preprocess (@) {
 				$im = Image::Magick->new;
 				$r = $im->Read($outfile);
 				error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
-		
-				$dwidth = $im->Get("width");
-				$dheight = $im->Get("height");
 			}
 			else {
 				($dwidth, $dheight)=($w, $h);
@@ -133,6 +130,9 @@ sub preprocess (@) {
 					$imglink = $file;
 				}
 			}
+			
+			$dwidth = $im->Get("width") unless defined $dwidth;
+			$dheight = $im->Get("height") unless defined $dheight;
 		}
 	}
 	else {
diff --git a/debian/changelog b/debian/changelog
index 0a7d17eb7..9a10332ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20100518.3) UNRELEASED; urgency=low
 
   * creation_day() etc use local time, not gmtime. To match calendars, which
     use local time.
+  * img: Fill in missing height or width when scaling image.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/img_plugin_and_missing_heigth_value.mdwn b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
index a82e2a7d7..bcb17c330 100644
--- a/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
+++ b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
@@ -1,3 +1,5 @@
 When I set up my picture page with `\[[!img  defaults size=300x]]` then the html validator complains that the value for height is missing and the IE browsers won't show the pictures up at all; no problems with ff tho. If I set up my picture page with `\[[!img  defaults size=300x300]]` then all the images are funny stretched. What am I doing wrong?
 
 > This is a bug. --[[Joey]]
+
+> And .. [[fixed|done]] --[[Joey]] 
-- 
cgit v1.2.3


From f3dacd82341477dd41d6c97e7381f8cdf889738b Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Wed, 9 Jun 2010 06:17:56 +0000
Subject: Ack.

---
 doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
index 2419cf75f..e5526bedf 100644
--- a/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
+++ b/doc/bugs/tag_plugin:_autotag_vs._staged_changes.mdwn
@@ -12,3 +12,6 @@ should be restricted to the specific file only.  --[[tschwinge]]
 > and there; you're free to not give ikiwiki its own repo, but you have to
 > be aware that it can fight with you if you're making changes to the same
 > repo. [[done]] --[[Joey]] 
+
+>> Ack, that is reasonable.  (And it's only been a very minor problem
+>> during manual testing.)  --[[tschwinge]]
-- 
cgit v1.2.3


From 215538aa58801a6a136029ff9ef4c632b72cf12e Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Wed, 9 Jun 2010 06:39:26 +0000
Subject: Yes, is a globbing issue.

---
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index 76bf740fb..55669e5c8 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -14,3 +14,16 @@ I did not yet do any testing to figure out when this broke.
 > 
 > This could be as simple as you having not rebuilt the wiki 
 > on upgrade to the version that tracks tagged links. --[[Joey]]
+
+>> Yes, it is a globbing issue:
+
+>>     \[[!map pages="tagged(open_i*ue_gdb)" show=title]]
+
+>> ... doesn't show anything.
+
+>>     \[[!map pages="tagged(open_issue_gdb)" show=title]]
+
+>> ... does show a map of eight pages.  Also, it's working fine on the
+>> autotags pages.
+
+>> --[[tschwinge]]
-- 
cgit v1.2.3


From 651acf8b1490ebdfe15c11fde3792c13fb118f31 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <http://jeremiahfoster.com/@web>
Date: Wed, 9 Jun 2010 11:55:11 +0000
Subject: Started discussion

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

(limited to 'doc')

diff --git a/doc/setup/byhand/discussion.mdwn b/doc/setup/byhand/discussion.mdwn
new file mode 100644
index 000000000..97ae40438
--- /dev/null
+++ b/doc/setup/byhand/discussion.mdwn
@@ -0,0 +1 @@
+What directory is the 'working copy'? There can be two interpretations: the current dir and the .git dir.
-- 
cgit v1.2.3


From 4eb82e7d4161114c6a2194f8f887629ab86162c8 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Wed, 9 Jun 2010 13:47:35 +0000
Subject: Comment and done.

---
 doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
index 6abe203a3..4ce7cc3df 100644
--- a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
+++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
@@ -187,3 +187,19 @@ intentional?  Otherwise I could supply a patch.
 > merge. As the file is then actually modified to resolve the merge
 > I think it makes sense to count the merge as the last modification in
 > that case. --[[Joey]] 
+
+>> That'd be reasonable, but `git log` will also show merges that are not
+>> conflicting (as in my case).
+
+>> Yet, I'm not totally disagreeing with your choice.  With this `git
+>> log` invocation, you're not able to tell from its output whether a
+>> conflict was resolved or not.
+
+>> Also, it's a bit like the *should we use the **author timestamp** or
+>> **commit timestamp*** discussion.  Your code will always use the
+>> latest timestamp.
+
+>> I guess I'll get my head wrapped around that, and it's fine, so this is
+>> [[done]].
+
+>> --[[tschwinge]]
-- 
cgit v1.2.3


From 0da7b1a9c33b3ff67fade15c395672f02bfe6a45 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 13:42:13 -0400
Subject: clarification

---
 doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
index 4ce7cc3df..164e62075 100644
--- a/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
+++ b/doc/bugs/Git:_changed_behavior_w.r.t._timestamps.mdwn
@@ -191,6 +191,15 @@ intentional?  Otherwise I could supply a patch.
 >> That'd be reasonable, but `git log` will also show merges that are not
 >> conflicting (as in my case).
 
+>>> Actually when displaying a merge, `git log --stat` only lists files that
+>>> were actually modified in a new way as part of the merge resolution.
+>>> Ie, if the merge resolution only joins together some of the parent
+>>> hunks, the file is not listed as having been modified.
+>>>
+>>> So, no, ikiwiki's use of git log will not show files modified in
+>>> non-conflicting merges.
+>>> --[[Joey]]
+
 >> Yet, I'm not totally disagreeing with your choice.  With this `git
 >> log` invocation, you're not able to tell from its output whether a
 >> conflict was resolved or not.
-- 
cgit v1.2.3


From bd59179e090d8443f4fbaa0f4c0ac586fc8dbbb3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 13:45:18 -0400
Subject: response

---
 doc/setup/byhand/discussion.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/setup/byhand/discussion.mdwn b/doc/setup/byhand/discussion.mdwn
index 97ae40438..941976789 100644
--- a/doc/setup/byhand/discussion.mdwn
+++ b/doc/setup/byhand/discussion.mdwn
@@ -1 +1,7 @@
 What directory is the 'working copy'? There can be two interpretations: the current dir and the .git dir.
+
+> It is fairly common terminology amoung all version control systems to use
+> "working copy" to refer to a checkout from version control, including
+> copies of all the versioned files, and whatever VCS-specific cruft that
+> entails. So, a working copy is everything you get when you `git clone`
+> a repository. --[[Joey]]
-- 
cgit v1.2.3


From ba9b808c898a556541057ac9f524db2de2a33d77 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:04:42 -0400
Subject: remove example blog tag pages

Autotag will create them as needed. Avoids some complexity.
---
 debian/changelog                                          | 2 ++
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 3 +++
 doc/examples/blog/tags/life.mdwn                          | 4 ----
 doc/examples/blog/tags/tech.mdwn                          | 4 ----
 4 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 doc/examples/blog/tags/life.mdwn
 delete mode 100644 doc/examples/blog/tags/tech.mdwn

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 9a10332ea..a0ea9c156 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20100518.3) UNRELEASED; urgency=low
   * creation_day() etc use local time, not gmtime. To match calendars, which
     use local time.
   * img: Fill in missing height or width when scaling image.
+  * Remove example blog tag pages; allow autotag creation to create them
+    when used.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index 55669e5c8..9a55c0673 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -27,3 +27,6 @@ I did not yet do any testing to figure out when this broke.
 >> autotags pages.
 
 >> --[[tschwinge]]
+
+>>> Only way I can reproduce something like this is if tagbase is not set.
+>>> --[[Joey]]
diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn
deleted file mode 100644
index e1614dbdc..000000000
--- a/doc/examples/blog/tags/life.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-[[!meta title="tag life"]]
-
-[[!inline pages="tagged(tags/life)" actions="no" archive="yes"
-feedshow=10]]
diff --git a/doc/examples/blog/tags/tech.mdwn b/doc/examples/blog/tags/tech.mdwn
deleted file mode 100644
index 398146cdb..000000000
--- a/doc/examples/blog/tags/tech.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-[[!meta title="tag tech"]]
-
-[[!inline pages="tagged(tags/tech)" actions="no" archive="yes"
-feedshow=10]]
-- 
cgit v1.2.3


From cdf4292846e6fe0fb877809ef0906ff6bddf6bf9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:33:49 -0400
Subject: Fix support for globbing in tagged() pagespecs.

The linktype check was being done on the relativised link target,
but %typedlinks uses the same link targets as %links, so that didn't work.

I think the bug only appeared when tagbase was not set.

This bugfix also let me factor out the common typedlink checking code.
---
 IkiWiki.pm                                                | 8 +++++---
 debian/changelog                                          | 1 +
 doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e2a3d216f..27fa4ca17 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2397,18 +2397,20 @@ sub match_link ($$;@) {
 		unless $links && @{$links};
 	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@{$links}) {
+		next unless (! defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p});
+
 		if (length $bestlink) {
-			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && $bestlink eq IkiWiki::bestlink($page, $p)) {
+			if ($bestlink eq IkiWiki::bestlink($page, $p)) {
 				return IkiWiki::SuccessReason->new("$page links to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 			}
 		}
 		else {
-			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && match_glob($p, $link, %params)) {
+			if (match_glob($p, $link, %params)) {
 				return IkiWiki::SuccessReason->new("$page links to page $p$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 			}
 			my ($p_rel)=$p=~/^\/?(.*)/;
 			$link=~s/^\///;
-			if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p_rel}) && match_glob($p_rel, $link, %params)) {
+			if (match_glob($p_rel, $link, %params)) {
 				return IkiWiki::SuccessReason->new("$page links to page $p_rel$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
 			}
 		}
diff --git a/debian/changelog b/debian/changelog
index a0ea9c156..38beca395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ikiwiki (3.20100518.3) UNRELEASED; urgency=low
   * img: Fill in missing height or width when scaling image.
   * Remove example blog tag pages; allow autotag creation to create them
     when used.
+  * Fix support for globbing in tagged() pagespecs.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index 9a55c0673..fba332949 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -29,4 +29,5 @@ I did not yet do any testing to figure out when this broke.
 >> --[[tschwinge]]
 
 >>> Only way I can reproduce something like this is if tagbase is not set.
+>>> I have fixed a bug there, see if it works for you?
 >>> --[[Joey]]
-- 
cgit v1.2.3


From 54c5baaa7c3882d32043c2875ac0324bf03fb956 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:44:38 -0400
Subject: note that setup is all done by auto-blog.setup

---
 doc/examples/blog.mdwn | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index 8775c01ab..b25601227 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -5,13 +5,15 @@ Or, run this command to set up a blog with ikiwiki.
 
 	% ikiwiki -setup /etc/ikiwiki/auto-blog.setup
 
-Some additional configuration you might want to do:
+Some additional configuration you might want to do, if not using
+`auto-blog.setup`:
 
 * Make sure to configure ikiwiki to generate RSS or Atom feeds.
 
-* Make sure you have the tag plugin enabled, and tag posts using it. An
-  example of how to tag a post is:
-	\[[!tag tags/life]]
+* Make sure you have the tag plugin enabled, and the `tagbase` set to
+  "tags". Tag pages will then automatically be created.
+  An example of how to tag a post is:
+	\[[!tag life]]
 
 * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud
   to display on the [[index]].
-- 
cgit v1.2.3


From fad44c9d4d7e907b35d99a664f77cb617916f5df Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:58:05 -0400
Subject: remove tag on first post

It's a broken link on ikiwiki.info.
---
 doc/examples/blog/posts/first_post.mdwn | 2 --
 1 file changed, 2 deletions(-)

(limited to 'doc')

diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
index f2729fcef..343497d18 100644
--- a/doc/examples/blog/posts/first_post.mdwn
+++ b/doc/examples/blog/posts/first_post.mdwn
@@ -1,4 +1,2 @@
 This is the first post to this example blog. To add new posts, just add
 files to the posts/ subdirectory, or use the web form.
-
-[[!tag tech]]
-- 
cgit v1.2.3


From 3fbcd2c8d270b1282e3c457cd2eb7720f43726af Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 14:58:39 -0400
Subject: move contrib plugin directives out of ikiwiki/directive

Problem is that ikiwiki/directive is turned into an underlay and added to
all wikis. And the test suite checks it for broken links and turns some up.
So it's not appropriate for contrib plugin's directives to be documented
in there.
---
 doc/ikiwiki/directive/ftemplate.mdwn               | 106 ---------------
 doc/ikiwiki/directive/report.mdwn                  | 149 ---------------------
 .../ftemplate/ikiwiki/directive/ftemplate.mdwn     | 106 +++++++++++++++
 .../contrib/report/ikiwiki/directive/report.mdwn   | 149 +++++++++++++++++++++
 4 files changed, 255 insertions(+), 255 deletions(-)
 delete mode 100644 doc/ikiwiki/directive/ftemplate.mdwn
 delete mode 100644 doc/ikiwiki/directive/report.mdwn
 create mode 100644 doc/plugins/contrib/ftemplate/ikiwiki/directive/ftemplate.mdwn
 create mode 100644 doc/plugins/contrib/report/ikiwiki/directive/report.mdwn

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/ftemplate.mdwn b/doc/ikiwiki/directive/ftemplate.mdwn
deleted file mode 100644
index 3009fc830..000000000
--- a/doc/ikiwiki/directive/ftemplate.mdwn
+++ /dev/null
@@ -1,106 +0,0 @@
-The `ftemplate` directive is supplied by the [[!iki plugins/contrib/ftemplate desc=ftemplate]] plugin.
-
-This is like the [[ikiwiki/directive/template]] directive, with the addition
-that one does not have to provide all the values in the call to the template,
-because ftemplate can query structured data ("fields") using the
-[[plugins/contrib/field]] plugin.
-
-Templates are files that can be filled out and inserted into pages in
-the wiki, by using the ftemplate directive. The directive has an id
-parameter that identifies the template to use.
-
-Additional parameters can be used to fill out the template, in
-addition to the "field" values.  Passed-in values override the
-"field" values.
-
-There are two places where template files can live.  One is in the /templates
-directory on the wiki.  These templates are wiki pages, and can be edited from
-the web like other wiki pages.
-
-The second place where template files can live is in the global
-templates directory (the same place where the page.tmpl template lives).
-This is a useful place to put template files if you want to prevent
-them being edited from the web, and you don't want to have to make
-them work as wiki pages.
-
-### EXAMPLES
-
-#### Example 1
-
-PageA:
-
-    \[[!meta title="I Am Page A"]]
-    \[[!meta description="A is for Apple."]]
-    \[[!meta author="Fred Nurk"]]
-    \[[!ftemplate id="mytemplate"]]
-
-Template "mytemplate":
-
-    # <TMPL_VAR NAME="TITLE">
-    by <TMPL_VAR NAME="AUTHOR">
-
-    **Summary:** <TMPL_VAR NAME="DESCRIPTION">
-
-This will give:
-
-    <h1>I Am Page A</h1>
-    <p>by Fred Nurk</p>
-    <p><strong>Summary:</strong> A is for Apple.
-
-#### Example 2: Overriding values
-
-PageB:
-
-    \[[!meta title="I Am Page B"]]
-    \[[!meta description="B is for Banana."]]
-    \[[!meta author="Fred Nurk"]]
-    \[[!ftemplate id="mytemplate" title="Bananananananas"]]
-
-This will give:
-
-    <h1>Bananananananas</h1>
-    <p>by Fred Nurk</p>
-    <p><strong>Summary:</strong> B is for Banana.
-
-#### Example 3: Loops
-
-(this example uses the [[plugins/contrib/ymlfront]] plugin)
-
-Page C:
-
-    ---
-    BookAuthor: Georgette Heyer
-    BookTitle: Black Sheep
-    BookGenre:
-      - Historical
-      - Romance
-    ---
-    \[[ftemplate id="footemplate"]]
-
-    I like this book.
-
-Template "footemplate":
-
-    # <TMPL_VAR BOOKTITLE>
-    by <TMPL_VAR BOOKAUTHOR>
-
-    <TMPL_IF BOOKGENRE>(
-    <TMPL_LOOP GENRE_LOOP><TMPL_VAR BOOKGENRE>
-    <TMPL_UNLESS __last__>, </TMPL_UNLESS>
-    </TMPL_LOOP>
-    )</TMPL_IF>
-
-This will give:
-
-    <h1>Black Sheep</h1>
-    <p>by Georgette Heyer</p>
-
-    <p>(Historical, Romance)</p>
-
-    <p>I like this book.</p>
-
-### LIMITATIONS
-
-One cannot query the values of fields on pages other than the current
-page.  If you want to do that, check out the [[plugins/contrib/report]]
-plugin.
diff --git a/doc/ikiwiki/directive/report.mdwn b/doc/ikiwiki/directive/report.mdwn
deleted file mode 100644
index 8f8e6b4e8..000000000
--- a/doc/ikiwiki/directive/report.mdwn
+++ /dev/null
@@ -1,149 +0,0 @@
-[[!toc]]
-The `report` directive is supplied by the [[!iki plugins/contrib/report desc=report]] plugin.
-
-This enables one to report on the structured data ("field" values) of
-multiple pages; the output is formatted via a template.  This depends
-on the [[plugins/contrib/field]] plugin.
-
-The pages to report on are selected by a PageSpec given by the "pages"
-parameter.  The template is given by the "template" parameter.
-The template expects the data from a single page; it is applied
-to each matching page separately, one after the other.
-
-Additional parameters can be used to fill out the template, in
-addition to the "field" values.  Passed-in values override the
-"field" values.
-
-There are two places where template files can live.  One is in the
-/templates directory on the wiki.  These templates are wiki pages, and
-can be edited from the web like other wiki pages.
-
-The second place where template files can live is in the global
-templates directory (the same place where the page.tmpl template lives).
-This is a useful place to put template files if you want to prevent
-them being edited from the web, and you don't want to have to make
-them work as wiki pages.
-
-## OPTIONS
-
-**template**: The template to use for the report.
-
-**pages**: A PageSpec to determine the pages to report on.
-
-**trail**: A page or pages to use as a "trail" page.
-
-When a trail page is used, the matching pages are limited to (a subset
-of) the pages which that page links to; the "pages" pagespec in this
-case, rather than selecting pages from the entire wiki, will select
-pages from within the set of pages given by the trail page.
-
-Additional space-separated trail pages can be given in this option.
-For example:
-
-    trail="animals/cats animals/dogs"
-
-This will take the links from both the "animals/cats" page and the
-"animals/dogs" page as the set of pages to apply the PageSpec to.
-
-**sort**: A SortSpec to determine how the matching pages should be sorted.
-
-**here_only**: Report on the current page only.
-
-This is useful in combination with "prev_" and "next_" variables to
-make a navigation trail.
-If the current page doesn't match the pagespec, then no pages will
-be reported on.
-
-### Headers
-
-An additional option is the "headers" option.  This is a space-separated
-list of field names which are to be used as headers in the report.  This
-is a way of getting around one of the limitations of HTML::Template, that
-is, not being able to do tests such as
-"if this-header is not equal to previous-header".
-
-Instead, that logic is performed inside the plugin.  The template is
-given parameters "HEADER1", "HEADER2" and so on, for each header.
-If the value of a header field is the same as the previous value,
-then HEADER**N** is set to be empty, but if the value of the header
-field is new, then HEADER**N** is given that value.
-
-#### Example
-
-Suppose you're writing a blog in which you record "moods", and you
-want to display your blog posts by mood.
-
-    \[[!report template="mood_summary"
-    pages="blog/*"
-    sort="Mood Date title"
-    headers="Mood"]]
-
-The "mood_summary" template might be like this:
-
-    <TMPL_IF NAME="HEADER1">
-    ## <TMPL_VAR NAME="HEADER1">
-    </TMPL_IF>
-    ### <TMPL_VAR NAME="TITLE">
-    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]]
-    <TMPL_VAR NAME="DESCRIPTION">
-    
-### Advanced Options
-
-The following options are used to improve efficiency when dealing
-with large numbers of pages; most people probably won't need them.
-
-**doscan**:
-
-Whether this report should be called in "scan" mode; if it is, then
-the pages which match the pagespec are added to the list of links from
-this page.  This can be used by *another* report by setting this
-page to be a "trail" page in *that* report.
-It is not possible to use "trail" and "doscan" at the same time.
-By default, "doscan" is false.
-
-## TEMPLATE PARAMETERS
-
-The templates are in HTML::Template format, just as [[plugins/template]] and
-[[ftemplate]] are.  The parameters passed in to the template are as follows:
-
-### Fields
-
-The structured data from the current matching page.  This includes
-"title" and "description" if they are defined.
-
-### Common values
-
-Values known for all pages: "page", "destpage".  Also "basename" (the
-base name of the page).
-
-### Passed-in values
-
-Any additional parameters to the report directive are passed to the
-template; a parameter will override the matching "field" value.
-For example, if you have a "Mood" field, and you pass Mood="bad" to
-the report, then that will be the Mood which is given for the whole
-report.
-
-Generally this is useful if one wishes to make a more generic
-template and hide or show portions of it depending on what
-values are passed in the report directive call.
-
-For example, one could have a "hide_mood" parameter which would hide
-the "Mood" section of your template when it is true, which one could
-use when the Mood is one of the headers.
-
-### Prev_ And Next_ Items
-
-Any of the above variables can be prefixed with "prev_" or "next_"
-and that will give the previous or next value of that variable; that is,
-the value from the previous or next page that this report is reporting on.
-This is mainly useful for a "here_only" report.
-
-### Headers
-
-See the section on Headers.
-
-### First and Last
-
-If this is the first page-record in the report, then "first" is true.
-If this is the last page-record in the report, then "last" is true.
diff --git a/doc/plugins/contrib/ftemplate/ikiwiki/directive/ftemplate.mdwn b/doc/plugins/contrib/ftemplate/ikiwiki/directive/ftemplate.mdwn
new file mode 100644
index 000000000..3009fc830
--- /dev/null
+++ b/doc/plugins/contrib/ftemplate/ikiwiki/directive/ftemplate.mdwn
@@ -0,0 +1,106 @@
+The `ftemplate` directive is supplied by the [[!iki plugins/contrib/ftemplate desc=ftemplate]] plugin.
+
+This is like the [[ikiwiki/directive/template]] directive, with the addition
+that one does not have to provide all the values in the call to the template,
+because ftemplate can query structured data ("fields") using the
+[[plugins/contrib/field]] plugin.
+
+Templates are files that can be filled out and inserted into pages in
+the wiki, by using the ftemplate directive. The directive has an id
+parameter that identifies the template to use.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One is in the /templates
+directory on the wiki.  These templates are wiki pages, and can be edited from
+the web like other wiki pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+### EXAMPLES
+
+#### Example 1
+
+PageA:
+
+    \[[!meta title="I Am Page A"]]
+    \[[!meta description="A is for Apple."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate"]]
+
+Template "mytemplate":
+
+    # <TMPL_VAR NAME="TITLE">
+    by <TMPL_VAR NAME="AUTHOR">
+
+    **Summary:** <TMPL_VAR NAME="DESCRIPTION">
+
+This will give:
+
+    <h1>I Am Page A</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> A is for Apple.
+
+#### Example 2: Overriding values
+
+PageB:
+
+    \[[!meta title="I Am Page B"]]
+    \[[!meta description="B is for Banana."]]
+    \[[!meta author="Fred Nurk"]]
+    \[[!ftemplate id="mytemplate" title="Bananananananas"]]
+
+This will give:
+
+    <h1>Bananananananas</h1>
+    <p>by Fred Nurk</p>
+    <p><strong>Summary:</strong> B is for Banana.
+
+#### Example 3: Loops
+
+(this example uses the [[plugins/contrib/ymlfront]] plugin)
+
+Page C:
+
+    ---
+    BookAuthor: Georgette Heyer
+    BookTitle: Black Sheep
+    BookGenre:
+      - Historical
+      - Romance
+    ---
+    \[[ftemplate id="footemplate"]]
+
+    I like this book.
+
+Template "footemplate":
+
+    # <TMPL_VAR BOOKTITLE>
+    by <TMPL_VAR BOOKAUTHOR>
+
+    <TMPL_IF BOOKGENRE>(
+    <TMPL_LOOP GENRE_LOOP><TMPL_VAR BOOKGENRE>
+    <TMPL_UNLESS __last__>, </TMPL_UNLESS>
+    </TMPL_LOOP>
+    )</TMPL_IF>
+
+This will give:
+
+    <h1>Black Sheep</h1>
+    <p>by Georgette Heyer</p>
+
+    <p>(Historical, Romance)</p>
+
+    <p>I like this book.</p>
+
+### LIMITATIONS
+
+One cannot query the values of fields on pages other than the current
+page.  If you want to do that, check out the [[plugins/contrib/report]]
+plugin.
diff --git a/doc/plugins/contrib/report/ikiwiki/directive/report.mdwn b/doc/plugins/contrib/report/ikiwiki/directive/report.mdwn
new file mode 100644
index 000000000..8f8e6b4e8
--- /dev/null
+++ b/doc/plugins/contrib/report/ikiwiki/directive/report.mdwn
@@ -0,0 +1,149 @@
+[[!toc]]
+The `report` directive is supplied by the [[!iki plugins/contrib/report desc=report]] plugin.
+
+This enables one to report on the structured data ("field" values) of
+multiple pages; the output is formatted via a template.  This depends
+on the [[plugins/contrib/field]] plugin.
+
+The pages to report on are selected by a PageSpec given by the "pages"
+parameter.  The template is given by the "template" parameter.
+The template expects the data from a single page; it is applied
+to each matching page separately, one after the other.
+
+Additional parameters can be used to fill out the template, in
+addition to the "field" values.  Passed-in values override the
+"field" values.
+
+There are two places where template files can live.  One is in the
+/templates directory on the wiki.  These templates are wiki pages, and
+can be edited from the web like other wiki pages.
+
+The second place where template files can live is in the global
+templates directory (the same place where the page.tmpl template lives).
+This is a useful place to put template files if you want to prevent
+them being edited from the web, and you don't want to have to make
+them work as wiki pages.
+
+## OPTIONS
+
+**template**: The template to use for the report.
+
+**pages**: A PageSpec to determine the pages to report on.
+
+**trail**: A page or pages to use as a "trail" page.
+
+When a trail page is used, the matching pages are limited to (a subset
+of) the pages which that page links to; the "pages" pagespec in this
+case, rather than selecting pages from the entire wiki, will select
+pages from within the set of pages given by the trail page.
+
+Additional space-separated trail pages can be given in this option.
+For example:
+
+    trail="animals/cats animals/dogs"
+
+This will take the links from both the "animals/cats" page and the
+"animals/dogs" page as the set of pages to apply the PageSpec to.
+
+**sort**: A SortSpec to determine how the matching pages should be sorted.
+
+**here_only**: Report on the current page only.
+
+This is useful in combination with "prev_" and "next_" variables to
+make a navigation trail.
+If the current page doesn't match the pagespec, then no pages will
+be reported on.
+
+### Headers
+
+An additional option is the "headers" option.  This is a space-separated
+list of field names which are to be used as headers in the report.  This
+is a way of getting around one of the limitations of HTML::Template, that
+is, not being able to do tests such as
+"if this-header is not equal to previous-header".
+
+Instead, that logic is performed inside the plugin.  The template is
+given parameters "HEADER1", "HEADER2" and so on, for each header.
+If the value of a header field is the same as the previous value,
+then HEADER**N** is set to be empty, but if the value of the header
+field is new, then HEADER**N** is given that value.
+
+#### Example
+
+Suppose you're writing a blog in which you record "moods", and you
+want to display your blog posts by mood.
+
+    \[[!report template="mood_summary"
+    pages="blog/*"
+    sort="Mood Date title"
+    headers="Mood"]]
+
+The "mood_summary" template might be like this:
+
+    <TMPL_IF NAME="HEADER1">
+    ## <TMPL_VAR NAME="HEADER1">
+    </TMPL_IF>
+    ### <TMPL_VAR NAME="TITLE">
+    (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]]
+    <TMPL_VAR NAME="DESCRIPTION">
+    
+### Advanced Options
+
+The following options are used to improve efficiency when dealing
+with large numbers of pages; most people probably won't need them.
+
+**doscan**:
+
+Whether this report should be called in "scan" mode; if it is, then
+the pages which match the pagespec are added to the list of links from
+this page.  This can be used by *another* report by setting this
+page to be a "trail" page in *that* report.
+It is not possible to use "trail" and "doscan" at the same time.
+By default, "doscan" is false.
+
+## TEMPLATE PARAMETERS
+
+The templates are in HTML::Template format, just as [[plugins/template]] and
+[[ftemplate]] are.  The parameters passed in to the template are as follows:
+
+### Fields
+
+The structured data from the current matching page.  This includes
+"title" and "description" if they are defined.
+
+### Common values
+
+Values known for all pages: "page", "destpage".  Also "basename" (the
+base name of the page).
+
+### Passed-in values
+
+Any additional parameters to the report directive are passed to the
+template; a parameter will override the matching "field" value.
+For example, if you have a "Mood" field, and you pass Mood="bad" to
+the report, then that will be the Mood which is given for the whole
+report.
+
+Generally this is useful if one wishes to make a more generic
+template and hide or show portions of it depending on what
+values are passed in the report directive call.
+
+For example, one could have a "hide_mood" parameter which would hide
+the "Mood" section of your template when it is true, which one could
+use when the Mood is one of the headers.
+
+### Prev_ And Next_ Items
+
+Any of the above variables can be prefixed with "prev_" or "next_"
+and that will give the previous or next value of that variable; that is,
+the value from the previous or next page that this report is reporting on.
+This is mainly useful for a "here_only" report.
+
+### Headers
+
+See the section on Headers.
+
+### First and Last
+
+If this is the first page-record in the report, then "first" is true.
+If this is the last page-record in the report, then "last" is true.
-- 
cgit v1.2.3


From 9f41b231088a6a3dbd560cc999ad5ee9549aa914 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:02:08 -0400
Subject: seems this was fixed a long time ago

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

(limited to 'doc')

diff --git a/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn b/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
index e43540c65..19aa94e7e 100644
--- a/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
+++ b/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn
@@ -25,3 +25,5 @@ types, ikiwiki should output a better error message.
 > It does allow including binary files right into a page, but nothing is
 > stopping you pasting binary data right into the edit form either, so
 > while annoying I don't think that will be a security problem. --[[Joey]] 
+
+[[done]]
-- 
cgit v1.2.3


From addedde0d64bc70b2dceac22886eec636f6b6e9a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:03:51 -0400
Subject: fixed by improved openid login form

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

(limited to 'doc')

diff --git a/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn b/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
index 9985c13a0..70266c49c 100644
--- a/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
+++ b/doc/bugs/the_login_page_is_unclear_when_multiple_methods_exist.mdwn
@@ -12,3 +12,5 @@ Followed by the "login" button underneath. It's not obvious to anyone unfamiliar
 > it visually distinct from the rest of the form. I'm sure the styling
 > could be improved, but the current form does not seem too non-obvious
 > to me, or to naive users in the field. --[[Joey]]
+
+>> [[done]], better fixed by new fancy openid login form. --[[Joey]] 
-- 
cgit v1.2.3


From 3cd4d1e31ba5d7b0a3705af08de2179a0dd07632 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:08:41 -0400
Subject: fixed

---
 doc/bugs/nested_raw_included_inlines.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/nested_raw_included_inlines.mdwn b/doc/bugs/nested_raw_included_inlines.mdwn
index 33433e235..92ea4c4ef 100644
--- a/doc/bugs/nested_raw_included_inlines.mdwn
+++ b/doc/bugs/nested_raw_included_inlines.mdwn
@@ -32,3 +32,20 @@ Am I missing something? Is this a bug or Ikiwiki not supposed to support this us
 > currently merges pagespecs, though - maybe the patches I suggested for
 > [[separating_and_uniquifying_pagespecs|todo/should_optimise_pagespecs]]
 > would help? --[[smcv]]
+
+>> That, or something seems to have helped in the meantime...
+>> Actually, I think it was the [[transitive_dependencies]] support
+>> that did it, though smcv's pagespec stuff was also a crucial improvement.
+>> 
+>> Anyhoo:
+
+	joey@gnu:~/tmp>touch testcase/page2.mdwn 
+	joey@gnu:~/tmp>ikiwiki -v testcase html 
+	refreshing wiki..
+	scanning page2.mdwn
+	building page2.mdwn
+	building page1.mdwn, which depends on page2
+	building page0.mdwn, which depends on page1
+	done
+
+>> I happily think this is [[done]] --[[Joey]]
-- 
cgit v1.2.3


From 34594fb89a78c26f934a03e06c1aebb097ad57d2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:11:23 -0400
Subject: close

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

(limited to 'doc')

diff --git a/doc/bugs/remove_orphaned_sparkline-php_from_Suggests.mdwn b/doc/bugs/remove_orphaned_sparkline-php_from_Suggests.mdwn
index b4e2a1501..ab08c0b26 100644
--- a/doc/bugs/remove_orphaned_sparkline-php_from_Suggests.mdwn
+++ b/doc/bugs/remove_orphaned_sparkline-php_from_Suggests.mdwn
@@ -18,3 +18,5 @@ Thanks
 > rewriting the ikiwiki code to use it, *and* packaging that alternative
 > and maintaining it in Debian. So your suggestion doesn't make a lot of
 > sense; Debian should just find a maintainer for sparkline-php. --[[Joey]]
+
+[[done]]
-- 
cgit v1.2.3


From b382625f9fbe860ca80baaac7c2b38baa0626bc0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:13:46 -0400
Subject: close

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

(limited to 'doc')

diff --git a/doc/bugs/login_page_should_note_cookie_requirement.mdwn b/doc/bugs/login_page_should_note_cookie_requirement.mdwn
index 96686053c..17ac12b34 100644
--- a/doc/bugs/login_page_should_note_cookie_requirement.mdwn
+++ b/doc/bugs/login_page_should_note_cookie_requirement.mdwn
@@ -31,3 +31,9 @@ Best of all would be to use URL-based or hidden-field-based session tokens if co
 >> don't look static. Are they really? --[MJR](http://mjr.towers.org.uk)
 
 >>> As soon as you post an edit page, you are back to a static website.
+
+>>> It is impossible to get to an edit page w/o a cookie, unless
+>>> anonymous edits are allowed, in which case it will save. No data loss.
+>>> Since noone is working on this, and the nonsense above has pissed me
+>>> off to the point that I will certianly never work on it, I'm going to
+>>> close it. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 3638657f75a5cba68511acebd5e124f4b22179ed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:15:18 -0400
Subject: closing; cannot reproduce and no followup for 1 year 9 months

---
 debian/changelog                                            |  2 +-
 doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn |  2 ++
 ikiwiki.spec                                                |  2 +-
 po/bg.po                                                    |  3 ++-
 po/cs.po                                                    |  3 ++-
 po/da.po                                                    |  3 ++-
 po/de.po                                                    |  3 ++-
 po/es.po                                                    |  3 ++-
 po/fr.po                                                    | 10 ++++++----
 9 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 38beca395..36848d680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100518.3) UNRELEASED; urgency=low
+ikiwiki (3.20100609) unstable; urgency=low
 
   * creation_day() etc use local time, not gmtime. To match calendars, which
     use local time.
diff --git a/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn b/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn
index 7daf52f2a..3e1fe823e 100644
--- a/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn
+++ b/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn
@@ -3,3 +3,5 @@ page produces nothing.  It looks like the inline plugin is failing to do
 the translation from apostrophe to `_39_` that other parts of the system do, so although one can make wikilinks to such pages and have them detected as existing (for instance, by the conditional plugin), inline looks in the wrong place and doesn't see the page.
 
 > I can't reproduce that (btw, an apostrophe would be `__39__`) --[[Joey]]
+
+[[done]]
diff --git a/ikiwiki.spec b/ikiwiki.spec
index fb8b777fe..d373c5cf3 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100518.2
+Version: 3.20100609
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/bg.po b/po/bg.po
index a399a8c77..49dddee2b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/cs.po b/po/cs.po
index 5e3d8abac..c3fb1f832 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2009-09-11 20:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/da.po b/po/da.po
index 81f40ea52..fb0ec754d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2009-07-23 01:07+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de.po b/po/de.po
index a6241388e..1cfc57886 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.14159\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2010-03-14 16:09+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/es.po b/po/es.po
index 2f0b83813..34c704238 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fr.po b/po/fr.po
index e1cee2e80..ec21d51ab 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:38-0400\n"
+"POT-Creation-Date: 2010-05-18 14:18-0400\n"
 "PO-Revision-Date: 2009-08-17 10:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -807,7 +808,8 @@ msgstr "pourcentage %s illégal"
 #: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
-"L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire."
+"L'un des paramètres « percent », « totalpages » ou « donepages » est "
+"nécessaire."
 
 #: ../IkiWiki/Plugin/recentchangesdiff.pm:37
 msgid "(Diff truncated)"
@@ -1320,5 +1322,5 @@ msgstr "Nom de domaine du serveur HTTP :"
 
 #~ msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 #~ msgstr ""
-#~ "<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero (%"
-#~ "s)"
+#~ "<p class=\"erreur\">Erreur : %s s'est terminé, valeur de sortie nonzero "
+#~ "(%s)"
-- 
cgit v1.2.3


From 2b716c47a7caa90338430d407fea2a0d07550429 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:19:46 -0400
Subject: close old bug, apparently worked around

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

(limited to 'doc')

diff --git a/doc/bugs/2.45_Compilation_error.mdwn b/doc/bugs/2.45_Compilation_error.mdwn
index c69c2fc25..63147b656 100644
--- a/doc/bugs/2.45_Compilation_error.mdwn
+++ b/doc/bugs/2.45_Compilation_error.mdwn
@@ -189,3 +189,10 @@ Would you suggest I try rebuilding perl without this patch? Debian has a huge pe
 it's not straightforward for me to see if they do something similar to Arch.
 
 > I think Debian has a similar patch.
+
+---
+
+[[done]] -- apparently this was a problem due to a distribution's
+customisation to perl, or something. Seems to late now to track down what,
+unfortunatly. And ikiwiki's Makefile no longer uses the "-libdir" switch
+that seemed to trigger the bug. --[[Joey]]
-- 
cgit v1.2.3


From 0b3d08665bf451d30bd9f355cfe31ed4072b407a Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Wed, 9 Jun 2010 19:26:40 +0000
Subject:

---
 ...espect_the_current_page___40__if_any__41__.mdwn | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn

(limited to 'doc')

diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
new file mode 100644
index 000000000..58cf9d737
--- /dev/null
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -0,0 +1,50 @@
+I really like the new approach to having only one main template "page.tmpl". For instance, it improves previews during edits.
+But it causes some nasty bugs for plugins that use the pagetemplate hook. It is especially visible with the [[plugins/sidebar]] plugin.
+
+## Some examples
+
+### A first example
+
+* activate sidebars globally and cgi
+* create "/sidebar.mdwn" with "[<span></span>[foo]]" inside
+* create "/foo.mdwn" with "hello!" inside
+* create "/bar.mdwn"
+* run ikiwiki
+* with the web browser, go to the page "bar"
+* notice the sidebar, click on "foo"
+* notice the page "foo" is now displayed (hello!)
+* return the the page "bar" and click "edit"
+* notice the sidebar is still here, click on the "foo"
+* -> Problem: 404, the browser goes to "/bar/foo" 
+* -> Was expected: the browser goes to "/foo"
+
+### A second example
+
+* create "/bar/sidebar.mdwn" with "world"
+* run ikiwiki
+* with the web browser, go to the page "bar"
+* notice the sidebar displays "world"
+* click "edit"
+* -> Problem: the sidebar now shows the foo link (it is the root sidebar!)
+* -> Was expecte : the sidebar displays "world"
+
+### A last example
+
+* with the web browser edit the page "bar"
+* type <code>[<span></span>[!sidebar content="goodby"]]</code>
+* click preview
+* -> Problem: the sidebar still displays the foo link
+* -> Was expected: the sidebar display "goodby"
+
+## Some superficial hacking
+
+With the following workaround hacks, I manage to solve the 3 examples shown above:
+
+1- edit IkiWiki/Plugin/editpage.pm and call showform with additional page and destpage parameters:
+<pre>showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl, page => $page, destpage => $page);</pre>
+
+2- edit /usr/share/perl5/IkiWiki.pm and modify the misctemplate function to use the given page and destpage:
+<pre>my %params=@_;
+shift->(page => $params{page}, destpage => $params{destpage}, template => $template);</pre>
+
+I do not guarantee (I do not even expect) that it is the proper way to solve this bug but it may help developers to find and solve the real problem. 
-- 
cgit v1.2.3


From b5978713f134f82ba4929df234a16c007d4acb79 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 15:29:20 -0400
Subject: close; use ENV in setup file

---
 doc/bugs/http_proxy_for_openid.mdwn | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn
index 3d0c99b83..dac4d2736 100644
--- a/doc/bugs/http_proxy_for_openid.mdwn
+++ b/doc/bugs/http_proxy_for_openid.mdwn
@@ -22,8 +22,7 @@ Note that using $ua->proxy(['https'], ...); won't work, you get a "Not Implement
 
 Also note that the proxy won't work with liblwpx-paranoidagent-perl, I had to remove liblwpx-paranoidagent-perl first.
 
-Please get the patch from the *.mdwn source.
-
+<pre>
 louie:/usr/share/perl5/IkiWiki/Plugin# diff -u openid.pm.old openid.pm
 --- openid.pm.old	2008-10-26 12:18:58.094489360 +1100
 +++ openid.pm	2008-10-26 12:40:05.763429880 +1100
@@ -42,6 +41,11 @@ louie:/usr/share/perl5/IkiWiki/Plugin# diff -u openid.pm.old openid.pm
  	# Store the secret in the session.
  	my $secret=$session->param("openid_secret");
  	if (! defined $secret) {
-
+</pre>
 
 Brian May
+
+> Rather than adding config file settings for every useful environment 
+> variable, there is a ENV config file setting that can be used to set
+> any environment variables you like. So, no changed needed. [[done]]
+> --[[Joey]] 
-- 
cgit v1.2.3


From e96cf38eccd219714140f221090d2e7751fd4ee0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 16:00:12 -0400
Subject: When editing a page, show that page's sidebar. (Thanks, privat)

---
 IkiWiki.pm                                            | 13 +++++++++++--
 IkiWiki/Plugin/editpage.pm                            | 13 ++++++++-----
 debian/changelog                                      |  1 +
 ...t_respect_the_current_page___40__if_any__41__.mdwn | 19 ++++++++++++++++++-
 4 files changed, 38 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 27fa4ca17..d2ed99923 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1739,11 +1739,20 @@ sub template ($;@) {
 sub misctemplate ($$;@) {
 	my $title=shift;
 	my $content=shift;
+	my %params=@_;
 	
 	my $template=template("page.tmpl");
 
+	my $page="";
+	if (exists $params{page}) {
+		$page=delete $params{page};
+	}
 	run_hooks(pagetemplate => sub {
-		shift->(page => "", destpage => "", template => $template);
+		shift->(
+			page => $page,
+			destpage => $page,
+			template => $template,
+		);
 	});
 	templateactions($template, "");
 
@@ -1754,7 +1763,7 @@ sub misctemplate ($$;@) {
 		content => $content,
 		baseurl => baseurl(),
 		html5 => $config{html5},
-		@_,
+		%params,
 	);
 	
 	return $template->output;
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 670eedfd9..aa73eb87d 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -312,7 +312,8 @@ sub cgi_editpage ($$) {
 			$form->title(sprintf(gettext("editing %s"), pagetitle($page)));
 		}
 		
-		showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
+		showform($form, \@buttons, $session, $q,
+			forcebaseurl => $baseurl, page => $page);
 	}
 	else {
 		# save page
@@ -329,7 +330,8 @@ sub cgi_editpage ($$) {
 			$form->field(name => "page", type => 'hidden');
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
-			showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
+			showform($form, \@buttons, $session, $q,
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 		elsif ($form->field("do") eq "create" && $exists) {
@@ -343,7 +345,8 @@ sub cgi_editpage ($$) {
 				value => readfile("$config{srcdir}/$file").
 				         "\n\n\n".$form->field("editcontent"),
 				force => 1);
-			showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
+			showform($form, \@buttons, $session, $q,
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 			
@@ -384,7 +387,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 		
@@ -423,7 +426,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 		}
 		else {
 			# The trailing question mark tries to avoid broken
diff --git a/debian/changelog b/debian/changelog
index 36848d680..66d525572 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ikiwiki (3.20100609) unstable; urgency=low
   * Remove example blog tag pages; allow autotag creation to create them
     when used.
   * Fix support for globbing in tagged() pagespecs.
+  * When editing a page, show that page's sidebar. (Thanks, privat)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
index 58cf9d737..2ef5cdba3 100644
--- a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -18,6 +18,12 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 * -> Problem: 404, the browser goes to "/bar/foo" 
 * -> Was expected: the browser goes to "/foo"
 
+> You must have a locally modified `page.tmpl` that omits the "TMPL_IF DYNAMIC"
+> that adds a `<base>` tag. That is needed to make all links displayed by
+> cgis work reliably. Not just in this page editing case.
+> The [[version_3.20100515]] announcment mentions that you need to
+> update old `page.tmpl` files to include that on upgrade. --[[Joey]]
+
 ### A second example
 
 * create "/bar/sidebar.mdwn" with "world"
@@ -28,6 +34,10 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 * -> Problem: the sidebar now shows the foo link (it is the root sidebar!)
 * -> Was expecte : the sidebar displays "world"
 
+> One could argue that the behavior here is right, or wrong. 
+> Is a page edit page really the same as the page being edited?
+> The next case is more clear.. --[[Joey]]
+
 ### A last example
 
 * with the web browser edit the page "bar"
@@ -36,6 +46,8 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 * -> Problem: the sidebar still displays the foo link
 * -> Was expected: the sidebar display "goodby"
 
+> I think this is worth fixing. --[[Joey]]
+
 ## Some superficial hacking
 
 With the following workaround hacks, I manage to solve the 3 examples shown above:
@@ -47,4 +59,9 @@ With the following workaround hacks, I manage to solve the 3 examples shown abov
 <pre>my %params=@_;
 shift->(page => $params{page}, destpage => $params{destpage}, template => $template);</pre>
 
-I do not guarantee (I do not even expect) that it is the proper way to solve this bug but it may help developers to find and solve the real problem. 
+I do not guarantee (I do not even expect) that it is the proper way to solve
+this bug but it may help developers to find and solve the real problem. 
+
+> Oh, it's pretty reasonable. I don't think it breaks anything. :)
+> [[done]]
+> --[[Joey]] 
-- 
cgit v1.2.3


From 95b45864debe8070e8229cc7def21aef5447f541 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 16:16:48 -0400
Subject: relativedate: Fix problem with localised dates not working.

---
 IkiWiki/Plugin/relativedate.pm                                   | 7 +++++--
 debian/changelog                                                 | 1 +
 ...lugins__47__relativedate_depends_on_locale_at_setup_file.mdwn | 9 +++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 179f9238c..c9280ef14 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -49,10 +49,13 @@ sub mydisplaytime ($;$$) {
 	my $pubdate=shift;
 
 	# This needs to be in a form that can be parsed by javascript.
-	# Being fairly human readable is also nice, as it will be exposed
-	# as the title if javascript is not available.
+	# (Being fairly human readable is also nice, as it will be exposed
+	# as the title if javascript is not available.)
+	my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
+	POSIX::setlocale(&POSIX::LC_TIME, "C");
 	my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
 			localtime($time)));
+	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
 
 	my $mid=' class="relativedate" title="'.$gmtime.'">'.
 		IkiWiki::formattime($time, $format);
diff --git a/debian/changelog b/debian/changelog
index 66d525572..fdf111168 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (3.20100609) unstable; urgency=low
     when used.
   * Fix support for globbing in tagged() pagespecs.
   * When editing a page, show that page's sidebar. (Thanks, privat)
+  * relativedate: Fix problem with localised dates not working.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
index db009fa19..e2ea3e4f6 100644
--- a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
+++ b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
@@ -3,3 +3,12 @@
 If I switch locale to en_US.UTF-8 then this plugin correctly parses text date and print relative date. But when I mouseover on date I see unusual formating of the date (it uses AM/PM format while russians use 24-h notation).
 
 P.S. All pages but RecentChanges show well-formated date. RecentChanges show date formated using locale. Anyway, plugin does not work without en_US locale.
+
+> [[Fixed|done]]. Now it uses C locale for the date put in the title,
+> that is used by relativedate. The mouseover will display the date in your
+> native locale. 
+> 
+> Only exception is that when javascript is disabled... then
+> relativedate can't work, so instead you will see your localized date
+> displayed; but on mouseover you will get shown the C locale date.
+> --[[Joey]] 
-- 
cgit v1.2.3


From e93cee33786da51d80f375cbeb8fb24db24bf0c9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 16:59:17 -0400
Subject: Fix display of sidebar when previewing page edit. (Thanks, privat)

On second thought, only display a page's personal sidebar when previewing
it, not when editing normally.
---
 IkiWiki/Plugin/editpage.pm                              | 17 +++++++++++------
 debian/changelog                                        |  2 +-
 ...not_respect_the_current_page___40__if_any__41__.mdwn | 15 +++++++++++----
 3 files changed, 23 insertions(+), 11 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index aa73eb87d..af2c5ff4e 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -153,6 +153,7 @@ sub cgi_editpage ($$) {
 			noimageinline => 1,
 			linktext => "FormattingHelp"));
 	
+	my $previewing=0;
 	if ($form->submitted eq "Cancel") {
 		if ($form->field("do") eq "create" && defined $from) {
 			redirect($q, urlto($from, undef, 1));
@@ -166,6 +167,8 @@ sub cgi_editpage ($$) {
 		exit;
 	}
 	elsif ($form->submitted eq "Preview") {
+		$previewing=1;
+
 		my $new=not exists $pagesources{$page};
 		if ($new) {
 			# temporarily record its type
@@ -255,7 +258,7 @@ sub cgi_editpage ($$) {
 			if (! @page_locs) {
 				# hmm, someone else made the page in the
 				# meantime?
-				if ($form->submitted eq "Preview") {
+				if ($previewing) {
 					# let them go ahead with the edit
 					# and resolve the conflict at save
 					# time
@@ -313,7 +316,9 @@ sub cgi_editpage ($$) {
 		}
 		
 		showform($form, \@buttons, $session, $q,
-			forcebaseurl => $baseurl, page => $page);
+			forcebaseurl => $baseurl,
+			($previewing ? (page => $page) : ()),
+		);
 	}
 	else {
 		# save page
@@ -331,7 +336,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl, page => $page);
+				forcebaseurl => $baseurl);
 			exit;
 		}
 		elsif ($form->field("do") eq "create" && $exists) {
@@ -346,7 +351,7 @@ sub cgi_editpage ($$) {
 				         "\n\n\n".$form->field("editcontent"),
 				force => 1);
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl, page => $page);
+				forcebaseurl => $baseurl);
 			exit;
 		}
 			
@@ -387,7 +392,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl, page => $page);
+				forcebaseurl => $baseurl);
 			exit;
 		}
 		
@@ -426,7 +431,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl, page => $page);
+				forcebaseurl => $baseurl);
 		}
 		else {
 			# The trailing question mark tries to avoid broken
diff --git a/debian/changelog b/debian/changelog
index fdf111168..5cfb9ce89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ ikiwiki (3.20100609) unstable; urgency=low
   * Remove example blog tag pages; allow autotag creation to create them
     when used.
   * Fix support for globbing in tagged() pagespecs.
-  * When editing a page, show that page's sidebar. (Thanks, privat)
+  * Fix display of sidebar when previewing page edit. (Thanks, privat)
   * relativedate: Fix problem with localised dates not working.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
index 2ef5cdba3..f1e4649ff 100644
--- a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -34,9 +34,10 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 * -> Problem: the sidebar now shows the foo link (it is the root sidebar!)
 * -> Was expecte : the sidebar displays "world"
 
-> One could argue that the behavior here is right, or wrong. 
-> Is a page edit page really the same as the page being edited?
-> The next case is more clear.. --[[Joey]]
+> I think it's a misconception to think that the page editing page is the same
+> as the page it's editing. If you were deleting that page, would you expect
+> the "are you sure" confirmation page to display the page's sidebar?
+> --[[Joey]]
 
 ### A last example
 
@@ -46,7 +47,12 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 * -> Problem: the sidebar still displays the foo link
 * -> Was expected: the sidebar display "goodby"
 
-> I think this is worth fixing. --[[Joey]]
+> In the specific case of previewing, it is indeed a bug that the
+> right sidebar is not displayed. And replacing the regular sidebar 
+> with the one from the previewed page is probably the best we can do..
+> displaying 2 sidebars would be confusing, and the `page.tmpl` can
+> put the sidebar anywhere so we can't just display the preview sidebar
+> next to the rest of the page preview. --[[Joey]]
 
 ## Some superficial hacking
 
@@ -63,5 +69,6 @@ I do not guarantee (I do not even expect) that it is the proper way to solve
 this bug but it may help developers to find and solve the real problem. 
 
 > Oh, it's pretty reasonable. I don't think it breaks anything. :)
+> I modified it a bit, and explicitly made it *not* "fix" the second example.
 > [[done]]
 > --[[Joey]] 
-- 
cgit v1.2.3


From 118750658885fa64a03c8860d8a3fe2573221276 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 17:13:35 -0400
Subject: ugly bug

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

(limited to 'doc')

diff --git a/doc/bugs/preview_pagestate.mdwn b/doc/bugs/preview_pagestate.mdwn
new file mode 100644
index 000000000..14973908b
--- /dev/null
+++ b/doc/bugs/preview_pagestate.mdwn
@@ -0,0 +1,11 @@
+If a change to a page is previewed, but not saved, `%pagestate` and
+`%wikistate` can be changed, and saved. Actually, it's not limited to
+those. Seems that spurious dependencies can be added, though existing
+dependencies will at least not be removed.
+
+It calls saveindex to record state about files created on disk for the
+preview. Those files will expire later. However, saveindex also
+saves other state changes.
+
+Seems like it needs to isolate all state changes when previewing... ugh.
+--[[Joey]] 
-- 
cgit v1.2.3


From 24b59b3a9edb350ef0dc064b0a3f3cdee01f81be Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jun 2010 17:44:40 -0400
Subject: editpage: Avoid storing accidental state changes when previewing
 pages.

This is a slow, safe, stupid approach. Could make deep copies of the data
structures as backups instead of re-loading the index from disk.
---
 IkiWiki/Plugin/editpage.pm                                | 15 ++++++---------
 debian/changelog                                          |  1 +
 .../comments_preview_unsafe_with_allowdirectives.mdwn     |  8 ++++++++
 doc/bugs/preview_pagestate.mdwn                           |  2 ++
 4 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn

(limited to 'doc')

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index af2c5ff4e..3d731d399 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -170,10 +170,8 @@ sub cgi_editpage ($$) {
 		$previewing=1;
 
 		my $new=not exists $pagesources{$page};
-		if ($new) {
-			# temporarily record its type
-			$pagesources{$page}=$page.".".$type;
-		}
+		# temporarily record its type
+		$pagesources{$page}=$page.".".$type if $new;
 		my %wasrendered=map { $_ => 1 } @{$renderedfiles{$page}};
 
 		my $content=$form->field('editcontent');
@@ -198,18 +196,17 @@ sub cgi_editpage ($$) {
 		});
 		$form->tmpl_param("page_preview", $preview);
 		
-		if ($new) {
-			delete $pagesources{$page};
-		}
-
 		# Previewing may have created files on disk.
 		# Keep a list of these to be deleted later.
 		my %previews = map { $_ => 1 } @{$wikistate{editpage}{previews}};
 		foreach my $f (@{$renderedfiles{$page}}) {
 			$previews{$f}=1 unless $wasrendered{$f};
 		}
+
+		# Throw out any other state changes made during previewing,
+		# and save the previews list.
+		loadindex();
 		@{$wikistate{editpage}{previews}} = keys %previews;
-		$renderedfiles{$page}=[keys %wasrendered];
 		saveindex();
 	}
 	elsif ($form->submitted eq "Save Page") {
diff --git a/debian/changelog b/debian/changelog
index 5cfb9ce89..96188c093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (3.20100609) unstable; urgency=low
   * Fix support for globbing in tagged() pagespecs.
   * Fix display of sidebar when previewing page edit. (Thanks, privat)
   * relativedate: Fix problem with localised dates not working.
+  * editpage: Avoid storing accidental state changes when previewing pages.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn
new file mode 100644
index 000000000..7f9fb67e9
--- /dev/null
+++ b/doc/bugs/comments_preview_unsafe_with_allowdirectives.mdwn
@@ -0,0 +1,8 @@
+If `comments_allowdirectives` is set, previewing a comment can run
+directives that create files. (Eg, img.) Unlike editpage, it does not
+keep track of those files and expire them. So the files will linger in
+destdir forever.
+
+Probably when the user then tries to save the comment, ikiwiki will refuse
+to overwrite the unknown file, and will crash.
+--[[Joey]]
diff --git a/doc/bugs/preview_pagestate.mdwn b/doc/bugs/preview_pagestate.mdwn
index 14973908b..7f7ec0976 100644
--- a/doc/bugs/preview_pagestate.mdwn
+++ b/doc/bugs/preview_pagestate.mdwn
@@ -9,3 +9,5 @@ saves other state changes.
 
 Seems like it needs to isolate all state changes when previewing... ugh.
 --[[Joey]] 
+
+[[done]]
-- 
cgit v1.2.3


From 04309536085b06a4121b8aad35adc53d91fcb3f2 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0"
 <https://www.google.com/accounts/o8/id?id=AItOawmPD3Qj5IoazkkW6Tk-kLOlKGmJLXim0H0@web>
Date: Thu, 10 Jun 2010 03:29:22 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
index e2ea3e4f6..a9a39ac47 100644
--- a/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
+++ b/doc/bugs/plugins__47__relativedate_depends_on_locale_at_setup_file.mdwn
@@ -12,3 +12,5 @@ P.S. All pages but RecentChanges show well-formated date. RecentChanges show dat
 > relativedate can't work, so instead you will see your localized date
 > displayed; but on mouseover you will get shown the C locale date.
 > --[[Joey]] 
+
+>> Thanks. 
-- 
cgit v1.2.3


From 0fbec10a42c0b6ae3111d5a5d5488cd5d573f554 Mon Sep 17 00:00:00 2001
From: tschwinge <tschwinge@web>
Date: Thu, 10 Jun 2010 08:54:46 +0000
Subject: Fixed.

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

(limited to 'doc')

diff --git a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
index fba332949..f9cb37487 100644
--- a/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
+++ b/doc/bugs/pagespec:_tagged__40____41____44___globbing.mdwn
@@ -31,3 +31,6 @@ I did not yet do any testing to figure out when this broke.
 >>> Only way I can reproduce something like this is if tagbase is not set.
 >>> I have fixed a bug there, see if it works for you?
 >>> --[[Joey]]
+
+>>>> This is now indeed [[fixed|done]] (thanks!) -- even though I already
+>>>> did have tagbase set.
-- 
cgit v1.2.3


From 23aaa5ac45f389a741afdac6d87e077a2e44fe8b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 14:14:46 -0400
Subject: style.css: Improvements to make floating sidebar fit better on pages
 with inlines.

The key is using width: auto; overflow: auto; -- this allows the div(s) to the
left of the floating sidebar to be resized to fit next to it, and prevents
any clear: both from pushing the div down below the end of the sidebar.

Many thanks for the Hurd wiki's developers for originally figuring this out.

The edit page recently developed the same problem with its textarea, now
that a sidebar can appear on that page too. In editpage.tmpl I needed to
add a new div around the editcontent textarea, as the above styles cannot
be applied directly to textareas. The textarea's own width is reduced to
98% because at least in chromium this avoids it getting unnecessary
horizonatl scrollbars when a sidebar is displayed next to it.
---
 debian/changelog        |  2 ++
 doc/style.css           | 12 +++++++++---
 templates/editpage.tmpl |  2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index abf7a2d87..f7810c66f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (3.20100609) unstable; urgency=low
   * editpage: Avoid storing accidental state changes when previewing pages.
   * page.tmpl: Add a div around the sidebar, page content, and comments,
     to aide in styling.
+  * style.css: Improvements to make floating sidebar fit better on
+    pages with inlines.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
 
diff --git a/doc/style.css b/doc/style.css
index 2cd7a9652..d88c93778 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -110,7 +110,12 @@ nav {
 }
 
 #editcontent {
-	width: 100%;
+	width: 98%;
+}
+
+.editcontentdiv {
+	width: auto;
+	overflow: auto;
 }
 
 img {
@@ -121,8 +126,8 @@ div.recentchanges {
 	border-style: solid;
 	border-width: 1px;
 	overflow: auto;
-	clear: both;
-	width: 100%;
+	width: auto;
+	clear: none;
 	background: #eee;
 	color: black !important;
 }
@@ -176,6 +181,7 @@ div.recentchanges {
 .inlinepage {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
+	overflow: auto;
 }
 
 .pagedate,
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 118ca4550..36076cb35 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -17,7 +17,9 @@
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
 <li>
+<div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
+</div>
 </li>
 <TMPL_IF NAME="CAN_COMMIT">
 <li>
-- 
cgit v1.2.3


From 685d10364fbebac69dfa925840528e695d37035f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 14:31:01 -0400
Subject: also set overflow: auto for blogform

This improves its display slighly when next to a sidebar or other floating
element.
---
 doc/style.css | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index d88c93778..154729721 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -176,6 +176,8 @@ div.recentchanges {
 	border: 1px solid #aaa;
 	background: #eee;
 	color: black !important;
+	width: auto;
+	overflow: auto;
 }
 
 .inlinepage {
-- 
cgit v1.2.3


From 04ff998c51b578017edf369e0dfc2dc7c63d8071 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 15:01:10 -0400
Subject: calendar styling

* calendar: Shorten day names, and improve styling of month calendar.
* style.css: Reduced sidebar width back to 20ex from 30; the month calendar
  will now fit in the smaller width, and 30 was feeling too large.
---
 IkiWiki/Plugin/calendar.pm |  5 +++--
 debian/changelog           |  9 ++++++---
 doc/style.css              | 15 ++++++++++++---
 3 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 0bf933dcd..359c9b861 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -123,6 +123,7 @@ sub format_month (@) {
 	}
 
 	# Find out month names for this, next, and previous months
+	my $monthabbrev=POSIX::strftime("%b", @monthstart);
 	my $monthname=POSIX::strftime("%B", @monthstart);
 	my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900)));
 	my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
@@ -137,7 +138,7 @@ sub format_month (@) {
 		$url = htmllink($params{page}, $params{destpage}, 
 			"$archivebase/$params{year}/".$params{month},
 			noimageinline => 1,
-			linktext => "$monthname $params{year}",
+			linktext => "$monthabbrev $params{year}",
 			title => $monthname);
 	}
 	add_depends($params{page}, "$archivebase/$params{year}/$params{month}",
@@ -182,7 +183,7 @@ EOF
 	for my $dow ($week_start_day..$week_start_day+6) {
 		my @day=localtime(timelocal(0,0,0,$start_day++,$params{month}-1,$params{year}-1900));
 		my $downame = POSIX::strftime("%A", @day);
-		my $dowabbr = POSIX::strftime("%a", @day);
+		my $dowabbr = substr($downame, 0, 1);
 		$downame{$dow % 7}=$downame;
 		$dowabbr{$dow % 7}=$dowabbr;
 		$calendar.= qq{\t\t<th class="month-calendar-day-head $downame" title="$downame">$dowabbr</th>\n};
diff --git a/debian/changelog b/debian/changelog
index f7810c66f..d66bcab20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20100609) unstable; urgency=low
+ikiwiki (3.20100610) unstable; urgency=low
 
   * creation_day() etc use local time, not gmtime. To match calendars, which
     use local time.
@@ -11,10 +11,13 @@ ikiwiki (3.20100609) unstable; urgency=low
   * editpage: Avoid storing accidental state changes when previewing pages.
   * page.tmpl: Add a div around the sidebar, page content, and comments,
     to aide in styling.
-  * style.css: Improvements to make floating sidebar fit better on
+  * style.css: Improvements to make floating sidebar fit much better on
     pages with inlines.
+  * calendar: Shorten day names, and improve styling of month calendar.
+  * style.css: Reduced sidebar width back to 20ex from 30; the month calendar
+    will now fit in the smaller width, and 30 was feeling too large.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 31 May 2010 20:44:17 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 10 Jun 2010 14:24:05 -0400
 
 ikiwiki (3.20100518.2) unstable; urgency=low
 
diff --git a/doc/style.css b/doc/style.css
index 154729721..2cc467b4f 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -199,7 +199,7 @@ div.recentchanges {
 }
 
 .sidebar {
-	width: 30ex;
+	width: 20ex;
 	float: right;
 	margin-left: 4px;
 	margin-bottom: 4px;
@@ -383,8 +383,17 @@ pre.hl { color:#000000; background-color:#ffffff; }
 .hl.kwd { color:#010181; }
 
 /* calendar plugin */
-.month-calendar-day-this-day { background-color: #eee; }
-.year-calendar-this-month { background-color: #eee; }
+.month-calendar-day-this-day,
+.year-calendar-this-month {
+	background-color: #eee;
+}
+.month-calendar-day-head,
+.month-calendar-day-nolink,
+.month-calendar-day-link,
+.month-calendar-day-this-day,
+.month-calendar-day-future {
+	text-align: right;
+}
 .month-calendar-arrow A:link,
 .year-calendar-arrow A:link,
 .month-calendar-arrow A:visited,
-- 
cgit v1.2.3


From b86ca0ef8adaac119841865a24e0648204102ab0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 16:05:29 -0400
Subject: add auto-scrolling pre's

let's see if anyone hates it :)
---
 doc/style.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 2cc467b4f..22c68bd7a 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -122,6 +122,10 @@ img {
 	border-style: none;
 }
 
+pre {
+	overflow: auto;
+}
+
 div.recentchanges {
 	border-style: solid;
 	border-width: 1px;
-- 
cgit v1.2.3


From a1e7e62c21dc424c7be00a3cb3a73dc0348f79a0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 16:15:43 -0400
Subject: add news item for ikiwiki 3.20100610

---
 doc/news/version_3.20100501.mdwn | 21 ---------------------
 doc/news/version_3.20100610.mdwn | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 doc/news/version_3.20100501.mdwn
 create mode 100644 doc/news/version_3.20100610.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100501.mdwn b/doc/news/version_3.20100501.mdwn
deleted file mode 100644
index 0cf5e38be..000000000
--- a/doc/news/version_3.20100501.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-ikiwiki 3.20100501 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * TMPL\_INCLUDE re-enabled for templates read from the templatedir.
-     (But not in-wiki templates.)
-   * Version dependency on liburi-perl to &gt;= 1.36; previous versions
-     did not support building urls from utf-8 strings. Closes: #[579713](http://bugs.debian.org/579713)
-   * Ikiwiki can be configured to generate html5 instead of the default xhtml
-     1.0. The html5 output mode is experimental, not yet fully standards
-     compliant, and will be subject to rapid change.
-   * htmlscrubber: Allow html5 semantic tags: section, nav, article, aside
-     hgroup, header, footer, figure, figcaption, time, mark
-   * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter,
-     ruby, rt, rp, details, summary, datalist.
-   * htmlscrubber: Round out html5 video support with the preload
-     attribute and the source tag.
-   * htmlscrubber: Allow the html5 form attributes: placeholder, autofocus,
-     min, max, step, required, autocomplete, novalidate, pattern, list,
-     and form. (Also the form* override attributes for input and buttons.)
-   * htmlscrubber: Allow additional misc html5 attributes: reversed,
-     spellcheck, and hidden.
-   * template: Fix typo."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100610.mdwn b/doc/news/version_3.20100610.mdwn
new file mode 100644
index 000000000..ee7c86d72
--- /dev/null
+++ b/doc/news/version_3.20100610.mdwn
@@ -0,0 +1,18 @@
+ikiwiki 3.20100610 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * creation\_day() etc use local time, not gmtime. To match calendars, which
+     use local time.
+   * img: Fill in missing height or width when scaling image.
+   * Remove example blog tag pages; allow autotag creation to create them
+     when used.
+   * Fix support for globbing in tagged() pagespecs.
+   * Fix display of sidebar when previewing page edit. (Thanks, privat)
+   * relativedate: Fix problem with localised dates not working.
+   * editpage: Avoid storing accidental state changes when previewing pages.
+   * page.tmpl: Add a div around the page content, and comments, to aide in
+     sidebar styling.
+   * style.css: Improvements to make floating sidebar fit much better on
+     pages with inlines.
+   * calendar: Shorten day names, and improve styling of month calendar.
+   * style.css: Reduced sidebar width back to 20ex from 30; the month calendar
+     will now fit in the smaller width, and 30 was feeling too large."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From a31ce0e97d1e1c476a1fcdb52a2d78cadb845557 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 10 Jun 2010 16:17:38 -0400
Subject: remove old

---
 doc/news/version_3.20100427/discussion.mdwn | 9 ---------
 doc/news/version_3.20100501/discussion.mdwn | 1 -
 2 files changed, 10 deletions(-)
 delete mode 100644 doc/news/version_3.20100427/discussion.mdwn
 delete mode 100644 doc/news/version_3.20100501/discussion.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100427/discussion.mdwn b/doc/news/version_3.20100427/discussion.mdwn
deleted file mode 100644
index 011f3d88f..000000000
--- a/doc/news/version_3.20100427/discussion.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-*TMPL_INCLUDE is no longer supported in any template used by ikiwiki. It used to be allowed in certian templates, but not in others.*
-
-Would it be possible to make that a config option?  Because I do use includes in my templates, and I don't allow users to edit templates, so it isn't a security loophole for me. --[[KathrynAndersen]]
-
-> I don't like config options that make wikis unsafe, but I should have
-> revisted enabling includes for templates read from the templatedir --
-> it's easy to do, and I've done it now. --[[Joey]] 
-
->> Thank you! --[[KathrynAndersen]]
diff --git a/doc/news/version_3.20100501/discussion.mdwn b/doc/news/version_3.20100501/discussion.mdwn
deleted file mode 100644
index fbf767afb..000000000
--- a/doc/news/version_3.20100501/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Thanks a lot for the HTML5 support! I'll have to try it some time soon.
-- 
cgit v1.2.3


From 15ef976fd26062b340bdbcb020f2a64f9cc9a672 Mon Sep 17 00:00:00 2001
From: "http://jblevins.org/" <http://jblevins.org/@web>
Date: Thu, 10 Jun 2010 22:11:00 +0000
Subject: Update URL

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

(limited to 'doc')

diff --git a/doc/forum/wiki_name_in_page_titles.mdwn b/doc/forum/wiki_name_in_page_titles.mdwn
index 01ff8d817..88711e99a 100644
--- a/doc/forum/wiki_name_in_page_titles.mdwn
+++ b/doc/forum/wiki_name_in_page_titles.mdwn
@@ -23,4 +23,4 @@ that provides a `IS_HOMEPAGE` template variable? --[[JasonBlevins]]
 >> few other small plugins brewing so I'll try to put up some contrib
 >> pages for them soon. --[[JasonBlevins]]
 
-[path]: http://code.jblevins.org/ikiwiki/plugins.git/plain/path.pm
+[path]: http://jblevins.org/git/ikiwiki/plugins.git/plain/path.pm
-- 
cgit v1.2.3


From 48a1dce15d870134358dacd2c2839e5c843a79e8 Mon Sep 17 00:00:00 2001
From: "http://jblevins.org/" <http://jblevins.org/@web>
Date: Thu, 10 Jun 2010 22:16:55 +0000
Subject: Update URL

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

(limited to 'doc')

diff --git a/doc/bugs/external_links_inside_headings_don__39__t_work.mdwn b/doc/bugs/external_links_inside_headings_don__39__t_work.mdwn
index 5bab283fd..51d6ad475 100644
--- a/doc/bugs/external_links_inside_headings_don__39__t_work.mdwn
+++ b/doc/bugs/external_links_inside_headings_don__39__t_work.mdwn
@@ -21,4 +21,4 @@ It works fine with h2 and deeper.  The square brackets also appear in the output
 
 > [[done]] --[[Joey]]
 
->> It works here but it definitely does *not* work on my wiki; but on further experimentation, I believe my problem is being caused by JasonBlevins' [h1title](http://code.jblevins.org/ikiwiki/plugins.git/plain/h1title.pm) plugin.
+>> It works here but it definitely does *not* work on my wiki; but on further experimentation, I believe my problem is being caused by JasonBlevins' [h1title](http://jblevins.org/git/ikiwiki/plugins.git/plain/h1title.pm) plugin.
-- 
cgit v1.2.3


From be0f52095b21b64d15eee408e630038aefbcae49 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Fri, 11 Jun 2010 01:03:43 +0000
Subject: use PARENTLINKS

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

(limited to 'doc')

diff --git a/doc/forum/wiki_name_in_page_titles.mdwn b/doc/forum/wiki_name_in_page_titles.mdwn
index 88711e99a..4e9e51835 100644
--- a/doc/forum/wiki_name_in_page_titles.mdwn
+++ b/doc/forum/wiki_name_in_page_titles.mdwn
@@ -24,3 +24,9 @@ that provides a `IS_HOMEPAGE` template variable? --[[JasonBlevins]]
 >> pages for them soon. --[[JasonBlevins]]
 
 [path]: http://jblevins.org/git/ikiwiki/plugins.git/plain/path.pm
+
+> I used the following trick in some page.tmpl:
+>
+>     <title><TMPL_VAR WIKINAME><TMPL_IF NAME="PARENTLINKS">: <TMPL_VAR TITLE></TMPL_IF></title>
+>
+> --[[JeanPrivat]]
-- 
cgit v1.2.3


From b6d00070a556e68d8e79eb5d64fe7a5ad2dbda18 Mon Sep 17 00:00:00 2001
From: nil <nil@web>
Date: Fri, 11 Jun 2010 02:45:14 +0000
Subject: use the ikiwiki userdb outside of the ikiwiki edition access control

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

(limited to 'doc')

diff --git a/doc/todo/htpasswd_mirror_of_the_userdb.mdwn b/doc/todo/htpasswd_mirror_of_the_userdb.mdwn
new file mode 100644
index 000000000..0582a6f7a
--- /dev/null
+++ b/doc/todo/htpasswd_mirror_of_the_userdb.mdwn
@@ -0,0 +1,17 @@
+[[!tag wishlist]]
+
+Ikiwiki is static, so access control for viewing the wiki must be implemented on the web server side. Managing wiki users and access together, we can currently
+
+* use [[httpauth|plugins/httpauth/]], but some [[passwordauth|plugins/passwordauth]] functionnality [[is missing|todo/httpauth_feature_parity_with_passwordauth/]];
+* use [[passwordauth|plugins/passwordauth]] plus [[an Apache `mod_perl` authentication mechanism|plugins/passwordauth/discussion/]], but this is Apache-centric and enabling `mod_perl` just for auth seems overkill.
+
+Moreover, when ikiwiki is just a part of a wider web project, we may want to use the same userdb for the other parts of this project.
+
+I think an ikiwiki plugin which would (re)generate an htpasswd version of the user/passwd base (better, two htpasswd files, one with only the wiki admins and one with everyone) each time an user is added or modified would solve this problem:
+
+* access control can be managed from the web server
+* user management is handled by the passwordauth plugin
+* htpasswd format is understood by various servers (Apache, lighttpd, nginx, ...) and languages commonly used for web development (perl, python, ruby)
+* htpasswd files can be mirrored on other machines when the web site is distributed
+
+-- [[nil]] 
-- 
cgit v1.2.3


From f0f0ba7bace1a07072ef401c53b3a2aa2b751209 Mon Sep 17 00:00:00 2001
From: dwabot <dwabot@web>
Date: Fri, 11 Jun 2010 04:33:40 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index fc66bcef9..8fb348c3d 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -146,6 +146,7 @@ Personal sites and blogs
 * [Gustaf Thorslund's blog](http://blog.thorslund.org)
 * [Ertug Karamatli](http://pages.karamatli.com)
 * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
+* [Daniel Wayne Armstrong](http://circuidipity.com/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 6ba1cf7c3dc81d4a9d3c92b1e319051d40bf8daa Mon Sep 17 00:00:00 2001
From: zimek <zimek@web>
Date: Fri, 11 Jun 2010 11:14:34 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/img_plugin_and_missing_heigth_value.mdwn b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
index bcb17c330..4bc070c95 100644
--- a/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
+++ b/doc/bugs/img_plugin_and_missing_heigth_value.mdwn
@@ -3,3 +3,5 @@ When I set up my picture page with `\[[!img  defaults size=300x]]` then the html
 > This is a bug. --[[Joey]]
 
 > And .. [[fixed|done]] --[[Joey]] 
+
+>> Not quite; For some reason it requires me to update wiki pages twice before the height value shows up.
-- 
cgit v1.2.3


From 77a3585e92a947610b1b26cdd7ce499bfefc21f6 Mon Sep 17 00:00:00 2001
From: jwalzer <jwalzer@web>
Date: Fri, 11 Jun 2010 13:53:06 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn
index 6eff46178..641d3ff76 100644
--- a/doc/bugs/img_vs_align.mdwn
+++ b/doc/bugs/img_vs_align.mdwn
@@ -29,3 +29,7 @@ almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
 >> scripts again...
 >> 
 >> --[[tschwinge]]
+
+>>> It seems, the 'align=right' parameter gets filtered in my installation
+>>> Are there other plugins, that could throw the parameter away?
+>>> --[[jwalzer]]
-- 
cgit v1.2.3


From 475b4199e1624350b928a002fe83033ee3389b31 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 11 Jun 2010 13:53:56 -0400
Subject: openid: Add openid_realm and openid_cgiurl configuration options,
 useful in a few edge case setups.

---
 IkiWiki/Plugin/openid.pm | 27 ++++++++++++++++++++++++---
 debian/changelog         |  7 +++++++
 doc/plugins/openid.mdwn  | 16 ++++++++++++++++
 3 files changed, 47 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index e10e21f4d..57cb139ca 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -40,6 +40,18 @@ sub getsetup () {
 			rebuild => 0,
 			section => "auth",
 		},
+		openid_realm => {
+			type => "string",
+			description => "url of openid realm (default is cgiurl)",
+			safe => 0,
+			rebuild => 0,
+		},
+		openid_cgiurl => {
+			type => "string",
+			description => "url to ikiwiki cgi to use for openid authentication (default is cgiurl)",
+			safe => 0,
+			rebuild => 0,
+		},
 }
 
 sub openid_selector {
@@ -135,9 +147,15 @@ sub validate ($$$;$) {
 		);
 	}
 
+	my $cgiurl=$config{openid_cgiurl};
+	$cgiurl=$config{cgiurl} if ! defined $cgiurl;
+
+	my $trust_root=$config{openid_realm};
+	$trust_root=$cgiurl if ! defined $trust_root;
+
 	my $check_url = $claimed_identity->check_url(
-		return_to => IkiWiki::cgiurl(do => "postsignin"),
-		trust_root => $config{cgiurl},
+		return_to => "$cgiurl?do=postsignin",
+		trust_root => $trust_root,
 		delayed_return => 1,
 	);
 	# Redirect the user to the OpenID server, which will
@@ -220,12 +238,15 @@ sub getobj ($$) {
 		$secret=rand;
 		$session->param(openid_secret => $secret);
 	}
+	
+	my $cgiurl=$config{openid_cgiurl};
+	$cgiurl=$config{cgiurl} if ! defined $cgiurl;
 
 	return Net::OpenID::Consumer->new(
 		ua => $ua,
 		args => $q,
 		consumer_secret => sub { return shift()+$secret },
-		required_root => $config{cgiurl},
+		required_root => $cgiurl,
 	);
 }
 
diff --git a/debian/changelog b/debian/changelog
index 01307db55..9a6b1361c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20100611) UNRELEASED; urgency=low
+
+  * openid: Add openid_realm and openid_cgiurl configuration options,
+    useful in a few edge case setups.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
+
 ikiwiki (3.20100610) unstable; urgency=low
 
   * creation_day() etc use local time, not gmtime. To match calendars, which
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 7da2f8575..3fb4c26b8 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -13,3 +13,19 @@ to support users entering "https" OpenID urls.
 
 This plugin is enabled by default, but can be turned off if you want to
 only use some other form of authentication, such as [[passwordauth]].
+
+## options
+
+These options do not normally need to be set, but can be useful in
+certian setups.
+
+* `openid_realm` can be used to control the scope of the openid request.
+  It defaults to the `cgiurl` (or `openid_cgiurl` if set); only allowing
+  ikiwiki's [[CGI]] to authenticate. If you have multiple ikiwiki instances,
+  or other things using openid on the same site, you may choose to put them
+  all in the same realm to improve the user's openid experience.
+
+* `openid_cgiurl` can be used to cause a different than usual `cgiurl`
+  to be used when doing openid authentication. The `openid_cgiurl` must
+  point to an ikiwiki [[CGI]], and it will need to match the `openid_realm`
+  to work.
-- 
cgit v1.2.3


From d5181a197732f1c6bb80fdf8c508568b8c4225c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 11 Jun 2010 14:14:20 -0400
Subject: realm is an url pattern

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

(limited to 'doc')

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 57cb139ca..f4ba8db18 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -42,7 +42,7 @@ sub getsetup () {
 		},
 		openid_realm => {
 			type => "string",
-			description => "url of openid realm (default is cgiurl)",
+			description => "url pattern of openid realm (default is cgiurl)",
 			safe => 0,
 			rebuild => 0,
 		},
diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn
index 3fb4c26b8..f3b3abfbb 100644
--- a/doc/plugins/openid.mdwn
+++ b/doc/plugins/openid.mdwn
@@ -23,7 +23,8 @@ certian setups.
   It defaults to the `cgiurl` (or `openid_cgiurl` if set); only allowing
   ikiwiki's [[CGI]] to authenticate. If you have multiple ikiwiki instances,
   or other things using openid on the same site, you may choose to put them
-  all in the same realm to improve the user's openid experience.
+  all in the same realm to improve the user's openid experience. It is an
+  url pattern, so can be set to eg "http://*.example.com/"
 
 * `openid_cgiurl` can be used to cause a different than usual `cgiurl`
   to be used when doing openid authentication. The `openid_cgiurl` must
-- 
cgit v1.2.3


From d7cfcef54a067221b801de17fafc1f05a13c2004 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Jun 2010 16:16:24 -0400
Subject: img: Support hspace and vspace attributes.

---
 IkiWiki/Plugin/img.pm          | 12 ++++++++----
 debian/changelog               |  1 +
 doc/ikiwiki/directive/img.mdwn |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 48211454e..a69175ba6 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -156,14 +156,18 @@ sub preprocess (@) {
 		$imgurl="$config{url}/$imglink";
 	}
 
+	my $attrs='';
+	foreach my $attr (qw{alt title class id hspace vspace}) {
+		if (exists $params{$attr}) {
+			$attrs.=" $attr=\"$params{$attr}\"";
+		}
+	}
+	
 	my $imgtag='<img src="'.$imgurl.
 		'" width="'.$dwidth.
 		'" height="'.$dheight.'"'.
-		(exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
-		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
-		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
+		$attrs.
 		(exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
-		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
 		' />';
 
 	my $link;
diff --git a/debian/changelog b/debian/changelog
index 4e120c622..dcf589861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * openid: Add openid_realm and openid_cgiurl configuration options,
     useful in a few edge case setups.
   * attachment: Show files from underlay in attachments list.
+  * img: Support hspace and vspace attributes.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/ikiwiki/directive/img.mdwn b/doc/ikiwiki/directive/img.mdwn
index 94cc754bd..cda62b58f 100644
--- a/doc/ikiwiki/directive/img.mdwn
+++ b/doc/ikiwiki/directive/img.mdwn
@@ -18,7 +18,8 @@ making the image smaller than the specified size. You can also specify only
 the width or the height, and the other value will be calculated based on
 it: "200x", "x200"
 
-You can also pass `alt`, `title`, `class`, `align` and `id` parameters.
+You can also pass `alt`, `title`, `class`, `align`, `id`, `hspace`, and
+`vspace` parameters.
 These are passed through unchanged to the html img tag. If you include a
 `caption` parameter, the caption will be displayed centered beneath the image.
 
-- 
cgit v1.2.3


From dccd76487151acc6adc93ec79f1808096bc41324 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 12 Jun 2010 22:43:34 -0400
Subject: edittemplate: Look for template pages under templates/ like
 everything else (still looks in old location for backwards compatability).

---
 IkiWiki/Plugin/edittemplate.pm |  7 ++++++-
 debian/changelog               |  2 ++
 doc/plugins/edittemplate.mdwn  |  4 ++--
 doc/templates.mdwn             | 16 +++++++++-------
 4 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 742413c94..226f83bb4 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -56,10 +56,15 @@ sub preprocess (@) {
 	}
 
 	my $link=linkpage($params{template});
+	add_depends($params{page}, $link, deptype("presence"));
 	my $bestlink=bestlink($params{page}, $link);
+	if (! length $bestlink) {
+		add_depends($params{page}, "templates/$link", deptype("presence"));
+		$link="/templates/".$link;
+		$bestlink=bestlink($params{page}, $link);
+	}
 	$pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
 
-	add_depends($params{page}, $link, deptype("presence"));
 	return "" if ($params{silent} && IkiWiki::yesno($params{silent})) &&
 		length $bestlink;
 	return sprintf(gettext("edittemplate %s registered for %s"),
diff --git a/debian/changelog b/debian/changelog
index d607640c4..07b349c57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
     comments div.
   * edittemplate: Make silent mode not disable display when the template
     page does not exist, so it can be easily created.
+  * edittemplate: Look for template pages under templates/ like everything
+    else (still looks in old location for backwards compatability).
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn
index 85dfdfc2d..c19ecd858 100644
--- a/doc/plugins/edittemplate.mdwn
+++ b/doc/plugins/edittemplate.mdwn
@@ -2,5 +2,5 @@
 [[!tag type/web]]
 
 This plugin provides the [[ikiwiki/directive/edittemplate]] [[ikiwiki/directive]].
-This directive allows registering template pages, that provide default
-content for new pages created using the web frontend.
+This directive allows registering [[template|templates]] pages, that
+provide default content for new pages created using the web frontend.
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 22b9345ef..d7480ee8f 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -22,20 +22,22 @@ easy to learn. All you really need to know to modify templates is this:
 The template directive allows wiki pages to be used as templates,
 filled out and inserted into other pages in the wiki.
 """]]
-[[!if test="enabled(template) and enabled(inline)" then="""
-[[!inline pages="templates/* and !*.tmpl and !*/discussion"
-feeds=no archive=yes sort=title template=titlepage
-rootpage=templates postformtext="Add a new template named:"]]
-"""]]
 
 [[!if test="enabled(edittemplate)" then="""
-## edit templates
+## default content for new pages
 
 The edittemplate directive can be used to make new pages default to
-containing text from a template, which can be filled as out the page is
+containing text from a template page, which can be filled as out the page is
 edited.
 """]]
 
+[[!if test="(enabled(template) or enabled(edittemplate)
+and enabled(inline)" then="""
+[[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion"
+feeds=no archive=yes sort=title template=titlepage
+rootpage=templates postformtext="Add a new template named:"]]
+"""]]
+
 ## wiki templates
 
 These templates are used to build the wiki. The aim is to keep almost all
-- 
cgit v1.2.3


From ec06929316180aad5719c9e9e0554fa8b075e846 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 01:12:04 -0400
Subject: typo

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

(limited to 'doc')

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index d7480ee8f..056e24c50 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -31,7 +31,7 @@ containing text from a template page, which can be filled as out the page is
 edited.
 """]]
 
-[[!if test="(enabled(template) or enabled(edittemplate)
+[[!if test="(enabled(template) or enabled(edittemplate))
 and enabled(inline)" then="""
 [[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion"
 feeds=no archive=yes sort=title template=titlepage
-- 
cgit v1.2.3


From bbdc69b6999a38e2e075a9b90636283b34956d61 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 01:14:24 -0400
Subject: speling

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

(limited to 'doc')

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 056e24c50..861d0bcbe 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -3,7 +3,7 @@ you can fully customise this site.
 
 Templates are located in `/usr/share/ikiwiki/templates` by default;
 the `templatedir` setting can be used to make another directory be
-searched first. Customized templates can also be placed inside the
+searched first. Customised templates can also be placed inside the
 "templates/" directory in your wiki's source.
 
 Ikiwiki uses the HTML::Template module as its template engine. This
@@ -44,7 +44,7 @@ These templates are used to build the wiki. The aim is to keep almost all
 html out of ikiwiki and in the templates.
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
-  key template to customize. [[!if test="enabled(pagetemplate)" then="""
+  key template to customise. [[!if test="enabled(pagetemplate)" then="""
   (The pagetemplate directive can be used to make a page use a
   different template than `page.tmpl`.)"""]]
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
-- 
cgit v1.2.3


From 85546d570e36b85fce27755590ec6e8b8e1fce81 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 01:21:32 -0400
Subject: wording

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

(limited to 'doc')

diff --git a/doc/examples/blog/posts.mdwn b/doc/examples/blog/posts.mdwn
index 4b2939120..fa2dbef0e 100644
--- a/doc/examples/blog/posts.mdwn
+++ b/doc/examples/blog/posts.mdwn
@@ -1,3 +1,3 @@
-Here is a full list of posts to my [[blog|index]].
+Here is a full list of posts to the [[blog|index]].
 
 [[!inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
-- 
cgit v1.2.3


From c8e5552f8440e960fa3ce68c18a4dd00edc41384 Mon Sep 17 00:00:00 2001
From: "http://abhidg.wordpress.com/" <http://abhidg.wordpress.com/@web>
Date: Sun, 13 Jun 2010 12:37:16 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/wiki_clones_on_dynamic_IPs.mdwn b/doc/forum/wiki_clones_on_dynamic_IPs.mdwn
new file mode 100644
index 000000000..f69f6501e
--- /dev/null
+++ b/doc/forum/wiki_clones_on_dynamic_IPs.mdwn
@@ -0,0 +1,10 @@
+OK, this is not really a ikiwiki problem... but ikiwiki makes wiki clones
+really easy to setup, and this is related to having a website cloned at
+different places and pulling from the servers which are online.
+
+My setup is like this: I have a server at home and another at my dorm
+which will serve as a wiki clone. Each of them has a dynamic IP with DynDNS
+set up. Now the problem lies in linking my domain to these two DynDNS addresses.
+Multiple CNAMEs are not supported, and I don't know if there's any utility
+which can update the A records on the DNS to point directly point to the
+two separate IPs.
-- 
cgit v1.2.3


From ec3cadb0659e747e66c1cfd48a0475ee8bbe5bcb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 08:47:21 -0400
Subject: remove obsolete ol class=form for editpage and editcomment

The styling of labels on the form largely obsoleted the special styled ol,
so just a few br's sufficed. Using an ol like that was not too semantically
right (probably?) and could cause problems with customized local.css.
---
 doc/style.css              |  7 -------
 templates/editcomment.tmpl | 16 ++++------------
 templates/editpage.tmpl    |  9 +--------
 3 files changed, 5 insertions(+), 27 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 22c68bd7a..7c97a518c 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -338,13 +338,6 @@ label.block {
 label.inline {    
 	display: inline;
 }
-ol.form {
-	list-style: none;
-	padding: 0;
-}
-li.form {
-	padding-bottom: 1em;
-}
 input#openid_identifier {
 	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
 	background-color: #fff;
diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl
index f3a8e7395..a2edc691e 100644
--- a/templates/editcomment.tmpl
+++ b/templates/editcomment.tmpl
@@ -1,35 +1,27 @@
 <div class="editcomment">
 <TMPL_VAR MESSAGE>
+<br />
 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-PAGE>
-<ol class="form">
 <TMPL_UNLESS NAME=USERNAME>
 <TMPL_IF NAME=ALLOWAUTHOR>
-<li>
 <label for="author" class="block">Name:</label>
 <TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>)
-</li>
-<li>
+<br/>
 <label for="url" class="block">Website:</label>
 <TMPL_VAR NAME=FIELD-URL> (optional)
-</li>
+<br />
 <TMPL_ELSE>
-<li>
 (You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)
-</li>
+<br />
 </TMPL_IF>
 </TMPL_UNLESS>
-<li>
 <label for="subject" class="block">Subject:</label>
 <TMPL_VAR FIELD-SUBJECT><br />
-</li>
-<li>
 <label for="editcontent" class="block">Comment:</label>
 <TMPL_VAR FIELD-EDITCONTENT><br />
-</li>
-</ol>
 <TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
 <TMPL_VAR NAME="FORM-END">
 <TMPL_VAR WMD_PREVIEW>
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index b4b0d05df..d6ad80614 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,33 +1,26 @@
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
+<br />
 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
 <TMPL_VAR FIELD-FROM>
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
-<ol class="form">
 <TMPL_IF NAME="PAGE_SELECT">
-<li>
 <label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE>
 <label for="type" class="inline">Page type:</label><TMPL_VAR FIELD-TYPE>
-</li>
 <TMPL_ELSE>
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
-<li>
 <div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
 </div>
-</li>
 <TMPL_IF NAME="CAN_COMMIT">
-<li>
 <label for="editmessage" class="block">Optional comment about this change:</label>
 <TMPL_VAR FIELD-EDITMESSAGE><br />
-</li>
 </TMPL_IF>
-</ol>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
 <TMPL_IF NAME="FIELD-ATTACHMENT">
-- 
cgit v1.2.3


From 89a970bd7d8cccf5362985ae293aba5626429095 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 13 Jun 2010 09:11:59 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn
index 641d3ff76..c78465a37 100644
--- a/doc/bugs/img_vs_align.mdwn
+++ b/doc/bugs/img_vs_align.mdwn
@@ -33,3 +33,6 @@ almost of my CSS foo again ;-) it seems.) --[[tschwinge]]
 >>> It seems, the 'align=right' parameter gets filtered in my installation
 >>> Are there other plugins, that could throw the parameter away?
 >>> --[[jwalzer]]
+
+>>>> Can't think of anything. htmlscrubber doesn't; tidy doesn't.
+>>>> --[[Joey]] 
-- 
cgit v1.2.3


From 8746480c259a9d52b1661f6832428cfeeb3458bd Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Mon, 14 Jun 2010 13:54:43 +0000
Subject: Reopen the bug since it is not fixed

---
 ...espect_the_current_page___40__if_any__41__.mdwn | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
index f1e4649ff..c6f1cef3d 100644
--- a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -24,6 +24,15 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 > The [[version_3.20100515]] announcment mentions that you need to
 > update old `page.tmpl` files to include that on upgrade. --[[Joey]]
 
+>> I followed the anouncment. I also disabled my custom page.tmpl to confirm the bug. I even produced a step-by-step example to reproduce the bug.
+>> In fact, the base tag work for the page links (the content part) but did not works for the sidebar links (the sidebar part) since the sidebar links are generated in the context of the root page.
+>> In the examble above:
+>>
+>> * base="http://www.example.com/bar" relative_link_in_bar=''something" -> absolute_link_in_bar = "http://www.example.com/bar/something" (that is fine)
+>> * base="http://www.example.com/bar" relative_link_in_sidebar="foo" (because generated in the context of the root page) -> absolute_link_in_sidebar = "http://www.example.com/bar/foo" (that is not fine)
+>>
+>> The fix commited work for previewing, but not in other cases : links are still broken. Please juste follow the example step-by-step to reproduce it (I just retried it with a "fixed" version: Debian 3.20100610). If you cannot reproduce, please say it explicitely instead of guessing about my innability to read changelogs. -- [[JeanPrivat]]
+
 ### A second example
 
 * create "/bar/sidebar.mdwn" with "world"
@@ -39,6 +48,13 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 > the "are you sure" confirmation page to display the page's sidebar?
 > --[[Joey]]
 
+>> It is a very good point and could be argued:
+>>
+>> * for dynamic page, is the root context more legitimate than the current page context?
+>> * when clicking the Edit link, does the user expect to remain in the "same page"?
+>>
+>> But, as far as something sensible is displayed and that the links work. I'm OK with any choice. -- [[JeanPrivat]]
+
 ### A last example
 
 * with the web browser edit the page "bar"
@@ -54,6 +70,13 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 > put the sidebar anywhere so we can't just display the preview sidebar
 > next to the rest of the page preview. --[[Joey]]
 
+>> The behavior is fine for me. However, some nitpicking (fell free to ingore) :
+>>
+>> * If the sidebar is replaced (making the previewing in-place), for consitency, should not the previewed content also shown in-place ? i.e. above the form part
+>> * there is no way to come back (without saving or canceling) to the root context (e.g. displaying the root sidebar) i.e. some sort of unpreviewing.
+>>
+>> -- [[JeanPrivat]]
+
 ## Some superficial hacking
 
 With the following workaround hacks, I manage to solve the 3 examples shown above:
@@ -70,5 +93,5 @@ this bug but it may help developers to find and solve the real problem.
 
 > Oh, it's pretty reasonable. I don't think it breaks anything. :)
 > I modified it a bit, and explicitly made it *not* "fix" the second example.
-> [[done]]
 > --[[Joey]] 
+>> I removed the done tag (I suspect it is the way to reopen bugs) -- [[JeanPrivat]]
-- 
cgit v1.2.3


From 5071a8eb734d090fd790ae1b9ceafe549c33cda2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 12:35:21 -0400
Subject: limit blog inlines to pages

This way images attached to blog posts don't show up as enclosures in the
blog by default.
---
 doc/examples/blog/index.mdwn | 2 +-
 doc/examples/blog/posts.mdwn | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index 220c1b3e3..7914cd203 100644
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -4,7 +4,7 @@
 [[!inline pages=sidebar raw=yes]]
 """]]
 
-[[!inline pages="./posts/* and !*/Discussion" show="10"
+[[!inline pages="page(./posts/*) and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
 
 
diff --git a/doc/examples/blog/posts.mdwn b/doc/examples/blog/posts.mdwn
index fa2dbef0e..08e014838 100644
--- a/doc/examples/blog/posts.mdwn
+++ b/doc/examples/blog/posts.mdwn
@@ -1,3 +1,3 @@
 Here is a full list of posts to the [[blog|index]].
 
-[[!inline pages="./posts/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
+[[!inline pages="page(./posts/*) and !*/Discussion" archive=yes feedshow=10 quick=yes]]
-- 
cgit v1.2.3


From 88b080f8a40840c62abd76fbf0330cb580713f1f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 14:10:59 -0400
Subject: simplify, avoid confusing suggestions

Don't even talk about ACLs, and more strongly discourage directly
committing to ikiwiki's srcdir.
---
 doc/rcs/git.mdwn | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'doc')

diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index 000eb0b3c..c627792d7 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -28,12 +28,7 @@ updates the published  wiki itself.
 
 The other (optional) leaf node repositories are meant for you to work
 on, and commit to, changes should then be pushed to the bare root
-repository.  In theory, you could work on the same leaf node repository
-that ikiwiki uses to compile the wiki from, and the [[cgi]] commits
-to, as long as you ensure that permissions and ownership don't hinder
-the working of the [[cgi]]. This can be done, for example, by using
-ACL's, in practice, it is easier to just setup separate clones for
-yourself.
+repository.
 
 So, to reiterate, when using Git, you probably want to set up three
 repositories:
@@ -41,9 +36,9 @@ repositories:
 * The root repository. This should be a bare repository (meaning that
   it does not have a working tree checked out), which the other
   repositories will push to/pull from.  It is a bare repository, since
-  there are problems pushing to a repository that has a working
+  git does not support pushing to a repository that has a working
   directory. This is called _repository_ in [[ikiwiki-makerepo]]'s
-  manual page. Nominally, this bare repository has a `post-update` hook
+  manual page. This bare repository has a `post-update` hook
   that either is or calls ikiwiki's git wrapper, which changes to the
   working directory for ikiwiki, does a `git pull`, and refreshes ikiwiki
   to regenerate the wiki with any new content. The [[setup]] page describes
@@ -51,10 +46,11 @@ repositories:
 
 * The second repository is a clone of the bare root repository, and
   has a working tree which is used as ikiwiki's srcdir for compiling
-  the wiki. **Never** push to this repository. When running as a
-  [[cgi]], the changes are committed to this repository, and pushed to
-  the master repository above. This is called _srcdir_ in
-  [[ikiwiki-makerepo]]'s manual page.
+  the wiki. **Never** push to this repository. It is wise to not make
+  changes or commits directly to this repository, to avoid conflicting
+  with ikiwiki's own changes. When running as a [[cgi]], the changes
+  are committed to this repository, and pushed to the master repository
+  above. This is called _srcdir_ in [[ikiwiki-makerepo]]'s manual page.
 
 * The other (third, fourth, fifth, sixth -- however many pleases you)
   repositories are also clones of the bare root repository above --
@@ -87,8 +83,8 @@ It can be tricky to get the permissions right to allow multiple people to
 commit to an ikiwiki git repository. As the [[security]] page mentions,
 for a secure ikiwiki installation, only one person should be able to write
 to ikiwiki's srcdir. When other committers make commits, their commits
-should go to the bare repository, which has a `post-update` hook that uses
-ikiwiki to pull the changes to the srcdir.
+should be pushed to the bare repository, which has a `post-update` hook
+that uses ikiwiki to pull the changes to the srcdir.
 
 One setup that will work is to put all committers in a group (say,
 "ikiwiki"), and use permissions to allow that group to commit to the bare git
-- 
cgit v1.2.3


From f9dc2bf8598033c2bc74229073323d97fe83e50a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 14:14:43 -0400
Subject: good idea

---
 doc/todo/htpasswd_mirror_of_the_userdb.mdwn | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/htpasswd_mirror_of_the_userdb.mdwn b/doc/todo/htpasswd_mirror_of_the_userdb.mdwn
index 0582a6f7a..e4a411780 100644
--- a/doc/todo/htpasswd_mirror_of_the_userdb.mdwn
+++ b/doc/todo/htpasswd_mirror_of_the_userdb.mdwn
@@ -1,13 +1,19 @@
 [[!tag wishlist]]
 
-Ikiwiki is static, so access control for viewing the wiki must be implemented on the web server side. Managing wiki users and access together, we can currently
+Ikiwiki is static, so access control for viewing the wiki must be
+implemented on the web server side. Managing wiki users and access
+together, we can currently
 
 * use [[httpauth|plugins/httpauth/]], but some [[passwordauth|plugins/passwordauth]] functionnality [[is missing|todo/httpauth_feature_parity_with_passwordauth/]];
 * use [[passwordauth|plugins/passwordauth]] plus [[an Apache `mod_perl` authentication mechanism|plugins/passwordauth/discussion/]], but this is Apache-centric and enabling `mod_perl` just for auth seems overkill.
 
-Moreover, when ikiwiki is just a part of a wider web project, we may want to use the same userdb for the other parts of this project.
+Moreover, when ikiwiki is just a part of a wider web project, we may want
+to use the same userdb for the other parts of this project.
 
-I think an ikiwiki plugin which would (re)generate an htpasswd version of the user/passwd base (better, two htpasswd files, one with only the wiki admins and one with everyone) each time an user is added or modified would solve this problem:
+I think an ikiwiki plugin which would (re)generate an htpasswd version of
+the user/passwd base (better, two htpasswd files, one with only the wiki
+admins and one with everyone) each time an user is added or modified would
+solve this problem:
 
 * access control can be managed from the web server
 * user management is handled by the passwordauth plugin
@@ -15,3 +21,9 @@ I think an ikiwiki plugin which would (re)generate an htpasswd version of the us
 * htpasswd files can be mirrored on other machines when the web site is distributed
 
 -- [[nil]] 
+
+> I think this is a good idea. Although unless the password hashes that
+> are stored in the userdb are compatible with htpasswd hashes, 
+> the htpasswd hashes will need to be stored in the userdb too. Then
+> any userdb change can just regenerate the htpasswd file, dumping out
+> the right kind of hashes. --[[Joey]] 
-- 
cgit v1.2.3


From c0bc2d08398ae5cfa6becba155a2127a481a4d5e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 14:34:52 -0400
Subject: editpage, comments: Fix broken links in sidebar (due to
 forcebaseurl). (Thanks, privat)

---
 IkiWiki/Plugin/comments.pm                                   |  2 +-
 IkiWiki/Plugin/editpage.pm                                   | 12 +++++-------
 debian/changelog                                             |  2 ++
 ...does_not_respect_the_current_page___40__if_any__41__.mdwn |  2 ++
 4 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index b244a7431..d204a7737 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -537,7 +537,7 @@ sub editcomment ($$) {
 	}
 	else {
 		IkiWiki::showform ($form, \@buttons, $session, $cgi,
-			forcebaseurl => $baseurl);
+			forcebaseurl => $baseurl, page => $page);
 	}
 
 	exit;
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 21f1f1824..3ba6c519e 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -313,9 +313,7 @@ sub cgi_editpage ($$) {
 		}
 		
 		showform($form, \@buttons, $session, $q,
-			forcebaseurl => $baseurl,
-			($previewing ? (page => $page) : ()),
-		);
+			forcebaseurl => $baseurl, page => $page);
 	}
 	else {
 		# save page
@@ -333,7 +331,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 		elsif ($form->field("do") eq "create" && $exists) {
@@ -348,7 +346,7 @@ sub cgi_editpage ($$) {
 				         "\n\n\n".$form->field("editcontent"),
 				force => 1);
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 			
@@ -389,7 +387,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 			exit;
 		}
 		
@@ -428,7 +426,7 @@ sub cgi_editpage ($$) {
 			$form->field(name => "type", type => 'hidden');
 			$form->title(sprintf(gettext("editing %s"), $page));
 			showform($form, \@buttons, $session, $q,
-				forcebaseurl => $baseurl);
+				forcebaseurl => $baseurl, page => $page);
 		}
 		else {
 			# The trailing question mark tries to avoid broken
diff --git a/debian/changelog b/debian/changelog
index 52b727440..32ba0cf08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * attachment: When inserting links, insert img directives for images,
     if that plugin is enabled.
   * websetup: Allow enabling plugins listed in disable_plugins.
+  * editpage, comments: Fix broken links in sidebar (due to forcebaseurl).
+    (Thanks, privat)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
index c6f1cef3d..adf0ec745 100644
--- a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -33,6 +33,8 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 >>
 >> The fix commited work for previewing, but not in other cases : links are still broken. Please juste follow the example step-by-step to reproduce it (I just retried it with a "fixed" version: Debian 3.20100610). If you cannot reproduce, please say it explicitely instead of guessing about my innability to read changelogs. -- [[JeanPrivat]]
 
+>>> Sorry if my not seeing the bug offended you. [[Fixed|done]] --[[Joey]] 
+
 ### A second example
 
 * create "/bar/sidebar.mdwn" with "world"
-- 
cgit v1.2.3


From ba00ff81c02680ff9f9ccf1ce74b10138e54fa62 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 16:35:12 -0400
Subject: add links to mentioned directives

Using the !iki shortcut, since the directive pages may not be included in
the basewiki.
---
 doc/templates.mdwn | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 861d0bcbe..5c8d9a99c 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -19,16 +19,17 @@ easy to learn. All you really need to know to modify templates is this:
 [[!if test="enabled(template)" then="""
 ## template pages
 
-The template directive allows wiki pages to be used as templates,
-filled out and inserted into other pages in the wiki.
+The [[!iki ikiwiki/directive/template desc="template directive"]] allows
+wiki pages to be used as templates, filled out and inserted into other
+pages in the wiki.
 """]]
 
 [[!if test="enabled(edittemplate)" then="""
 ## default content for new pages
 
-The edittemplate directive can be used to make new pages default to
-containing text from a template page, which can be filled as out the page is
-edited.
+The [[!iki ikiwiki/directive/template desc="edittemplate directive"]] can
+be used to make new pages default to containing text from a template
+page, which can be filled as out the page is edited.
 """]]
 
 [[!if test="(enabled(template) or enabled(edittemplate))
@@ -45,8 +46,8 @@ html out of ikiwiki and in the templates.
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
   key template to customise. [[!if test="enabled(pagetemplate)" then="""
-  (The pagetemplate directive can be used to make a page use a
-  different template than `page.tmpl`.)"""]]
+  (The [[!iki ikiwiki/directive/template desc="pagetemplate directive"]]
+  can be used to make a page use a different template than `page.tmpl`.)"""]]
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
 * `atompage.tmpl` - Used for generating atom feeds for blogs.
-- 
cgit v1.2.3


From 4e18d4415b49bbcc4a43db22ee4473a8c99f0eb2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 14 Jun 2010 16:36:54 -0400
Subject: fix links

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

(limited to 'doc')

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 5c8d9a99c..9eb12e819 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -27,7 +27,7 @@ pages in the wiki.
 [[!if test="enabled(edittemplate)" then="""
 ## default content for new pages
 
-The [[!iki ikiwiki/directive/template desc="edittemplate directive"]] can
+The [[!iki ikiwiki/directive/edittemplate desc="edittemplate directive"]] can
 be used to make new pages default to containing text from a template
 page, which can be filled as out the page is edited.
 """]]
@@ -46,7 +46,7 @@ html out of ikiwiki and in the templates.
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
   key template to customise. [[!if test="enabled(pagetemplate)" then="""
-  (The [[!iki ikiwiki/directive/template desc="pagetemplate directive"]]
+  (The [[!iki ikiwiki/directive/pagetemplate desc="pagetemplate directive"]]
   can be used to make a page use a different template than `page.tmpl`.)"""]]
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
-- 
cgit v1.2.3


From 696d54545a82e862fa9f87749f6f66b5bd141d7f Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Tue, 15 Jun 2010 03:41:34 +0000
Subject:

---
 doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn

(limited to 'doc')

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
new file mode 100644
index 000000000..d328f4c14
--- /dev/null
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -0,0 +1 @@
+I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesign for my wiki, I have changed the `autotag.tmpl` template, but IkiWiki refuses to rebuild existing tag pages using the updated template. I understand that existing tag pages are not rebuilt because they have been marked as "created" in `.ikiwiki/indexdb`. Is there a way purge all tag pages from `indexdb`? --dkobozev
-- 
cgit v1.2.3


From b1a7972ea0ee02851943552d1c9c96a84d35e83e Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Tue, 15 Jun 2010 03:43:48 +0000
Subject: typo

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

(limited to 'doc')

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
index d328f4c14..44833b11f 100644
--- a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -1 +1 @@
-I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesign for my wiki, I have changed the `autotag.tmpl` template, but IkiWiki refuses to rebuild existing tag pages using the updated template. I understand that existing tag pages are not rebuilt because they have been marked as "created" in `.ikiwiki/indexdb`. Is there a way purge all tag pages from `indexdb`? --dkobozev
+I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesign for my wiki, I have changed the `autotag.tmpl` template, but IkiWiki refuses to rebuild existing tag pages using the updated template. I understand that existing tag pages are not rebuilt because they have been marked as "created" in `.ikiwiki/indexdb`. Is there a way to purge all tag pages from `indexdb`? --dkobozev
-- 
cgit v1.2.3


From b39630c16cd663bd39f4fc787407928c44010a24 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Tue, 15 Jun 2010 13:33:16 +0000
Subject: Thanks

---
 ...sctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
index adf0ec745..3b0347f5f 100644
--- a/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
+++ b/doc/bugs/misctemplate_does_not_respect_the_current_page___40__if_any__41__.mdwn
@@ -35,6 +35,8 @@ But it causes some nasty bugs for plugins that use the pagetemplate hook. It is
 
 >>> Sorry if my not seeing the bug offended you. [[Fixed|done]] --[[Joey]] 
 
+>>>> Thanks! --[[JeanPrivat]] (I'm not offended)
+
 ### A second example
 
 * create "/bar/sidebar.mdwn" with "world"
-- 
cgit v1.2.3


From 3adde7a38c014e836f93432f1da67ef3e2399769 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 13:44:42 -0400
Subject: clear floats before comments begin

---
 doc/style.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'doc')

diff --git a/doc/style.css b/doc/style.css
index 7c97a518c..bf000dae1 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -62,10 +62,9 @@ nav {
 	margin-top: .4em;
 }
 
-.pagefooter {
-	clear: both;
-}
-.inlinefooter {
+.pagefooter,
+.inlinefooter,
+.comments {
 	clear: both;
 }
 
-- 
cgit v1.2.3


From ad858475e774672c8805cb91431f0b7cb5c2da8d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 14:17:23 -0400
Subject: match only pages in calendar

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

(limited to 'doc')

diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn
index 5c1f17723..e0895f63f 100644
--- a/doc/examples/blog/sidebar.mdwn
+++ b/doc/examples/blog/sidebar.mdwn
@@ -1,5 +1,5 @@
 [[!if test="enabled(calendar)" then="""
-[[!calendar pages="./posts/* and !*/Discussion"]]
+[[!calendar pages="page(./posts/*) and !*/Discussion"]]
 """]]
 
 [[Recent Comments|comments]]
-- 
cgit v1.2.3


From 17be286cc347bd6e48b174482ed10f3f46639961 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 15:15:39 -0400
Subject: note

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

(limited to 'doc')

diff --git a/doc/tips/yaml_setup_files.mdwn b/doc/tips/yaml_setup_files.mdwn
index 4ae0de4aa..e8ab4f144 100644
--- a/doc/tips/yaml_setup_files.mdwn
+++ b/doc/tips/yaml_setup_files.mdwn
@@ -7,4 +7,6 @@ the new YAML format recently added to ikiwiki.
 
 The format of the YAML setup file should be fairly self-explanatory.
 
+(To convert the other way, use "setuptype=Standard" instead.)
+
 --[[Joey]]
-- 
cgit v1.2.3


From 96c7e31c34b10e343afb3f17eb1ca7c34aaa4123 Mon Sep 17 00:00:00 2001
From: jhagg <jhagg@web>
Date: Wed, 16 Jun 2010 13:40:29 +0000
Subject:

---
 ...ment_upload_does_not_work_for_windows_clients.mdwn | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn

(limited to 'doc')

diff --git a/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
new file mode 100644
index 000000000..de57a1441
--- /dev/null
+++ b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
@@ -0,0 +1,19 @@
+It seems as if windows clients (IE) submit filenames with backslash as directory separator.
+(no surprise :-).
+
+But the attachment plugin translates these backslashes to underscore, making the
+whole path a filename.
+
+This little hack fixed the backslash problem, although I wonder if that
+really is the problem?
+(Everything works perfectly from linux clients of course. :-)
+
+	sub basename ($) {
+		my $file=shift;
+
+		$file=~s!.*/+!!;
+		$file=~s!.*\\+!!;
+		return $file;
+	}
+
+Should probably be `$file=~s!.*[/\\]+!!` :-)
-- 
cgit v1.2.3


From 69c22fa1ea143e3eb36692e087b167ae2171581e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 13:23:32 -0400
Subject: attachment: Support Windows paths when taking basename of
 client-supplied file name.

---
 IkiWiki/Plugin/attachment.pm                                      | 5 ++++-
 debian/changelog                                                  | 2 ++
 doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 9c774557f..ce688ca40 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -134,9 +134,12 @@ sub formbuilder (@) {
 			}
 		}
 
+		$filename=IkiWiki::basename($filename);
+		$filename=~s/.*\\+(.+)/$1/; # hello, windows
+
 		$filename=linkpage(IkiWiki::possibly_foolish_untaint(
 				attachment_location($form->field('page')).
-				IkiWiki::basename($filename)));
+				$filename));
 		if (IkiWiki::file_pruned($filename)) {
 			error(gettext("bad attachment filename"));
 		}
diff --git a/debian/changelog b/debian/changelog
index aeb9dc0eb..1f350912e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
     (Workaround bug #586045)
   * Make --gettime be honored after initial setup.
   * git: Gix --gettime to properly support utf8 filenames.
+  * attachment: Support Windows paths when taking basename of client-supplied
+    file name.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
index de57a1441..ad3aadbce 100644
--- a/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
+++ b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
@@ -4,6 +4,13 @@ It seems as if windows clients (IE) submit filenames with backslash as directory
 But the attachment plugin translates these backslashes to underscore, making the
 whole path a filename.
 
+> As far as I can see, that just means that the file will be saved with
+> a filename something like `c:__92__My_Documents__92__somefile`.
+> I don't see any "does not work" here. Error message?
+> 
+> Still, I don't mind adding a special case, though obviously not in
+> `basename`. [[done]] --[[Joey]] 
+
 This little hack fixed the backslash problem, although I wonder if that
 really is the problem?
 (Everything works perfectly from linux clients of course. :-)
-- 
cgit v1.2.3


From 062ed44f47d61c3bbbf2e8a7944a9b4e423b735a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 15:43:42 -0400
Subject: add theme plugin

---
 IkiWiki/Plugin/theme.pm                       |  37 ++++
 Makefile.PL                                   |  14 +-
 debian/changelog                              |   1 +
 doc/plugins/theme.pm                          |  11 +
 themes/actiontabs/style.css                   | 123 +++++++++++
 themes/bzed/background_darkness.png           | Bin 0 -> 165 bytes
 themes/bzed/style.css                         | 280 ++++++++++++++++++++++++++
 underlays/themes/actiontabs/style.css         | 123 -----------
 underlays/themes/bzed/background_darkness.png | Bin 165 -> 0 bytes
 underlays/themes/bzed/style.css               | 280 --------------------------
 10 files changed, 465 insertions(+), 404 deletions(-)
 create mode 100644 IkiWiki/Plugin/theme.pm
 create mode 100644 doc/plugins/theme.pm
 create mode 100644 themes/actiontabs/style.css
 create mode 100644 themes/bzed/background_darkness.png
 create mode 100644 themes/bzed/style.css
 delete mode 100644 underlays/themes/actiontabs/style.css
 delete mode 100644 underlays/themes/bzed/background_darkness.png
 delete mode 100644 underlays/themes/bzed/style.css

(limited to 'doc')

diff --git a/IkiWiki/Plugin/theme.pm b/IkiWiki/Plugin/theme.pm
new file mode 100644
index 000000000..5e6e4b092
--- /dev/null
+++ b/IkiWiki/Plugin/theme.pm
@@ -0,0 +1,37 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::theme;
+
+use warnings;
+use strict;
+use IkiWiki 3.00;
+
+sub import {
+	hook(type => "getsetup", id => "theme", call => \&getsetup);
+	hook(type => "checkconfig", id => "theme", call => \&checkconfig);
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+			section => "web",
+		},
+		theme => {
+			type => "string",
+			example => "actiontabs",
+			description => "name of theme to enable",
+			safe => 1,
+			rebuild => 0,
+		},
+}
+
+my $added=0;
+sub checkconfig () {
+	if (! $added && exists $config{theme} && $config{theme} =~ /^\w+$/) {
+		add_underlay("themes/".$config{theme});
+		$added=1;
+	}
+}
+
+1
diff --git a/Makefile.PL b/Makefile.PL
index 4001c841b..29ec9c209 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -78,7 +78,19 @@ underlay_install:
 			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
 		fi \
 	done
-	
+
+	# Themes have their style.css appended to the normal one.
+	for theme in themes/*; do \
+		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme; \
+		for file in $$theme/*; do \
+			if echo "$$file" | grep -q style.css; then \
+				(cat doc/style.css; cat $$file) >> $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \
+			elif [ -f "$$file" ]; then \
+				install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
+			fi \
+		done; \
+	done
+
 extra_install: underlay_install
 	# Install example sites.
 	for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \
diff --git a/debian/changelog b/debian/changelog
index 1f350912e..0d49df676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * git: Gix --gettime to properly support utf8 filenames.
   * attachment: Support Windows paths when taking basename of client-supplied
     file name.
+  * theme: New plugin, allows easily theming a site via the underlay.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/plugins/theme.pm b/doc/plugins/theme.pm
new file mode 100644
index 000000000..7149cc163
--- /dev/null
+++ b/doc/plugins/theme.pm
@@ -0,0 +1,11 @@
+[[!template id=plugin name=theme author="[[Joey]]"]]
+[[!tag type/web]]
+
+The theme plugin allows easily applying a theme to your wiki, by
+configuring the `theme` setting in the setup file with the name of a theme
+to use. The themes you can choose from are all subdirectories, typically
+inside `/usr/share/ikiwiki/themes/`.
+
+A theme provides, via the underlay, an enhanced version of the regular
+[[style.css]]. This leaves [[local.css]] free for you to further
+customise. Themes can also provide header and background images.
diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css
new file mode 100644
index 000000000..f48448e2e
--- /dev/null
+++ b/themes/actiontabs/style.css
@@ -0,0 +1,123 @@
+/* actiontabs theme for ikiwiki
+ *
+ * by svend
+ */
+
+a {
+	text-decoration: none;
+	color: #005a9c;
+}
+
+a:hover {
+	text-decoration: underline;
+}
+
+
+hr {
+	border-style: none;
+	background-color: #999;
+	height: 1px;
+}
+
+code, pre {
+	background: #eee;
+}
+
+pre {
+	padding: .5em;
+}
+
+body {
+	margin: 0;
+	padding: 0;
+	font-family: sans-serif;
+	color: black;
+	background: white;
+}
+
+.pageheader {
+	margin: 0;
+	padding: 1em 2em 0 2em;
+	background: #eee;
+	border-color: #999;
+	border-style: none none solid none;
+	border-width: 1px;
+}
+
+.header {
+	font-size: 100%;
+	font-weight: normal;
+}
+
+.title {
+	display: block;
+	margin-top: .2em;
+	font: 140% sans-serif;
+	text-transform: capitalize;
+}
+
+.actions {
+	text-align: right;
+	padding: 0;
+}
+
+#content, #comments, #footer {
+  	margin: 1em 2em;
+}
+
+#pageinfo {
+	border-color: #999;
+}
+
+.inlinepage {
+	margin: .4em 0;
+	padding: .4em 0;
+	border-style: none;
+	border-top: 1px solid #aaa;
+}
+
+.inlineheader {
+	font-size: 120%;
+	font-weight: normal;
+}
+
+h1 { font: 120% sans-serif }
+h2 { font: bold 100% sans-serif }
+h3 { font: italic 100% sans-serif }
+h4, h5, h6 { font: small-caps 100% sans-serif }
+
+/* Smaller headings for inline pages */
+.inlinepage h1 { font-size: 110% }
+.inlinepage h2 { font-size: 100% }
+.inlinepage h3 { font-size: 100% }
+
+.pageheader .actions ul {
+	border-style: none
+}
+
+.actions ul {
+	font-size: 75%;
+	padding: 0;
+	border-style: none;
+}
+
+.actions ul li a {
+	text-decoration: none;
+}
+
+.actions ul li {
+	margin: 0;
+	padding: .1em .5em 0 .5em;
+	background: white;
+	border-color: #999;
+	border-style: solid solid none solid;
+	border-width: 1px;
+}
+
+div.recentchanges {
+	border-style: none;
+}
+
+.pagecloud {
+	width: auto;
+}
diff --git a/themes/bzed/background_darkness.png b/themes/bzed/background_darkness.png
new file mode 100644
index 000000000..0a1cb4e9e
Binary files /dev/null and b/themes/bzed/background_darkness.png differ
diff --git a/themes/bzed/style.css b/themes/bzed/style.css
new file mode 100644
index 000000000..540cac415
--- /dev/null
+++ b/themes/bzed/style.css
@@ -0,0 +1,280 @@
+/*    bzed theme for ikiwiki
+ *
+ *    Copyright (C) 2010 Bernd Zeimetz
+ *       Licensed under same license as ikiwiki: GPL v2 or later
+ *
+ *     Parts of this file are based on the awesome YUI,
+ *     these parts will stay under the BSD license,
+ *     but you're free to apply the GPLv2 to them, of course.
+ */
+
+
+
+/* -------------------------------------------------------------------------------------------------
+Based on reset-fonts-grids.css from yui.
+Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.5.1
+*/
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,legend,p,blockquote,th,td{margin:0;padding:0;}
+table{border-collapse:collapse;border-spacing:0;}
+img{border:0;}
+address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
+li{list-style:none;}
+caption,th{text-align:left;}
+h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}
+q:before,q:after{content:'';}
+abbr,acronym {border:0;font-variant:normal;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+input,textarea,select{font-family:inherit;font-size: 13px/1.23;font-weight:normal;}
+input,textarea,select{*font-size:100%;}
+legend{color:#000;}
+/* body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} */
+body {font:13px/1.231 "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;*font-size:small;*font:x-small;}
+table {font-size:inherit;font:100%;}
+pre,code,kbd,samp,tt{font-family:monospace;}
+
+
+body{text-align:left;}
+.inlinefooter{clear:both;}
+
+/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */
+.page {margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;}
+
+/* #doc3{margin:auto 10px;width:auto;} */
+.page {margin:auto 10px;width:auto;}
+
+#pagebody, .sidebar{position:relative;}
+#pagebody, .sidebar{_position:static;}
+#pagebody {position:static;}
+.sidebar {float:right;width:16.5em;*width:16em;}
+#pagebody {margin-right:19em;*margin-right:18.5em;}
+/* #content {float:none;width:auto;} */
+#pagebody:after, .sidebar:after, .page:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.page f{zoom:1;}
+
+/* ------------------------------------------------------------------------------------------------
+ * Taken from base.css, part of YUI's CSS Foundation
+ * Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+ * Code licensed under the BSD License:
+ * http://developer.yahoo.net/yui/license.txt
+ * version: 2.5.1
+*/
+h1 {
+	/*18px via YUI Fonts CSS foundation*/
+	font-size:138.5%;
+}
+h2 {
+	/*16px via YUI Fonts CSS foundation*/
+	font-size:123.1%;
+}
+h3 {
+	/*14px via YUI Fonts CSS foundation*/
+	font-size:108%;
+}
+h1,h2,h3 {
+	/* top & bottom margin based on font size */
+	margin:1em 0;
+}
+h1,h2,h3,h4,h5,h6,strong {
+	/*bringing boldness back to headers and the strong element*/
+	font-weight:bold;
+}
+abbr,acronym {
+	/*indicating to users that more info is available */
+	border-bottom:1px dotted #000;
+	cursor:help;
+}
+em {
+	/*bringing italics back to the em element*/
+	font-style:italic;
+}
+blockquote,ul,ol,dl {
+	/*giving blockquotes and lists room to breath*/
+	margin:1em;
+}
+ol,ul,dl {
+	/*bringing lists on to the page with breathing room */
+	margin-left:2em;
+}
+ol li {
+	/*giving OL's LIs generated numbers*/
+	list-style: decimal outside;
+}
+ul li {
+	/*giving UL's LIs generated disc markers*/
+	list-style: disc outside;
+}
+dl dd {
+	/*giving UL's LIs generated numbers*/
+	margin-left:1em;
+}
+th,td {
+	/*borders and padding to make the table readable*/
+	border:1px solid #000;
+	padding:.5em;
+}
+th {
+	/*distinguishing table headers from data cells*/
+	font-weight:bold;
+	text-align:center;
+}
+caption {
+	/*coordinated margin to match cell's padding*/
+	margin-bottom:.5em;
+	/*centered so it doesn't blend in to other content*/
+	text-align:center;
+}
+p,fieldset,table,pre {
+	/*so things don't run into each other*/
+	margin-bottom:1em;
+}
+
+#searchbox {
+	width:21.5em;*width:21em;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------
+ * All CSS below is
+ * Copyright (C) 2010 Bernd Zeimetz
+ * Licensed under same license as ikiwiki: GPL v2 or later */
+
+.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody {
+	border: none;
+}
+
+html, body {
+	color:#000;
+	/* background-image: url('body_background.png');
+	background-repeat: repeat; */
+	background-color: #8da1b8;
+}
+
+body {
+	padding-left: 5%;
+	padding-right: 5%;
+	padding-top: 1em;
+	padding-bottom: 1em;
+}
+
+.page {
+	background: #fff;
+	border: outset #ccc;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-top: 1em;
+}
+
+.pageheader {
+	background-image: url('header_background.png');
+	background-repeat: repeat-x;
+	height: 100px;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-bottom: 1em;
+	padding-top: 1em;
+}
+
+.pageheader .header {
+	text-align: top;
+	clear: both;
+}
+
+.pageheader .header form {
+	padding: 0em 0em 0em 0em;
+	float: right;
+	margin-top: 0.5em;
+}
+
+.pageheader .header .title, .pageheader .header .parentlinks,
+ .inlinepage .inlineheader,
+ h1, h2, h3, h4, h5, h6 {
+	margin-top: 1em;
+	font-weight: bold;
+}
+
+.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span {
+	padding: 0.25em 0.25em 0.25em 0.25em;
+	background-image: url('background_darkness.png');
+	background-repeat: repeat;
+	color: white;
+}
+
+.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
+	color: white;
+	text-decoration: none;
+}
+
+.pageheader .actions {
+	text-align: right;
+	vertical-align: bottom;
+	clear: both;
+}
+
+#pagebody {
+	padding-right: 1em;
+	padding-bottom: 2em;
+	border-right: ridge #eee;
+	clear: none;
+}
+
+#content a, #comments a, .sidebar a {
+	color: #315485;
+	text-decoration: none;
+	font-weight: bold;
+}
+
+.sidebar h2 {
+	border-bottom: ridge #eee;
+	padding-right: 0;
+}
+
+.sidebar .menu {
+	margin-left: 1em;
+}
+
+
+.inlinepage, .recentchanges, div.recentchanges {
+	clear: none !important;
+	margin-bottom: 2em;
+}
+
+.inlinefooter {
+	border-top: 1px dotted #315485;
+}
+
+.inlinefooter .pagedate, .inlinefooter .tags {
+	display: inline;
+	clear: none;
+	margin-right: 2em;
+}
+
+.calendar .month-calendar th, .calendar .month-calendar td {
+	padding: 0.22em;
+}
+
+@media print {
+	.sidebar, .page .pageheader .header .parentlinks {
+		content:".";
+		display:block;
+		height:0;
+		visibility:hidden;
+	}
+	.page {
+		padding: 1em 1em 1em 1em;
+	}
+	.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
+		color #315485;
+	}
+	#content, #comments, #pagebody {
+		margin-right: 0;
+		*margin-right: 0;
+		border-right: none;
+	}
+
+}
+
diff --git a/underlays/themes/actiontabs/style.css b/underlays/themes/actiontabs/style.css
deleted file mode 100644
index f48448e2e..000000000
--- a/underlays/themes/actiontabs/style.css
+++ /dev/null
@@ -1,123 +0,0 @@
-/* actiontabs theme for ikiwiki
- *
- * by svend
- */
-
-a {
-	text-decoration: none;
-	color: #005a9c;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-
-hr {
-	border-style: none;
-	background-color: #999;
-	height: 1px;
-}
-
-code, pre {
-	background: #eee;
-}
-
-pre {
-	padding: .5em;
-}
-
-body {
-	margin: 0;
-	padding: 0;
-	font-family: sans-serif;
-	color: black;
-	background: white;
-}
-
-.pageheader {
-	margin: 0;
-	padding: 1em 2em 0 2em;
-	background: #eee;
-	border-color: #999;
-	border-style: none none solid none;
-	border-width: 1px;
-}
-
-.header {
-	font-size: 100%;
-	font-weight: normal;
-}
-
-.title {
-	display: block;
-	margin-top: .2em;
-	font: 140% sans-serif;
-	text-transform: capitalize;
-}
-
-.actions {
-	text-align: right;
-	padding: 0;
-}
-
-#content, #comments, #footer {
-  	margin: 1em 2em;
-}
-
-#pageinfo {
-	border-color: #999;
-}
-
-.inlinepage {
-	margin: .4em 0;
-	padding: .4em 0;
-	border-style: none;
-	border-top: 1px solid #aaa;
-}
-
-.inlineheader {
-	font-size: 120%;
-	font-weight: normal;
-}
-
-h1 { font: 120% sans-serif }
-h2 { font: bold 100% sans-serif }
-h3 { font: italic 100% sans-serif }
-h4, h5, h6 { font: small-caps 100% sans-serif }
-
-/* Smaller headings for inline pages */
-.inlinepage h1 { font-size: 110% }
-.inlinepage h2 { font-size: 100% }
-.inlinepage h3 { font-size: 100% }
-
-.pageheader .actions ul {
-	border-style: none
-}
-
-.actions ul {
-	font-size: 75%;
-	padding: 0;
-	border-style: none;
-}
-
-.actions ul li a {
-	text-decoration: none;
-}
-
-.actions ul li {
-	margin: 0;
-	padding: .1em .5em 0 .5em;
-	background: white;
-	border-color: #999;
-	border-style: solid solid none solid;
-	border-width: 1px;
-}
-
-div.recentchanges {
-	border-style: none;
-}
-
-.pagecloud {
-	width: auto;
-}
diff --git a/underlays/themes/bzed/background_darkness.png b/underlays/themes/bzed/background_darkness.png
deleted file mode 100644
index 0a1cb4e9e..000000000
Binary files a/underlays/themes/bzed/background_darkness.png and /dev/null differ
diff --git a/underlays/themes/bzed/style.css b/underlays/themes/bzed/style.css
deleted file mode 100644
index 540cac415..000000000
--- a/underlays/themes/bzed/style.css
+++ /dev/null
@@ -1,280 +0,0 @@
-/*    bzed theme for ikiwiki
- *
- *    Copyright (C) 2010 Bernd Zeimetz
- *       Licensed under same license as ikiwiki: GPL v2 or later
- *
- *     Parts of this file are based on the awesome YUI,
- *     these parts will stay under the BSD license,
- *     but you're free to apply the GPLv2 to them, of course.
- */
-
-
-
-/* -------------------------------------------------------------------------------------------------
-Based on reset-fonts-grids.css from yui.
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.5.1
-*/
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,legend,p,blockquote,th,td{margin:0;padding:0;}
-table{border-collapse:collapse;border-spacing:0;}
-img{border:0;}
-address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
-li{list-style:none;}
-caption,th{text-align:left;}
-h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}
-q:before,q:after{content:'';}
-abbr,acronym {border:0;font-variant:normal;}
-sup {vertical-align:text-top;}
-sub {vertical-align:text-bottom;}
-input,textarea,select{font-family:inherit;font-size: 13px/1.23;font-weight:normal;}
-input,textarea,select{*font-size:100%;}
-legend{color:#000;}
-/* body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} */
-body {font:13px/1.231 "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;*font-size:small;*font:x-small;}
-table {font-size:inherit;font:100%;}
-pre,code,kbd,samp,tt{font-family:monospace;}
-
-
-body{text-align:left;}
-.inlinefooter{clear:both;}
-
-/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */
-.page {margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;}
-
-/* #doc3{margin:auto 10px;width:auto;} */
-.page {margin:auto 10px;width:auto;}
-
-#pagebody, .sidebar{position:relative;}
-#pagebody, .sidebar{_position:static;}
-#pagebody {position:static;}
-.sidebar {float:right;width:16.5em;*width:16em;}
-#pagebody {margin-right:19em;*margin-right:18.5em;}
-/* #content {float:none;width:auto;} */
-#pagebody:after, .sidebar:after, .page:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
-.page f{zoom:1;}
-
-/* ------------------------------------------------------------------------------------------------
- * Taken from base.css, part of YUI's CSS Foundation
- * Copyright (c) 2008, Yahoo! Inc. All rights reserved.
- * Code licensed under the BSD License:
- * http://developer.yahoo.net/yui/license.txt
- * version: 2.5.1
-*/
-h1 {
-	/*18px via YUI Fonts CSS foundation*/
-	font-size:138.5%;
-}
-h2 {
-	/*16px via YUI Fonts CSS foundation*/
-	font-size:123.1%;
-}
-h3 {
-	/*14px via YUI Fonts CSS foundation*/
-	font-size:108%;
-}
-h1,h2,h3 {
-	/* top & bottom margin based on font size */
-	margin:1em 0;
-}
-h1,h2,h3,h4,h5,h6,strong {
-	/*bringing boldness back to headers and the strong element*/
-	font-weight:bold;
-}
-abbr,acronym {
-	/*indicating to users that more info is available */
-	border-bottom:1px dotted #000;
-	cursor:help;
-}
-em {
-	/*bringing italics back to the em element*/
-	font-style:italic;
-}
-blockquote,ul,ol,dl {
-	/*giving blockquotes and lists room to breath*/
-	margin:1em;
-}
-ol,ul,dl {
-	/*bringing lists on to the page with breathing room */
-	margin-left:2em;
-}
-ol li {
-	/*giving OL's LIs generated numbers*/
-	list-style: decimal outside;
-}
-ul li {
-	/*giving UL's LIs generated disc markers*/
-	list-style: disc outside;
-}
-dl dd {
-	/*giving UL's LIs generated numbers*/
-	margin-left:1em;
-}
-th,td {
-	/*borders and padding to make the table readable*/
-	border:1px solid #000;
-	padding:.5em;
-}
-th {
-	/*distinguishing table headers from data cells*/
-	font-weight:bold;
-	text-align:center;
-}
-caption {
-	/*coordinated margin to match cell's padding*/
-	margin-bottom:.5em;
-	/*centered so it doesn't blend in to other content*/
-	text-align:center;
-}
-p,fieldset,table,pre {
-	/*so things don't run into each other*/
-	margin-bottom:1em;
-}
-
-#searchbox {
-	width:21.5em;*width:21em;
-}
-
-
-
-/* ------------------------------------------------------------------------------------------------
- * All CSS below is
- * Copyright (C) 2010 Bernd Zeimetz
- * Licensed under same license as ikiwiki: GPL v2 or later */
-
-.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody {
-	border: none;
-}
-
-html, body {
-	color:#000;
-	/* background-image: url('body_background.png');
-	background-repeat: repeat; */
-	background-color: #8da1b8;
-}
-
-body {
-	padding-left: 5%;
-	padding-right: 5%;
-	padding-top: 1em;
-	padding-bottom: 1em;
-}
-
-.page {
-	background: #fff;
-	border: outset #ccc;
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-top: 1em;
-}
-
-.pageheader {
-	background-image: url('header_background.png');
-	background-repeat: repeat-x;
-	height: 100px;
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-bottom: 1em;
-	padding-top: 1em;
-}
-
-.pageheader .header {
-	text-align: top;
-	clear: both;
-}
-
-.pageheader .header form {
-	padding: 0em 0em 0em 0em;
-	float: right;
-	margin-top: 0.5em;
-}
-
-.pageheader .header .title, .pageheader .header .parentlinks,
- .inlinepage .inlineheader,
- h1, h2, h3, h4, h5, h6 {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span {
-	padding: 0.25em 0.25em 0.25em 0.25em;
-	background-image: url('background_darkness.png');
-	background-repeat: repeat;
-	color: white;
-}
-
-.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
-	color: white;
-	text-decoration: none;
-}
-
-.pageheader .actions {
-	text-align: right;
-	vertical-align: bottom;
-	clear: both;
-}
-
-#pagebody {
-	padding-right: 1em;
-	padding-bottom: 2em;
-	border-right: ridge #eee;
-	clear: none;
-}
-
-#content a, #comments a, .sidebar a {
-	color: #315485;
-	text-decoration: none;
-	font-weight: bold;
-}
-
-.sidebar h2 {
-	border-bottom: ridge #eee;
-	padding-right: 0;
-}
-
-.sidebar .menu {
-	margin-left: 1em;
-}
-
-
-.inlinepage, .recentchanges, div.recentchanges {
-	clear: none !important;
-	margin-bottom: 2em;
-}
-
-.inlinefooter {
-	border-top: 1px dotted #315485;
-}
-
-.inlinefooter .pagedate, .inlinefooter .tags {
-	display: inline;
-	clear: none;
-	margin-right: 2em;
-}
-
-.calendar .month-calendar th, .calendar .month-calendar td {
-	padding: 0.22em;
-}
-
-@media print {
-	.sidebar, .page .pageheader .header .parentlinks {
-		content:".";
-		display:block;
-		height:0;
-		visibility:hidden;
-	}
-	.page {
-		padding: 1em 1em 1em 1em;
-	}
-	.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
-		color #315485;
-	}
-	#content, #comments, #pagebody {
-		margin-right: 0;
-		*margin-right: 0;
-		border-right: none;
-	}
-
-}
-
-- 
cgit v1.2.3


From e35d728a3297c9caa9da696d35a8f3d51811f783 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 16 Jun 2010 19:23:08 -0400
Subject: link to theme plugin

---
 doc/css.mdwn        | 3 +++
 doc/css_market.mdwn | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/css.mdwn b/doc/css.mdwn
index 29a335596..35db57b0c 100644
--- a/doc/css.mdwn
+++ b/doc/css.mdwn
@@ -9,6 +9,9 @@ defining brand new rendering rules.
 While ikiwiki's default use of stylesheets is intentionally quite plain and
 minimalistic, CSS allows creating any kind of look you can dream up.
 
+The [[theme_plugin|plugins/theme]] provides some prepackaged themes in an
+easy to use way.
+
 The [[css_market]] page is an attempt to collect user contributed local.css
 files.
 
diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn
index a0943547c..0e5a68740 100644
--- a/doc/css_market.mdwn
+++ b/doc/css_market.mdwn
@@ -5,7 +5,8 @@ these style sheets can be installed by copying them into your wiki's source
 dir with a filename of `local.css`.
 
 Feel free to add your own stylesheets here. (Upload as wiki pages; wiki
-gnomes will convert them to css files..)
+gnomes will convert them to css files..) Selected ones from here are
+included in the [[theme_plugin|plugins/theme]].
 
 * **[[css_market/zack.css]]**, contributed by [[StefanoZacchiroli]],
   customized mostly for *blogging purposes*, can be seen in action on 
-- 
cgit v1.2.3


From 653a8179cab9ca999a2c5fadfbb059d87da97b8e Mon Sep 17 00:00:00 2001
From: jeanm <jeanm@web>
Date: Thu, 17 Jun 2010 06:22:19 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn
new file mode 100644
index 000000000..e998ef825
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn
@@ -0,0 +1,5 @@
+Hi,
+Installed ikiwiki on my ubuntu (04.10) box; after creating a blog according to your setup instructions I cannot edit files on the web interface, and I get this errer «The requested URL /~jean/blog/ikiwiki.cgi was not found on this server.»
+I have no idea what to do (sorry for my ignorance)
+
+tia,
-- 
cgit v1.2.3


From 79ffede4a7224a26e1725296db2db1918d52667c Mon Sep 17 00:00:00 2001
From: jhagg <jhagg@web>
Date: Thu, 17 Jun 2010 08:30:38 +0000
Subject:

---
 doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
index ad3aadbce..4e8c7bdcf 100644
--- a/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
+++ b/doc/bugs/attachment_upload_does_not_work_for_windows_clients.mdwn
@@ -11,6 +11,14 @@ whole path a filename.
 > Still, I don't mind adding a special case, though obviously not in
 > `basename`. [[done]] --[[Joey]] 
 
+>> Well, it's probably something else also, I get **bad attachment filename**.
+>> Now, that could really be a bad filename, problem is that it wasn't. I even
+>> tried applying the **wiki_file_prune_regexps** one by one to see what was
+>> causing it. No problem there. The strange thing is that the error shows up
+>> when using firefox on windows too. But the backslash hack fixes at least the
+>> incorrect filename from IE (firefox on windows gave me the correct filename.
+>> I'll do some more digging... :-)  /jh
+
 This little hack fixed the backslash problem, although I wonder if that
 really is the problem?
 (Everything works perfectly from linux clients of course. :-)
-- 
cgit v1.2.3


From 2e3f3ae89cfe66eb6be78003165cca1aff17ecb8 Mon Sep 17 00:00:00 2001
From: demo <demo@web>
Date: Thu, 17 Jun 2010 15:00:59 +0000
Subject: yeay ! \\o \o/ o//

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 6e9cfe48e..cc2569e7c 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -37,6 +37,8 @@ Bulleted list
 * item
 * one
   * footballs; runner; unices
+  * Cool !
+
 
 ----
 
@@ -85,3 +87,4 @@ Test
 test2
 
 I assume this triggers a checkin and recompile?
+
-- 
cgit v1.2.3


From c52d8d263efeffbc31c097fae371b8c572834077 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Fri, 18 Jun 2010 09:08:28 +0000
Subject: `themes.pm` instead of `themes.mdwn`

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

(limited to 'doc')

diff --git a/doc/plugins/discussion.mdwn b/doc/plugins/discussion.mdwn
index 854307a98..49b76c662 100644
--- a/doc/plugins/discussion.mdwn
+++ b/doc/plugins/discussion.mdwn
@@ -34,3 +34,7 @@ Any objections to listing plugins alphabetically rather than by creation date?
 >> "recently changed" list with the 10 most recently changed plugins
 >> at the top.  That would allow what you suggested, but still allow
 >> the main list to be alphabetical. -- [[Will]]
+
+### `themes.pm` instead of `themes.mdwn`
+
+Could someone please change the filename. I cannot fix this using the Web interface. Somebody step in please. --[[PaulePanter]]
-- 
cgit v1.2.3


From fca54dc52a49fe50361cf6c4ab2b3c2e0450a2f8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 12:57:20 -0400
Subject: fix filename

---
 doc/plugins/discussion.mdwn |  2 ++
 doc/plugins/theme.mdwn      | 11 +++++++++++
 doc/plugins/theme.pm        | 11 -----------
 3 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 doc/plugins/theme.mdwn
 delete mode 100644 doc/plugins/theme.pm

(limited to 'doc')

diff --git a/doc/plugins/discussion.mdwn b/doc/plugins/discussion.mdwn
index 49b76c662..d47fa4718 100644
--- a/doc/plugins/discussion.mdwn
+++ b/doc/plugins/discussion.mdwn
@@ -38,3 +38,5 @@ Any objections to listing plugins alphabetically rather than by creation date?
 ### `themes.pm` instead of `themes.mdwn`
 
 Could someone please change the filename. I cannot fix this using the Web interface. Somebody step in please. --[[PaulePanter]]
+
+> Oops, not the first time I've made that mistake! --[[Joey]] 
diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn
new file mode 100644
index 000000000..7149cc163
--- /dev/null
+++ b/doc/plugins/theme.mdwn
@@ -0,0 +1,11 @@
+[[!template id=plugin name=theme author="[[Joey]]"]]
+[[!tag type/web]]
+
+The theme plugin allows easily applying a theme to your wiki, by
+configuring the `theme` setting in the setup file with the name of a theme
+to use. The themes you can choose from are all subdirectories, typically
+inside `/usr/share/ikiwiki/themes/`.
+
+A theme provides, via the underlay, an enhanced version of the regular
+[[style.css]]. This leaves [[local.css]] free for you to further
+customise. Themes can also provide header and background images.
diff --git a/doc/plugins/theme.pm b/doc/plugins/theme.pm
deleted file mode 100644
index 7149cc163..000000000
--- a/doc/plugins/theme.pm
+++ /dev/null
@@ -1,11 +0,0 @@
-[[!template id=plugin name=theme author="[[Joey]]"]]
-[[!tag type/web]]
-
-The theme plugin allows easily applying a theme to your wiki, by
-configuring the `theme` setting in the setup file with the name of a theme
-to use. The themes you can choose from are all subdirectories, typically
-inside `/usr/share/ikiwiki/themes/`.
-
-A theme provides, via the underlay, an enhanced version of the regular
-[[style.css]]. This leaves [[local.css]] free for you to further
-customise. Themes can also provide header and background images.
-- 
cgit v1.2.3


From 17675c18a8619a3b8c3fb2db67ccab009a525091 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 12:59:03 -0400
Subject: avoid showing subpages of contrib plugins

---
 doc/plugins.mdwn         | 2 +-
 doc/plugins/contrib.mdwn | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/plugins.mdwn b/doc/plugins.mdwn
index 697b4a219..0bea33592 100644
--- a/doc/plugins.mdwn
+++ b/doc/plugins.mdwn
@@ -14,4 +14,4 @@ will fit most uses of ikiwiki.
 ## Plugin directory
 
 [[!map pages="plugins/* and !plugins/type/* and !plugins/write and 
-!plugins/write/* and !plugins/contrib and !plugins/install and !*/Discussion"]]
+!plugins/write/* and !plugins/contrib and !plugins/contrib/*/* and !plugins/install and !*/Discussion"]]
diff --git a/doc/plugins/contrib.mdwn b/doc/plugins/contrib.mdwn
index ac6c1b751..d8199a756 100644
--- a/doc/plugins/contrib.mdwn
+++ b/doc/plugins/contrib.mdwn
@@ -1,4 +1,4 @@
 These plugins are provided by third parties and are not currently
 included in ikiwiki. See [[install]] for installation help.
 
-[[!map pages="plugins/contrib/* and !*/Discussion"]]
+[[!map pages="plugins/contrib/* and !plugins/contrib/*/* and !*/Discussion"]]
-- 
cgit v1.2.3


From 0aaaa9b3f90e6bfe5e4a7da85d78c510b510e8de Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 14:24:39 -0400
Subject: response

---
 ...an__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn
index e998ef825..4061a7348 100644
--- a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server..mdwn
@@ -3,3 +3,9 @@ Installed ikiwiki on my ubuntu (04.10) box; after creating a blog according to y
 I have no idea what to do (sorry for my ignorance)
 
 tia,
+
+> Make sure you have a `~/public_html/ikiwiki.cgi`. Your setup
+> file should generate that via the `cgi_wrapper` option.
+> 
+> Maybe you need to follow the [[tips/dot_cgi]] tip to make apache see it.
+> --[[Joey]]
-- 
cgit v1.2.3


From 2035881f55119471d3d506be6b0e0b1a35305aea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 14:31:24 -0400
Subject: response

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

(limited to 'doc')

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
index 44833b11f..637790482 100644
--- a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -1 +1,6 @@
 I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesign for my wiki, I have changed the `autotag.tmpl` template, but IkiWiki refuses to rebuild existing tag pages using the updated template. I understand that existing tag pages are not rebuilt because they have been marked as "created" in `.ikiwiki/indexdb`. Is there a way to purge all tag pages from `indexdb`? --dkobozev
+
+> Well, you can delete the indexdb and rebuild, and that will do it.
+> The tag plugin is careful not to replace existing pages or even recreate
+> tag pages if you delete them, which does cause a problem if you need to
+> update them. --[[Joey]]
-- 
cgit v1.2.3


From 99c9d8c34f95fe62c575a78e28abdbb47310c230 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 14:39:08 -0400
Subject: also a problem for theme plugin

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

(limited to 'doc')

diff --git a/doc/bugs/underlaydir_file_expose.mdwn b/doc/bugs/underlaydir_file_expose.mdwn
index c827c6dd8..ca492e396 100644
--- a/doc/bugs/underlaydir_file_expose.mdwn
+++ b/doc/bugs/underlaydir_file_expose.mdwn
@@ -1,4 +1,12 @@
 If a file in the srcdir is removed, exposing a file in the underlaydir,
-ikiwiki will notice the removal and delete the page from the destdir. The
+ikiwiki will not notice the removal, and the
 page from the underlay will not be built. (However, it will be if the wiki
 gets rebuilt.)
+
+> This problem is caused by ikiwiki storing only filenames relative to
+> the srcdir or underlay, and mtime comparison not handling this case.
+
+> A related problem occurs if changing a site's theme with the
+> [[plugins/theme]] plugin. The style.css of the old and new theme
+> often has the same mtime, so ikiwiki does not update it w/o a rebuild.
+> --[[Joey]]
-- 
cgit v1.2.3


From 57e56828f5b03f8fb31631f36731f989d4335607 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Jun 2010 16:40:47 -0400
Subject: store state to avoid needing to rebuild when changing theme

---
 IkiWiki/Plugin/theme.pm               | 30 +++++++++++++++++++++++++++++-
 doc/bugs/underlaydir_file_expose.mdwn |  1 +
 2 files changed, 30 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/theme.pm b/IkiWiki/Plugin/theme.pm
index ba6966381..03b0816ed 100644
--- a/IkiWiki/Plugin/theme.pm
+++ b/IkiWiki/Plugin/theme.pm
@@ -8,6 +8,7 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "theme", call => \&getsetup);
 	hook(type => "checkconfig", id => "theme", call => \&checkconfig);
+	hook(type => "needsbuild", id => "theme", call => \&needsbuild);
 }
 
 sub getsetup () {
@@ -22,7 +23,7 @@ sub getsetup () {
 			example => "actiontabs",
 			description => "name of theme to enable",
 			safe => 1,
-			rebuild => 1,
+			rebuild => 0,
 		},
 }
 
@@ -34,4 +35,31 @@ sub checkconfig () {
 	}
 }
 
+sub needsbuild ($) {
+	my $needsbuild=shift;
+	if (($config{theme} || '') ne ($wikistate{theme}{currenttheme} || '')) {
+		# theme changed; ensure all files in the theme are built
+		my %needsbuild=map { $_ => 1 } @$needsbuild;
+		if ($config{theme}) {
+			foreach my $file (glob("$config{underlaydirbase}/themes/$config{theme}/*")) {
+				if (-f $file) {
+					my $f=IkiWiki::basename($file);
+					push @$needsbuild, $f
+						unless $needsbuild{$f};
+				}
+			}
+		}
+		elsif ($wikistate{theme}{currenttheme}) {
+			foreach my $file (glob("$config{underlaydirbase}/themes/$wikistate{theme}{currenttheme}/*")) {
+				my $f=IkiWiki::basename($file);
+				if (-f $file && defined eval { srcfile($f) }) {
+					push @$needsbuild, $f;
+				}
+			}
+		}
+		
+		$wikistate{theme}{currenttheme}=$config{theme};
+	}
+}
+
 1
diff --git a/doc/bugs/underlaydir_file_expose.mdwn b/doc/bugs/underlaydir_file_expose.mdwn
index ca492e396..4ee30e39d 100644
--- a/doc/bugs/underlaydir_file_expose.mdwn
+++ b/doc/bugs/underlaydir_file_expose.mdwn
@@ -9,4 +9,5 @@ gets rebuilt.)
 > A related problem occurs if changing a site's theme with the
 > [[plugins/theme]] plugin. The style.css of the old and new theme
 > often has the same mtime, so ikiwiki does not update it w/o a rebuild.
+> This is worked around in theme.pm with a special-purpose needsbuild hook.
 > --[[Joey]]
-- 
cgit v1.2.3


From b3e8115c95c79859c2893ac73e9f0bab0db31594 Mon Sep 17 00:00:00 2001
From: "http://www.openid.albertlash.com/openid/"
 <http://www.openid.albertlash.com/openid/@web>
Date: Fri, 18 Jun 2010 20:47:31 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/todo/Google_Sitemap_protocol.mdwn b/doc/todo/Google_Sitemap_protocol.mdwn
index 057a88b72..6657c9350 100644
--- a/doc/todo/Google_Sitemap_protocol.mdwn
+++ b/doc/todo/Google_Sitemap_protocol.mdwn
@@ -45,3 +45,13 @@ On [Google Webmaster tools](https://www.google.com/webmasters/tools) you can sub
 [Google should grok feeds as sitemaps.](http://www.google.com/support/webmasters/bin/answer.py?answer=34654) Or rather [[plugins/inline]] should be improved to support the [sitemap protocol](http://sitemaps.org/protocol.php) natively.
 
 -- [[Hendry]]
+
+
+Took me a minute to figure this out so I figured I'd share the steps I took:
+
+* Added rss=>1 and allowrss=>1 to my setup file
+* Created a new page where the RSS would be created with this content, replacing "first_page" with the page in my wiki with the earliest date:
+
+<pre>
+\[\[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
+</pre>
-- 
cgit v1.2.3


From 4833f486b6ca759e1bcd8acc19e13ef4a0a6063f Mon Sep 17 00:00:00 2001
From: "http://www.openid.albertlash.com/openid/"
 <http://www.openid.albertlash.com/openid/@web>
Date: Fri, 18 Jun 2010 20:48:10 +0000
Subject: don't need to escape the inline tag if its in pre tag

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

(limited to 'doc')

diff --git a/doc/todo/Google_Sitemap_protocol.mdwn b/doc/todo/Google_Sitemap_protocol.mdwn
index 6657c9350..12ac8d036 100644
--- a/doc/todo/Google_Sitemap_protocol.mdwn
+++ b/doc/todo/Google_Sitemap_protocol.mdwn
@@ -53,5 +53,5 @@ Took me a minute to figure this out so I figured I'd share the steps I took:
 * Created a new page where the RSS would be created with this content, replacing "first_page" with the page in my wiki with the earliest date:
 
 <pre>
-\[\[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
+[[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
 </pre>
-- 
cgit v1.2.3


From 8b2b66655d5328a2eaaaaa5562e4047c31fbf077 Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Sat, 19 Jun 2010 00:20:01 +0000
Subject: reply to Joey

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

(limited to 'doc')

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
index 637790482..f88b78f37 100644
--- a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -4,3 +4,5 @@ I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesi
 > The tag plugin is careful not to replace existing pages or even recreate
 > tag pages if you delete them, which does cause a problem if you need to
 > update them. --[[Joey]]
+
+>> Thanks. I thought about deleting `indexdb`, but hesitated to do that. According to [[tips/inside dot ikiwiki]], `indexdb` stores "all persistent state about pages". I didn't know if it's harmless to lose all persistent state.
-- 
cgit v1.2.3


From 99a4096397d9ee5ce65084ac80cc6ff3a0879df5 Mon Sep 17 00:00:00 2001
From: bhobbit <bhobbit@web>
Date: Sat, 19 Jun 2010 00:20:50 +0000
Subject: forgotten signature

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

(limited to 'doc')

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
index f88b78f37..02138326d 100644
--- a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -5,4 +5,4 @@ I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesi
 > tag pages if you delete them, which does cause a problem if you need to
 > update them. --[[Joey]]
 
->> Thanks. I thought about deleting `indexdb`, but hesitated to do that. According to [[tips/inside dot ikiwiki]], `indexdb` stores "all persistent state about pages". I didn't know if it's harmless to lose all persistent state.
+>> Thanks. I thought about deleting `indexdb`, but hesitated to do that. According to [[tips/inside dot ikiwiki]], `indexdb` stores "all persistent state about pages". I didn't know if it's harmless to lose all persistent state. --dkobozev
-- 
cgit v1.2.3


From dd3274ce734e3af0ca6a7940f69201d8d4b84fda Mon Sep 17 00:00:00 2001
From: Bernd Zeimetz <bernd@bzed.de>
Date: Mon, 14 Jun 2010 01:18:33 +0200
Subject: Enhance the link plugin to handle external links.

The following ways to create a link are supported now:
[[url]]
[[text|url]]
url can be one of the following:
- an internal wikilink: will be handled as before
- any other kind of URL, including mailto: proper links will be created:
  <a href="url">url</a>
  <a href="url">text</a>
- an email address:
  <a href="mailto:url">url</a>
  <a href="mailto:url">text</a>
---
 IkiWiki/Plugin/link.pm | 89 +++++++++++++++++++++++++++++++++++++-------------
 doc/plugins/link.mdwn  |  2 +-
 2 files changed, 68 insertions(+), 23 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 3838aec09..d41965bd3 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -7,6 +7,9 @@ use IkiWiki 3.00;
 
 my $link_regexp;
 
+my $email_regexp = qr/^(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])$/i; 
+my $url_regexp = qr/^(?:[^:]+:\/\/|mailto:).*/i;
+
 sub import {
 	hook(type => "getsetup", id => "link", call => \&getsetup);
 	hook(type => "checkconfig", id => "link", call => \&checkconfig);
@@ -57,8 +60,42 @@ sub checkconfig () {
 			)?                      # optional
 
 			\]\]                    # end of link
-		}x,
+		}x;
+	}
+}
+
+sub is_externallink ($$) {
+	my $page = shift;
+	my $url = shift;
+	if ($url =~ /$email_regexp/) {
+		# url looks like an email address, so we assume it
+		# is supposed to be an external link if there is no
+		# page with that name.
+		$url =~ s/#.*//;
+		return (! (bestlink($page, linkpage($url))))
 	}
+	return ($url =~ /$url_regexp/)
+}
+
+sub externallink ($;@) {
+	my $url = shift;
+	my $pagetitle = shift;
+
+	# build pagetitle
+	if (!($pagetitle)) {
+		$pagetitle = $url;
+		# use only the email address as title for mailto: urls
+		if ($pagetitle =~ /^mailto:.*/) {
+			$pagetitle =~ s/^mailto:([^?]+).*/$1/;
+		}
+	}
+
+	# handle email-addresses (without mailto:):
+	if ($url =~ /$email_regexp/) {
+		$url = "mailto:" . $url;
+	}
+
+	return "<a href=\"$url\">$pagetitle</a>";
 }
 
 sub linkify (@) {
@@ -70,12 +107,16 @@ sub linkify (@) {
 		defined $2
 			? ( $1 
 				? "[[$2|$3".($4 ? "#$4" : "")."]]" 
-				: htmllink($page, $destpage, linkpage($3),
-					anchor => $4, linktext => pagetitle($2)))
+				: is_externallink($page, $3 . ($4 ? "#$4" : ""))
+					? externallink("$3" . ($4 ? "#$4" : ""), $2)
+					: htmllink($page, $destpage, linkpage($3),
+						anchor => $4, linktext => pagetitle($2)))
 			: ( $1 
 				? "[[$3".($4 ? "#$4" : "")."]]"
-				: htmllink($page, $destpage, linkpage($3),
-					anchor => $4))
+				: is_externallink($page, $3 . ($4 ? "#$4" : ""))
+					? externallink("$3" . ($4 ? "#$4" : ""))
+					: htmllink($page, $destpage, linkpage($3),
+						anchor => $4))
 	}eg;
 	
 	return $params{content};
@@ -87,7 +128,9 @@ sub scan (@) {
 	my $content=$params{content};
 
 	while ($content =~ /(?<!\\)$link_regexp/g) {
-		add_link($page, linkpage($2));
+		if (! is_externallink($page, $2 . ($3 ? "#$3" : ""))) {
+			add_link($page, linkpage($2));
+		}
 	}
 }
 
@@ -98,24 +141,26 @@ sub renamepage (@) {
 	my $new=$params{newpage};
 
 	$params{content} =~ s{(?<!\\)$link_regexp}{
-		my $linktext=$2;
-		my $link=$linktext;
-		if (bestlink($page, linkpage($linktext)) eq $old) {
-			$link=pagetitle($new, 1);
-			$link=~s/ /_/g;
-			if ($linktext =~ m/.*\/*?[A-Z]/) {
-				# preserve leading cap of last component
-				my @bits=split("/", $link);
-				$link=join("/", @bits[0..$#bits-1], ucfirst($bits[$#bits]));
-			}
-			if (index($linktext, "/") == 0) {
-				# absolute link
-				$link="/$link";
+		if (! is_externallink($page, $2 . ($3 ? "#$3" : ""))) {
+			my $linktext=$2;
+			my $link=$linktext;
+			if (bestlink($page, linkpage($linktext)) eq $old) {
+				$link=pagetitle($new, 1);
+				$link=~s/ /_/g;
+				if ($linktext =~ m/.*\/*?[A-Z]/) {
+					# preserve leading cap of last component
+					my @bits=split("/", $link);
+					$link=join("/", @bits[0..$#bits-1], ucfirst($bits[$#bits]));
+				}
+				if (index($linktext, "/") == 0) {
+					# absolute link
+					$link="/$link";
+				}
 			}
+			defined $1
+				? ( "[[$1|$link".($3 ? "#$3" : "")."]]" )
+				: ( "[[$link".   ($3 ? "#$3" : "")."]]" )
 		}
-		defined $1
-			? ( "[[$1|$link".($3 ? "#$3" : "")."]]" )
-			: ( "[[$link".   ($3 ? "#$3" : "")."]]" )
 	}eg;
 
 	return $params{content};
diff --git a/doc/plugins/link.mdwn b/doc/plugins/link.mdwn
index 6adbf3eae..5de4fe3cb 100644
--- a/doc/plugins/link.mdwn
+++ b/doc/plugins/link.mdwn
@@ -1,4 +1,4 @@
 [[!template id=plugin name=link core=1 author="[[Joey]]"]]
 [[!tag type/link]]
 
-This plugin implements standard [[WikiLinks|ikiwiki/wikilink]].
+This plugin implements standard [[WikiLinks|ikiwiki/wikilink]] and links to [[external pages|http://www.debian.org]].
-- 
cgit v1.2.3


From 02871721951f0cf48238542b98077d5e99523857 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sat, 19 Jun 2010 10:27:28 +0000
Subject: Test PageSpec with root page `/index.mdwn`.

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index cc2569e7c..1e5a890b3 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -88,3 +88,4 @@ test2
 
 I assume this triggers a checkin and recompile?
 
+[[!inline pages="/index"]]
-- 
cgit v1.2.3


From 14e1cccf1222232bd890c9eff1ea2c7fb0804b4f Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sat, 19 Jun 2010 10:35:32 +0000
Subject: Match start page `/index` does not work.

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

(limited to 'doc')

diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn
index 4eed3722c..1aac47fa4 100644
--- a/doc/ikiwiki/pagespec/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/discussion.mdwn
@@ -92,3 +92,11 @@ does not seem suitable for this, as
 > \[[!map pages="./*"]]
 
 also lists the current page and all its siblings.
+
+---
+
+I am a little lost. I want to match the start page `/index.mdwn`. So I use
+
+    \[[!inline pages="/index"]]
+
+which does not work though. I also tried it in this Wiki. Just take a look at the end of the [[SandBox|sandbox]]. --[[PaulePanter]]
-- 
cgit v1.2.3


From 397f1cbc7625b76832e3a6d41ebd7cd871c8cbc9 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sat, 19 Jun 2010 10:47:30 +0000
Subject: What license for themes for distribution in ikiwiki?

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

(limited to 'doc')

diff --git a/doc/plugins/theme/discussion.mdwn b/doc/plugins/theme/discussion.mdwn
new file mode 100644
index 000000000..8c834e701
--- /dev/null
+++ b/doc/plugins/theme/discussion.mdwn
@@ -0,0 +1,3 @@
+### What license do themes need to have for distribution?
+
+Could someone specify what license the themes need to have to get distributed in ikiwiki or Debian? The current included theme seem to be under the GPLv2. Does the [Creative Commons Attribution 3.0 Unported License](http://creativecommons.org/licenses/by/3.0/) also work. This way a lot of free CSS templates could be included, e. g. from [freecsstemplates.org](http://www.freecsstemplates.org/).
-- 
cgit v1.2.3


From 03947e706abcd8df9c5c5fba753a8a6ee56c59b2 Mon Sep 17 00:00:00 2001
From: jeanm <jeanm@web>
Date: Sat, 19 Jun 2010 13:35:37 +0000
Subject: Added a comment

---
 .../comment_1_d36ce6fab90e0a086ac84369af38d205._comment  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_1_d36ce6fab90e0a086ac84369af38d205._comment

(limited to 'doc')

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_1_d36ce6fab90e0a086ac84369af38d205._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_1_d36ce6fab90e0a086ac84369af38d205._comment
new file mode 100644
index 000000000..f95972c4f
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_1_d36ce6fab90e0a086ac84369af38d205._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="jeanm"
+ subject="comment 1"
+ date="2010-06-19T13:35:37Z"
+ content="""
+OK, I followed the dot cgi tip and this error diappears, thanks a lot! So ubuntu doesn't provide a \"working out of the box\" ikiwiki.
+
+But I get a new error message now when trying to edit a page:
+
+Error: \"do\" parameter missing
+
+My plugins now:
+add_plugins => [qw{goodstuff websetup comments blogspam 404 muse}],
+
+
+"""]]
-- 
cgit v1.2.3


From 22478de2cb9d843e3444e0f39bac850d372887f1 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Tue, 22 Jun 2010 13:30:50 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/todo/auto_publish_expire.mdwn b/doc/todo/auto_publish_expire.mdwn
new file mode 100644
index 000000000..6f767a693
--- /dev/null
+++ b/doc/todo/auto_publish_expire.mdwn
@@ -0,0 +1,10 @@
+It could be nice to mark some page such that:
+
+* the page is automatically published on some date (i.e. build, linked, syndicated, inlined/mapped, etc.)
+* the page is automatically unpublished at some other date (i.e. removed)
+
+I know that ikiwiki is a wiki compiler so that something has to refresh the wiki periodically to enforce the rules (a cronjob for instance). It seems to me that the calendar plugin rely on something similar.
+
+The date for publishing and expiring could be set be using some new directives; an alternative could be to expand the [[plugin/meta]] plugin with [<span/>[!meta date="auto publish date"]] and [<span/>[!meta expires="auto expire date"]].
+
+--[[JeanPrivat]]
-- 
cgit v1.2.3


From cfc1c4e933b8ba77bc6c3adb60fcea40721c0a61 Mon Sep 17 00:00:00 2001
From: privat <privat@web>
Date: Tue, 22 Jun 2010 15:10:59 +0000
Subject: ping

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

(limited to 'doc')

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index bb4339f88..8c689294a 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -17,6 +17,8 @@ those contents instead.
 
 >>> I made a [[git]] branch for it [[!template id=gitbranch branch="privat/multiple_sidebars" author="[[jeanprivat]]"]] --[[jeanprivat]]
 
+>>>> Ping for [[Joey]]. Do you have any comment? I could improve it if there is things you do not like. I prefer to have such a feature integrated upstream. --[[JeanPrivat]]
+
 <pre>
 --- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
 +++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
-- 
cgit v1.2.3


From c0a99d24b150ba5a495290c75abb2516c924f0ab Mon Sep 17 00:00:00 2001
From: ikiwikiweb <ikiwikiweb@web>
Date: Tue, 22 Jun 2010 20:45:40 +0000
Subject: testing

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 1e5a890b3..347fd9945 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -53,6 +53,7 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
+* [TVs](http://www.superstoresearch.com/shopping/categories/4326-1/electronics/home-cinema-audio/flat-panel-televisions.html)
 * [GNU](http://www.gnu.org/)
 
 -----
-- 
cgit v1.2.3


From 9372a40189f5ac04cc045a476c8a3e4e791678f2 Mon Sep 17 00:00:00 2001
From: ikiwikiweb <ikiwikiweb@web>
Date: Tue, 22 Jun 2010 20:46:57 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 347fd9945..c49a47cb6 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -29,6 +29,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
+ 3. cool
 
 Bulleted list
 
@@ -53,7 +54,7 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
-* [TVs](http://www.superstoresearch.com/shopping/categories/4326-1/electronics/home-cinema-audio/flat-panel-televisions.html)
+* [TVS](http://www.superstoresearch.com/shopping/categories/4326-1/electronics/home-cinema-audio/flat-panel-televisions.html)
 * [GNU](http://www.gnu.org/)
 
 -----
-- 
cgit v1.2.3


From 44e286de2eed96c223d07b53e8038c8a61d1cdec Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 12:51:50 -0400
Subject: response

---
 doc/plugins/theme/discussion.mdwn | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/plugins/theme/discussion.mdwn b/doc/plugins/theme/discussion.mdwn
index 8c834e701..091aa97c1 100644
--- a/doc/plugins/theme/discussion.mdwn
+++ b/doc/plugins/theme/discussion.mdwn
@@ -1,3 +1,18 @@
 ### What license do themes need to have for distribution?
 
-Could someone specify what license the themes need to have to get distributed in ikiwiki or Debian? The current included theme seem to be under the GPLv2. Does the [Creative Commons Attribution 3.0 Unported License](http://creativecommons.org/licenses/by/3.0/) also work. This way a lot of free CSS templates could be included, e. g. from [freecsstemplates.org](http://www.freecsstemplates.org/).
+Could someone specify what license the themes need to have to get
+distributed in ikiwiki or Debian? The current included theme seem to be
+under the GPLv2. Does the [Creative Commons Attribution 3.0 Unported
+License](http://creativecommons.org/licenses/by/3.0/) also work. This way a
+lot of free CSS templates could be included, e. g. from
+[freecsstemplates.org](http://www.freecsstemplates.org/). --PaulePanter
+
+> Paule, I'd love it if you did that! The only hard requirement on themes
+> included in ikiwiki is that they need to be licensed with a [DFSG
+> compatable license](https://wiki.debian.org/DFSGLicenses). CC-BY-SA 3.0
+> is DFSG; CC-BY is apparently being accepted by Debian too.
+> 
+> As a soft requirement, I may exersise some discretion about themes that
+> require obtrusive attributions links be included on every page of a
+> site using the theme. While probably DFSG, that adds a requirement
+> that ikiwiki itself does not require. --[[Joey]]
-- 
cgit v1.2.3


From c208ac5b2867fdf96268d928e48f1467391a0a10 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 12:53:01 -0400
Subject: despam

"ikiwikiweb" is banned
---
 doc/sandbox.mdwn | 1 -
 1 file changed, 1 deletion(-)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index c49a47cb6..7c32d0cfe 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -54,7 +54,6 @@ Bulleted list
 * <http://ikiwiki.info/ikiwiki/formatting/>
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
-* [TVS](http://www.superstoresearch.com/shopping/categories/4326-1/electronics/home-cinema-audio/flat-panel-televisions.html)
 * [GNU](http://www.gnu.org/)
 
 -----
-- 
cgit v1.2.3


From 7d55ee1961d52cc79ab533e0cde7f53af21a075d Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <http://joey.kitenet.net/@web>
Date: Wed, 23 Jun 2010 17:03:12 +0000
Subject: Added a comment: do parameter missing

---
 .../comment_2_5836bba08172d2ddf6a43da87ebb0332._comment            | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_2_5836bba08172d2ddf6a43da87ebb0332._comment

(limited to 'doc')

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_2_5836bba08172d2ddf6a43da87ebb0332._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_2_5836bba08172d2ddf6a43da87ebb0332._comment
new file mode 100644
index 000000000..0a544eeb1
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_2_5836bba08172d2ddf6a43da87ebb0332._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ subject="do parameter missing"
+ date="2010-06-23T17:03:12Z"
+ content="""
+That's an unusual problem. Normally the url or form that calls ikiwiki.cgi includes a \"do\" parameter, like \"do=edit\". I'd have to see the site to debug why it is missing for you.
+"""]]
-- 
cgit v1.2.3


From 4048988576c4ad23293379751b438af0bdb4b310 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:04:56 -0400
Subject: response

---
 doc/ikiwiki/pagespec/discussion.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn
index 1aac47fa4..4c553925a 100644
--- a/doc/ikiwiki/pagespec/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/discussion.mdwn
@@ -100,3 +100,6 @@ I am a little lost. I want to match the start page `/index.mdwn`. So I use
     \[[!inline pages="/index"]]
 
 which does not work though. I also tried it in this Wiki. Just take a look at the end of the [[SandBox|sandbox]]. --[[PaulePanter]]
+
+> Unlike wikilinks, pagespecs match relative to the top of the wiki by
+> default. So lose the "/" and it will work. --[[Joey]]
-- 
cgit v1.2.3


From bbbbf04f76dc5eb6824e5efd5f0ca128e32430ce Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:12:43 -0400
Subject: thoughts

---
 doc/todo/auto_publish_expire.mdwn | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/auto_publish_expire.mdwn b/doc/todo/auto_publish_expire.mdwn
index 6f767a693..7a5a17517 100644
--- a/doc/todo/auto_publish_expire.mdwn
+++ b/doc/todo/auto_publish_expire.mdwn
@@ -8,3 +8,26 @@ I know that ikiwiki is a wiki compiler so that something has to refresh the wiki
 The date for publishing and expiring could be set be using some new directives; an alternative could be to expand the [[plugin/meta]] plugin with [<span/>[!meta date="auto publish date"]] and [<span/>[!meta expires="auto expire date"]].
 
 --[[JeanPrivat]]
+
+> This is a duplicate, and expansion, of
+> [[todo/tagging_with_a_publication_date]].
+> There, I suggest using a branch to develop
+> prepublication versions of a site, and merge from it
+> when the thing is published. 
+> 
+> Another approach I've seen used is to keep such pages in a pending/
+> directory, and move them via cron job when their publication time comes.
+> But that requires some familiarity with, and access to, cron.
+> 
+> On [[todo/tagging_with_a_publication_date]], I also suggested using meta 
+> date to set a page's date into the future,
+> and adding a pagespec that matches only pages with dates in the past,
+> which would allow filtering out the unpublished ones.
+> Sounds like you are thinking along these lines, but possibly using
+> something other than the page's creation or modification date to do it.
+> 
+> I do think the general problem with that approach is that you have to be
+> careful to prevent the unpublished pages from leaking out in any
+> inlines, maps, etc. --[[Joey]] 
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From 0025798751dfc721aa81ce75f7baf87545bd1370 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:15:10 -0400
Subject: clarify indexdb is cached info, rebuildable

---
 doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn | 3 +++
 doc/tips/inside_dot_ikiwiki.mdwn                        | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
index 02138326d..114837031 100644
--- a/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
+++ b/doc/forum/tag_plugin:_rebuilding_autocreated_pages.mdwn
@@ -6,3 +6,6 @@ I have a bunch of tag pages autogenerated by the tag plugin. As part of a redesi
 > update them. --[[Joey]]
 
 >> Thanks. I thought about deleting `indexdb`, but hesitated to do that. According to [[tips/inside dot ikiwiki]], `indexdb` stores "all persistent state about pages". I didn't know if it's harmless to lose all persistent state. --dkobozev
+
+>>> The persistant state is best thought of as a cache,
+>>> so it's safe to delete it. --[[Joey]] 
diff --git a/doc/tips/inside_dot_ikiwiki.mdwn b/doc/tips/inside_dot_ikiwiki.mdwn
index b81ffae8d..a74d00f47 100644
--- a/doc/tips/inside_dot_ikiwiki.mdwn
+++ b/doc/tips/inside_dot_ikiwiki.mdwn
@@ -6,9 +6,10 @@ you need/want to.
 
 ## the index
 
-`.ikiwiki/indexdb` contains a cache of information about pages, as well
-as all persisitant state about pages. It used to be a (semi) human-readable
-text file, but is not anymore.
+`.ikiwiki/indexdb` contains a cache of information about pages.
+This information can always be recalculated by rebuilding the wiki.
+(So the file is safe to delete and need not be backed up.)
+It used to be a (semi) human-readable text file, but is not anymore.
 
 To dump the contents of the file, enter a perl command like this.
 
-- 
cgit v1.2.3


From 16ff593ab78409fc3c2482aeb2903e9a3d83b581 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:16:31 -0400
Subject: Revert "don't need to escape the inline tag if its in pre tag"

This reverts commit 4833f486b6ca759e1bcd8acc19e13ef4a0a6063f.

Being in a pre does not stop an inline directive from working.
---
 doc/todo/Google_Sitemap_protocol.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/Google_Sitemap_protocol.mdwn b/doc/todo/Google_Sitemap_protocol.mdwn
index 12ac8d036..6657c9350 100644
--- a/doc/todo/Google_Sitemap_protocol.mdwn
+++ b/doc/todo/Google_Sitemap_protocol.mdwn
@@ -53,5 +53,5 @@ Took me a minute to figure this out so I figured I'd share the steps I took:
 * Created a new page where the RSS would be created with this content, replacing "first_page" with the page in my wiki with the earliest date:
 
 <pre>
-[[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
+\[\[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
 </pre>
-- 
cgit v1.2.3


From 9b845ea8132f5677c7466b8747333afba54017b9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:17:33 -0400
Subject: one slash is enough to escape

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

(limited to 'doc')

diff --git a/doc/todo/Google_Sitemap_protocol.mdwn b/doc/todo/Google_Sitemap_protocol.mdwn
index 6657c9350..2cf7c61e3 100644
--- a/doc/todo/Google_Sitemap_protocol.mdwn
+++ b/doc/todo/Google_Sitemap_protocol.mdwn
@@ -53,5 +53,5 @@ Took me a minute to figure this out so I figured I'd share the steps I took:
 * Created a new page where the RSS would be created with this content, replacing "first_page" with the page in my wiki with the earliest date:
 
 <pre>
-\[\[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
+\[[!inline  pages="* and !*/Discussion and created_after(first_page)" archive="yes" rss="yes" ]]
 </pre>
-- 
cgit v1.2.3


From 6235167962e65733f8a120edba394a77d684278f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:29:46 -0400
Subject: response

---
 .../beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index 8c689294a..1f7b48764 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -19,6 +19,21 @@ those contents instead.
 
 >>>> Ping for [[Joey]]. Do you have any comment? I could improve it if there is things you do not like. I prefer to have such a feature integrated upstream. --[[JeanPrivat]]
 
+>>>>> The code is fine.
+>>>>>
+>>>>> I did think about having it examine
+>>>>> the `page.tmpl` for parameters with names like `FOO_SIDEBAR`
+>>>>> and automatically enable page `foo` as a sidebar in that case,
+>>>>> instead of using the setup file to enable. But I'm not sure about
+>>>>> that idea..
+>>>>> 
+>>>>> The full compliment of sidebars would be a header, a footer,
+>>>>> a left, and a right sidebar. It would make sense to go ahead
+>>>>> and add the parameters to `page.tmpl` so enabling each just works,
+>>>>> and add whatever basic CSS makes sense. Although I don't know
+>>>>> if I want to try to get a 3 column CSS going, so perhaps leave the
+>>>>> left sidebar out of that.
+
 <pre>
 --- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
 +++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
-- 
cgit v1.2.3


From 383ad93f777f19a38036f88ff40972155d60a593 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:33:14 -0400
Subject: add changelog for externalink

remove debian.org linkspam ;)
---
 debian/changelog      | 1 +
 doc/plugins/link.mdwn | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index eddca6dfc..0d169fb56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * Added actiontabs theme by Svend Sorensen.
   * Added blueview theme by Bernd Zeimetz.
   * mercurial: Fix buggy getctime code. Closes: #586279
+  * link: Enhanced to handle URLs and email addresses. (Bernd Zeimetz)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
diff --git a/doc/plugins/link.mdwn b/doc/plugins/link.mdwn
index 5de4fe3cb..7dfa50de4 100644
--- a/doc/plugins/link.mdwn
+++ b/doc/plugins/link.mdwn
@@ -1,4 +1,5 @@
 [[!template id=plugin name=link core=1 author="[[Joey]]"]]
 [[!tag type/link]]
 
-This plugin implements standard [[WikiLinks|ikiwiki/wikilink]] and links to [[external pages|http://www.debian.org]].
+This plugin implements standard [[WikiLinks|ikiwiki/wikilink]] and links to
+external pages.
-- 
cgit v1.2.3


From 07a08122d926ab6b7741c94bc6c0038ffe0113fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 13:35:31 -0400
Subject: document external links

---
 doc/ikiwiki/wikilink.mdwn | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/wikilink.mdwn b/doc/ikiwiki/wikilink.mdwn
index 0c30aafa2..cf3b89c76 100644
--- a/doc/ikiwiki/wikilink.mdwn
+++ b/doc/ikiwiki/wikilink.mdwn
@@ -9,9 +9,6 @@ wikilink, just prefix it with a `\`, like `\\[[WikiLink]]`.
 There are some special [[SubPage/LinkingRules]] that come into play when
 linking between [[SubPages|SubPage]].
 
-Also, if the file linked to by a WikiLink looks like an image, it will
-be displayed inline on the page.
-
 WikiLinks are matched with page names in a case-insensitive manner, so you
 don't need to worry about getting the case the same, and can capitalise
 links at the start of a sentence, and so on.
@@ -22,3 +19,11 @@ page, but the link will appear like this: [[foo_bar|SandBox]].
 
 To link to an anchor inside a page, you can use something like
 `\[[WikiLink#foo]]` .
+
+If the file linked to by a WikiLink looks like an image, it will
+be displayed inline on the page.
+
+---
+
+You can also put an url in a WikiLink, to link to an external page.
+Email addresses can also be used to generate a mailto link.
-- 
cgit v1.2.3


From 609367933f07ff826a5c1bbbd093dfe2ddae1c04 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 14:23:51 -0400
Subject: add news item for ikiwiki 3.20100623

---
 doc/news/version_3.20100504.mdwn | 16 ----------------
 doc/news/version_3.20100623.mdwn | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 16 deletions(-)
 delete mode 100644 doc/news/version_3.20100504.mdwn
 create mode 100644 doc/news/version_3.20100623.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100504.mdwn b/doc/news/version_3.20100504.mdwn
deleted file mode 100644
index 5ed6b6b4f..000000000
--- a/doc/news/version_3.20100504.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-ikiwiki 3.20100504 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Add parameter to displaytime to specify that it is a pubdate,
-     and in html5 mode, use time tag.
-   * Add placeholder text in search form (in html5 mode only).
-   * In html5 mode, use all the nice new semantic tags. Care was taken
-     to not change the id/class named used in the CSS, so only CSS
-     that refers to tag types needed to be changed.
-   * Add ACTIONS variable to page.tmpl, which allows plugins to add arbitrary
-     links to the action bar without modifying the template further.
-     (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
-     are kept separate for now to avoid breaking modified templates.)
-   * websetup: Only display Setup button on admins' preferences page.
-   * graphviz: Fix display of preexisting images in preview mode.
-   * Fixes a bug in skipping of illegal source files introduced in
-     3.20100427."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100623.mdwn b/doc/news/version_3.20100623.mdwn
new file mode 100644
index 000000000..684217e26
--- /dev/null
+++ b/doc/news/version_3.20100623.mdwn
@@ -0,0 +1,29 @@
+ikiwiki 3.20100623 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * openid: Add openid\_realm and openid\_cgiurl configuration options,
+     useful in a few edge case setups.
+   * attachment: Show files from underlay in attachments list.
+   * img: Support hspace and vspace attributes.
+   * editpage: Rename "comments" field to avoid CSS conflict with the
+     comments div.
+   * edittemplate: Make silent mode not disable display when the template
+     page does not exist, so it can be easily created.
+   * edittemplate: Look for template pages under templates/ like everything
+     else (still looks in old location for backwards compatibility).
+   * attachment: When inserting links, insert img directives for images,
+     if that plugin is enabled.
+   * websetup: Allow enabling plugins listed in disable\_plugins.
+   * editpage, comments: Fix broken links in sidebar (due to forcebaseurl).
+     (Thanks, privat)
+   * calendar: Tune archive\_pagespec to only match pages, not other files.
+   * Fix issues with combining unicode srcdirs and source files.
+     (Workaround bug #586045)
+   * Make --gettime be honored after initial setup.
+   * git: Fix --gettime to properly support utf8 filenames.
+   * attachment: Support Windows paths when taking basename of client-supplied
+     file name.
+   * theme: New plugin, allows easily themeing a site via the underlay.
+   * Added actiontabs theme by Svend Sorensen.
+   * Added blueview theme by Bernd Zeimetz.
+   * mercurial: Fix buggy getctime code. Closes: #[586279](http://bugs.debian.org/586279)
+   * link: Enhanced to handle URLs and email addresses. (Bernd Zeimetz)"""]]
\ No newline at end of file
-- 
cgit v1.2.3


From e32bce464305fd8314d8324169a2079516548faf Mon Sep 17 00:00:00 2001
From: BerndZeimetz <BerndZeimetz@web>
Date: Wed, 23 Jun 2010 18:44:52 +0000
Subject: It is possible to use google-sitemapgen to create google sitemaps for
 ikiwiki.

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

(limited to 'doc')

diff --git a/doc/todo/Google_Sitemap_protocol.mdwn b/doc/todo/Google_Sitemap_protocol.mdwn
index 2cf7c61e3..ea8ee7f03 100644
--- a/doc/todo/Google_Sitemap_protocol.mdwn
+++ b/doc/todo/Google_Sitemap_protocol.mdwn
@@ -34,6 +34,9 @@ for an example.  You will probably need to strip out the metadata variables I
 >>>[xtermin.us rather than localhost](http://xtermin.us/git/?p=website.git;a=blob;f=plugins/googlesitemap.pm) is 404 now.
 >>> -- weakish
 
+
+Although it is not able to read the meta-data from files, using google-sitemapgen [works well for me](http://bzed.de/posts/2010/06/creating_a_google_sitemap_for_ikiwiki/) to create a sitemap for my ikiwiki installation. -- [[bzed|BerndZeimetz]]
+
 There is a [sitemap XML standard](http://www.sitemaps.org/protocol.php) that ikiwiki needs to generate for. 
 
 # Google Webmaster tools and RSS
-- 
cgit v1.2.3


From c46bcb425af0948ac59581d6ba7b477826d83ae3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 15:32:27 -0400
Subject: Add new optional field usershort to rcs_recentchanges.

Now the git plugin supports commits with author fields that look like:
Author: http://my.openid/ <me@web>

Then in recentchanges, the short username will be displayed, linking
to the openid.

Particularly useful for the horrible google openids, of course.
---
 IkiWiki/Plugin/git.pm           | 15 +++++++++++----
 IkiWiki/Plugin/recentchanges.pm |  3 +--
 debian/changelog                |  6 ++++++
 doc/plugins/write.mdwn          |  4 +++-
 4 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 222692eda..a43b85920 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -342,8 +342,9 @@ sub parse_diff_tree ($) {
 			$ci{ "${who}_epoch" } = $epoch;
 			$ci{ "${who}_tz"    } = $tz;
 
-			if ($name =~ m/^[^<]+\s+<([^@>]+)/) {
-				$ci{"${who}_username"} = $1;
+			if ($name =~ m/^([^<]+)\s+<([^@>]+)/) {
+				$ci{"${who}_name"} = $1;
+				$ci{"${who}_username"} = $2;
 			}
 			elsif ($name =~ m/^([^<]+)\s+<>$/) {
 				$ci{"${who}_username"} = $1;
@@ -588,9 +589,14 @@ sub rcs_recentchanges ($) {
 			push @messages, { line => $line };
 		}
 
-		my $user=$ci->{'author_username'};
+		my $user=$ci->{'author_name'};
+		my $usershort=$ci->{'author_username'};
 		my $web_commit = ($ci->{'author'} =~ /\@web>/);
-		
+
+		if ($usershort =~ /:\/\//) {
+			$usershort=undef; # url; not really short
+		}
+
 		# compatability code for old web commit messages
 		if (! $web_commit &&
 		      defined $messages[0] &&
@@ -603,6 +609,7 @@ sub rcs_recentchanges ($) {
 		push @rets, {
 			rev        => $sha1,
 			user       => $user,
+			usershort  => $usershort,
 			committype => $web_commit ? "web" : "git",
 			when       => $when,
 			message    => [@messages],
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index e546e4702..9f188cbff 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -114,12 +114,11 @@ sub store ($$$) {
 	];
 	push @{$change->{pages}}, { link => '...' } if $is_excess;
 
-	# See if the committer is an openid.
 	$change->{author}=$change->{user};
 	my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
 	if (defined $oiduser) {
 		$change->{authorurl}=$change->{user};
-		$change->{user}=$oiduser;
+		$change->{user}=defined $change->{usershort} ? $change->{usershort} : $oiduser;
 	}
 	elsif (length $config{cgiurl}) {
 		$change->{authorurl} = IkiWiki::cgiurl(
diff --git a/debian/changelog b/debian/changelog
index 032041346..01d0abb47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100624) UNRELEASED; urgency=low
+
+  * Add new optional field usershort to rcs_recentchanges.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
+
 ikiwiki (3.20100623) unstable; urgency=low
 
   * openid: Add openid_realm and openid_cgiurl configuration options,
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 193005565..5f0e95a9f 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1103,7 +1103,9 @@ The data structure returned for each change is:
 
 	{
 		rev => # the RCSs id for this commit
-		user => # name of user who made the change,
+		user => # user who made the change (may be an openid),
+		usershort => # short name of user (optional; not an openid),
+		
 		committype => # either "web" or the name of the rcs,
 		when => # time when the change was made,
 		message => [
-- 
cgit v1.2.3


From b4a43406f61b7ff9ab77d242edf4d59369ac8596 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 16:05:49 -0400
Subject: API: rcs_commit and rcs_commit_staged are passed a new parameter that
 may contain the username component of the email address of the user making
 the commit.

---
 IkiWiki/Plugin/bzr.pm       |  8 ++++----
 IkiWiki/Plugin/cvs.pm       |  7 ++++---
 IkiWiki/Plugin/darcs.pm     |  8 ++++----
 IkiWiki/Plugin/git.pm       |  8 ++++----
 IkiWiki/Plugin/mercurial.pm |  8 ++++----
 IkiWiki/Plugin/monotone.pm  |  7 ++++---
 IkiWiki/Plugin/norcs.pm     |  8 ++++----
 IkiWiki/Plugin/svn.pm       |  7 ++++---
 IkiWiki/Plugin/tla.pm       |  7 ++++---
 debian/changelog            |  5 ++++-
 doc/plugins/write.mdwn      | 10 ++++++----
 11 files changed, 46 insertions(+), 37 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 9bee0c4b2..44ab9a86a 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -137,8 +137,8 @@ sub bzr_author ($$) {
 	}
 }
 
-sub rcs_commit ($$$;$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+sub rcs_commit ($$$;$$$) {
+	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
 
 	$user = bzr_author($user, $ipaddr);
 
@@ -156,10 +156,10 @@ sub rcs_commit ($$$;$$) {
 	return undef; # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 
 	$user = bzr_author($user, $ipaddr);
 
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 18491d517..a9fe162a1 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -183,7 +183,7 @@ sub rcs_prepedit ($) {
 	return defined $rev ? $rev : "";
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
@@ -192,6 +192,7 @@ sub rcs_commit ($$$;$$) {
 	my $rcstoken=shift;
 	my $user=shift;
 	my $ipaddr=shift;
+	my $emailuser=shift;
 
 	return unless cvs_is_controlling;
 
@@ -224,10 +225,10 @@ sub rcs_commit ($$$;$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 
 	if (defined $user) {
 		$message="web commit by $user".(length $message ? ": $message" : "");
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index f17fadcb1..345456c01 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -140,11 +140,11 @@ sub rcs_prepedit ($) {
 	return $rev;
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Commit the page.  Returns 'undef' on success and a version of the page
 	# with conflict markers on failure.
 
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
 
 	# Compute if the "revision" of $file changed.
 	my $changed = darcs_rev($file) ne $rcstoken;
@@ -239,8 +239,8 @@ sub rcs_commit ($$$;$$) {
 	}
 }
 
-sub rcs_commit_staged ($$$) {
-	my ($message, $user, $ipaddr) = @_;
+sub rcs_commit_staged ($$$;$) {
+	my ($message, $user, $ipaddr, $emailuser) = @_;
 
 	my $author;
 	if (defined $user) {
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index a43b85920..b56f229d7 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -464,12 +464,12 @@ sub rcs_prepedit ($) {
 	return git_sha1($file);
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Try to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on
 	# failure.
 
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
 
 	# Check to see if the page has been changed by someone else since
 	# rcs_prepedit was called.
@@ -485,10 +485,10 @@ sub rcs_commit ($$$;$$) {
 	return rcs_commit_staged($message, $user, $ipaddr);
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 
 	# Set the commit author and email to the web committer.
 	my %env=%ENV;
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index a80bb2da5..1793ab4bb 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -126,8 +126,8 @@ sub rcs_prepedit ($) {
 	return "";
 }
 
-sub rcs_commit ($$$;$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+sub rcs_commit ($$$;$$$) {
+	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
 
 	if (defined $user) {
 		$user = IkiWiki::possibly_foolish_untaint($user);
@@ -153,10 +153,10 @@ sub rcs_commit ($$$;$$) {
 	return undef; # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 	
 	error("rcs_commit_staged not implemented for mercurial"); # TODO
 }
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 67d4abbaa..55d8039e0 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -293,7 +293,7 @@ sub rcs_prepedit ($) {
 	return get_rev();
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
@@ -302,6 +302,7 @@ sub rcs_commit ($$$;$$) {
 	my $rcstoken=shift;
 	my $user=shift;
 	my $ipaddr=shift;
+	my $emailuser=shift;
 	my $author;
 
 	if (defined $user) {
@@ -438,10 +439,10 @@ sub rcs_commit ($$$;$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 	
 	# Note - this will also commit any spurious changes that happen to be
 	# lying around in the working copy.  There shouldn't be any, but...
diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm
index 053652a5f..5131a1502 100644
--- a/IkiWiki/Plugin/norcs.pm
+++ b/IkiWiki/Plugin/norcs.pm
@@ -38,13 +38,13 @@ sub rcs_prepedit ($) {
 	return ""
 }
 
-sub rcs_commit ($$$;$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+sub rcs_commit ($$$;$$$) {
+	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
-	my ($message, $user, $ipaddr)=@_;
+sub rcs_commit_staged ($$$;$) {
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 	return undef # success
 }
 
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index d10b4888d..ffacb8cf9 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -144,7 +144,7 @@ sub rcs_prepedit ($) {
 	}
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
@@ -153,6 +153,7 @@ sub rcs_commit ($$$;$$) {
 	my $rcstoken=shift;
 	my $user=shift;
 	my $ipaddr=shift;
+	my $emailuser=shift;
 
 	if (defined $user) {
 		$message="web commit by $user".(length $message ? ": $message" : "");
@@ -189,10 +190,10 @@ sub rcs_commit ($$$;$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 	
 	if (defined $user) {
 		$message="web commit by $user".(length $message ? ": $message" : "");
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index f5ad0cc96..80c015e3c 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -98,12 +98,13 @@ sub rcs_prepedit ($) {
 	}
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
 	my $file=shift;
 	my $message=shift;
 	my $rcstoken=shift;
 	my $user=shift;
 	my $ipaddr=shift;
+	my $emailuser=shift;
 
 	if (defined $user) {
 		$message="web commit by $user".(length $message ? ": $message" : "");
@@ -139,10 +140,10 @@ sub rcs_commit ($$$;$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr)=@_;
+	my ($message, $user, $ipaddr, $emailuser)=@_;
 	
 	error("rcs_commit_staged not implemented for tla"); # TODO
 }
diff --git a/debian/changelog b/debian/changelog
index 01d0abb47..2dfebd0b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 ikiwiki (3.20100624) UNRELEASED; urgency=low
 
-  * Add new optional field usershort to rcs_recentchanges.
+  * API: Add new optional field usershort to rcs_recentchanges.
+  * API: rcs_commit and rcs_commit_staged are passed a new parameter
+    that may contain the username component of the email address of
+    the user making the commit.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 5f0e95a9f..ab2934bf1 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1051,15 +1051,17 @@ token, that will be passed into `rcs_commit` when committing. For example,
 it might return the current revision ID of the file, and use that
 information later when merging changes.
 
-#### `rcs_commit($$$;$$)`
+#### `rcs_commit($$$;$$$)`
 
-Passed a file, message, token (from `rcs_prepedit`), user, and ip address.
+Passed a file, message, token (from `rcs_prepedit`), user, ip address,
+and optionally the username component of the committer's email address.
 Should try to commit the file. Returns `undef` on *success* and a version
 of the page with the rcs's conflict markers on failure.
 
-#### `rcs_commit_staged($$$)`
+#### `rcs_commit_staged($$$;$)`
 
-Passed a message, user, and ip address. Should commit all staged changes.
+Passed a message, user, ip address, and optionally the username component of
+the committer's email address. Should commit all staged changes.
 Returns undef on success, and an error message on failure.
 
 Changes can be staged by calls to `rcs_add`, `rcs_remove`, and
-- 
cgit v1.2.3


From ecdfd1b8644bc926db008054ab6192e18351afed Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 17:35:21 -0400
Subject: rcs_commit and rcs_commit_staged api changes

Using named parameters for these is overdue. Passing the session in a
parameter instead of passing username and IP separately will later allow
storing other session info, like username or part of the email.

Note that these functions are not part of the exported API,
and the prototype change will catch (most) skew, so I am not changing
API versions. Any third-party plugins that call them will need updated
though.
---
 IkiWiki.pm                   |   4 +-
 IkiWiki/Plugin/attachment.pm |  10 ++--
 IkiWiki/Plugin/autoindex.pm  |   4 +-
 IkiWiki/Plugin/bzr.pm        |  43 +++++++++--------
 IkiWiki/Plugin/comments.pm   |  14 +++---
 IkiWiki/Plugin/cvs.pm        |  59 ++++++++++++-----------
 IkiWiki/Plugin/darcs.pm      |  75 +++++++++++++++---------------
 IkiWiki/Plugin/editpage.pm   |  10 ++--
 IkiWiki/Plugin/git.pm        |  52 +++++++++++++--------
 IkiWiki/Plugin/mercurial.pm  |  32 ++++++-------
 IkiWiki/Plugin/monotone.pm   |  85 +++++++++++++++-------------------
 IkiWiki/Plugin/norcs.pm      |   6 +--
 IkiWiki/Plugin/poll.pm       |  10 ++--
 IkiWiki/Plugin/remove.pm     |   7 +--
 IkiWiki/Plugin/rename.pm     |   5 +-
 IkiWiki/Plugin/svn.pm        |  59 ++++++++++++-----------
 IkiWiki/Plugin/tag.pm        |   2 +-
 IkiWiki/Plugin/tla.pm        |  34 ++++++++------
 debian/changelog             |   5 +-
 doc/plugins/write.mdwn       |  16 ++++---
 ikiwiki-calendar.in          |   2 +-
 ikiwiki.spec                 |   2 +-
 po/ikiwiki.pot               | 108 +++++++++++++++++++++----------------------
 t/bazaar.t                   |  25 ++++++++--
 t/cvs.t                      |   6 ++-
 t/git.t                      |  12 +++--
 t/mercurial.t                |  11 ++++-
 t/svn.t                      |   6 ++-
 28 files changed, 380 insertions(+), 324 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 203da3ba2..35b38df46 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1840,11 +1840,11 @@ sub rcs_prepedit ($) {
 	$hooks{rcs}{rcs_prepedit}{call}->(@_);
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit (@) {
 	$hooks{rcs}{rcs_commit}{call}->(@_);
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged (@) {
 	$hooks{rcs}{rcs_commit_staged}{call}->(@_);
 }
 
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 216e00b3d..ee105a170 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -183,10 +183,12 @@ sub formbuilder (@) {
 		if ($config{rcs}) {
 			IkiWiki::rcs_add($filename);
 			IkiWiki::disable_commit_hook();
-			IkiWiki::rcs_commit($filename, gettext("attachment upload"),
-				IkiWiki::rcs_prepedit($filename),
-				$session->param("name"),
-				$session->remote_addr());
+			IkiWiki::rcs_commit(
+				file => $filename,
+				message => gettext("attachment upload"),
+				token => IkiWiki::rcs_prepedit($filename),
+				session => $session,
+			);
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index c3eb53300..11595e217 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -117,8 +117,8 @@ sub refresh () {
 		}
 		if ($config{rcs}) {
 			IkiWiki::rcs_commit_staged(
-				gettext("automatic index generation"),
-				undef, undef);
+				message => gettext("automatic index generation"),
+			);
 			IkiWiki::enable_commit_hook();
 		}
 	}
diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 44ab9a86a..562d5d389 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -123,8 +123,13 @@ sub rcs_prepedit ($) {
 	return "";
 }
 
-sub bzr_author ($$) {
-	my ($user, $ipaddr) = @_;
+sub bzr_author ($) {
+	my $session=shift;
+
+	return unless defined $session;
+
+	my $user=$session->param("name");
+	my $ipaddr=$session->remote_addr();
 
 	if (defined $user) {
 		return IkiWiki::possibly_foolish_untaint($user);
@@ -137,18 +142,19 @@ sub bzr_author ($$) {
 	}
 }
 
-sub rcs_commit ($$$;$$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
+sub rcs_commit (@) {
+	my %params=@_;
 
-	$user = bzr_author($user, $ipaddr);
+	my $user=bzr_author($params{session});
 
-	$message = IkiWiki::possibly_foolish_untaint($message);
-	if (! length $message) {
-		$message = "no message given";
+	$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
+	if (! length $params{message}) {
+		$params{message} = "no message given";
 	}
 
-	my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user,
-	               $config{srcdir}."/".$file);
+	my @cmdline = ("bzr", "commit", "--quiet", "-m", $params{message},
+	               (defined $user ? ("--author", $user) : ()),
+	               $config{srcdir}."/".$params{file});
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
@@ -156,19 +162,18 @@ sub rcs_commit ($$$;$$$) {
 	return undef; # success
 }
 
-sub rcs_commit_staged ($$$;$) {
-	# Commits all staged changes. Changes can be staged using rcs_add,
-	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
+sub rcs_commit_staged (@) {
+	my %params=@_;
 
-	$user = bzr_author($user, $ipaddr);
+	my $user=bzr_author($params{session});
 
-	$message = IkiWiki::possibly_foolish_untaint($message);
-	if (! length $message) {
-		$message = "no message given";
+	$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
+	if (! length $params{message}) {
+		$params{message} = "no message given";
 	}
 
-	my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user,
+	my @cmdline = ("bzr", "commit", "--quiet", "-m", $params{message},
+	               (defined $user ? ("--author", $user) : ()),
 	               $config{srcdir});
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 4770209c9..41c6948e8 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -513,9 +513,10 @@ sub editcomment ($$) {
 
 			IkiWiki::rcs_add($file);
 			IkiWiki::disable_commit_hook();
-			$conflict = IkiWiki::rcs_commit_staged($message,
-				$session->param('name'),
-				$session->remote_addr());
+			$conflict = IkiWiki::rcs_commit_staged(
+				message => $message,
+				session => $session,
+			);
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
@@ -603,9 +604,10 @@ sub commentmoderation ($$) {
 			if ($config{rcs} and $config{comments_commit}) {
 				my $message = gettext("Comment moderation");
 				IkiWiki::disable_commit_hook();
-				$conflict=IkiWiki::rcs_commit_staged($message,
-					$session->param('name'),
-					$session->remote_addr());
+				$conflict=IkiWiki::rcs_commit_staged(
+					message => $message,
+					session => $session,
+				);
 				IkiWiki::enable_commit_hook();
 				IkiWiki::rcs_update();
 			}
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index a9fe162a1..c6687d780 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -183,41 +183,47 @@ sub rcs_prepedit ($) {
 	return defined $rev ? $rev : "";
 }
 
-sub rcs_commit ($$$;$$$) {
+sub commitmessage (@) {
+	my %params=@_;
+	
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			return "web commit by ".
+				$params{session}->param("name").
+				(length $params{message} ? ": $params{message}" : "");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			return "web commit from ".
+				$params{session}->remote_addr().
+				(length $params{message} ? ": $params{message}" : "");
+		}
+	}
+	return $params{message};
+}
+
+sub rcs_commit (@) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
-	my $file=shift;
-	my $message=shift;
-	my $rcstoken=shift;
-	my $user=shift;
-	my $ipaddr=shift;
-	my $emailuser=shift;
+	my %params=@_;
 
 	return unless cvs_is_controlling;
 
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
-	}
-
 	# Check to see if the page has been changed by someone
 	# else since rcs_prepedit was called.
-	my ($oldrev)=$rcstoken=~/^([0-9]+)$/; # untaint
-	my $rev=cvs_info("Repository revision", "$config{srcdir}/$file");
+	my ($oldrev)=$params{token}=~/^([0-9]+)$/; # untaint
+	my $rev=cvs_info("Repository revision", "$config{srcdir}/$params{file}");
 	if (defined $rev && defined $oldrev && $rev != $oldrev) {
 		# Merge their changes into the file that we've
 		# changed.
-		cvs_runcvs('update', $file) ||
+		cvs_runcvs('update', $params{file}) ||
 			warn("cvs merge from $oldrev to $rev failed\n");
 	}
 
 	if (! cvs_runcvs('commit', '-m',
-			 IkiWiki::possibly_foolish_untaint $message)) {
-		my $conflict=readfile("$config{srcdir}/$file");
-		cvs_runcvs('update', '-C', $file) ||
+			 IkiWiki::possibly_foolish_untaint(commitmessage(%params)))) {
+		my $conflict=readfile("$config{srcdir}/$params{file}");
+		cvs_runcvs('update', '-C', $params{file}) ||
 			warn("cvs revert failed\n");
 		return $conflict;
 	}
@@ -225,20 +231,13 @@ sub rcs_commit ($$$;$$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
-
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
-	}
+	my %params=@_;
 
 	if (! cvs_runcvs('commit', '-m',
-			 IkiWiki::possibly_foolish_untaint $message)) {
+			 IkiWiki::possibly_foolish_untaint(commitmessage(%params)))) {
 		warn "cvs staged commit failed\n";
 		return 1; # failure
 	}
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 345456c01..0dfc8708d 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -140,14 +140,31 @@ sub rcs_prepedit ($) {
 	return $rev;
 }
 
-sub rcs_commit ($$$;$$$) {
+sub commitauthor (@) {
+	my %params=@_;
+	
+	my $author="anon\@web";
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			return $params{session}->param("name").'@web';
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			return $params{session}->remote_addr().'@web';
+		}
+	}
+	return 'anon@web';
+}
+
+sub rcs_commit (@) {
 	# Commit the page.  Returns 'undef' on success and a version of the page
 	# with conflict markers on failure.
+	my %params=@_;
 
-	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
+	my ($file, $message, $token) =
+		($params{file}, $params{message}, $params{token});
 
 	# Compute if the "revision" of $file changed.
-	my $changed = darcs_rev($file) ne $rcstoken;
+	my $changed = darcs_rev($file) ne $token;
 
 	# Yes, the following is a bit convoluted.
 	if ($changed) {
@@ -155,7 +172,7 @@ sub rcs_commit ($$$;$$$) {
 		rename("$config{srcdir}/$file", "$config{srcdir}/$file.save") or
 			error("failed to rename $file to $file.save: $!");
 
-		# Roll the repository back to $rcstoken.
+		# Roll the repository back to $token.
 
 		# TODO.  Can we be sure that no changes are lost?  I think that
 		# we can, if we make sure that the 'darcs push' below will always
@@ -166,37 +183,28 @@ sub rcs_commit ($$$;$$$) {
 		# TODO: 'yes | ...' needed?  Doesn't seem so.
 		silentsystem('darcs', "revert", "--repodir", $config{srcdir}, "--all") == 0 ||
 			error("'darcs revert' failed");
-		# Remove all patches starting at $rcstoken.
+		# Remove all patches starting at $token.
 		my $child = open(DARCS_OBLITERATE, "|-");
 		if (! $child) {
 			open(STDOUT, ">/dev/null");
 			exec('darcs', "obliterate", "--repodir", $config{srcdir},
-			   "--match", "hash " . $rcstoken) and
+			   "--match", "hash " . $token) and
 			   error("'darcs obliterate' failed");
 		}
 		1 while print DARCS_OBLITERATE "y";
 		close(DARCS_OBLITERATE);
-		# Restore the $rcstoken one.
+		# Restore the $token one.
 		silentsystem('darcs', "pull", "--quiet", "--repodir", $config{srcdir},
-			"--match", "hash " . $rcstoken, "--all") == 0 ||
+			"--match", "hash " . $token, "--all") == 0 ||
 			error("'darcs pull' failed");
 	
-		# We're back at $rcstoken.  Re-install the modified file.
+		# We're back at $token.  Re-install the modified file.
 		rename("$config{srcdir}/$file.save", "$config{srcdir}/$file") or
 			error("failed to rename $file.save to $file: $!");
 	}
 
 	# Record the changes.
-	my $author;
-	if (defined $user) {
-		$author = "$user\@web";
-	}
-	elsif (defined $ipaddr) {
-		$author = "$ipaddr\@web";
-	}
-	else {
-		$author = "anon\@web";
-	}
+	my $author=commitauthor(%params);
 	if (!defined $message || !length($message)) {
 		$message = "empty message";
 	}
@@ -211,13 +219,13 @@ sub rcs_commit ($$$;$$$) {
 
 	# If this updating yields any conflicts, we'll record them now to resolve
 	# them.  If nothing is recorded, there are no conflicts.
-	$rcstoken = darcs_rev($file);
+	$token = darcs_rev($file);
 	# TODO: Use only the first line here, i.e. only the patch name?
 	writefile("$file.log", $config{srcdir}, 'resolve conflicts: ' . $message);
 	silentsystem('darcs', 'record', '--repodir', $config{srcdir}, '--all',
 		'-m', 'resolve conflicts: ' . $message, '--author', $author, $file) == 0 ||
 		error("'darcs record' failed");
-	my $conflicts = darcs_rev($file) ne $rcstoken;
+	my $conflicts = darcs_rev($file) ne $token;
 	unlink("$config{srcdir}/$file.log") or
 		error("failed to remove '$file.log'");
 
@@ -239,25 +247,18 @@ sub rcs_commit ($$$;$$$) {
 	}
 }
 
-sub rcs_commit_staged ($$$;$) {
-	my ($message, $user, $ipaddr, $emailuser) = @_;
+sub rcs_commit_staged (@) {
+	my %params=@_;
 
-	my $author;
-	if (defined $user) {
-		$author = "$user\@web";
-	}
-	elsif (defined $ipaddr) {
-		$author = "$ipaddr\@web";
-	}
-	else {
-		$author = "anon\@web";
-	}
-	if (!defined $message || !length($message)) {
-		$message = "empty message";
+	my $author=commitauthor(%params);
+	if (!defined $params{message} || !length($params{message})) {
+		$params{message} = "empty message";
 	}
 
-	silentsystem('darcs', "record", "--repodir", $config{srcdir}, "-a", "-A", $author,
-		"-m", $message)	== 0 || error("'darcs record' failed");
+	silentsystem('darcs', "record", "--repodir", $config{srcdir},
+		"-a", "-A", $author,
+		"-m", $params{message},
+	) == 0 || error("'darcs record' failed");
 
 	# Push the changes to the main repository.
 	silentsystem('darcs', 'push', '--quiet', '--repodir', $config{srcdir}, '--all') == 0 ||
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index a8e75121f..1a04a72b5 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -401,10 +401,12 @@ sub cgi_editpage ($$) {
 			# signaling to it that it should not try to
 			# do anything.
 			disable_commit_hook();
-			$conflict=rcs_commit($file, $message,
-				$form->field("rcsinfo"),
-				$session->param("name"),
-				$session->remote_addr());
+			$conflict=rcs_commit(
+				file => $file,
+				message => $message,
+				token => $form->field("rcsinfo"),
+				session => $session,
+			);
 			enable_commit_hook();
 			rcs_update();
 		}
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index b56f229d7..b02fc118d 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -464,43 +464,55 @@ sub rcs_prepedit ($) {
 	return git_sha1($file);
 }
 
-sub rcs_commit ($$$;$$$) {
+sub rcs_commit (@) {
 	# Try to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on
 	# failure.
-
-	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
+	my %params=@_;
 
 	# Check to see if the page has been changed by someone else since
 	# rcs_prepedit was called.
-	my $cur    = git_sha1($file);
-	my ($prev) = $rcstoken =~ /^($sha1_pattern)$/; # untaint
+	my $cur    = git_sha1($params{file});
+	my ($prev) = $params{token} =~ /^($sha1_pattern)$/; # untaint
 
 	if (defined $cur && defined $prev && $cur ne $prev) {
-		my $conflict = merge_past($prev, $file, $dummy_commit_msg);
+		my $conflict = merge_past($prev, $params{file}, $dummy_commit_msg);
 		return $conflict if defined $conflict;
 	}
 
-	rcs_add($file);	
-	return rcs_commit_staged($message, $user, $ipaddr);
+	rcs_add($params{file});
+	return rcs_commit_staged(
+		message => $params{message},
+		session => $params{session},
+	);
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
-
-	# Set the commit author and email to the web committer.
+	my %params=@_;
+	
 	my %env=%ENV;
-	if (defined $user || defined $ipaddr) {
-		my $u=encode_utf8(defined $user ? $user : $ipaddr);
-		$ENV{GIT_AUTHOR_NAME}=$u;
-		$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
+
+	if (defined $params{session}) {
+		# Set the commit author and email based on web session info.
+		my $u;
+		if (defined $params{session}->param("name")) {
+			$u=$params{session}->param("name");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			$u=$params{session}->remote_addr();
+		}
+		if (defined $u) {
+			$u=encode_utf8($u);
+			$ENV{GIT_AUTHOR_NAME}=$u;
+			$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
+		}
 	}
 
-	$message = IkiWiki::possibly_foolish_untaint($message);
+	$params{message} = IkiWiki::possibly_foolish_untaint($params{message});
 	my @opts;
-	if ($message !~ /\S/) {
+	if ($params{message} !~ /\S/) {
 		# Force git to allow empty commit messages.
 		# (If this version of git supports it.)
 		my ($version)=`git --version` =~ /git version (.*)/;
@@ -508,13 +520,13 @@ sub rcs_commit_staged ($$$;$) {
 			push @opts, '--cleanup=verbatim';
 		}
 		else {
-			$message.=".";
+			$params{message}.=".";
 		}
 	}
 	push @opts, '-q';
 	# git commit returns non-zero if file has not been really changed.
 	# so we should ignore its exit status (hence run_or_non).
-	if (run_or_non('git', 'commit', @opts, '-m', $message)) {
+	if (run_or_non('git', 'commit', @opts, '-m', $params{message})) {
 		if (length $config{gitorigin_branch}) {
 			run_or_cry('git', 'push', $config{gitorigin_branch});
 		}
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 1793ab4bb..edf915ae9 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -126,26 +126,26 @@ sub rcs_prepedit ($) {
 	return "";
 }
 
-sub rcs_commit ($$$;$$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
+sub rcs_commit (@) {
+	my %params=@_;
 
-	if (defined $user) {
-		$user = IkiWiki::possibly_foolish_untaint($user);
-	}
-	elsif (defined $ipaddr) {
-		$user = "Anonymous from ".IkiWiki::possibly_foolish_untaint($ipaddr);
-	}
-	else {
-		$user = "Anonymous";
+	my $user="Anonymous";
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			$user = $params{session}->param("name");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			$user = "Anonymous from ".$params{session}->remote_addr();
+		}
 	}
 
-	$message = IkiWiki::possibly_foolish_untaint($message);
-	if (! length $message) {
-		$message = "no message given";
+	if (! length $params{message}) {
+		$params{message} = "no message given";
 	}
 
 	my @cmdline = ("hg", "-q", "-R", $config{srcdir}, "commit", 
-	               "-m", $message, "-u", $user);
+	               "-m", IkiWiki::possibly_foolish_untaint($params{message}),
+	               "-u", IkiWiki::possibly_foolish_untaint($user));
 	if (system(@cmdline) != 0) {
 		warn "'@cmdline' failed: $!";
 	}
@@ -153,10 +153,10 @@ sub rcs_commit ($$$;$$$) {
 	return undef; # success
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
+	my %params=@_;
 	
 	error("rcs_commit_staged not implemented for mercurial"); # TODO
 }
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 55d8039e0..95fbcee76 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -293,32 +293,33 @@ sub rcs_prepedit ($) {
 	return get_rev();
 }
 
-sub rcs_commit ($$$;$$$) {
+sub commitauthor (@) {
+	my %params=@_;
+
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			return "Web user: " . $params{session}->param("name");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			return "Web IP: " . $params{session}->remote_addr();
+		}
+	}
+	return "Web: Anonymous";
+}
+
+
+sub rcs_commit (@) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
-	my $file=shift;
-	my $message=shift;
-	my $rcstoken=shift;
-	my $user=shift;
-	my $ipaddr=shift;
-	my $emailuser=shift;
-	my $author;
+	my %params=@_;
 
-	if (defined $user) {
-		$author="Web user: " . $user;
-	}
-	elsif (defined $ipaddr) {
-		$author="Web IP: " . $ipaddr;
-	}
-	else {
-		$author="Web: Anonymous";
-	}
+	my $author=IkiWiki::possibly_foolish_untaint(commitauthor(%params)),
 
 	chdir $config{srcdir}
 	    or error("Cannot chdir to $config{srcdir}: $!");
 
-	my ($oldrev)= $rcstoken=~ m/^($sha1_pattern)$/; # untaint
+	my ($oldrev) = $params{token} =~ m/^($sha1_pattern)$/; # untaint
 	my $rev = get_rev();
 	if (defined $rev && defined $oldrev && $rev ne $oldrev) {
 		my $automator = Monotone->new();
@@ -327,8 +328,8 @@ sub rcs_commit ($$$;$$$) {
 		# Something has been committed, has this file changed?
 		my ($out, $err);
 		$automator->setOpts("r", $oldrev, "r", $rev);
-		($out, $err) = $automator->call("content_diff", $file);
-		debug("Problem committing $file") if ($err ne "");
+		($out, $err) = $automator->call("content_diff", $params{file});
+		debug("Problem committing $params{file}") if ($err ne "");
 		my $diff = $out;
 		
 		if ($diff) {
@@ -337,11 +338,11 @@ sub rcs_commit ($$$;$$$) {
 			#
 			# first get the contents
 			debug("File changed: forming branch");
-			my $newfile=readfile("$config{srcdir}/$file");
+			my $newfile=readfile("$config{srcdir}/$params{file}");
 			
 			# then get the old content ID from the diff
-			if ($diff !~ m/^---\s$file\s+($sha1_pattern)$/m) {
-				error("Unable to find previous file ID for $file");
+			if ($diff !~ m/^---\s$params{file}\s+($sha1_pattern)$/m) {
+				error("Unable to find previous file ID for $params{file}");
 			}
 			my $oldFileID = $1;
 
@@ -352,13 +353,13 @@ sub rcs_commit ($$$;$$$) {
 			my $branch = $1;
 
 			# then put the new content into the DB (and record the new content ID)
-			my $newRevID = commit_file_to_new_rev($automator, $file, $oldFileID, $newfile, $oldrev, $branch, $author, $message);
+			my $newRevID = commit_file_to_new_rev($automator, $params{file}, $oldFileID, $newfile, $oldrev, $branch, $author, $params{message});
 
 			$automator->close();
 
 			# if we made it to here then the file has been committed... revert the local copy
-			if (system("mtn", "--root=$config{mtnrootdir}", "revert", $file) != 0) {
-				debug("Unable to revert $file after merge on conflicted commit!");
+			if (system("mtn", "--root=$config{mtnrootdir}", "revert", $params{file}) != 0) {
+				debug("Unable to revert $params{file} after merge on conflicted commit!");
 			}
 			debug("Divergence created! Attempting auto-merge.");
 
@@ -407,7 +408,7 @@ sub rcs_commit ($$$;$$$) {
 				# for cleanup note, this relies on the fact
 				# that ikiwiki seems to call rcs_prepedit()
 				# again after we return
-				return readfile("$config{srcdir}/$file");
+				return readfile("$config{srcdir}/$params{file}");
 			}
 			return undef;
 		}
@@ -419,11 +420,12 @@ sub rcs_commit ($$$;$$$) {
 
 	if (system("mtn", "--root=$config{mtnrootdir}", "commit", "--quiet",
 	           "--author", $author, "--key", $config{mtnkey}, "-m",
-		   IkiWiki::possibly_foolish_untaint($message), $file) != 0) {
+	           IkiWiki::possibly_foolish_untaint($params{message}),
+	           $params{file}) != 0) {
 		debug("Traditional commit failed! Returning data as conflict.");
-		my $conflict=readfile("$config{srcdir}/$file");
+		my $conflict=readfile("$config{srcdir}/$params{file}");
 		if (system("mtn", "--root=$config{mtnrootdir}", "revert",
-		           "--quiet", $file) != 0) {
+		           "--quiet", $params{file}) != 0) {
 			debug("monotone revert failed");
 		}
 		return $conflict;
@@ -439,32 +441,21 @@ sub rcs_commit ($$$;$$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
-	
+	my %params=@_;
+
 	# Note - this will also commit any spurious changes that happen to be
 	# lying around in the working copy.  There shouldn't be any, but...
 	
 	chdir $config{srcdir}
 	    or error("Cannot chdir to $config{srcdir}: $!");
 
-	my $author;
-
-	if (defined $user) {
-		$author="Web user: " . $user;
-	}
-	elsif (defined $ipaddr) {
-		$author="Web IP: " . $ipaddr;
-	}
-	else {
-		$author="Web: Anonymous";
-	}
-
 	if (system("mtn", "--root=$config{mtnrootdir}", "commit", "--quiet",
-	           "--author", $author, "--key", $config{mtnkey}, "-m",
-		   IkiWiki::possibly_foolish_untaint($message)) != 0) {
+	           "--author", IkiWiki::possibly_foolish_untaint(commitauthor(%params)),
+	           "--key", $config{mtnkey}, "-m",
+		   IkiWiki::possibly_foolish_untaint($params{message})) != 0) {
 		error("Monotone commit failed");
 	}
 }
diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm
index 5131a1502..a3bb6240e 100644
--- a/IkiWiki/Plugin/norcs.pm
+++ b/IkiWiki/Plugin/norcs.pm
@@ -38,13 +38,11 @@ sub rcs_prepedit ($) {
 	return ""
 }
 
-sub rcs_commit ($$$;$$$) {
-	my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
+sub rcs_commit (@) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$;$) {
-	my ($message, $user, $ipaddr, $emailuser)=@_;
+sub rcs_commit_staged (@) {
 	return undef # success
 }
 
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index e50efa5e0..b333e2cdc 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -134,10 +134,12 @@ sub sessioncgi ($$) {
 		$oldchoice=$session->param($choice_param);
 		if ($config{rcs}) {
 			IkiWiki::disable_commit_hook();
-			IkiWiki::rcs_commit($pagesources{$page}, "poll vote ($choice)",
-				IkiWiki::rcs_prepedit($pagesources{$page}),
-				$session->param("name"),
-				$session->remote_addr());
+			IkiWiki::rcs_commit(
+				file => $pagesources{$page},
+				message => "poll vote ($choice)",
+				token => IkiWiki::rcs_prepedit($pagesources{$page}),
+				session => $session,
+			);
 			IkiWiki::enable_commit_hook();
 			IkiWiki::rcs_update();
 		}
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index b664cbf74..95f148183 100644
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -213,9 +213,10 @@ sub sessioncgi ($$) {
 				foreach my $file (@files) {
 					IkiWiki::rcs_remove($file);
 				}
-				IkiWiki::rcs_commit_staged(gettext("removed"),
-					$session->param("name"),
-					$session->remote_addr());
+				IkiWiki::rcs_commit_staged(
+					message => gettext("removed"),
+					session => $session,
+				);
 				IkiWiki::enable_commit_hook();
 				IkiWiki::rcs_update();
 			}
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 977c09e67..61d39d4b5 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -349,9 +349,8 @@ sub sessioncgi ($$) {
 				$pagesources{$rename->{src}}=$rename->{destfile};
 			}
 			IkiWiki::rcs_commit_staged(
-				sprintf(gettext("rename %s to %s"), $srcfile, $destfile),
-				$session->param("name"),
-				$session->remote_addr(),
+				message => sprintf(gettext("rename %s to %s"), $srcfile, $destfile),
+				session => $session,
 			) if $config{rcs};
 
 			# Then link fixups.
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index ffacb8cf9..f1e608408 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -144,44 +144,50 @@ sub rcs_prepedit ($) {
 	}
 }
 
-sub rcs_commit ($$$;$$$) {
+sub commitmessage (@) {
+	my %params=@_;
+
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			return "web commit by ".
+				$params{session}->param("name").
+				(length $params{message} ? ": $params{message}" : "");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			return "web commit from ".
+				$params{session}->remote_addr().
+				(length $params{message} ? ": $params{message}" : "");
+		}
+	}
+	return $params{message};
+}
+
+sub rcs_commit (@) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
-	my $file=shift;
-	my $message=shift;
-	my $rcstoken=shift;
-	my $user=shift;
-	my $ipaddr=shift;
-	my $emailuser=shift;
-
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
-	}
+	my %params=@_;
 
 	if (-d "$config{srcdir}/.svn") {
 		# Check to see if the page has been changed by someone
 		# else since rcs_prepedit was called.
-		my ($oldrev)=$rcstoken=~/^([0-9]+)$/; # untaint
-		my $rev=svn_info("Revision", "$config{srcdir}/$file");
+		my ($oldrev)=$params{token}=~/^([0-9]+)$/; # untaint
+		my $rev=svn_info("Revision", "$config{srcdir}/$params{file}");
 		if (defined $rev && defined $oldrev && $rev != $oldrev) {
 			# Merge their changes into the file that we've
 			# changed.
 			if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
-			           "$config{srcdir}/$file", "$config{srcdir}/$file") != 0) {
+			           "$config{srcdir}/$params{file}", "$config{srcdir}/$params{file}") != 0) {
 				warn("svn merge -r$oldrev:$rev failed\n");
 			}
 		}
 
 		if (system("svn", "commit", "--quiet", 
 		           "--encoding", "UTF-8", "-m",
-		           IkiWiki::possibly_foolish_untaint($message),
+		           IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
 			   $config{srcdir}) != 0) {
-			my $conflict=readfile("$config{srcdir}/$file");
-			if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
+			my $conflict=readfile("$config{srcdir}/$params{file}");
+			if (system("svn", "revert", "--quiet", "$config{srcdir}/$params{file}") != 0) {
 				warn("svn revert failed\n");
 			}
 			return $conflict;
@@ -190,21 +196,14 @@ sub rcs_commit ($$$;$$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
-	
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
-	}
+	my %params=@_;
 	
 	if (system("svn", "commit", "--quiet",
 	           "--encoding", "UTF-8", "-m",
-	           IkiWiki::possibly_foolish_untaint($message),
+	           IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
 		   $config{srcdir}) != 0) {
 		warn("svn commit failed\n");
 		return 1; # failure	
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 62f030f4e..55064a9a3 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -90,7 +90,7 @@ sub gentag ($) {
 			if ($config{rcs}) {
 				IkiWiki::disable_commit_hook();
 				IkiWiki::rcs_add($tagfile);
-				IkiWiki::rcs_commit_staged($message, undef, undef);
+				IkiWiki::rcs_commit_staged(message => $message);
 				IkiWiki::enable_commit_hook();
 			}
 		});
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index 80c015e3c..da4385446 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -98,19 +98,23 @@ sub rcs_prepedit ($) {
 	}
 }
 
-sub rcs_commit ($$$;$$$) {
-	my $file=shift;
-	my $message=shift;
-	my $rcstoken=shift;
-	my $user=shift;
-	my $ipaddr=shift;
-	my $emailuser=shift;
-
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
+sub rcs_commit (@) {
+	my %params=@_;
+
+	my ($file, $message, $rcstoken)=
+		($params{file}, $params{message}, $params{token});
+
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			$message="web commit by ".
+				$params{session}->param("name").
+				(length $message ? ": $message" : "");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			$message="web commit from ".
+				$params{session}->remote_addr().
+				(length $message ? ": $message" : "");
+		}
 	}
 
 	if (-d "$config{srcdir}/{arch}") {
@@ -140,10 +144,10 @@ sub rcs_commit ($$$;$$$) {
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$;$) {
+sub rcs_commit_staged (@) {
 	# Commits all staged changes. Changes can be staged using rcs_add,
 	# rcs_remove, and rcs_rename.
-	my ($message, $user, $ipaddr, $emailuser)=@_;
+	my %params=@_;
 	
 	error("rcs_commit_staged not implemented for tla"); # TODO
 }
diff --git a/debian/changelog b/debian/changelog
index 2dfebd0b2..f7452a070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
 ikiwiki (3.20100624) UNRELEASED; urgency=low
 
   * API: Add new optional field usershort to rcs_recentchanges.
-  * API: rcs_commit and rcs_commit_staged are passed a new parameter
-    that may contain the username component of the email address of
-    the user making the commit.
+  * API: rcs_commit and rcs_commit_staged are now passed named
+    parameters.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index ab2934bf1..a2b954bd4 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1051,18 +1051,20 @@ token, that will be passed into `rcs_commit` when committing. For example,
 it might return the current revision ID of the file, and use that
 information later when merging changes.
 
-#### `rcs_commit($$$;$$$)`
+#### `rcs_commit(@)`
+
+Passed named parameters: `file`, `message`, `token` (from `rcs_prepedit`),
+and `session` (optional).
 
-Passed a file, message, token (from `rcs_prepedit`), user, ip address,
-and optionally the username component of the committer's email address.
 Should try to commit the file. Returns `undef` on *success* and a version
 of the page with the rcs's conflict markers on failure.
 
-#### `rcs_commit_staged($$$;$)`
+#### `rcs_commit_staged(@)`
+
+Passed named parameters: `message`, and `session` (optional).
 
-Passed a message, user, ip address, and optionally the username component of
-the committer's email address. Should commit all staged changes.
-Returns undef on success, and an error message on failure.
+Should commit all staged changes. Returns undef on success, and an
+error message on failure.
 
 Changes can be staged by calls to `rcs_add`, `rcs_remove`, and
 `rcs_rename`.
diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
index 04352b970..60df99855 100755
--- a/ikiwiki-calendar.in
+++ b/ikiwiki-calendar.in
@@ -59,7 +59,7 @@ foreach my $y ($startyear..$endyear) {
 	}
 }
 
-IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
+IkiWiki::rcs_commit_staged(message => gettext("calendar update"))
 	if $config{rcs};
 
 exec("ikiwiki", "-setup", $setup, "-refresh");
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 9a4bbf6bc..9644fd396 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20100623
+Version: 3.20100624
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 437cdbdcc..e50fa0f68 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-10 15:02-0400\n"
+"POT-Creation-Date: 2010-06-23 17:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1317
 msgid "Error"
 msgstr ""
 
@@ -163,19 +163,19 @@ msgstr ""
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:141
+#: ../IkiWiki/Plugin/attachment.pm:144
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:183
+#: ../IkiWiki/Plugin/attachment.pm:188
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:117
+#: ../IkiWiki/Plugin/autoindex.pm:120
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:109
+#: ../IkiWiki/Plugin/blogspam.pm:110
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -248,19 +248,19 @@ msgstr ""
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/comments.pm:554 ../IkiWiki/Plugin/websetup.pm:268
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:603
+#: ../IkiWiki/Plugin/comments.pm:605
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:641
+#: ../IkiWiki/Plugin/comments.pm:645
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:790
+#: ../IkiWiki/Plugin/comments.pm:802
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -270,7 +270,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:800
+#: ../IkiWiki/Plugin/comments.pm:812
 msgid "Comment"
 msgstr ""
 
@@ -305,9 +305,9 @@ msgstr ""
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334
-#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390
-#: ../IkiWiki/Plugin/editpage.pm:429
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -320,12 +320,12 @@ msgstr ""
 msgid "match not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:70
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
 #: ../IkiWiki/Plugin/template.pm:44
 msgid "failed to process template:"
 msgstr ""
@@ -356,18 +356,18 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705
-#: ../IkiWiki/Receive.pm:130
+#: ../IkiWiki/Plugin/git.pm:724 ../IkiWiki/Plugin/git.pm:742
+#: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:727
+#: ../IkiWiki/Plugin/git.pm:764
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:731
+#: ../IkiWiki/Plugin/git.pm:768
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -513,7 +513,7 @@ msgstr ""
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:58
+#: ../IkiWiki/Plugin/openid.pm:70
 #, perl-format
 msgid "failed to load openid module: "
 msgstr ""
@@ -610,7 +610,7 @@ msgstr ""
 msgid "rebuilding all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:784
 #, perl-format
 msgid "building %s"
 msgstr ""
@@ -619,48 +619,48 @@ msgstr ""
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:476
+#: ../IkiWiki/Plugin/po.pm:475
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:876
+#: ../IkiWiki/Plugin/po.pm:875
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:890
+#: ../IkiWiki/Plugin/po.pm:889
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:899
+#: ../IkiWiki/Plugin/po.pm:898
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:905
+#: ../IkiWiki/Plugin/po.pm:904
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:941
+#: ../IkiWiki/Plugin/po.pm:940
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:954
+#: ../IkiWiki/Plugin/po.pm:953
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1038
+#: ../IkiWiki/Plugin/po.pm:1037
 msgid "removed obsolete PO files"
 msgstr ""
 
@@ -803,7 +803,7 @@ msgstr ""
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:216
+#: ../IkiWiki/Plugin/remove.pm:217
 msgid "removed"
 msgstr ""
 
@@ -853,7 +853,7 @@ msgstr ""
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:576
+#: ../IkiWiki/Plugin/rename.pm:577
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -988,26 +988,26 @@ msgstr ""
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:276
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:292
+#: ../IkiWiki/Plugin/websetup.pm:288
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:431
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:439
+#: ../IkiWiki/Plugin/websetup.pm:435
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:476
+#: ../IkiWiki/Plugin/websetup.pm:472
 #, perl-format
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
@@ -1017,7 +1017,7 @@ msgstr ""
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:86
+#: ../IkiWiki/Receive.pm:85
 #, perl-format
 msgid "bad file name %s"
 msgstr ""
@@ -1034,47 +1034,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:311
+#: ../IkiWiki/Render.pm:316
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:327
+#: ../IkiWiki/Render.pm:332
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:369
+#: ../IkiWiki/Render.pm:372
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:431
+#: ../IkiWiki/Render.pm:446
 #, perl-format
 msgid "removing obsolete %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:505
+#: ../IkiWiki/Render.pm:520
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:514
+#: ../IkiWiki/Render.pm:529
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:692
+#: ../IkiWiki/Render.pm:707
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:821
+#: ../IkiWiki/Render.pm:836
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1179,31 +1179,31 @@ msgstr ""
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:606
+#: ../IkiWiki.pm:607
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1298
+#: ../IkiWiki.pm:1299
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1993
+#: ../IkiWiki.pm:1994
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2070
+#: ../IkiWiki.pm:2071
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2091
+#: ../IkiWiki.pm:2092
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2227
+#: ../IkiWiki.pm:2228
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
diff --git a/t/bazaar.t b/t/bazaar.t
index 0bdd883d5..3e54ec4dc 100755
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -24,11 +24,19 @@ IkiWiki::checkconfig();
 
 system "bzr init $config{srcdir}";
 
+use CGI::Session;
+my $session=CGI::Session->new;
+$session->param("name", "Joe User");
+
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo", "Joe User");
+IkiWiki::rcs_commit(
+	file => "test1.mdwn",
+	message => "Added the first page",
+	token => "moo",
+	session => $session);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
@@ -66,7 +74,10 @@ ok($mtime >= time() - 20);
 writefile('test3.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test3.mdwn");
 IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn");
-IkiWiki::rcs_commit_staged("Added the 4th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(
+	message => "Added the 4th page",
+	session => $session,
+);
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
@@ -75,7 +86,10 @@ is($changes[0]{pages}[0]{"page"}, "test4");
 
 ok(mkdir($config{srcdir}."/newdir"));
 IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn");
-IkiWiki::rcs_commit_staged("Added the 5th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(
+	message => "Added the 5th page",
+	session => $session,
+);
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
@@ -83,6 +97,9 @@ is($#changes, 3);
 is($changes[0]{pages}[0]{"page"}, "newdir/test5");
 
 IkiWiki::rcs_remove("newdir/test5.mdwn");
-IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(
+	message => "Remove the 5th page",
+	session => $session,
+);
 
 system "rm -rf $dir";
diff --git a/t/cvs.t b/t/cvs.t
index 2808973be..96359ab6e 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -46,7 +46,11 @@ system "cvs -d $cvsrepo co -d $config{srcdir} ikiwiki >/dev/null";
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
+IkiWiki::rcs_commit(
+	files => "test1.mdwn",
+	message => "Added the first page",
+	token => "moo"
+);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
diff --git a/t/git.t b/t/git.t
index f1c24b359..ee778ebf0 100755
--- a/t/git.t
+++ b/t/git.t
@@ -38,7 +38,11 @@ is($changes[0]{pages}[0]{"page"}, ".gitignore");
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
+IkiWiki::rcs_commit(
+	file => "test1.mdwn",
+	message => "Added the first page",
+	token => "moo",
+);
 
 @changes = IkiWiki::rcs_recentchanges(3);
 
@@ -68,7 +72,7 @@ is($changes[1]{pages}[0]{"page"}, "test1");
 writefile('test3.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test3.mdwn");
 IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn");
-IkiWiki::rcs_commit_staged("Added the 4th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(message => "Added the 4th page");
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
@@ -77,7 +81,7 @@ is($changes[0]{pages}[0]{"page"}, "test4");
 
 ok(mkdir($config{srcdir}."/newdir"));
 IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn");
-IkiWiki::rcs_commit_staged("Added the 5th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(message => "Added the 5th page");
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
@@ -85,6 +89,6 @@ is($#changes, 3);
 is($changes[0]{pages}[0]{"page"}, "newdir/test5");
 
 IkiWiki::rcs_remove("newdir/test5.mdwn");
-IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User");
+IkiWiki::rcs_commit_staged(message => "Remove the 5th page");
 
 system "rm -rf $dir";
diff --git a/t/mercurial.t b/t/mercurial.t
index 954b17526..b64ea8e56 100755
--- a/t/mercurial.t
+++ b/t/mercurial.t
@@ -22,13 +22,22 @@ $config{srcdir} = "$dir/repo";
 IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 
+use CGI::Session;
+my $session=CGI::Session->new;
+$session->param("name", "Joe User");
+
 system "hg init $config{srcdir}";
 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo", "Joe User");
+IkiWiki::rcs_commit(
+	file => "test1.mdwn",
+	message => "Added the first page",
+	token => "moo",
+	session => $session,
+);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
diff --git a/t/svn.t b/t/svn.t
index 5223b4409..82b71b5fc 100755
--- a/t/svn.t
+++ b/t/svn.t
@@ -36,7 +36,11 @@ system "svn co file://$svnrepo/trunk $config{srcdir} >/dev/null";
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
-IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo");
+IkiWiki::rcs_commit(
+	file => "test1.mdwn",
+	message => "Added the first page",
+	token => "moo",
+);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
-- 
cgit v1.2.3


From a4f381ace837a032bc202cc6b2a98e922d4b7cfc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 19:44:41 -0400
Subject: git: Record the username from openid in the git author email. (This
 avoids display of ugly google openids.)

---
 IkiWiki/Plugin/git.pm                        |  5 +++++
 debian/changelog                             |  2 ++
 doc/rcs.mdwn                                 | 20 +++++++++++++-------
 doc/todo/Separate_OpenIDs_and_usernames.mdwn |  3 +++
 4 files changed, 23 insertions(+), 7 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 85368606e..3e289e0c3 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -506,6 +506,11 @@ sub rcs_commit_staged (@) {
 		if (defined $u) {
 			$u=encode_utf8($u);
 			$ENV{GIT_AUTHOR_NAME}=$u;
+		}
+		if (defined $params{session}->param("username")) {
+			$u=encode_utf8($params{session}->param("username"));
+		}
+		if (defined $u) {
 			$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
 		}
 	}
diff --git a/debian/changelog b/debian/changelog
index 88ed3a90b..dfa862e5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
     parameters.
   * Fixed some confusion and bugginess about whether
     rcs_getctime/rcs_getmtime were passed absolute or relative filenames.
+  * git: Record the username from openid in the git author email.
+    (This avoids display of ugly google openids.)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index 248d93024..83c6910d0 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -10,13 +10,8 @@ generic that it can be adapted to work with many systems by writing a
 
 While all supported revision control systems work well enough for basic
 use, some advanced or special features are not supported in all of them.
-Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to
-set up a wiki using that revision control system. The `rcs_commit_staged`
-hook is needed to use [[attachments|plugins/attachment]] or
-[[plugins/comments]]. `rcs_getctime` may be implemented in a fast way
-(ie, one log lookup for all files), or very slowly (one lookup per file).
-And so on. The table below summarises this for each revision control
-system and links to more information about each.
+The table below summarises this for each revision control system and
+links to more information about each.
 
 [[!table data="""
 feature             |[[git]]|[[svn]]|[[bzr]]   |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]]   |[[cvs]]
@@ -30,7 +25,18 @@ auto.setup          |yes    |yes    |incomplete|yes         |incomplete   |yes
 `rcs_getmtime`      |fast   |slow   |slow      |no          |no           |no       |no        |no
 anonymous push      |yes    |no     |no        |no          |no           |no       |no        |no
 conflict handling   |yes    |yes    |yes       |buggy       |yes          |yes      |yes       |yes
+openid username     |yes    |no     |no        |no          |no           |no       |no        |no
 """]]
 
+Notes:
+
+* Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to
+  set up a wiki using that revision control system.
+* The `rcs_commit_staged` hook is needed to use [[attachments|plugins/attachment]]
+  or [[plugins/comments]].
+* `rcs_getctime` and `rcs_getmtime` may be implemented in a fast way (ie, one log
+  lookup for all files), or very slowly (one lookup per file).
+* Openid username support allows avoiding display of Google's ugly openids.
+
 There is a page with [[details]] about how the different systems work with
 ikiwiki, for the curious.
diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index fcdb49f6d..60b7b6c61 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -38,10 +38,13 @@ A slightly more complex next step would be to request sreg from the provider and
 > * Change `rcs_commit` and `rcs_commit_staged` to take a session object,
 >   instead of just a userid. (For back-compat, if the parameter is 
 >   not an object, it's a userid.) Bump ikiwiki plugin interface version.
+>   (done)
 > * Modify all RCS plugins to include the session username somewhere
 >   in the commit, and parse it back out in `rcs_recentchanges`.
+>   (done for git only so far)
 > * Modify recentchanges plugin to display the username instead of the
 >   `openiduser`.
+>   (done)
 > * Modify comment plugin to put the session username in the comment
 >   template instead of the `openiduser`.
 
-- 
cgit v1.2.3


From 9a32451986c710d1f1ce71217c1f7ab3b84f72bf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 20:12:26 -0400
Subject: finializing openid nickname support

Renamed usershort => nickname.

Note that this means existing user login sessions will not have the nickname
recorded, and so it won't be used for those.
---
 IkiWiki/Plugin/comments.pm         |  8 ++++++--
 IkiWiki/Plugin/git.pm              | 16 ++++++++++------
 IkiWiki/Plugin/openid.pm           | 14 +++++++-------
 IkiWiki/Plugin/recentchanges.pm    |  2 +-
 debian/changelog                   | 10 +++++++---
 doc/ikiwiki/directive/comment.mdwn |  2 ++
 doc/plugins/write.mdwn             |  2 +-
 7 files changed, 34 insertions(+), 20 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 41c6948e8..d34951570 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -177,7 +177,7 @@ sub preprocess {
 		if (defined $oiduser) {
 			# looks like an OpenID
 			$commentauthorurl = $commentuser;
-			$commentauthor = $oiduser;
+			$commentauthor = (defined $params{nickname} && length $params{nickname}) ? $params{nickname} : $oiduser;
 			$commentopenid = $commentuser;
 		}
 		else {
@@ -396,12 +396,16 @@ sub editcomment ($$) {
 
 	my $content = "[[!comment format=$type\n";
 
-	# FIXME: handling of double quotes probably wrong?
 	if (defined $session->param('name')) {
 		my $username = $session->param('name');
 		$username =~ s/"/&quot;/g;
 		$content .= " username=\"$username\"\n";
 	}
+	if (defined $session->param('nickname')) {
+		my $nickname = $session->param('nickname');
+		$nickname =~ s/"/&quot;/g;
+		$content .= " nickname=\"$nickname\"\n";
+	}
 	elsif (defined $session->remote_addr()) {
 		my $ip = $session->remote_addr();
 		if ($ip =~ m/^([.0-9]+)$/) {
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 3e289e0c3..8d210cb5d 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -606,12 +606,16 @@ sub rcs_recentchanges ($) {
 			push @messages, { line => $line };
 		}
 
-		my $user=$ci->{'author_name'};
-		my $usershort=$ci->{'author_username'};
+		my $user=$ci->{'author_username'};
 		my $web_commit = ($ci->{'author'} =~ /\@web>/);
-
-		if ($usershort =~ /:\/\//) {
-			$usershort=undef; # url; not really short
+		my $nickname;
+
+		# Set nickname only if a non-url author_username is available,
+		# and author_name is an url.
+		if ($user !~ /:\/\// && defined $ci->{'author_name'} &&
+		    $ci->{'author_name'} =~ /:\/\//) {
+			$nickname=$user;
+			$user=$ci->{'author_name'};
 		}
 
 		# compatability code for old web commit messages
@@ -626,7 +630,7 @@ sub rcs_recentchanges ($) {
 		push @rets, {
 			rev        => $sha1,
 			user       => $user,
-			usershort  => $usershort,
+			nickname   => $nickname,
 			committype => $web_commit ? "web" : "git",
 			when       => $when,
 			message    => [@messages],
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index f19a559a9..d393afd23 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -187,16 +187,16 @@ sub auth ($$) {
 					$vident->signed_extension_fields('http://openid.net/srv/ax/1.0'),
 				);
 			}
-			my $username;
+			my $nickname;
 			foreach my $ext (@extensions) {
 				foreach my $field (qw{value.email email}) {
 					if (exists $ext->{$field} &&
 					    defined $ext->{$field} &&
 					    length $ext->{$field}) {
 						$session->param(email => $ext->{$field});
-						if (! defined $username &&
+						if (! defined $nickname &&
 						    $ext->{$field}=~/(.+)@.+/) {
-							$username = $1;
+							$nickname = $1;
 						}
 						last;
 					}
@@ -205,14 +205,14 @@ sub auth ($$) {
 					if (exists $ext->{$field} &&
 					    defined $ext->{$field} &&
 					    length $ext->{$field}) {
-						$username=$ext->{$field};
+						$nickname=$ext->{$field};
 						last;
 					}
 				}
 			}
-			if (defined $username) {
-				$username=~s/\s+/_/g;
-				$session->param(username => $username);
+			if (defined $nickname) {
+				$nickname=~s/\s+/_/g;
+				$session->param(nickname => $nickname);
 			}
 		}
 		else {
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 9f188cbff..758b98348 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -118,7 +118,7 @@ sub store ($$$) {
 	my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
 	if (defined $oiduser) {
 		$change->{authorurl}=$change->{user};
-		$change->{user}=defined $change->{usershort} ? $change->{usershort} : $oiduser;
+		$change->{user}=defined $change->{nickname} ? $change->{nickname} : $oiduser;
 	}
 	elsif (length $config{cgiurl}) {
 		$change->{authorurl} = IkiWiki::cgiurl(
diff --git a/debian/changelog b/debian/changelog
index dfa862e5b..e41de638f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
 ikiwiki (3.20100624) UNRELEASED; urgency=low
 
-  * API: Add new optional field usershort to rcs_recentchanges.
+  * Changes to avoid display of ugly google openids, by displaying
+    a username taken from openid.
+  * API: Add new optional field nickname to rcs_recentchanges.
   * API: rcs_commit and rcs_commit_staged are now passed named
     parameters.
+  * openid: Store nickname based on username or email provided from
+    openid provider.
+  * git: Record the nickname from openid in the git author email.
+  * comment: Record the username from openid in the comment page.
   * Fixed some confusion and bugginess about whether
     rcs_getctime/rcs_getmtime were passed absolute or relative filenames.
-  * git: Record the username from openid in the git author email.
-    (This avoids display of ugly google openids.)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/ikiwiki/directive/comment.mdwn b/doc/ikiwiki/directive/comment.mdwn
index 693a92770..398130e2e 100644
--- a/doc/ikiwiki/directive/comment.mdwn
+++ b/doc/ikiwiki/directive/comment.mdwn
@@ -29,6 +29,8 @@ metadata of the comment.
   nearly any format, since it's parsed by [[!cpan TimeDate]]
 * `username` - Used to record the username (or OpenID)
   of a logged in commenter.
+* `nickname` - Name to display for a logged in commenter.
+  (Optional; used for OpenIDs.)
 * `ip` - Can be used to record the IP address of a commenter,
   if they posted anonymously.
 * `claimedauthor` - Records the name that the user entered,
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index a2b954bd4..a921b9a02 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -1108,7 +1108,7 @@ The data structure returned for each change is:
 	{
 		rev => # the RCSs id for this commit
 		user => # user who made the change (may be an openid),
-		usershort => # short name of user (optional; not an openid),
+		nickname => # short name for user (optional; not an openid),
 		
 		committype => # either "web" or the name of the rcs,
 		when => # time when the change was made,
-- 
cgit v1.2.3


From 9a2c56b748ec9cd9230abada56267bde1840ca39 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Jun 2010 20:21:44 -0400
Subject: openid nickname support finished; closing

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

(limited to 'doc')

diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index 60b7b6c61..a4940220a 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -46,8 +46,8 @@ A slightly more complex next step would be to request sreg from the provider and
 >   `openiduser`.
 >   (done)
 > * Modify comment plugin to put the session username in the comment
->   template instead of the `openiduser`.
+>   template instead of the `openiduser`. (done)
 
 Unfortunately I don't speak Perl, so hopefully someone thinks these suggestions are good enough to code up. I've hacked on openid code in Ruby before, so hopefully these changes aren't all that difficult to implement. Even if you don't get any data via sreg, you're no worse off than where you are now, so I don't think there'd need to be much in the way of error/sanity-checking of returned data. If it's null or not available then no big deal, typing in a username is no sweat.
 
-[[!tag wishlist]]
+[[!tag wishlist done]]
-- 
cgit v1.2.3


From cf5b767777bf922ef55cdc51adef024436d2171e Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawm0mAKbBvoYTeRz4lDv83cTfXsAns5CmDQ"
 <Joey@web>
Date: Thu, 24 Jun 2010 00:45:59 +0000
Subject: test from google openid

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

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 7c32d0cfe..8ecaf1cb9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,9 +1,5 @@
-[[!sidebar]]
-
-
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-[[Testing 1 2 3| test]]
 # Header
 
 ## Subheader2
@@ -19,8 +15,6 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v
 >
 > Back to the first level.
 
-"I'm sitting in the middle of a rather muddy puddle."
-
 Numbered list 
 
 1. First item.
@@ -29,7 +23,6 @@ Numbered list
 1. And another..
  1. foo
  2. bar
- 3. cool
 
 Bulleted list
 
@@ -56,37 +49,8 @@ Bulleted list
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
 
------
-
-[[!progress percent=27]]
-
-[[!progress percent=78]]
-
------
+----
 
 This **SandBox** is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
-
-----
-
-What about [relative urls](../setup/byhand)?
-
-[[!toggleable  id="foobar" text="""
-foo
-"""]]
-
-[[!toggleable  id="foobar" text="""
-bar
-"""]]
-
-[[!toggle  id="foobar" text="foo/bar"]]
-
-Hmm, can I dig it?
-
-Test
-test2
-
-I assume this triggers a checkin and recompile?
-
-[[!inline pages="/index"]]
-- 
cgit v1.2.3


From 11899a031c64b3e9fb5fe792c8611f69fb14fd5e Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 25 Jun 2010 01:58:02 +0000
Subject: commenting on the link-text-from-title idea

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

(limited to 'doc')

diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index d6df4cbf6..89affc502 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -84,3 +84,8 @@ Is it possible to refer to a page, say \[[foobar]], such that the link text is t
 > Not yet. :-) Any suggestion for a syntax for it? Maybe something like \[[|foobar]] ? --[[Joey]]
 
 I like your suggestion because it's short and conscise. However, it would be nice to be able to refer to more or less arbitrary meta tags in links, not just "title". To do that, the link needs two parameters: the page name and the tag name, i.e. \[[pagename!metatag]]. Any sufficiently weird separater can be used instead of '!', of course. I like \[[pagename->metatag]], too, because it reminds me of accessing a data member of a structure (which is what referencing a meta tag is, really). --Peter
+
+> I dislike \[[pagename->metatag]] because other wikis use that as their normal link/label syntax.
+> I'm not sure that it is a good idea to refer to arbitrary meta tags in links in the first place - what other meta tags would you really be interested in?  Description?  Author?  It makes sense to me to refer to the title, because that is a "label" for a page.
+> As for syntax, I do like the \[[|foobar]] idea, or perhaps something like what <a href="http://www.pmwiki.org">PmWiki</a> does - they have their links the other way around, so they go \[[page|label]] and for link-text-as-title, they have \[[page|+]].  So for IkiWiki, that would be \[[+|page]] I guess.
+> --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 71950b2ae5ff6fd3b631c5504455cc07699b1c11 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Fri, 25 Jun 2010 02:40:25 +0000
Subject: sidebars defined by pagespec perhaps?

---
 ..._up_sidebar_to_allow_for_multiple_sidebars.mdwn | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
index 1f7b48764..fdaa09f26 100644
--- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
+++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
@@ -34,6 +34,8 @@ those contents instead.
 >>>>> if I want to try to get a 3 column CSS going, so perhaps leave the
 >>>>> left sidebar out of that.
 
+-------------------
+
 <pre>
 --- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm	2010-02-11 22:53:17.000000000 -0500
 +++ plugins/IkiWiki/Plugin/sidebar.pm	2010-02-27 09:54:12.524412391 -0500
@@ -85,4 +87,39 @@ those contents instead.
  }
 </pre>
 
+----------------------------------------
+## Further thoughts about this
+
+(since the indentation level was getting rather high.)
+
+What about using pagespecs in the config to map pages and sidebar pages together?  Something like this:
+
+<pre>
+	sidebar_pagespec => {
+	    "foo/*" => 'sidebars/foo_sidebar',
+	    "bar/* and !bar/*/*' => 'bar/bar_top_sidebar',
+	    "* and !foo/* and !bar/*" => 'sidebars/general_sidebar',
+	},
+</pre>
+
+One could do something similar for *pageheader*, *pagefooter* and *rightbar* if desired.
+
+Another thing which I find compelling - but probably because I am using [[plugins/contrib/field]] - is to be able to treat the included page as if it were *part* of the page it was included into, rather than as an included page.  I mean things like \[[!if ...]] would test against the page name of the page it's included into rather than the name of the sidebar/header/footer page.  It's even more powerful if one combines this with field/getfield/ftemplate/report, since one could make "generic" headers and footers that could apply to a whole set of pages.
+
+Header example:
+<pre>
+#{{$title}}
+\[[!ftemplate id="nice_data_table"]]
+</pre>
+
+Footer example:
+<pre>
+------------
+\[[!report template="footer_trail" trail="trailpage" here_only=1]]
+</pre>
+
+(Yes, I am already doing something like this on my own site.  It's like the PmWiki concept of GroupHeader/GroupFooter)
+
+-- [[KathrynAndersen]]
+
 [[!tag wishlist]]
-- 
cgit v1.2.3