Merge commit 'upstream/master' into prv/po

4 files changed, 47 insertions, 13 deletions

diff --git a/doc/todo/allow_disabling_backlinks.mdwn b/doc/todo/allow_disabling_backlinks.mdwn
new file mode 100644
index 000000000..5dd4876e8
--- /dev/null
+++ b/doc/todo/allow_disabling_backlinks.mdwn
@@ -0,0 +1,18 @@
+This patch allows disabling the backlinks in the config file by setting nobacklinks to 0.
+
+It is backwards compatible, and by default enables backlinks in the generated pages.
+
+<pre>
+--- IkiWiki/Render.pm.orig2	2009-01-06 14:54:01.000000000 +1300
++++ IkiWiki/Render.pm	2009-01-06 14:55:08.000000000 +1300
+@@ -107,7 +107,8 @@
+ 		$template->param(have_actions => 1);
+ 	}
+ 
+-	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
++	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page)
++		unless defined $config{nobacklinks} && $config{nobacklinks} == 0;
+ 	my ($backlinks, $more_backlinks);
+ 	if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) {
+ 		$backlinks=\@backlinks;
+</pre>
diff --git a/doc/todo/comments.mdwn b/doc/todo/comments.mdwn
index 832441be1..c74ded8f6 100644
--- a/doc/todo/comments.mdwn
+++ b/doc/todo/comments.mdwn
@@ -10,19 +10,6 @@
   > it's hard enough to get some people to title their blog posts :-)
   > --[[smcv]]
 
-* If a spammer posts a comment, it is either impossible or hard to clean
-  up via the web. Would be nice to have some kind of link on the comment
-  that allows trusted users to remove it (using the remove plugin of
-  course).
-
-  > Won't the remove plugin refuse to remove internal pages? This would be
-  > a good feature to have, though. --[[smcv]]
-
-  > Here, FWIW, is the first ikiwiki comment spam I've seen:
-  > <http://waldeneffect.org/blog/Snake_bite_information/#blog/Snake_bite_information/comment_1>
-  > So that took about 10 days...
-  > --[[Joey]] 
-
 ## Patches pending merge
 
 * There is some common code cargo-culted from other plugins (notably inline and editpage) which
@@ -147,3 +134,22 @@
   first. --[[smcv]]
 
   > done --[[Joey]]
+
+* If a spammer posts a comment, it is either impossible or hard to clean
+  up via the web. Would be nice to have some kind of link on the comment
+  that allows trusted users to remove it (using the remove plugin of
+  course).
+
+  > Won't the remove plugin refuse to remove internal pages? This would be
+  > a good feature to have, though. --[[smcv]]
+
+  > Here, FWIW, is the first ikiwiki comment spam I've seen:
+  > <http://waldeneffect.org/blog/Snake_bite_information/#blog/Snake_bite_information/comment_1>
+  > So that took about 10 days...
+  > --[[Joey]] 
+
+  >> Implemented in my 'comments' branch, please review. It turns out
+  >> [[plugins/remove]] is happy to remove internal pages, so it was quite
+  >> easy to do. --[[smcv]]
+
+  >>> done --[[Joey]] 
diff --git a/doc/todo/modify_page_filename_in_plugin.mdwn b/doc/todo/modify_page_filename_in_plugin.mdwn
index 4099487a1..a13c8b62f 100644
--- a/doc/todo/modify_page_filename_in_plugin.mdwn
+++ b/doc/todo/modify_page_filename_in_plugin.mdwn
@@ -6,6 +6,8 @@ The problem is that I occasionally have xxx.c and xxx.h in the same directory an
 
 My solution is to allow plugins to provide a hook that sets the pagename. --[[/users/bstpierre]]
 
+> You might also find the solution to [[bugs/multiple_pages_with_same_name]] helps you.  That patch is already applied. -- [[Will]]
+
     --- /usr/share/perl5/IkiWiki.pm.ORIG    2008-10-03 14:12:50.000000000 -0400
     +++ /usr/share/perl5/IkiWiki.pm 2008-10-07 11:57:26.000000000 -0400
     @@ -196,11 +196,32 @@
diff --git a/doc/todo/relative_pagespec_deficiency.mdwn b/doc/todo/relative_pagespec_deficiency.mdwn
new file mode 100644
index 000000000..4500581c7
--- /dev/null
+++ b/doc/todo/relative_pagespec_deficiency.mdwn
@@ -0,0 +1,8 @@
+While a relative pagespec like `./posts/*` will work, when used in a page
+such as `bdale/blog`, you cannot do
+`created_after(./posts/foo)` -- only `glob()` supports relative page
+references.
+
+The other pagespec functions should too, where appropriate.
+
+[[done]]