reduced difference

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

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 83c654b5e5b8686ea9a4994111de0e6bee1d1318..a701a26855f7cc548fb83d62da5a08d0ad2a9c8d 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -7,7 +7,7 @@ This is the roadmap for ikiwiki development.
 
 Released 29 April 2006.
 
 
 Released 29 April 2006.
 

-The 1.x series is no longer supported.
+The 1.X series is no longer supported.

 
 ----
 
 
 ----
 


@@ -42,11 +42,11 @@ 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/progress]], [[plugins/color]], [[plugins/autoindex]],
   [[plugins/cutpaste]], [[plugins/hnb]], [[plugins/creole]], [[plugins/txt]],
   [[plugins/amazon_s3]], [[plugins/pinger]], [[plugins/pingee]],


@@ -54,13 +54,14 @@ The highlights of the changes in version 3.0 include:
 * The RecentChanges page is compiled statically, not generated from the CGI.
 * Support for additional revision control systems: [[rcs/bzr]],
   [[rcs/monotone]]
 * 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]].
+* 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