2 files changed, 41 insertions, 31 deletions

diff --git a/doc/news/ikiwiki_version_3.0.mdwn b/doc/news/ikiwiki_version_3.0.mdwn
new file mode 100644
index 000000000..56e0353c3
--- /dev/null
+++ b/doc/news/ikiwiki_version_3.0.mdwn
@@ -0,0 +1,41 @@
+Ikiwiki has reached version 3.0 and entered a new phase in its
+[[development_cycle|roadmap]].
+
+The 3.0 release of ikiwiki changes several defaults and finishes
+some transitions. You will need to modify your wikis to work with
+ikiwiki 3.0. A document explaining the process is available
+in [[upgrade_to_3.0]].
+
+The highlights of the changes in version 3.0 include:
+
+* Support for uploading [[attachments|plugins/attachment]].
+* Can [[plugins/rename]] and [[plugins/remove]] pages and files via the web.
+* [[Web_based_setup|plugins/websetup]].
+* Blog-style [[plugins/comments]] as an alternative to Discussion pages.
+* Many other new plugins including [[plugins/htmlbalance]], [[plugins/format]],
+  [[plugins/progress]], [[plugins/color]], [[plugins/autoindex]],
+  [[plugins/cutpaste]], [[plugins/hnb]], [[plugins/creole]], [[plugins/txt]],
+  [[plugins/amazon_s3]], [[plugins/pinger]], [[plugins/pingee]],
+  [[plugins/edittemplate]]
+* The RecentChanges page is compiled statically, not generated from the CGI.
+* Support for additional revision control systems: [[rcs/bzr]],
+  [[rcs/monotone]]
+* Support for [[tips/trusted_git_push]].
+* A new version (3.00) of the plugin API, exporting additional
+  commonly used functions from `IkiWiki.pm`. Nearly everything in ikiwiki is
+  now a plugin, from WikiLinks to page editing, to RecentChanges.
+* Far too many bug fixes, features, and enhancements to list here.
+
+Thanks to the many contributors to ikiwiki 3.0, including:
+
+  Jelmer Vernooij, Recai Oktaş, William Uther, Simon McVittie, Axel Beckert,
+  Bernd Zeimetz, Gabriel McManus, Paweł Tęcza, Peter Simons, Manoj
+  Srivastava, Patrick Winnertz, Jeremie Koenig, Josh Triplett, thm, Michael
+  Gold, Jason Blevins, Alexandre Dupas, Henrik Brix Andersen, Thomas Keller,
+  Enrico Zini, intrigeri, Scott Bronson, Brian May, Adeodato Simó, Brian
+  Downing, Nis Martensen. (And anyone I missed.)
+
+Also, thanks to the users, bug submitters, and documentation wiki editors.
+Without you, ikiwiki would just be a little thing I use for my home page.
+
+--[[Joey]]
diff --git a/doc/news/version_3.00.mdwn b/doc/news/version_3.00.mdwn
deleted file mode 100644
index 08d3a1a56..000000000
--- a/doc/news/version_3.00.mdwn
+++ /dev/null
@@ -1,31 +0,0 @@
-News for ikiwiki 3.00:
-
-   The 3.0 release of ikiwiki changes several defaults and finishes
-   some transitions. You will need to modify your wikis to work with
-   ikiwiki 3.0. A document explaining the process is available
-   in </usr/share/doc/ikiwiki/html/tips/upgrade\_to\_3.0.html>
-
-ikiwiki 3.00 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Remove support for GlobLists.
-   * Remove support for configuring allowed attachments, locked pages,
-     and banned users from the admin preferences page. These can only be
-     controlled via the setup file now.
-   * ikiwiki-transition moveprefs can be used to move the above
-     admin preferences into a setup file.
-   * prefix\_directives and aggregate\_internal are now turned on by default.
-   * ikiwiki-transition prefix\_directives syntax changed
-   * googlecalendar: removed this deprecated plugin. Use htmlscrubber\_skip
-     instead.
-   * embed: This plugin is deprecated, use htmlscrubber\_skip instead.
-     Closes: ##462970.
-   * Version 3.00 of the plugin API.
-   * Replace blank OpenID placeholder logo with an unofficial OpenID
-     logo developed by Anna Hess. The official logo does not seem destined to
-     be free.
-   * comments: Add cache avoidance.
-   * htmlbalance: Demand-load HTML::TreeBuilder to avoid failing test suite
-     if it is not present.
-   * French translation update from Philippe Batailler. Closes: #[510216](http://bugs.debian.org/510216)
-   * websetup: Avoid a crash when a new array setup item has been added in
-     a new ikiwiki release, and is thus not present in the setup file yet."""]]
\ No newline at end of file