Merge branch 'master' into comments

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index bf14860dd1251e99ef0e1f865e3a2f01c09814d7..b884dd596cd43e366c33f2f8b6beb28e40ecef49 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ikiwiki (2.71) UNRELEASED; urgency=low
 
 ikiwiki (2.71) UNRELEASED; urgency=low
 

+  * comments: Blog-style comment support, contributed by Simon McVittie.

   * htmlbalance: New plugin contributed by Simon McVittie.
   * Change deb dependencies to list Text::Markdown before markdown (really
     this time).
   * htmlbalance: New plugin contributed by Simon McVittie.
   * Change deb dependencies to list Text::Markdown before markdown (really
     this time).


@@ -14,6 +15,10 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * inline: Support feedfile option to change the filename of the feed
     generated.
   * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
   * inline: Support feedfile option to change the filename of the feed
     generated.
   * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.

+  * htmlbalance: don't compact whitespace, and set misc other options (smcv)
+  * rename: Fix double-escaping of page name in edit box.
+  * monotone: When getting the log, tell monotone how many entries
+    we want, rather than closing the pipe, which it dislikes. (thm)

 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500