* Make pagespec merge code smarter about merging duplicate pagespecs.

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 61379c5fb5e864ccdb3f110cdcd36844ec73631c..4f7342cde4a1c7dbce34a79c33f91117b741b81a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,23 @@
-ikiwiki (1.21) UNRELEASED; urgency=low
+ikiwiki (1.22) UNRELEASED; urgency=low
+
+  * 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.
+  * 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
 
   * Add a tail fin^W^Wsidebar plugin by Tuomo Valkonen.
   * If a page links to itself, mark up the link text in a span with
@@ -16,8 +35,9 @@ ikiwiki (1.21) UNRELEASED; urgency=low
     Talens-Oliag. Note that this has many known issues -- see the caveats on
     the plugin's page.
   * Credit everyone who wrote a plugin on the plugins' wiki pages.
+  * Fix utf-8 in blog post form.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 19 Aug 2006 00:56:32 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 20 Aug 2006 16:42:54 -0400
 
 ikiwiki (1.20) unstable; urgency=low