Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 7ae3821c9e34c7e0c7aa3fbfb2dbe47a6c9042cd..fa3e0cc4e998946434c73ed20f9857e79e076383 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 ikiwiki (2.40) UNRELEASED; urgency=low
 
+  [ Josh Triplett ]
   * Add new preprocessor directive syntax¸ using a '!' prefix.  Add a
     prefix_directives option to the setup file to turn this syntax on;
     currently defaults to false, for backward compatibility.  Support
@@ -7,6 +8,9 @@ ikiwiki (2.40) UNRELEASED; urgency=low
     the underlay to support either setting of prefix_directives.  Add NEWS
     entry with migration information.
 
+  [ Joey Hess ]
+  * Danish translation update from Jonas Smedegaard. Closes: #465152
+
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800
 
 ikiwiki (2.31.3) unstable; urgency=high
@@ -28,6 +32,7 @@ ikiwiki (2.31.3) unstable; urgency=high
     character.
   * Do not allow the steam: URI scheme.
   * Allow the snews: URI scheme.
+  * Allow the smb: URI scheme.
 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 14:48:48 -0800
 
@@ -42,6 +47,8 @@ ikiwiki (2.31.1) unstable; urgency=low
 
   * htmlscrubber security fix: Block javascript in uris.
   * Add htmlscrubber test suite.
+  * Thanks to Josh Triplett for pointing out the holes and for his help
+    in implementing and checking fixes.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 10 Feb 2008 13:22:59 -0500