Update to 3.20100722. From the changelog:

   * img: Add a margin around images displayed by this directive.
   * comments: Added commentmoderation directive for easy linking to the
     comment moderation queue.
   * aggregate: Write timestamp next aggregation can happen to
     .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.
   * Add --changesetup mode that allows easily changing options in a
     setup file.
   * openid: Fix handling of utf-8 nicknames.
   * Clarified what the filter hook should be passed: Only be the raw,
     complete text of a page. Not a snippet, or data read in from an
     unrelated file.
   * template: Do not pass filled in template through filter hook.
     Avoids causing breakage in po plugin.
   * color, comments, conditional, cutpaste, more, sidebar, toggle: Also
     avoid unnecessary calls to filter hook.
   * po: needstranslation() pagespec can have a percent specified.
   * Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have
     the caching problem that was added to work around). Closes: #588623
   * Made much more robust in cases where multiple source files produce
     conflicting files/directories in the destdir.
   * Updated French translation from Philippe Batailler. Closes: #589423
   * po: Fix selflink display on tranlsated pages. (intrigeri)
   * Avoid showing 'Add a comment' link at the bottom of the comment post form.

3 files changed, 8 insertions, 7 deletions

diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile
index 74f172bf0c7..49a4d4eaeac 100644
--- a/www/ikiwiki/Makefile
+++ b/www/ikiwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2010/07/05 07:45:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.58 2010/07/23 13:07:16 schmonz Exp $
 #
 
-DISTNAME=	ikiwiki_3.20100704
+DISTNAME=	ikiwiki_3.20100722
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	www textproc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST
index 3a094c7dec1..a6d13e7274e 100644
--- a/www/ikiwiki/PLIST
+++ b/www/ikiwiki/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2010/06/23 23:52:12 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.27 2010/07/23 13:07:16 schmonz Exp $
 bin/ikiwiki
 bin/ikiwiki-calendar
 bin/ikiwiki-makerepo
@@ -50,6 +50,7 @@ share/ikiwiki/directives/ikiwiki/directive/brokenlinks.mdwn
 share/ikiwiki/directives/ikiwiki/directive/calendar.mdwn
 share/ikiwiki/directives/ikiwiki/directive/color.mdwn
 share/ikiwiki/directives/ikiwiki/directive/comment.mdwn
+share/ikiwiki/directives/ikiwiki/directive/commentmoderation.mdwn
 share/ikiwiki/directives/ikiwiki/directive/copy.mdwn
 share/ikiwiki/directives/ikiwiki/directive/cut.mdwn
 share/ikiwiki/directives/ikiwiki/directive/cutpaste.mdwn
diff --git a/www/ikiwiki/distinfo b/www/ikiwiki/distinfo
index c966a7fd98f..6a46b22663f 100644
--- a/www/ikiwiki/distinfo
+++ b/www/ikiwiki/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.43 2010/07/05 07:45:21 schmonz Exp $
+$NetBSD: distinfo,v 1.44 2010/07/23 13:07:16 schmonz Exp $
 
-SHA1 (ikiwiki_3.20100704.tar.gz) = e27c46798e8a50bd67e957b83a488a240acf17d8
-RMD160 (ikiwiki_3.20100704.tar.gz) = 406b0077f126572b27cde728c44f3d51763ff1f6
-Size (ikiwiki_3.20100704.tar.gz) = 1839067 bytes
+SHA1 (ikiwiki_3.20100722.tar.gz) = 4613a82c48253996f858ae47e67e5e562c8272c8
+RMD160 (ikiwiki_3.20100722.tar.gz) = 33770af9aaa3308b2fb53e056ec47ef7a7bd09b8
+Size (ikiwiki_3.20100722.tar.gz) = 1872037 bytes
 SHA1 (patch-aa) = 7feab1b6e6d27afc5884f107dd8d7364a9b475be
 SHA1 (patch-ab) = 9700097a9dbe8a2203169367c497ac8b89251903
 SHA1 (patch-ad) = 5720c313ea335a182417b2339ee2e8ef204fc11d