# HG changeset patch
# User kylev
# Date 1234397310 0
# Node ID 7b67220c510960331a0a9cefed34b87eed507a34
# Parent  7c7b7114864b05c18096a58ee00909df12ce349d
Merge back doc changes 556:557 from 1.2 branch

diff -r 7c7b7114864b -r 7b67220c5109 MANIFEST.in
--- a/MANIFEST.in	Wed Feb 11 23:51:13 2009 +0000
+++ b/MANIFEST.in	Thu Feb 12 00:08:30 2009 +0000
@@ -9,4 +9,3 @@
 include site.cfg
 include setup_*.py
 include ez_setup.py
-
diff -r 7c7b7114864b -r 7b67220c5109 README
--- a/README	Wed Feb 11 23:51:13 2009 +0000
+++ b/README	Thu Feb 12 00:08:30 2009 +0000
@@ -21,6 +21,10 @@
     - Make sure you have the Python development headers and libraries
       (python-devel).
 
++ setuptools
+
+  * http://pypi.python.org/pypi/setuptools
+
 + MySQL 3.23.32 or higher
 
   * http://www.mysql.com/downloads/
@@ -35,11 +39,22 @@
 
   * MySQL-4.0 is supported, but not tested and slightly discouraged.
 
-  * MySQL-4.1 is supported and tested. The prepared statements API is not
-    supported, and won't be until MySQLdb-1.3 or 2.0.
+  * MySQL-4.1 is supported. The prepared statements API is not
+    supported, and won't be until MySQLdb-1.3 or 2.0, if ever.
 
   * MySQL-5.0 is supported and tested, including stored procedures.
       
+  * MySQL-5.1 is supported (currently a release candidate) but untested.
+    It should work.
+
+  * MySQL-6.0 is sorta-kinda-supported (currently alpha) but untested.
+    It should work.
+
+  * Drizzle <https://launchpad.net/drizzle> is a fork of MySQL. So far
+    the C API looks really similar except everything is renamed.
+    Drizzle support probably won't happen in 1.2. There may be have to
+    be an entirely different module, but still using DB-API.
+
   * MaxDB, formerly known as SAP DB (and maybe Adabas D?), is a
     completely different animal. Use the sapdb.sql module that comes
     with MaxDB.
@@ -94,7 +109,6 @@
 .. _Cygwin: http://www.cygwin.com/
 
 
-
 Building and installing
 -----------------------
 
@@ -213,8 +227,7 @@
 Gentoo Linux
 ............
 
-Packaged as `mysql-python`_. Gentoo is also my preferred development platform,
-though I have also done some with Ubuntu lately. ::
+Packaged as `mysql-python`_. ::
 
       # emerge sync
       # emerge mysql-python