Merge branch 'master' into autoconfig

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 205620508af01f04efbb445ef485c7473a7a3af5..865544786ae7f91e44b3db8f1eac0d6392ce2b9e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,20 @@
 ikiwiki (2.60) UNRELEASED; urgency=low
  
+  * Starting with this version, "ikiwiki -setup /etc/ikiwiki/simple.setup"
+    can be used set up 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.
+  * Large amounts of internal config data reorg.
   * The way wrappers are defined in the setup file has changed. Old setup
     files will continue to work, for now.
- 
+  * Version control backends promoted to first-class plugins.
+  * ikiwiki-update-wikilist: Add -r switch to remove. Default behavior is now
+    always to add.
+
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 
-ikiwiki (2.55) UNRELEASED; urgency=low
+ikiwiki (2.55) unstable; urgency=low
 
   * remove: New plugin that adds the ability to remove pages via the web.
     (Sponsored by The TOVA Company.)
@@ -39,8 +45,10 @@ ikiwiki (2.55) UNRELEASED; urgency=low
   * toggle: Fix incompatability between javascript and webkit.
   * bzr: Add support for rename and delete. (Jelmer Vernooij)
   * attachment: Use relative paths when inserting links.
+  * toggle: Fix for when html got tidied. Closes: #492529 (Enrico Zini)
+  * cutpaste: New plugin by Enrico Zini
 
- -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 27 Jul 2008 11:23:13 -0400
 
 ikiwiki (2.54) unstable; urgency=low