* 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.
+ * When building the doc wiki, build with LANG=C.
+ * More gettext fun.
+
+ -- Joey Hess <joeyh@debian.org> Sat, 27 Jan 2007 21:16:33 -0500
ikiwiki (1.40) unstable; urgency=low