Merge commit 'intrigeri/po' into po

2 files changed, 15 insertions, 6 deletions

diff --git a/doc/news/version_3.08.mdwn b/doc/news/version_3.08.mdwn
deleted file mode 100644
index 06d795c23..000000000
--- a/doc/news/version_3.08.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-ikiwiki 3.08 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * git: Fix utf-8 encoding of author names.
-   * git: Manually decode git output from utf-8, avoids
-     warning messages on invalidly encoded output.
-   * Fix bug that caused weird things to appear as page types."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.10.mdwn b/doc/news/version_3.10.mdwn
new file mode 100644
index 000000000..9d9c33c58
--- /dev/null
+++ b/doc/news/version_3.10.mdwn
@@ -0,0 +1,15 @@
+ikiwiki 3.10 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * darcs: Finally added support for this VCS, thanks to many
+     contributors:
+     - Thomas Schwinge wrote the original file, implementing only rcs\_commit.
+     - Benjamin A'Lee contributed an alternative implementation.
+     - Tuomo Valkonen contributed rcs\_getctime and stub rcs\_recentchanges.
+     - Simon Michael contributed multiple changes.
+     - Petr Ročkai fixed rcs\_recentchanges.
+     - Sven M. Hallberg merged the above and added missing features.
+   * Add missing newline to Confirm Password prompt.
+   * Add missing permalink support to archivepage and titlepage templates.
+   * debian/control: Wrap fields.
+   * inline: Add author info to archive display.
+   * Add a microblog template that is useful for inlining microblogging posts."""]]
\ No newline at end of file