Merge commit 'ee9a4e06fcce53062b38814707a0b7d6946d4a36' into sipb

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 049a3a89827cdde3998c14d5e82ae0dad3650f1b..6b4ba759220e8707670619872aee606589d58fa2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-ikiwiki (3.20100502) UNRELEASED; urgency=low
+ikiwiki (3.20100505) UNRELEASED; urgency=low
+
+  * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
+    a single template, page.tmpl.
+  * If you have a locally customised page.tmpl, it needs to be updated
+    to set <base> when BASEURL or FORCEBAREURL is set.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 05 May 2010 18:07:29 -0400
+
+ikiwiki (3.20100504) unstable; urgency=low
 
   * Add parameter to displaytime to specify that it is a pubdate,
     and in html5 mode, use time tag.
@@ -15,7 +24,7 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
   * Fixes a bug in skipping of illegal source files introduced in 
     3.20100427.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 04 May 2010 20:26:20 -0400
 
 ikiwiki (3.20100501) unstable; urgency=low