releasing version 3.20101112

diff --git a/debian/changelog b/debian/changelog
index 2c4c9274afbf391af7833bf1a3ef196506287ee8..f8dc04ecac360c2e9377205a8a5b23bb3f624b69 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20101024) UNRELEASED; urgency=low
+ikiwiki (3.20101112) unstable; urgency=HIGH
 
   * txt: Fix display when used inside a format directive.
   * highlight: Ensure that other, more-specific format plugins,
@@ -16,7 +16,7 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
   * comments: Make comment() pagespec also match comments that are being
     posted.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 12 Nov 2010 00:36:06 -0400
 
 ikiwiki (3.20101023) unstable; urgency=low
 

diff --git a/doc/security.mdwn b/doc/security.mdwn
index 33b199247dbf541362097124a984ceba6d93658e..2c342b19986104ed27b46c6c736768d34ad82c15 100644 (file)
--- a/doc/security.mdwn
+++ b/doc/security.mdwn
@@ -449,7 +449,7 @@ of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not
 scrub comments.
 
 Additionally, it was discovered that comments' html was never scrubbed during
-preview or moderation of comments.
+preview or moderation of comments with such a configuration.
 
 These problems were discovered on 12 November 2010 and fixed the same
 hour with the release of ikiwiki 3.20101112.

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 7653ac671aaf41041e9d3ba4be8807a6ec52f866..5ef43903dd336b4c21c502f2f47b26dc26bb3a4d 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20101023
+Version: 3.20101112
 Release:        1%{?dist}
 Summary:        A wiki compiler
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index fa65b6f93f0abdc98f92992c04faf98944e728ae..e4274d0f666933efd56d4fffd8e26cb1c129f484 100644 (file)
--- 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-10-23 17:21-0400\n"
+"POT-Creation-Date: 2010-11-12 00:37-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"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
@@ -268,7 +268,7 @@ msgstr ""
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:822
+#: ../IkiWiki/Plugin/comments.pm:828
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -278,7 +278,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:832
+#: ../IkiWiki/Plugin/comments.pm:838
 msgid "Comment"
 msgstr ""
 
@@ -411,7 +411,7 @@ msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
 
-#: ../IkiWiki/Plugin/htmltidy.pm:62
+#: ../IkiWiki/Plugin/htmltidy.pm:63
 msgid "htmltidy failed to parse this html"
 msgstr ""