# HG changeset patch
# User paulb
# Date 1191021598 0
# Node ID 6d791548da91084c1c7153aedb19b4c5acf206d8
# Parent  cc5e19a474cde5771ee33223ad7d35a530a9cfc7
[project @ 2007-09-28 23:19:58 by paulb]
Updated framework notes.

diff -r cc5e19a474cd -r 6d791548da91 docs/deploying-applications.html
--- a/docs/deploying-applications.html	Fri Sep 28 23:19:49 2007 +0000
+++ b/docs/deploying-applications.html	Fri Sep 28 23:19:58 2007 +0000
@@ -49,7 +49,8 @@
     </tr>
     <tr>
       <td>WSGI</td>
-      <td>(Follow the instructions for CGI - this may change in future.)</td>
+      <td>Either run the adapter code (for applications using <code>wsgiref</code>)<br />
+        Or follow the instructions for CGI (for applications using WSGI on CGI)</td>
     </tr>
     <tr>
       <td>Zope 2</td>
diff -r cc5e19a474cd -r 6d791548da91 docs/supported-frameworks.html
--- a/docs/supported-frameworks.html	Fri Sep 28 23:19:49 2007 +0000
+++ b/docs/supported-frameworks.html	Fri Sep 28 23:19:58 2007 +0000
@@ -16,11 +16,11 @@
     </tr>
     <tr>
       <td>BaseHTTPRequestHandler</td>
-      <td align="undefined" valign="undefined">Python 2.2.2<br />Python 2.3.3<br />Python 2.4.1</td><td>Found in Python's standard library - no additional software required</td><td align="undefined" valign="undefined"></td>
+      <td align="undefined" valign="undefined">Python 2.2.2<br />Python 2.3.x<br />Python 2.4.x<br />Python 2.5.1</td><td>Found in Python's standard library - no additional software required</td><td align="undefined" valign="undefined"></td>
     </tr>
     <tr>
       <td>CGI</td>
-      <td align="undefined" valign="undefined">Apache 2.0.44<br />Apache 2.0.53<br /> AOLserver 4.0.10<br />lighttpd 1.3.15</td><td><br /></td><td align="undefined" valign="undefined">Web server with CGI support:<br /><br /> Apache httpd (<a href="http://httpd.apache.org/">http://httpd.apache.org/</a>) AOLserver (<a href="http://aolserver.com/">http://aolserver.com/</a>)<br />lighttpd (<a href="http://www.lighttpd.net/">http://www.lighttpd.net/</a>)</td>
+      <td align="undefined" valign="undefined">Apache 2.0.x<br />Apache 2.2.x<br />AOLserver 4.0.10<br />lighttpd 1.3.15</td><td><br /></td><td align="undefined" valign="undefined">Web server with CGI support:<br /><br /> Apache httpd (<a href="http://httpd.apache.org/">http://httpd.apache.org/</a>) AOLserver (<a href="http://aolserver.com/">http://aolserver.com/</a>)<br />lighttpd (<a href="http://www.lighttpd.net/">http://www.lighttpd.net/</a>)</td>
     </tr>
     <tr><td align="undefined" valign="undefined">Django</td><td align="undefined" valign="undefined">Django 0.95</td><td align="undefined" valign="undefined"><a href="http://www.djangoproject.com/">http://www.djangoproject.com/</a><br /></td><td align="undefined" valign="undefined"></td></tr><tr>
       <td>Jython/Java Servlet</td>
@@ -36,7 +36,7 @@
     </tr>
     <tr>
       <td>Webware</td>
-      <td align="undefined" valign="undefined">0.8.1<br />CVS (2004-02-06)<br />0.9b2</td><td><a href="http://www.webwareforpython.org/">http://www.webwareforpython.org/</a></td><td align="undefined" valign="undefined">Web server supporting CGI (see above)</td>
+      <td align="undefined" valign="undefined">0.8.1 <strong>(deprecated)</strong><br />0.9.4</td><td><a href="http://www.webwareforpython.org/">http://www.webwareforpython.org/</a></td><td align="undefined" valign="undefined">Web server supporting CGI (see above)</td>
     </tr>
     <tr>
       <td>WSGI</td>