Merge branch 'master' into prefix-directives

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b21cdb4419905119277620d732a7937e98a5d417..420cef5ad9e0e3a440936f756b4b78c9fc693fdd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ikiwiki (2.40) UNRELEASED; urgency=low
+
+  [ Josh Triplett ]
+  * Add new preprocessor directive syntax¸ using a '!' prefix.  Add a
+    prefix_directives option to the setup file to turn this syntax on;
+    currently defaults to false, for backward compatibility.  Support
+    optional '!' prefix even with prefix_directives off, and use that in
+    the underlay to support either setting of prefix_directives.  Add NEWS
+    entry with migration information.
+
+ -- Josh Triplett <josh@freedesktop.org>  Sat, 09 Feb 2008 23:01:19 -0800
+
 ikiwiki (2.31) unstable; urgency=low
 
   [ Joey Hess ]