X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c7d8b16cba499f5f091221ef5307d07dbcc96f1..ff83a7701caa5615f8a2cee0ce2cc216a22af19a:/docs/html/roadmap.htm

diff --git a/docs/html/roadmap.htm b/docs/html/roadmap.htm
index 7220f6732a..b4b4d845f7 100644
--- a/docs/html/roadmap.htm
+++ b/docs/html/roadmap.htm
@@ -31,10 +31,23 @@ This page represents current thinking about where wxWindows is going in the near
 medium and long-term. It also serves as a schedule for new releases so
 that both developers and users can know what to expect when, at least approximately.<P>
 
-Note (1): as the wxWindows effort is voluntary, these are not hard-and-fast deadlines:
+We are adopting the Linux kernel style of numbering system where odd minor version numbers are development
+versions, and even numbers are stable versions. For example, 2.1.x are development releases,
+and the next 'stable' or final release of it would be 2.2.<P>
+
+Bug-fix patches to the stable release (if made) then become point
+releases of 2.2 (2.2.x) while development continues with wild abandon
+on 2.3.x until the end of the next development cycle when it is
+released as 2.4.<P>
+
+Development versions that end up on the FTP site or CD-ROM, as opposed to remaining
+in the CVS archive, are semi-stable -- i.e. they are checked for compilation and
+run-time problems, but not as thoroughly as the stable versions.<P>
+
+Note that since the wxWindows effort is voluntary, these are not hard-and-fast deadlines:
 but we will endeavour to follow them as closely as possible.<P>
 
-Note (2): the releases described are for wxGTK, wxMSW and wxMotif ports. wxMac currently follows
+Note also that the releases described are for wxGTK, wxMSW and wxMotif ports. wxMac currently follows
 its own development path but is due to merge with the main code base in November/December.
 Also, minor snapshot releases for specific platforms may be
 available at dates convenient to the developers.<P>
@@ -44,90 +57,60 @@ available at dates convenient to the developers.<P>
 </CENTER>
 <P>
 
-<H4>Release 2.0.?</H4>
-
-<ul>
-<li>Release date: October 3rd, 1999
-<li>This beta is intended to be the last stable snapshot before wxWindows
-is split into base and GUI libraries.
-<li>New wxGrid in beta.
-<li>wxWizard (beta)
-<li>wxDialUpManager and wxPhoneDialer (beta)
-<li>wxFontEnumerator (beta)
-<li>Preliminary support for different encodings
-<li>wxPostEvent function
-</ul>
+<H4>Release 2.1.11</H4>
 
-<P>
-
-<H2>Release 2.1</H2>
+Release date: November 7th, 1999<P>
 
 <ul>
-<li>Release date: November 7th, 1999
-<li>Splits wxWindows into base and GUI libraries. Most, but not all makefiles
+<li>Split wxWindows into base and GUI libraries. Most, but not all makefiles
 are expected to support this: for the rest, the makefiles will build a valid
 combined base/GUI library for GUI applications only.
+<li>wxWizard (beta).
+<li>wxDialUpManager and wxPhoneDialer.
+<li>wxFontEnumerator.
+<li>Preliminary support for different font encodings
+<li>wxPostEvent function
 <li>New wxGrid.
 <li>wxSocket working.
-<li>Full support for fonts in different encodings
-<li>Tested multithreading support (wxThread)
-<li>wxHTML printing (possibly).
-<li>Better i18n support (i.e. more translations)
-<li>Animation classes (possibly, low priority).
-<li>PCX writing capability (possibly, low priority).
-<li>wxImage handlers in separate .h and .cpp files.
-<li>Rewritten timer.cpp, possible wxChrono class.
-<li>Bug tracking system in place.
+<li>Full support for fonts in different encodings.
+<li>Tested multithreading support (wxThread).
+<li>wxHTML printing.
+<li>Better i18n support (i.e. more translations).
 </ul>
 
 <P>
 
-<H4>Release 2.1.1</H4>
+<H4>Release 2.2 (stable)</H4>
+
+Release date: December 19th, 1999.<P>
 
 <ul>
-<li>Release date: January 9th, 2000
 <li>Miscellaneous fixes and small enhancements.
 </ul>
 
 <P>
 
-<H4>Release 2.1.2</H4>
+<H4>Release 2.3</H4>
+
+Release date: March 5th, 2000
 
 <ul>
-<li>Release date: March 5th, 2000
 <li>Miscellaneous fixes and small enhancements.
 <li>wxDateTime class in beta.
-<li>Context sensitive help
+<li>Context sensitive help.
 <li>More i18n issues: dates, times, ...
+<li>Regular expressions support.
 </ul>
 
 <P>
 
-<H4>Release 2.1.3</H4>
-
-<ul>
-<li>Release date: May 7th, 2000
-<li>Unicode compilation starting to work in wxGTK and wxMSW.
-</ul>
-
-<P>
+<H4>Release 2.4 (stable)</H4>
 
-<H2>Release 2.2</H2>
+Release date: May 7th, 2000.
 
 <ul>
-<li>Release date: c. July 2nd, 2000
-<li>Unicode compilation working in wxGTK and wxMSW.
+<li>Unicode compilation starting to work in wxGTK and wxMSW.
 <li>wxDateTime class.
-<li>Regular expressions support.
-</ul>
-
-<P>
-
-<H2>Release 2.3</H2>
-
-<ul>
-<li>Release date: unknown
-<li>WinCE port available.
 </ul>
 
 <P>
@@ -166,11 +149,13 @@ correct help id.
 determining if there is a connection to Internet on the machine and
 wxPhoneDialer for dialing arbitrary phone numbers and otherwise communicating
 with the modem.
+<li>wxImage handlers in separate .h and .cpp files.
 <li>PCX writing code.
 <li>GIF animation code.
 <li>Tidying of timer code, addition of wxChrono class.
 <li>Debug wxPostScriptDC further.
 <li>wxDateTime class.
+<li>Regular expressions support.
 <li>Expansion of wxHTML to support further tags, and frames.
 <li>MGL port (see Backroom/Future Ports page).
 <li>Rotated text support.
@@ -181,6 +166,7 @@ written generically in wxWindows.
 <li>Modem and telephony support.
 <li>Book, tutorial.
 <li>More examples.
+<li>Bug tracking system.
 </ul>
 
 <P>