Merge branch 'master' into prefix-directives

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b32c7ad51b58b38dcdbe09543a9676d778e30643..397ecca1b0107c58a26f54b32fd31d6619c9f188 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,12 @@ ikiwiki (2.30) unstable; urgency=low
   [ Josh Triplett ]
   * Add trailing comma to commented-out umask in sample ikiwiki.setup, so
     that uncommenting it does not break the setup file.
+  * 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.
 
   [ Joey Hess ]
   * inline: The template can check for FIRST and LAST, which will be