2 files changed, 26 insertions, 42 deletions

diff --git a/doc/news/version_2.10.mdwn b/doc/news/version_2.10.mdwn
new file mode 100644
index 000000000..f4e7e11e7
--- /dev/null
+++ b/doc/news/version_2.10.mdwn
@@ -0,0 +1,26 @@
+ikiwiki 2.10 released with [[toggle text="these changes"]]
+[[toggleable text="""
+   * Tidy ctime debug output for git.
+   * French translation update. Closes: #[445923](http://bugs.debian.org/445923)
+   * Fix --get-ctime with git, needed to remove srcdir from filename.
+   * In the cgi edit path, reload the index file before rendering. A bug
+     showed up where a web edit that added a page caused a near-concurrent
+     web edit to fail in will\_render. While it would be hard to reproduce this,
+     my analysis is that the failing cgi started first, loaded the index file
+     (prior to locking) then the other cgi created the new page and rendered
+     it, and then the failing cgi choked on the new file when \_it\_ tried to
+     render it. Ensuring that the index file is loaded after taking the lock
+     will avoid this bug.
+   * Fix strange stderr-hiding code in the git module, allow error messages
+     to be passed on to stderr. Also fixes a potential bug, since git error
+     meesages were treated as if they came from git stdout.
+   * Add a "createlink" class attribute to the span for wikilinks pointing
+     to not-yet-existing pages. I don't have a useful style defined for that
+     though.
+   * Rewritten rst plugin by madduck is a python program that communicates with
+     ikiwiki via XML RPC. This should be much faster than the old plugin that
+     had to fork python for every rst page render. Note that if you use
+     the rst plugin, you now need to have the RPC::XML perl module installed.
+   * Danish translation from Jonas Smedegaard. Closes: #[446952](http://bugs.debian.org/446952)
+   * Support git authors of the form "joey <joey>", which is common when
+     importing from a svn repo."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.7.mdwn b/doc/news/version_2.7.mdwn
deleted file mode 100644
index 9c497f5bf..000000000
--- a/doc/news/version_2.7.mdwn
+++ /dev/null
@@ -1,42 +0,0 @@
-ikiwiki 2.7 released with [[toggle text="these changes"]]
-[[toggleable text="""
- * [ Joey Hess ]
-   * Add an editcontent hook.
-   * Support for looking in multiple directories for underlay files.
-   * Plugins can add new directories to the search path with the add\_underlay
-     function.
-   * Split out smiley underlay files into a separate underlay, so if the plugin
-     isn't used, the wiki isn't bloated with all those files.
-   * Allow -cgi -wrapper to be passed on the command line to generate a
-     wrapper.
-   * Fix some taint issues with generating wrappers using the command line.
-   * Don't allow newlines in link text in a wikilink.
-   * Tables containing links with a link text were misparsed, because the "|"
-     in the wikilink looked like a table field separator. Avoid this ambiguity
-     by linkifying the data before parsing it as a table.
-   * Turn on allow\_loose\_quotes in the table plugin's Text::CSV object,
-     so that links from wikilinks don't confuse the parser.
-   * mercurial: Pass --style default to hg log to ensure right format is used.
-   * mercurial: Fix rcs\_getctime (thanks, bma)
- * [ Josh Triplett ]
-   * Use git-log rather than the shell, git-rev-list, and git-diff-tree.
-     Patch by Jamey Sharp <jamey@minilop.net>.
-   * Renames from git-diff-tree aren't handled, so don't ask for them.
-     Patch by Jamey Sharp
-   * Handle operating in sub-trees of a git repository.
-     When looking for git commits that affect the wiki, only include changes
-     that affect the ikiwiki source directory. If that is not the top-level
-     directory in this git repository, strip off the prefix as given by
-     `git-rev-parse --show-prefix` from all names reported by git-log.
-     Patch by Jamey Sharp
- * [ Joey Hess ]
-   * Correct generation of RFC 3339 format times for atom/rss feeds. Always use
-     gmtime for these since a time zone is not specified.
-   * Updated Spanish translation from Victor Moral.
-   * table: Text::CSV doesn't return decoded unicode (XS module); decode its
-     return values.
-   * Change git test suite to reflect change in log for initial repo creation
-     commit.
-   * Add the ikiwiki-update-wikilist command.
-   * Exclude external plugin from syntax check since it uses a module that is
-     not in the build depends. Closes: #[441171](http://bugs.debian.org/441171)"""]]
\ No newline at end of file