Merge branch 'master' into autoconfig

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index c4e4b7f48a34b1bbac5c92b6ed1090662ef37421..440910313131e8e21be85a0b9a7591c8b04df27d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 ikiwiki (2.60) UNRELEASED; urgency=low
  
   * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
-    can be used set up a new wiki in seconds.
+    can be used create a new wiki in seconds.
   * Add getsetup hook, all plugins that add fields to %config should use it.
   * ikiwiki --dumpsetup can generate a nice setup file snapshotting ikiwiki's
     current configuration.
@@ -14,12 +14,18 @@ ikiwiki (2.60) UNRELEASED; urgency=low
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 
-ikiwiki (2.56) UNRELEASED; urgency=low
+ikiwiki (2.56) unstable; urgency=low
 
   * autoindex: New plugin that generates missing index pages.
     (Sponsored by The TOVA Company.)
-
- -- Joey Hess <joeyh@debian.org>  Tue, 29 Jul 2008 15:53:26 -0400
+  * Escape HTML is rss and atom feeds instead of respectively using CDATA and
+    treating it as XHTML. This avoids problems with escaping the end of the
+    CDATA when the htmlscrubber is not used, and it avoids problems with atom
+    XHTML using named entity references that are not in the atom DTD. (Simon McVittie)
+  * Add test for old versions of git that don't support --cleanup=verbatim,
+    and munge empty commit messages.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 31 Jul 2008 19:25:24 -0400
 
 ikiwiki (2.55) unstable; urgency=low