2 files changed, 48 insertions, 29 deletions
diff --git a/doc/news/version_2.00.mdwn b/doc/news/version_2.00.mdwn
deleted file mode 100644
index 44e2a2fbf..000000000
--- a/doc/news/version_2.00.mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-Version 2.0 of ikiwiki is now available.
-
-With the 2.0 release of ikiwiki, some major changes have been made to the
-default configuration:
-
-* The `usedirs` setting is enabled by default. This *will* break all URLs
-  to wikis that did not have `usedirs` turned on before, unless you follow
-  the procedure described at [[tips/switching_to_usedirs]]
-  or edit your setup file to turn `usedirs` off: `usedirs => 0,`
-* [[plugins/OpenID]] logins are now enabled by default, if the
-  [[cpan Net::OpenID::Consumer]] perl module is available. Password logins
-  are also still enabled by default. If you like, you can turn either OpenID
-  or password logins off via the `disable_plugins` setting.
-
-An overview of changes in the year since the 1.0 release:
-
-* New improved URLs to pages via `usedirs`.
-* [[plugins/OpenID]] support, enabled by default.
-* Plugin [[interface|plugins/write]] added, with some 60 [[plugins]] available,
-  greatly expanding the capabilities of ikiwiki.
-* [[Tags]], atom feeds, and generally full-fledged blogging support.
-* Fully working [[todo/utf8]].
-* Optimisations, approximately 3.5 times as fast as version 1.0.
-* Improved scalability to large numbers of pages.
-* Improved scalable [[logo]].
-* Support for additional revision control systems besides svn: git,
-  tla, mercurial.
-* Some support for other markup languages than markdown: rst, textile.
-* Unit test suite, with more than 300 tests.
diff --git a/doc/news/version_2.1.mdwn b/doc/news/version_2.1.mdwn
new file mode 100644
index 000000000..508687e3a
--- /dev/null
+++ b/doc/news/version_2.1.mdwn
@@ -0,0 +1,48 @@
+News for ikiwiki 2.1:
+
+   Some wikis need to be rebuilt on upgrade to this version, due to changes to
+   page templates and the style sheet. If you listed your wiki in
+   /etc/ikiwiki/wikilist this will be done automatically when the Debian
+   package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild.
+
+ikiwiki 2.1 released with [[toggle text="these changes"]]
+[[toggleable text="""
+ * [ Joey Hess ]
+   * Use div layout for the signin and preferences forms, so that they can be
+     styled using the stylesheet, rather than by creating signin and prefs
+     templates.
+   * Make the openid login form nicely styled.
+   * Fix a bug that prevented clearing email or subscriptions.
+   * Improve handling of edits of locked pages by users who are not yet signed
+     in.
+   * Make testpagespec more robust, including checking for missing/bad
+     parameters.
+   * Add all=no option to conditional, can be used to form conditionals that do
+     not need to examine every page in the wiki.
+   * Add the needsbuild hook. Plugins can use this to manipulate which files
+     ikiwiki builds when refreshing the wiki.
+ * [ Josh Triplett ]
+   * Add an account-creation password as a simple anti-spam mechanism. If
+     set in the wiki setup, passwordauth will require the password in
+     order to create an account.
+ * [ Joey Hess ]
+   * Updated Czech translation from Miroslav Kure.
+   * Apply patch from Pawel to avoid using -L in Makefile as it's not available
+     in older finds.
+   * Make all templates have a footer div to ease themeing. Required template
+     and style sheet updates, and unless you're using customised versions,
+     you'll want to rebuild wikis on upgrade to this version to avoid
+     inconsistencies.
+   * Allow WIKINAME to to used in footers, as an example of something to put
+     there.
+   * Patch from hb to fix the pagestats plugin, which was broken by a past
+     change to the backlinks() function.
+   * Fix some bugs in password handling:
+     - If the password is empty in preferences, don't clear the existing
+       password.
+     - Actually check the confirm password field, even if it's left empty.
+   * Add a destpage parameter to the filter hook.
+   * Fix links to smilies generated by the smiley plugin for inlined pages. The
+     old links were often wrong, but often still worked by accident.
+   * Add a test ensuring that the basewiki is self-contained and has no broken
+     links."""]]
+\ No newline at end of file