Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index ac8bbc3f4f3180458b27d02ea7a45ea30866b30c..488e2dec827150f9e21f5a42b23f36b4af18ef59 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -1,17 +1,65 @@
-This is the roadmap for ikiwiki drevelopment.
+This is the roadmap for ikiwiki development.

 
 # 1.0
 
 
 # 1.0
 

-Generally usable release.
-

 * No severe [[security]] bugs.
 * No severe [[security]] bugs.

-* All the features people would expect in a wiki. Needs to be a plausable promise of being a wiki that people can commit to [[using|ikiwikiusers]].
+* All the basic [[features]] people would expect in a wiki.
+
+Released 29 April 2006.

 
 

-Estimated ETA for 1.0 is May 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. 1.x will stop being supported with
+the release of 3.0.
+
+----

 
 # 2.0
 
 
 # 2.0
 

-* Plugin mechanism. See [[todo/PluggableRenderers]]. Should support things like [[todo/lists]] and [[todo/link_map]].
-* Should have fully working [[todo/utf8]] support.
-* [[Optimised_rendering|todo/optimisations]] if possible. Deal with other scalability issues.
-* improved [[todo/html]] stylesheets and templates
\ No newline at end of file
+* New improved URLs to pages via `usedirs`.
+* [[plugins/OpenID]] support, enabled by default.
+* 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]].
+* Optimisations, approximately 3.5 times as fast as version 1.0.
+* Improved scalability to large numbers of pages.
+* Improved scalable [[logo]].
+* Support for additional revision control systems besides svn: git,
+  tla, mercurial.
+* Some support for other markup languages than markdown: rst, textile.
+* Unit test suite, with more than 300 tests.
+
+Released 30 April 2007.
+
+The 2.x series is expected to undergo continuing development for some time,
+adding improvements and new features, but avoiding changes that break
+backwards compatability.
+
+----
+
+# 3.0
+
+Version 3.0 will be an opportunity to make significant transitions.
+
+* Default to using `prefix_directives`.
+* Default to using `aggregateinternal`.
+* Remove deprecated prefs form settings for `allowed_attachments` and
+  `locked_pages`.
+* Finalise a new version of the plugin API, exporting additional commonly
+  used functions from IkiWiki.pm. See [[todo/firm_up_plugin_interface]]
+
+It will include a vast number of new features, bugfixes, and other
+improvements, far too many to list here.
+
+Release is planned for fall, 2008.
+
+----
+
+# future goals
+
+* 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]], ...