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

[www/ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index f36580d26abb4f601ce857aa9262e97cde45bc2d..f17eed3e53ebcbf1b8ae8b60ab7561df528a86b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
   * signinedit: Auto-disable the plugin when all authentication methods
     are disabled.
   * comments: Fix permalinks for comments using new conflict-free filenames.
+  * img: Support alignment of images with captions. (Giuseppe Bilotta)
+  * websetup: Fix utf-8 problems.
+  * websetup: Fix bug in array change detection.
+  * linkmap: Simplify and improve browser compatability by using an img, 
+    not object tag.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
@@ -257,7 +262,7 @@ ikiwiki (3.141592) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
-  * po: New plugin<F11>, suporting translation of wiki pages using po files.
+  * po: New plugin, suporting translation of wiki pages using po files.
     (intrigeri)
   * Add build machinery to build po files to translate the underlay wikis,
   * Add further build machinery to generate translated underlays from