formatting

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

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

-The 1.x series changed a great deal over the more than 50 releases in its
-lifetime. It is now in maintenance mode, only security issues or really bad
-bugs will be fixed in 1.x going forward.
+The 1.x series is no longer supported.

 
 ----
 
 
 ----
 


@@ -17,7 +15,7 @@ bugs will be fixed in 1.x going forward.
 
 * New improved URLs to pages via `usedirs`.
 * [[plugins/OpenID]] support, enabled by default.
 
 * New improved URLs to pages via `usedirs`.
 * [[plugins/OpenID]] support, enabled by default.

-* [[plugins/write||interface]] added, with some 60 [[plugins]] available,
+* 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]].
   greatly expanding the capabilities of ikiwiki.
 * [[Tags]], atom feeds, and generally full-fledged blogging support.
 * Fully working [[todo/utf8]].


@@ -29,9 +27,43 @@ bugs will be fixed in 1.x going forward.
 * Some support for other markup languages than markdown: rst, textile.
 * Unit test suite, with more than 300 tests.
 
 * Some support for other markup languages than markdown: rst, textile.
 * Unit test suite, with more than 300 tests.
 

-Will be released 29 April 2007.
+Released 30 April 2007.

 
 

-The 2.x series is expected to undergo continuing development for some time,
+The 2.x series is now in maintenance mode. Only security fixes and fixes for
+really bad bugs will be applied going forward.
+
+----
+
+# 3.0
+
+Version 3.0 is an opportunity to make significant transitions.
+Read [[tips/upgrade_to_3.0]] for the steps you will need to
+follow when upgrading your wiki to this version.
+
+The highlights of the changes in version 3.0 include:
+
+* Support for uploading [[attachments|plugins/attachment]].
+* Can [[plugins/rename]] and [[plugins/remove]] pages and files via the web.
+* [[Web_based_setup|plugins/websetup]].
+* 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/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.
+* Far too many bug fixes, features, and enhancements to list here.
+
+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
 backwards compatability.
 
 adding improvements and new features, but avoiding changes that break
 backwards compatability.
 


@@ -39,10 +71,8 @@ backwards compatability.
 
 # future goals
 
 
 # future goals
 

-* Improved [[todo/html]] stylesheets and templates.
-  _(status: [[css_market]] exists; it could always provide more stylesheets.  No alternate templates yet, though.)_

 * Conversion support for existing other wikis.
   (Being worked on for MoinMoin and TWiki by [[Josh_Triplett|JoshTriplett]]
   and Jamey Sharp; support for other wikis should fit into the same
   framework.)
 * Conversion support for existing other wikis.
   (Being worked on for MoinMoin and TWiki by [[Josh_Triplett|JoshTriplett]]
   and Jamey Sharp; support for other wikis should fit into the same
   framework.)

-* [[TODO]], [[bugs]], [[soc]], ...
+* [[TODO]], [[bugs]], ...