Move release days to Monday; slip 1.1 (but not rest); typos

3 files changed, 42 insertions, 68 deletions

diff --git a/www/gen_sched_table.py b/www/gen_sched_table.py
index cf9df5a..572de2a 100755
--- a/www/gen_sched_table.py
+++ b/www/gen_sched_table.py
@@ -13,7 +13,7 @@ def row(*cells, **kw):
 	for cell in cells:
 		print '    <%s>%s</%s>' % (td,cell,td)
 	print '  </tr>'
-row('Estimated date', 'Type', 'Name', 'Comments', tr = 'th')
+row('Est. date', 'Type', 'Comments', tr = 'th')
 
 if len(sys.argv) > 1:
 	f = open(sys.argv[1])
@@ -32,14 +32,13 @@ for line in f:
 	else:
 		print 'dunna understand code', line[0]
 		sys.exit(1)
-	name = current + '.d' + str(now).replace('-','')
+	#name = current + '.d' + str(now).replace('-','')
 	date = '%s-%s-%s' % (now.day,months[now.month-1],now.year)
 	if type == 'ck':
-		category = 'checkpoint'
+		category = 'Ckpt'
 	elif type == 'rc':
-		category = 'candidate'
+		category = 'RC'
 	else:
-		current = name = type
-		category = 'release'
-	row(date, category, name, desc)
+		category = current = type
+	row(date, category, desc)
 print '</table>'
diff --git a/www/roadmap.html b/www/roadmap.html
index c6ad799..45739b4 100644
--- a/www/roadmap.html
+++ b/www/roadmap.html
@@ -31,116 +31,92 @@ but they may be adjusted without notice.
 
 <table>
   <tr>
-    <th>Date</th>
+    <th>Estimated 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>29-Sep-2008</td>
+    <td>RC</td>
     <td>Release candidate for 1.1.</td>
   </tr>
   <tr>
-    <td>4-Oct-2008</td>
-    <td>release</td>
+    <td>8-Oct-2008</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>13-Oct-2008</td>
+    <td>Ckpt</td>
     <td>Beta for testing new features.</td>
   </tr>
   <tr>
-    <td>25-Oct-2008</td>
-    <td>checkpoint</td>
-    <td>1.1.d20081025</td>
+    <td>27-Oct-2008</td>
+    <td>Ckpt</td>
     <td>Beta for testing new features.</td>
   </tr>
   <tr>
-    <td>8-Nov-2008</td>
-    <td>checkpoint</td>
-    <td>1.1.d20081108</td>
+    <td>10-Nov-2008</td>
+    <td>Ckpt</td>
     <td>Beta for testing new features.</td>
   </tr>
   <tr>
-    <td>15-Nov-2008</td>
-    <td>candidate</td>
-    <td>1.1.d20081115</td>
+    <td>17-Nov-2008</td>
+    <td>RC</td>
     <td>Release candidate for 1.2.</td>
   </tr>
   <tr>
-    <td>22-Nov-2008</td>
-    <td>release</td>
+    <td>24-Nov-2008</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>1-Dec-2008</td>
+    <td>Ckpt</td>
     <td>Beta for testing new features.</td>
   </tr>
   <tr>
-    <td>13-Dec-2008</td>
-    <td>checkpoint</td>
-    <td>1.2.d20081213</td>
+    <td>15-Dec-2008</td>
+    <td>Ckpt</td>
     <td>Beta for testing new features.</td>
   </tr>
   <tr>
-    <td>27-Dec-2008</td>
-    <td>checkpoint</td>
-    <td>1.2.d20081227</td>
+    <td>29-Dec-2008</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>5-Jan-2009</td>
+    <td>RC</td>
     <td>Release candidate for 1.3.</td>
   </tr>
   <tr>
-    <td>10-Jan-2009</td>
-    <td>release</td>
+    <td>12-Jan-2009</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>19-Jan-2009</td>
+    <td>Ckpt</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>26-Jan-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>2-Feb-2009</td>
+    <td>RC</td>
     <td>Release candidate for 2.0.</td>
   </tr>
   <tr>
-    <td>7-Feb-2009</td>
-    <td>candidate</td>
-    <td>1.3.d20090207</td>
+    <td>9-Feb-2009</td>
+    <td>RC</td>
     <td>Release candidate for 2.0, if needed.</td>
   </tr>
   <tr>
-    <td>14-Feb-2009</td>
-    <td>release</td>
+    <td>16-Feb-2009</td>
     <td>2.0</td>
     <td>Public release that breaks backward compatibility</td>
   </tr>
@@ -195,9 +171,9 @@ 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>
diff --git a/www/schedule b/www/schedule
index a8cef71..542accd 100644
--- a/www/schedule
+++ b/www/schedule
@@ -1,8 +1,7 @@
 =2008-09-13 1.0.1
-+0 ck	Beta for 1.1.  Prioritization of work items and checkins for 1.1 are occuring now.
-+14 rc	Release candidate for 1.1.
-+7 1.1	First minor release of 1.0.
-+7 ck	Beta for testing new features.
++16 rc	Release candidate for 1.1.
++9 1.1	First minor release of 1.0.
++5 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.