X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ffc9f25e734a8ca5397f2dfd09c1e31725624ee0..aed16b4833f98eda566f75b6a1a679febc1ba5ff:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index ae0b5eefd..df3490640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,33 @@
-ikiwiki (3.20091219) UNRELEASED; urgency=low
+ikiwiki (3.20100104) UNRELEASED; urgency=low
+
+  * inline: Avoid showing edit links if page editing is disabled.
+    (Sjoerd)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
+
+ikiwiki (3.20100102.3) unstable; urgency=low
+
+  Happy palindrome day!
 
   * pagestats: Add show parameter. Closes: #562129 (David Paleino)
   * toc: Add startlevel parameter. (kerravonsen)
-
- -- Joey Hess <joeyh@debian.org>  Fri, 25 Dec 2009 14:31:22 -0500
+  * Remove example ikiwiki setup file from the Debian package. This
+    re-enables linking to /usr/share/ikiwiki/examples which has the
+    example sites also used by auto-blog.setup. The example setup file
+    can be generated at any time using ikiwiki --dumpsetup so I do
+    not see a reason to ship it. Closes: #562183
+  * Use env hack in python scripts.
+  * comments: Add a checksum to the name of comment pages, to
+    avoid merge conflicts when comments are posted to two branches of a
+    site.
+  * linkmap: Add option to omit disconnected pages from the map.
+  * inline: Fix bug that limited displayed pages when feedshow was
+    specified w/o show.
+  * Fix several places that did not properly handle capitalization of
+    the discussionpage setting. Specifically, fixes discussion actions
+    on discussion pages, and unbreaks the opendiscussion plugin.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 02 Jan 2010 21:46:16 -0500
 
 ikiwiki (3.20091218) unstable; urgency=low