poll vote (Accept both)

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

diff --git a/debian/changelog b/debian/changelog
index 5433ba05f0541350dd03f959c57beeddafc07d27..59d7eb7614456872e64a3893e88b78f4456b6f19 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,24 @@
-ikiwiki (3.20100927) UNRELEASED; urgency=low
+ikiwiki (3.20101024) UNRELEASED; urgency=low
+
+  * txt: Fix display when used inside a format directive.
+  * highlight: Ensure that other, more-specific format plugins,
+    like txt are used in preference to this one in case of ties.
+  * htmltidy, sortnaturally: Add missing checkconfig hook
+    registration. Closes: #601912
+    (Thanks, Craig Lennox and Tuomas Jormola)
+  * git: Use author date, not committer date. Closes: #602012
+    (Thanks, Tuomas Jormola)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2010 22:30:29 -0400
+
+ikiwiki (3.20101023) unstable; urgency=low
+
+  * Fix typo that broke anonymous git push.
+  * Fix web reversion when the srcdir is in a subdir of the git repo.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 23 Oct 2010 16:36:50 -0400
+
+ikiwiki (3.20101019) unstable; urgency=low
 
   * Fix test suite failure on other side of date line.
   * htmltidy: Allow configuring tidy parameters in setup file.
@@ -16,8 +36,10 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low
     of the monotone workspace. Thanks, tommyd.
   * img: If a class is specified, don't also put the img in the img
     class.
+  * auto-blog.setup: Don't enable opendiscussion by default; require users be
+    logged in to post comments.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 29 Sep 2010 11:58:23 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 19 Oct 2010 02:32:23 -0400
 
 ikiwiki (3.20100926) unstable; urgency=low