Merge branch 'master' into autoconfig

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b53d846d7e54b3922b7607b399b44b0d10061256..865544786ae7f91e44b3db8f1eac0d6392ce2b9e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,32 @@
-ikiwiki (2.55) UNRELEASED; urgency=low
+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) unstable; urgency=low
 
   * remove: New plugin that adds the ability to remove pages via the web.
     (Sponsored by The TOVA Company.)
   * rename: New plugin that adds the ability to rename pages via the web.
     (Sponsored by The TOVA Company.) (This one's for you, Kyle.)
+  * All rcs backends need to implement rcs_remove, rcs_commitstaged,
+    and rcs_rename. (Done for svn, git).
+  * This version adds renamepage hooks, which can be used to modify page content,
+    including links, during renames.
   * prefix_directives enabled in doc wiki, all preprocessor directives
     converted. (Simon McVittie)
   * editpage: Don't show attachments link when attachments are disabled.
-  * All rcs backends need to implement rcs_remove. (Done for svn, git).
   * tag: Allow tagbase to be overridden by starting a tag with "./" or "/".
     (Simon McVittie)
   * Really fix bug with links to pages with names containing colons. 
@@ -16,8 +35,20 @@ ikiwiki (2.55) UNRELEASED; urgency=low
   * Add allow_symlinks_before_srcdir config setting that can be used to avoid
     a security check that is a good safe default, but problimatic overkill in
     some situations.
-
- -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
+  * Don't allow uploading an attachment with the same name as an existing
+    page, to avoid confusion.
+  * Split out error messages from editpage.tmpl into several separate
+    templates.
+  * attachment: Do not escape _ when determining attachment filenames.
+  * Rebuild pages that change their type. (Gabriel McManus)
+  * monotone: Add support for rename, delete, and also diff. (William Uther)
+  * 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>  Sun, 27 Jul 2008 11:23:13 -0400
 
 ikiwiki (2.54) unstable; urgency=low