X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b32480f0f975e80caa0b87a0001c9343e258f987..19d79818247058dbe07cf85bf158f5c01254e100:/CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 22d9a3660..9e595e5e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,15 +1,41 @@
-ikiwiki (3.20180106) UNRELEASED; urgency=medium
+ikiwiki (3.20180311) upstream; urgency=medium
+
+  [ Amitai Schleier ]
+  * Avoid unexpected full paths from find(1)
+
+  [ thm.id.fedoraproject.org ]
+  * rst test: Probe for docutils Python 3 module, not Python 2
+
+  [ Simon McVittie ]
+  * mdwn: Automatically detect which Discount flags to use, fixing
+    regressions in 3.20180228 when using Discount < 2.2
+  * Add a test asserting that no plugin is an empty file, to confirm
+    that the build fixes in 3.20180228 were successful
+
+ -- Simon McVittie <smcv@debian.org>  Sun, 11 Mar 2018 15:53:34 +0000
+
+ikiwiki (3.20180228) upstream; urgency=medium
 
   * core: Don't send relative redirect URLs when behind a reverse proxy
+  * core: Escape backticks etc. in directive error messages as HTML
+    entities so that the error message is not subsequently parsed as
+    Markdown
   * mdwn: Enable fenced code blocks, PHP Markdown Extra-style definition
     lists and GitHub-style extensions to HTML tag syntax when used with
     Discount >= 2.2.0 (Closes: #888055)
+  * img: Fix auto-detection of image format (if enabled, which is
+    strongly discouraged) with ImageMagick >= 6.9.8-3
+  * rst: Use Python 3 instead of Python 2
   * build: `set -e` before each `for` loop, so that errors are reliably
     trapped
   * build: Use if/then instead of `||` so that the `-e` flag works
   * build: Ensure that pm_to_blib finishes before rewriting shebang lines
+  * t: Make the img test pass with ImageMagick >= 6.9.8-3
+    (Closes: #891647)
+  * debian: Remove unused Lintian overrides for duplicate word false positives
+  * debian: Declare compliance with Debian Policy 4.1.3
 
- -- Simon McVittie <smcv@debian.org>  Mon, 08 Jan 2018 10:51:10 +0000
+ -- Simon McVittie <smcv@debian.org>  Wed, 28 Feb 2018 10:38:19 +0000
 
 ikiwiki (3.20180105) upstream; urgency=medium