X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4eabe04ced0825d578ae83942daebda613aade1b..a59af82bb85a037814d3f95d3c9841048b221ca0:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 70935c1d7..0736146d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,21 @@ ikiwiki (2.40) UNRELEASED; urgency=low
   * Setting NOTAINT=1 had no effect when building ikiwiki itself, fix this.
   * Depend on HTML::Scrubber, since the scrubber is enabled by default and
     dies if its can't be loaded.
+  * The search plugin needs to override <base> to point to the directory
+    containing ikiwiki.cgi, but this should not change the urls to the style
+    sheets etc. Add a new forcebareurl parameter to misctemplate to allow
+    it to do that.
+  * Preview limits the page dropdown to what's selected previously
+    (as preserving the full list across preview would be tricky). Userdirs
+    were still being offered as an option there, remove them.
+  * Fix a bug where user A created a page concurrently with user B, and
+    when B previewed it would redirect B to A's new page, losing B's work.
+    Instead, don't redirect and let conflict handling resolve it.
+  * monotone: Add code to default mergerc file to run
+    _MTN/ikiwiki-netsync-hook when a commit is merged in from the net.
+  * tla: Remove call to escapeHTML when constructing recentchanges message;
+    the html is escaped at a different level. Closes: #466495
+  * bzr, mercurial: Remove unused import of escapeHTML.
 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800