smiley: Detect smileys inside pre and tags, and do not expand.

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

diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn
index 1df503492782be547870ee2aff5bd9b09c763a66..af46e162be7f89ab3efb33dc5dc96f1c0b3343ce 100644 (file)
--- a/doc/roadmap.mdwn
+++ b/doc/roadmap.mdwn
@@ -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.
 
 * 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
 
 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,20 @@ 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.
+
+----
+

 # future goals
 
 * Improved [[todo/html]] stylesheets and templates.
   _(status: [[css_market]] exists; it could always provide more stylesheets.  No alternate templates yet, though.)_
 # 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
 * 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