X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b56e98cbe3556ea05e626f1111c2adb496cd7ff7..178cd7664c0e0632abc63425fb2111d809921912:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index ceeb6d7e7..f7ae8d5ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,32 @@
-ikiwiki (1.40) UNRELEASED; urgency=low
+ikiwiki (1.41) UNRELEASED; urgency=low
+
+  * Gettext 1.04 or up is needed for the OO interface that ikiwiki needs,
+    if an older version is installed, just don't gettext strings, instead of
+    crashing.
+  * Added smileys for Moin Moin compatability.
+  * Fix handling of discussion links on discussion pages when l10n is used.
+  * Make gitorigin_branch and gitmaster_branch configurable via the setup
+    file. Closes: #408599
+  * French translation update. Closes: #408593
+  * Improve use of svn merge, by specifying the file to merge, rather than
+    chdiring to the srcdir (which wasn't right when merging in a subdir).
+    Thanks Ethan.
+  * Always call rcs_update after a commit during a web edit, to work around
+    the problem described in bugs/svn_fails_to_update. Thanks to Ethan for the
+    analysis and patch.
+  * Replace underscores in shortcut texts with spaces when formatting for
+    display. This allows using a shortcut like [[wikipedia War_of_1812]],
+    which links to the correct remote page, but is displayed nicely.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 27 Jan 2007 19:59:58 -0500
+
+ikiwiki (1.40) unstable; urgency=low
 
   * Fix missing categories in rss/atom feeds.
   * Add French translation by Jean-Luc Coulon. Closes: #406881
+  * Fix bogus use of CDATA in atom feeds. Closes: #406898
 
- -- Joey Hess <joeyh@debian.org>  Sun, 14 Jan 2007 15:44:42 -0500
+ -- Joey Hess <joeyh@debian.org>  Sun, 14 Jan 2007 21:42:27 -0500
 
 ikiwiki (1.39) unstable; urgency=low