(no commit message)

[ikiwiki.git] / doc / roadmap.mdwn

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index d8c80b234369111dec9a344d3194204bf62686a0..8688b856cfad8597799c057d5b9f169a28d029ac 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -8,7 +8,7 @@ This is the roadmap for ikiwiki development.
 Released 29 April 2006.
 
 The 1.x series is no longer supported.
-
+d
 ----
 
 # 2.0
@@ -42,25 +42,26 @@ 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]],
   [[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]].
-* The RecentChanges page is compiled statically, not generated the the CGI.
+* Support for [[tips/untrusted_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.
+  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.
 
-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