X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8ed142afc9483c3c3d88319df54e4772f585b507..ea7e0b77f22d78f1e945b921d68802d916674b51:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index c9ab41ebd..c8db76966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,36 @@
-ikiwiki (3.20111230) UNRELEASED; urgency=low
+ikiwiki (3.20120202) unstable; urgency=low
+
+  * mdwn: Added nodiscount setting, which can be used to avoid using the
+    markdown discount engine, when maximum compatability is needed.
+  * Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533
+  * cvs: Ensure text files are added in non-binary mode. (Amitai Schlair)
+  * cvs: Various cleanups and testing. (Amitai Schlair)
+  * calendar: Fix strftime encoding bug.
+  * shortcuts: Fixed a broken shortcut to wikipedia (accidentially
+    made into a shortcut to wikiMedia).
+  * Various portability improvements. (Amitai Schlair)
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 02 Feb 2012 21:42:40 -0400
+
+ikiwiki (3.20120115) unstable; urgency=low
+
+  * Make backlink(.) work. Thanks, Giuseppe Bilotta.
+  * mdwn: Workaround discount's eliding of <style> blocks.
+  * attachment: Fix utf-8 display bug.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Jan 2012 16:19:25 -0400
+
+ikiwiki (3.20120109) unstable; urgency=low
 
   * mdwn: Can use the discount markdown library, via the
     Text::Markdown::Discount perl module. This is preferred if available
     since it's the fastest currently supported markdown library, speeding up
-    ikiwiki's rendering by a factor of 40.
+    ikiwiki's markdown rendering by a factor of 40.
     (However, when multimarkdown is enabled, Text::Markdown::Multimarkdown
     is still used.)
   * On Debian, depend on libtext-markdown-discount.
 
- -- Joey Hess <joeyh@debian.org>  Sun, 01 Jan 2012 16:22:24 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Jan 2012 11:49:14 -0400
 
 ikiwiki (3.20111229) unstable; urgency=low