X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8c5350bcf879d25512c986973e80151997c1a83e..5a128f3d6333b16200512b33b5265b1b1e8f3837:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 483d14b12..f7ae8d5ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,17 @@ ikiwiki (1.41) UNRELEASED; urgency=low
   * Make gitorigin_branch and gitmaster_branch configurable via the setup
     file. Closes: #408599
   * French translation update. Closes: #408593
-
- -- Joey Hess <joeyh@debian.org>  Sat, 27 Jan 2007 18:56:49 -0500
+  * 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