Merge branch 'master' into comments

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index eeb9fe6ce7570d810c83906a714e69d38fbb99a7..bf14860dd1251e99ef0e1f865e3a2f01c09814d7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,15 @@ ikiwiki (2.71) UNRELEASED; urgency=low
     this time).
   * Improve escaping of wikilinks and preprocessor directives in content
     produced by aggregate and recentchanges.
+  * French translation update from Philippe Batailler. Closes: #506250
+  * Spanish translation update from Victor Moral.
+  * Fix handling of wrappergroup option.
+  * Correct --dumpsetup to include the srcdir in the setup file.
+  * German translation update from Kai Wasserbäch. Closes: #507056
+  * inline: Support emptyfeeds=no option to skip generating empty feeds.
+  * inline: Support feedfile option to change the filename of the feed
+    generated.
+  * meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500