Merge branch 'master' into po

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

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 0f8cb00fc14a8fefbe454bead1dada747d6afe4f..2f79f79784ef0efc73c5db8a52a9ff3250dad7f0 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -42,25 +42,26 @@ follow when upgrading your wiki to this version.
 
 The highlights of the changes in version 3.0 include:
 
 
 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]].
 * 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]]
   [[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 additional revision control systems: [[rcs/bzr]],
   [[rcs/monotone]]

-* Support for [[tips/trusted_git_push]].
-* The RecentChanges page is compiled statically, not generated from the CGI.
+* Support for [[tips/untrusted_git_push]].

 * A new version (3.00) of the plugin API, exporting additional
 * 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.
 
 * 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
 
 The 3.x series is expected to undergo continuing development for some time,
 adding improvements and new features, but avoiding changes that break