Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / doc / roadmap.mdwn

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 83c654b5e5b8686ea9a4994111de0e6bee1d1318..7a03776faac55bb87f6a9f764f8f2d86e638fee1 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -42,11 +42,11 @@ follow when upgrading your wiki to this version.
 
 The highlights of the changes in version 3.0 include:
 
-* Blog-style [[plugins/comments]] as an alternative to Discussion pages.
 * Support for uploading [[attachments|plugins/attachment]].
 * Can [[plugins/rename]] and [[plugins/remove]] pages and files via the web.
 * [[Web_based_setup|plugins/websetup]].
-* Many new plugins including [[plugins/htmlbalance]], [[plugins/format]],
+* 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]],
@@ -60,7 +60,7 @@ The highlights of the changes in version 3.0 include:
   now a plugin, from WikiLinks to page editing, to RecentChanges.
 * Far too many bug fixes, features, and enhancements to list here.
 
-Release is planned for fall^Wlate, 2008.
+Released 31 December, 2008.
 
 The 3.x series is expected to undergo continuing development for some time,
 adding improvements and new features, but avoiding changes that break