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 4b47d2db9108b5f062ebb1187ea2afff1b3e7e20..488e2dec827150f9e21f5a42b23f36b4af18ef59 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -9,7 +9,8 @@ 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.
+bugs will be fixed in 1.x going forward. 1.x will stop being supported with
+the release of 3.0.
 
 ----
 
@@ -45,6 +46,8 @@ Version 3.0 will be an opportunity to make significant transitions.
 * 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.