Update post 1.2 schedule

2 files changed, 46 insertions, 50 deletions

diff --git a/www/roadmap.html b/www/roadmap.html
index e80f38b..386ae17 100644
--- a/www/roadmap.html
+++ b/www/roadmap.html
@@ -45,80 +45,75 @@ running "gen_sched_table.py".
     <th>Comments</th>
   </tr>
   <tr>
-    <td>13-Oct-2008</td>
-    <td>Ckpt</td>
-    <td>Beta for testing new features.</td>
-  </tr>
-  <tr>
-    <td>27-Oct-2008</td>
-    <td>Ckpt</td>
-    <td>Beta for testing new features.</td>
-  </tr>
-  <tr>
-    <td>10-Nov-2008</td>
-    <td>Ckpt</td>
-    <td>Beta for testing new features.</td>
-  </tr>
-  <tr>
-    <td>17-Nov-2008</td>
+    <td>5-Dec-2008</td>
     <td>RC</td>
-    <td>Release candidate for 1.2.</td>
+    <td>Release candidate for 1.2. (released 7-Dec)</td>
   </tr>
   <tr>
-    <td>24-Nov-2008</td>
+    <td>12-Dec-2008</td>
     <td>1.2</td>
-    <td>Second minor release of 1.0.</td>
+    <td>Second minor release of 1.0. (released 21-Dec)</td>
   </tr>
   <tr>
-    <td>1-Dec-2008</td>
-    <td>Ckpt</td>
-    <td>Beta for testing new features.</td>
-  </tr>
-  <tr>
-    <td>15-Dec-2008</td>
+    <td>29-Dec-2008</td>
     <td>Ckpt</td>
     <td>Beta for testing new features.</td>
   </tr>
   <tr>
-    <td>29-Dec-2008</td>
+    <td>12-Jan-2009</td>
     <td>Ckpt</td>
     <td>Beta for testing new features.</td>
   </tr>
   <tr>
-    <td>5-Jan-2009</td>
+    <td>19-Jan-2009</td>
     <td>RC</td>
     <td>Release candidate for 1.3.</td>
   </tr>
   <tr>
-    <td>12-Jan-2009</td>
+    <td>26-Jan-2009</td>
     <td>1.3</td>
     <td>Third minor release of 1.0.</td>
   </tr>
   <tr>
-    <td>19-Jan-2009</td>
-    <td>Ckpt</td>
-    <td>Beta for testing new features; breaks backward compatibility with Python 1.5.2.</td>
-  </tr>
-  <tr>
-    <td>26-Jan-2009</td>
+    <td>2-Feb-2009</td>
     <td>Ckpt</td>
-    <td>Beta for testing new features.</td>
+    <td>Beta for 2.0; breaks backward compatibility</td>
   </tr>
   <tr>
-    <td>2-Feb-2009</td>
+    <td>9-Feb-2009</td>
     <td>RC</td>
     <td>Release candidate for 2.0.</td>
   </tr>
   <tr>
-    <td>9-Feb-2009</td>
+    <td>16-Feb-2009</td>
     <td>RC</td>
     <td>Release candidate for 2.0, if needed.</td>
   </tr>
   <tr>
-    <td>16-Feb-2009</td>
+    <td>23-Feb-2009</td>
     <td>2.0</td>
     <td>Public release that breaks backward compatibility and drops deprecated features</td>
   </tr>
+  <tr>
+    <td>16-Mar-2009</td>
+    <td>Ckpt</td>
+    <td>Beta for testing new features.</td>
+  </tr>
+  <tr>
+    <td>6-Apr-2009</td>
+    <td>Ckpt</td>
+    <td>Beta for testing new features.</td>
+  </tr>
+  <tr>
+    <td>27-Apr-2009</td>
+    <td>RC</td>
+    <td>Release candidate for 2.1.</td>
+  </tr>
+  <tr>
+    <td>4-May-2009</td>
+    <td>2.1</td>
+    <td>First minor release of 2.0</td>
+  </tr>
 </table>
 
 <!--
diff --git a/www/schedule b/www/schedule
index 5a51f46..4b1e9eb 100644
--- a/www/schedule
+++ b/www/schedule
@@ -1,18 +1,19 @@
-=2008-09-13 1.0.1
-=2008-10-01 Release candidate for 1.1.
-=2008-10-10 1.1.0
-+3 ck	Beta for testing new features.
-+14 ck	Beta for testing new features.
-+14 ck	Beta for testing new features.
-+7 rc	Release candidate for 1.2.
-+7 1.2	Second minor release of 1.0.
-+7 ck	Beta for testing new features.
-+14 ck	Beta for testing new features.
+#=2008-09-13 1.0.1
+#=2008-10-01 Release candidate for 1.1.
+#=2008-10-10 1.1.0
+=2008-12-01 1.1.0
++4 rc	Release candidate for 1.2. (released 7-Dec)
++7 1.2	Second minor release of 1.0. (released 21-Dec)
++17 ck	Beta for testing new features.
 +14 ck	Beta for testing new features.
 +7 rc	Release candidate for 1.3.
 +7 1.3	Third minor release of 1.0.
-+7 ck	Beta for testing new features; breaks backward compatibility with Python 1.5.2.
-+7 ck	Beta for testing new features.
++7 ck	Beta for 2.0; breaks backward compatibility
+#+7 ck	Beta for 2.0.
 +7 rc	Release candidate for 2.0.
 +7 rc	Release candidate for 2.0, if needed.
 +7 2.0	Public release that breaks backward compatibility and drops deprecated features
++21 ck	Beta for testing new features.
++21 ck	Beta for testing new features.
++21 rc	Release candidate for 2.1.
++7 2.1	First minor release of 2.0