make the 2.0 news item special and non-removable, and link to it again

diff --git a/doc/index.mdwn b/doc/index.mdwn
index 9fc0ddecc26e83390cafa85317afade06c7706d5..2a0ee22840225732c2a57b4ef1d82300537baa98 100644 (file)
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -12,7 +12,7 @@ and instead uses a revision control system such as [[Subversion]].
 
 [[template id=note text="""
 [[ikiwiki_logo|logo/ikiwiki.png]]  
-[[news/Version_2.1]] is now available.  
+[[version_2.0|news/ikiwiki_version_2.0]] is now available.  
 If you use ikiwiki, please list your wiki in [[IkiWikiUsers]].
 Thanks! --[[Joey]]
 """]]

diff --git a/doc/news/ikiwiki_version_2.0.mdwn b/doc/news/ikiwiki_version_2.0.mdwn
new file mode 100644 (file)
index 0000000..248b217
--- /dev/null
+++ b/doc/news/ikiwiki_version_2.0.mdwn
@@ -0,0 +1,32 @@
+Ikiwiki has reached version 2.0 and entered a new phase in its
+[[development_cycle|roadmap]].
+
+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.
+
+[[meta date="2007-04-30 00:51:57 -0400"]]

diff --git a/doc/news/version_2.00.mdwn b/doc/news/version_2.00.mdwn
deleted file mode 100644 (file)
index 2aae627..0000000
--- a/doc/news/version_2.00.mdwn
+++ /dev/null
@@ -1,31 +0,0 @@
-Version 2.0 of ikiwiki is now available.
-
-[[meta date="2007-04-30 00:51:57 -0400"]]
-
-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.