Merge commit 'upstream/master' into pub/po

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

diff --git a/debian/changelog b/debian/changelog
index 7efa31cf1e19644a15fcc68d09c346a48b241b92..4e1aa854598fba25d699eca391e0463f39d54e79 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ikiwiki (3.14) UNRELEASED; urgency=low
+
+  * Add new hooks: canremove, canrename, rename. (intrigeri)
+  * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
+  * po: New plugin, suporting translation of wiki pages using po files.
+    (intrigeri)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 20 Apr 2009 19:40:25 -0400
+
 ikiwiki (3.13) UNRELEASED; urgency=low
 
   * ikiwiki-transition: If passed a nonexistant srcdir, or one not
@@ -9,6 +18,8 @@ ikiwiki (3.13) UNRELEASED; urgency=low
   * Allow curly braces to be used in pagespecs, and avoid a whole class
     of potential security problems, by avoiding performing any string
     interpolation on user-supplied data when translating pagespecs.
+  * ikiwiki-transition: Allow setup files to be passed to all subcommands
+    that need a srcdir.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 06 May 2009 20:45:44 -0400