X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5dbf25127fb776cc52a3a142b805a0c7f3cef242..ec6c1269d251c78d2eef68cb789de6cfc6272464:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index f8dc04eca..faabf1993 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20101113) UNRELEASED; urgency=low
+
+  * websetup: Fix encoding problem when restoring old setup file.
+  * more: Add pages parameter to limit where the more is displayed.
+    (thanks, dark)
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 16 Nov 2010 14:23:47 -0400
+
 ikiwiki (3.20101112) unstable; urgency=HIGH
 
   * txt: Fix display when used inside a format directive.
@@ -10,11 +18,11 @@ ikiwiki (3.20101112) unstable; urgency=HIGH
     (Thanks, Tuomas Jormola)
   * Fix htmlscrubber_skip to be matched on the source page, not the page it is
     inlined into. Should allow setting to "* and !comment(*)" to scrub
-    comments, but leave your blog posts unscrubbed, etc.
+    comments, but leave your blog posts unscrubbed, etc. CVE-2010-1673
   * comments: Make postcomment() pagespec work when previewing a comment,
-    including during moderation.
+    including during moderation. CVE-2010-1673
   * comments: Make comment() pagespec also match comments that are being
-    posted.
+    posted. CVE-2010-1673
 
  -- Joey Hess <joeyh@debian.org>  Fri, 12 Nov 2010 00:36:06 -0400