From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 4 May 2007 14:52:02 +0000 (+0000)
Subject: - shored up DBAPI descriptions
X-Git-Tag: rel_0_3_8~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7de3caf5b93dd347de27373329a406d51155e7f9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- shored up DBAPI descriptions
- added link to select() docs in sqlconstruction
---

diff --git a/doc/build/content/dbengine.txt b/doc/build/content/dbengine.txt
index 0d8ee859db..a3cc899e33 100644
--- a/doc/build/content/dbengine.txt
+++ b/doc/build/content/dbengine.txt
@@ -19,7 +19,7 @@ Underneath the public-facing API of `Engine`, several components are provided by
 
 ### Supported Databases {@name=supported}
 
-Engines exist for SQLite, Postgres, MySQL, and Oracle, using the Pysqlite, Psycopg2 (Psycopg1 will work to a limited degree, but it is **not supported**), MySQLDB, and cx_Oracle modules.  There is also preliminary support for MS-SQL using pyodbc, adodbapi or pymssql, Firebird with kinterbasdb, and Informix with informixdb.   For each engine, a distinct Python module exists in the `sqlalchemy.databases` package, which provides implementations of some of the objects mentioned in the previous section.
+Engines exist for SQLite, Postgres, MySQL, MS-SQL, Firebird, Informix, and Oracle.  For each engine, the appropriate DBAPI drivers must be installed separately.  A distinct Python module exists in the `sqlalchemy.databases` package for each type of database as well, which provides implementations of some of the objects mentioned in the previous section.
 
 Downloads for each DBAPI at the time of this writing are as follows:
 
@@ -27,7 +27,7 @@ Downloads for each DBAPI at the time of this writing are as follows:
 * SQLite:  [pysqlite](http://initd.org/tracker/pysqlite)
 * MySQL:   [MySQLDB](http://sourceforge.net/projects/mysql-python)
 * Oracle:  [cx_Oracle](http://www.cxtools.net/default.aspx?nav=home)
-* MS-SQL:  [adodbapi](http://adodbapi.sourceforge.net/)  [pymssql](http://pymssql.sourceforge.net/)
+* MS-SQL:  [pyodbc](http://pyodbc.sourceforge.net/) (recommended) [adodbapi](http://adodbapi.sourceforge.net/)  [pymssql](http://pymssql.sourceforge.net/)
 * Firebird:  [kinterbasdb](http://kinterbasdb.sourceforge.net/)
 * Informix:  [informixdb](http://informixdb.sourceforge.net/)
 
diff --git a/doc/build/content/sqlconstruction.txt b/doc/build/content/sqlconstruction.txt
index c5ccff559b..1996b5de4b 100644
--- a/doc/build/content/sqlconstruction.txt
+++ b/doc/build/content/sqlconstruction.txt
@@ -46,7 +46,7 @@ For this section, we will mostly use the implcit style of execution, meaning the
 
 ### Simple Select {@name=select}
 
-A select is done by constructing a `Select` object with the proper arguments, adding any extra arguments if desired, then calling its `execute()` method.
+A select is done by constructing a `Select` object with the proper arguments  [[api](rel:docstrings_sqlalchemy.sql_modfunc_select)], adding any extra arguments if desired, then calling its `execute()` method.
 
     {python title="Basic Select"}
     from sqlalchemy import *