X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/553136ec1f73246cde1dce300b15eec2e5e73a97..f7303db5a194bff0e0c621efedc320cf9997d35e:/debian/changelog?ds=inline

diff --git a/debian/changelog b/debian/changelog
index 02d6aa499..cd66d3c5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,17 @@ ikiwiki (2.40) UNRELEASED; urgency=low
   * 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.
+  * Fix another preview will_render bug. This one involved inline,
+    which forced a scan of the page to make available metadata that
+    appeared after the inline directive. Problem is that scan made it forget
+    about any other files rendered due to the page. The scan also turns out
+    to be unnecessary now, since meta persistently stores state and it's
+    always available. So it was just removed.
 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800
 
@@ -62,7 +73,7 @@ ikiwiki (2.31.3) unstable; urgency=high
 ikiwiki (2.31.2) unstable; urgency=high
 
   * The security fix in the last release had buggy handling of data:image,
-    now fixed.
+    now fixed. Closes: #465110 (CVE-2008-0808, CVE-2008-0809)
 
  -- Joey Hess <joeyh@debian.org>  Sun, 10 Feb 2008 15:31:17 -0500