Remove the recently-removed _scons_sets15.py from MANIFEST.in.

[scons.git] / www / roadmap.html

diff --git a/www/roadmap.html b/www/roadmap.html
index c6ad7997c6d88274cae7489aa95bc0b155a23241..17995acf67649597a3cbff9332698621f35d0ec9 100644 (file)
--- a/www/roadmap.html
+++ b/www/roadmap.html
@@ -13,11 +13,11 @@
 <h2>Current Releases</h2>
 
 <p>
-The current stable release is 1.0.1, released 7 September 2008.
+The current stable release is 1.3.0, released 23 March 2010.
 </p>
 
 <p>
-The latest release is 1.0.1, released 7 September 2008.
+The latest release is 1.3.0, released 23 March 2010.
 </p>
 
 <h2>Upcoming Releases</h2>
@@ -29,120 +29,55 @@ the beta checkpoint dates are our best guess as this was published,
 but they may be adjusted without notice.
 </p>
 
-<table>
+<!--
+
+DO NOT EDIT THE FOLLOWING TABLE DIRECTLY.
+
+Edit the "schedule" file and replace it with the output from
+running "gen_sched_table.py".
+
+-->
+
+<table width="100%">
   <tr>
-    <th>Date</th>
+    <th>Estimated&nbsp;date</th>
     <th>Type</th>
-    <th>Name</th>
     <th>Comments</th>
   </tr>
   <tr>
-    <td>15-Sep-2008</td>
-    <td>checkpoint</td>
-    <td>1.0.1.d20080915</td>
-    <td>Beta for 1.1.  Prioritization of work items and checkins for 1.1 are occuring now.</td>
-  </tr>
-  <tr>
-    <td>27-Sep-2008</td>
-    <td>candidate</td>
-    <td>1.0.1.d20080927</td>
-    <td>Release candidate for 1.1.</td>
-  </tr>
-  <tr>
-    <td>4-Oct-2008</td>
-    <td>release</td>
-    <td>1.1</td>
-    <td>First minor release of 1.0.</td>
-  </tr>
-  <tr>
-    <td>11-Oct-2008</td>
-    <td>checkpoint</td>
-    <td>1.1.d20081011</td>
-    <td>Beta for testing new features.</td>
-  </tr>
-  <tr>
-    <td>25-Oct-2008</td>
-    <td>checkpoint</td>
-    <td>1.1.d20081025</td>
-    <td>Beta for testing new features.</td>
-  </tr>
-  <tr>
-    <td>8-Nov-2008</td>
-    <td>checkpoint</td>
-    <td>1.1.d20081108</td>
-    <td>Beta for testing new features.</td>
+    <td>April 2009</td>
+    <td>Ckpt</td>
+    <td>Beta for 2.0; breaks backward compatibility</td>
   </tr>
   <tr>
-    <td>15-Nov-2008</td>
-    <td>candidate</td>
-    <td>1.1.d20081115</td>
-    <td>Release candidate for 1.2.</td>
-  </tr>
-  <tr>
-    <td>22-Nov-2008</td>
-    <td>release</td>
-    <td>1.2</td>
-    <td>Second minor release of 1.0.</td>
-  </tr>
-  <tr>
-    <td>29-Nov-2008</td>
-    <td>checkpoint</td>
-    <td>1.2.d20081129</td>
-    <td>Beta for testing new features.</td>
+    <td>May 2009</td>
+    <td>RC</td>
+    <td>Release candidate for 2.0.</td>
   </tr>
   <tr>
-    <td>13-Dec-2008</td>
-    <td>checkpoint</td>
-    <td>1.2.d20081213</td>
-    <td>Beta for testing new features.</td>
+    <td>May 2009</td>
+    <td>2.0</td>
+    <td>Public release that breaks backward compatibility and drops deprecated features</td>
   </tr>
   <tr>
-    <td>27-Dec-2008</td>
-    <td>checkpoint</td>
-    <td>1.2.d20081227</td>
+    <td>June 2009</td>
+    <td>Ckpt</td>
     <td>Beta for testing new features.</td>
   </tr>
   <tr>
-    <td>3-Jan-2009</td>
-    <td>candidate</td>
-    <td>1.2.d20090103</td>
-    <td>Release candidate for 1.3.</td>
-  </tr>
-  <tr>
-    <td>10-Jan-2009</td>
-    <td>release</td>
-    <td>1.3</td>
-    <td>Third minor release of 1.0.</td>
-  </tr>
-  <tr>
-    <td>17-Jan-2009</td>
-    <td>checkpoint</td>
-    <td>1.3.d20090117</td>
-    <td>Beta for testing new featurea; breaks backward compatibility with Python 1.5.2.</td>
-  </tr>
-  <tr>
-    <td>24-Jan-2009</td>
-    <td>checkpoint</td>
-    <td>1.3.d20090124</td>
+    <td>July 2009</td>
+    <td>Ckpt</td>
     <td>Beta for testing new features.</td>
   </tr>
   <tr>
-    <td>31-Jan-2009</td>
-    <td>candidate</td>
-    <td>1.3.d20090131</td>
-    <td>Release candidate for 2.0.</td>
-  </tr>
-  <tr>
-    <td>7-Feb-2009</td>
-    <td>candidate</td>
-    <td>1.3.d20090207</td>
-    <td>Release candidate for 2.0, if needed.</td>
+    <td>Aug 2009</td>
+    <td>RC</td>
+    <td>Release candidate for 2.1.</td>
   </tr>
   <tr>
-    <td>14-Feb-2009</td>
-    <td>release</td>
-    <td>2.0</td>
-    <td>Public release that breaks backward compatibility</td>
+    <td>Sept 2009</td>
+    <td>2.1</td>
+    <td>First minor release of v2</td>
   </tr>
 </table>
 
@@ -195,14 +130,14 @@ with any previous minor releases from the same major release.
 Revision numbers are appended and/or incremented
 whenever a critical bug fix is necessary
 for a major or minor release.
-Bedause most new functionality and bug fixes
+Because most new functionality and bug fixes
 will be delivered in minor releases,
-we expect that there will be few of these--at most
+we expect that there will be few of these&mdash;at most
 one per minor release.
 </p>
 </li>
 <li>
-<strong>Release candidates (x.y.z.dyyyymmdd )</strong>
+<strong>Release candidates (x.y.z.dyyyymmdd)</strong>
 <p>
 A release candidates is a special form of checkpoint
 (see below)
@@ -214,7 +149,7 @@ otherwise the candidate will be repackaged as the major or minor release.
 </p>
 </li>
 <li>
-<strong>Checkpoints (x.y.z.dyyyymmdd )</strong>
+<strong>Checkpoints (x.y.z.dyyyymmdd)</strong>
 <p>
 A checkpoint has a 'd<i>yyymmdd</i>' suffix
 and is made every couple of weeks between major or minor releases.