* Make pagespec merge code smarter about merging duplicate pagespecs.

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 825b7a6ff24db977f749b773208793750a4e317e..4f7342cde4a1c7dbce34a79c33f91117b741b81a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,18 @@ ikiwiki (1.22) UNRELEASED; urgency=low
     STYLEURL and add BASEURL to all templates (some already had it). This
     new more general variable can be used to link to other things (eg, images)
     from the template, as well as stylesheets.
-  * Clean up behavior with broken parentlinks.
   * Fix a bug introduced last version to do with nested inlines.
-
- -- Joey Hess <joeyh@debian.org>  Tue, 22 Aug 2006 12:53:05 -0400
+  * Allow preprocessor directives to span multiple lines, both to make
+    long ones with lots of values easier to write, and to allow for ones with
+    multi-line quoted values.
+  * Allow preprocessor directives to contain python-like triple-quoted
+    text blocks, for easy nesting of quotes inside.
+  * Add a template plugin.
+  * Use the template plugin to add infoboxes to each plugin page listing basic
+    info about the plugin.
+  * Make pagespec merge code smarter about merging duplicate pagespecs.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 23 Aug 2006 02:38:34 -0400
 
 ikiwiki (1.21) unstable; urgency=low