Merge branch 'master' into commentreorg

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 5b51a74f9d3190f59cda369687945fb54af84fe5,31d64e2372b24854a3837cd47ced8cecfb529ada..7f024a84b923ef1a0ed418d2586e0e1f772971d8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -4,14 -4,12 +4,20 @@@ ikiwiki (3.20100505) UNRELEASED; urgenc
      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.
+   * 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. 
  
   -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400