Merge branch 'master' into next

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

diff --git a/debian/changelog b/debian/changelog
index 0fa6590f0efa6f390594dca2c9f631c090e84d47..66db70288902f59227924176d85e1e33580716a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,22 @@
-ikiwiki (2.72) UNRELEASED; urgency=low
+ikiwiki (3.00) UNRELEASED; urgency=low
+
+  * Remove support for GlobLists.
+  * Remove support for configuring allowed attachments, locked pages,
+    and banned users from the admin preferences page. These can only be
+    controlled via the setup file now.
+  * ikiwiki-transition moveprefs can be used to move the above
+    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 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
+
+ikiwiki (2.72) unstable; urgency=low

 
   * Avoid comments in recentchanges being broken links (smcv)
   * Add deprecation warning for GlobLists, which will stop working in 3.0.
 
   * Avoid comments in recentchanges being broken links (smcv)
   * Add deprecation warning for GlobLists, which will stop working in 3.0.


@@ -8,7 +26,7 @@ ikiwiki (2.72) UNRELEASED; urgency=low
   * inline: Run format hook first, to ensure other format hooks can affect
     inlined content.  Closes: #509710
 
   * inline: Run format hook first, to ensure other format hooks can affect
     inlined content.  Closes: #509710
 

- -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
+ -- Joey Hess <joeyh@debian.org>  Sun, 28 Dec 2008 15:01:02 -0500

 
 ikiwiki (2.71) unstable; urgency=low
 
 
 ikiwiki (2.71) unstable; urgency=low