Merge branch 'master' into next

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

diff --git a/debian/changelog b/debian/changelog
index 9a96f7415d6a4856c2e971eaea659ca451bef3ec..66db70288902f59227924176d85e1e33580716a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,10 @@ ikiwiki (3.00) UNRELEASED; urgency=low
     admin preferences into a setup file.
   * prefix_directives and aggregate_internal are now turned on by default.
   * ikiwiki-transition prefix_directives syntax changed
-  * googlecalendar: removed this deprecated plugin. Use embed instead.
+  * googlecalendar: removed this deprecated plugin. Use htmlscrubber_skip
+    instead.
+  * embed: This plugin is deprecated, use htmlscrubber_skip instead.
+    Closes: ##462970.
   * Version 3.00 of the plugin API.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:36 -0500
@@ -20,8 +23,10 @@ ikiwiki (2.72) unstable; urgency=low
   * camelcase: Add camelcase_ignore setting.
   * googlecalendar: Add runtime deprecation warning.
   * comments: Deal with users entering unqualified or partial urls.
+  * inline: Run format hook first, to ensure other format hooks can affect
+    inlined content.  Closes: #509710
 
- -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:32 -0500
+ -- Joey Hess <joeyh@debian.org>  Sun, 28 Dec 2008 15:01:02 -0500
 
 ikiwiki (2.71) unstable; urgency=low