* Make pagespec merge code smarter about merging duplicate pagespecs.

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 323dcf6b27f41bd1ba4d4ae5ffec069795a95c0f..4f7342cde4a1c7dbce34a79c33f91117b741b81a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,21 @@
 ikiwiki (1.22) UNRELEASED; urgency=low
 
-  * Fixed a bug with previews of subpages having broken links to top-level
-    pages.
   * Change how the stylesheet url is determined in the templates: Remove
     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.
-
- -- Joey Hess <joeyh@debian.org>  Mon, 21 Aug 2006 18:16:09 -0400
+  * Fix a bug introduced last version to do with nested inlines.
+  * 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