7 files changed, 56 insertions, 66 deletions
diff --git a/doc/news/version_3.11.mdwn b/doc/news/version_3.11.mdwn
deleted file mode 100644
index 2d1dc7063..000000000
--- a/doc/news/version_3.11.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-ikiwiki 3.11 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Avoid using python-support. Closes: #[525086](http://bugs.debian.org/525086)
-   * websetup: Display stderr in browser if ikiwiki setup fails.
-   * blogspam: Load RPC::XML library in checkconfig, so that an
-     error can be printed at that point if it's not available,
-     allowing the admin to see it during wiki setup.
-     Closes: #[520015](http://bugs.debian.org/520015)
-   * websetup: If setup fails, restore old setup file.
-   * relativedate: Deal with clock skew.
-   * Add IkiWiki::ErrorReason objects, and modify pagespecs to return
-     them in cases where they fail to match due to a configuration or syntax
-     error.
-   * pagespec\_match\_list: New API function, matches pages in a list
-     and throws an error if the pagespec is bad.
-   * inline, brokenlinks, calendar, linkmap, map, orphans, pagecount,
-     pagestate, postsparkline: Display a handy error message if the pagespec
-     is erronious.
-   * comments: Add link to comment post form to allow user to sign in
-     if they wish to, if the configuration makes signin optional
-     for commenting.
-   * Updated Danish translation from Jonas Smedegaard. Closes: #[525751](http://bugs.debian.org/525751)
-   * translation.mdwn: Typo fixes. Closes: #[525753](http://bugs.debian.org/525753)"""]]
diff --git a/doc/news/version_3.12.mdwn b/doc/news/version_3.12.mdwn
deleted file mode 100644
index 1e1862bb0..000000000
--- a/doc/news/version_3.12.mdwn
+++ /dev/null
@@ -1,19 +0,0 @@
-You may want to run `ikiwiki-transition deduplinks my.setup`
-after upgrading to this version of ikiwiki. This command will
-optimise your wiki's saved state, removing duplicate information
-that can slow ikiwiki down.
-
-ikiwiki 3.12 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-  * Re-enable python-support and add python:Depends to control file.
-  * ikiwiki-makerepo: Avoid using abs_path, as it apparently
-    fails on nonexistant directories with some broken perl
-    versions.
-  * inline: Minor optimisation.
-  * add_link: New function, which plugins should use rather than
-    modifying %links directly, to avoid it accumulating duplicates.
-  * ikiwiki-transition: Add a deduplinks action, that can be used
-    to remove duplicate links and optimise a wiki w/o rebuilding it.
-  * external: Fix pagespec_match and pagespec_match_list.
-    Closes: #527281
-"""]]
diff --git a/doc/news/version_3.13.mdwn b/doc/news/version_3.13.mdwn
deleted file mode 100644
index 0c8f7ab8b..000000000
--- a/doc/news/version_3.13.mdwn
+++ /dev/null
@@ -1,24 +0,0 @@
-News for ikiwiki 3.13:
-
-   The `ikiwiki-transition deduplinks` command introduced in the
-   last release was buggy. If you followed the NEWS file instructions
-   and ran it, you should run `ikiwiki -setup` to rebuild your wiki
-   to fix the problem.
-
-ikiwiki 3.13 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * ikiwiki-transition: If passed a nonexistant srcdir, or one not
-     containing .ikiwiki, abort with an error rather than creating it.
-   * Allow underlaydir to be overridden without messing up inclusion
-     of other underlays via add\_underlay.
-   * More friendly display of markdown, textile in edit form selector
-     (jmtd)
-   * Allow curly braces to be used in pagespecs, and avoid a whole class
-     of potential security problems, by avoiding performing any string
-     interpolation on user-supplied data when translating pagespecs.
-   * ikiwiki-transition: Allow setup files to be passed to all subcommands
-     that need a srcdir.
-   * ikiwiki-transition: deduplinks was broken and threw away all
-     metadata stored by plugins in the index. Fix this bug.
-   * listdirectives: Avoid listing \_comment directives and generally
-     assume any directive starting with \_ is likewise internal."""]]
-\ No newline at end of file
diff --git a/doc/news/version_3.141.mdwn b/doc/news/version_3.141.mdwn
new file mode 100644
index 000000000..ac76ce023
--- /dev/null
+++ b/doc/news/version_3.141.mdwn
@@ -0,0 +1,28 @@
+ikiwiki 3.141 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * comment: Make comment directives no longer use the internal "\_comment"
+     form, and document the comment directive syntax.
+   * Avoid relying on translators preserving the case when translating
+     "discussion", which caused Discussion pages to get unwanted Discussion
+     links.
+   * Tighten up matching of bare words inside directives; do not
+     allow an unterminated triple string to be treated as a series
+     of bare words. Fixes runaway regexp recursion/backtracking
+     in strange situations.
+   * Setup automator: Check that each plugin added to the generated
+     setup file can be loaded and that its config is ok. If a plugin
+     fails for any reason, disable it in the generated file.
+     Closes: [532001](http://bugs.debian.org/532001)
+   * pagecount: Fix broken optimisation for * pagespec.
+   * goto: Support being passed a page title that is not a valid page
+     name, to support several cases including mercurial's long user
+     names on the RecentChanges page, and urls with spaces being handled
+     by the 404 plugin.
+   * Optimise use of gettext, and avoid ugly warnings if Locale::gettext
+     is not available. Closes: #[532285](http://bugs.debian.org/532285)
+   * meta: Add openid delegate parameter to allow delegating only
+     openid or openid2.
+   * Disable the Preferences link if no plugin with an auth hook is enabled.
+   * Updated French translation. Closes: #[532654](http://bugs.debian.org/532654)
+   * aggregate: Fix storing of changed md5.
+   * aggregate: Avoid resetting ctime when an item md5 changes."""]]
diff --git a/doc/news/version_3.141/discussion.mdwn b/doc/news/version_3.141/discussion.mdwn
new file mode 100644
index 000000000..1f5f39282
--- /dev/null
+++ b/doc/news/version_3.141/discussion.mdwn
@@ -0,0 +1,16 @@
+Version 3.141!? Is it not a mistake? Maybe you meant 3.14.1 or 3.15?
+--[[Paweł|users/ptecza]]
+
+> I suspect the next version will be 3.1415 ;) -- [[Jon]]
+
+>> And next 3.14159, 3.141592, etc. :) I think that version schema
+>> should be patented by Joey ;) --[[Paweł|users/ptecza]]
+
+>>> That's not exactly new; quoting from <http://www-cs-faculty.stanford.edu/~knuth/abcde.html>:
+>>>
+>>>> The latest and best TeX is currently version 3.1415926 (and plain.tex is version 3.141592653); METAFONT is currently version 2.718281 (and plain.mf is version 2.71). My last will and testament for TeX and METAFONT is that their version numbers ultimately become $\pi$ and $e$, respectively. At that point they will be completely error-free by definition.
+>>>
+>>> --[[tschwinge]]
+
+>>>> Thanks for the info, Thomas! I didn't know about it. Sorry Joey,
+>>>> but Don Knuth was faster. What a pity... ;) --[[Paweł|users/ptecza]]
diff --git a/doc/news/version_3.1415.mdwn b/doc/news/version_3.1415.mdwn
new file mode 100644
index 000000000..93310bc64
--- /dev/null
+++ b/doc/news/version_3.1415.mdwn
@@ -0,0 +1,7 @@
+ikiwiki 3.1415 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * img: Fix extra double quote with alt text. (smcv)
+   * Updated French debconf templates translation. Closes: #[535103](http://bugs.debian.org/535103)
+   * openid: Support Net::OpenID 2.x when pretty-printing
+     openids. (smcv)
+   * highlight: Fix utf-8 encoding bug. Closes: #[535028](http://bugs.debian.org/535028)"""]]
+\ No newline at end of file
diff --git a/doc/news/version_3.14159.mdwn b/doc/news/version_3.14159.mdwn
new file mode 100644
index 000000000..21f91fdb4
--- /dev/null
+++ b/doc/news/version_3.14159.mdwn
@@ -0,0 +1,5 @@
+ikiwiki 3.14159 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * svn: Fix rcs\_rename to properly scope call to dirname.
+   * img: Pass the align parameter through to the generated img tag.
+   * Move OpenID pretty-printing from openid plugin to core (smcv)"""]]
+\ No newline at end of file