Merge branch 'master' into tova

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

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index e19df15539634d2c83c5f97f2a5fe3641f2b332d..32752715d8fe4b1f2c50219227ff396c50884080 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -17,7 +17,7 @@ bugs will be fixed in 1.x going forward.
 
 * 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]].
@@ -29,7 +29,7 @@ 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.
 
-Will be released 29 April 2007.
+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
@@ -37,10 +37,21 @@ backwards compatability.
 
 ----
 
+# 3.0
+
+Still in the early planning stages, version 3.0 will be an opportunity to
+make significant transitions.
+
+* Default to using `prefix_directives`.
+* Default to using `aggregateinternal`.
+
+----
+
 # future goals
 
 * Improved [[todo/html]] stylesheets and templates.
   _(status: [[css_market]] exists; it could always provide more stylesheets.  No alternate templates yet, though.)_
+* More documentation in the basewiki, including documentation for all enabled plugins.  Probably need some solution for [[todo/conditional_underlay_files]], too.
 * 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