Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 38701b6dbeb2c18ffa4f62aa27863eed98daff85..424c99ac48959c91dcef4e3130f872fb541fc0d2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,16 @@
-ikiwiki (2.68) UNRELEASED; urgency=low
+ikiwiki (2.69) UNRELEASED; urgency=low
+
+  * aggregate: Try to query XML::Feed for the base url when derelevatising
+    links. Since this needs the just released XML::Feed 0.3, as well 
+    as a not yet released XML::RSS, it will fall back to the old method
+    if no xml:base info is available.
+  * meta: Plugin is now enabled by default since the basewiki uses it.
+  * txt: Do not encode quotes when filtering the txt, as that broke
+    later parsing of any directives on the page.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 06 Nov 2008 16:01:00 -0500
+
+ikiwiki (2.68) unstable; urgency=low
 
   * Add support for checking pushes from untrusted git committers. This can be
     used to set up anonymous git pushes, and other similar things.
@@ -43,7 +55,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
   * Several fixes to --render mode.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 03 Nov 2008 16:31:11 -0500
 
 ikiwiki (2.67) unstable; urgency=low