From fd22efe2977a2eeb3a0c0f8bd0ff51041806693a Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Fri, 11 Sep 2009 23:16:20 +0000
Subject: [PATCH] oracle/mssql+zxjdbc blurb

---
 doc/build/dbengine.rst                  | 6 ++++--
 doc/build/intro.rst                     | 2 +-
 doc/build/reference/dialects/mssql.rst  | 3 +++
 doc/build/reference/dialects/oracle.rst | 4 ++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/build/dbengine.rst b/doc/build/dbengine.rst
index ec407658ef..1216071134 100644
--- a/doc/build/dbengine.rst
+++ b/doc/build/dbengine.rst
@@ -67,10 +67,12 @@ Downloads for each DBAPI at the time of this writing are as follows:
  - PostgreSQL on Jython: `PostgreSQL JDBC Driver <http://jdbc.postgresql.org/>`_
  - SQLite:  `sqlite3 <http://www.python.org/doc/2.5.2/lib/module-sqlite3.html>`_ (included in Python 2.5 or greater) `pysqlite <http://initd.org/tracker/pysqlite>`_
  - MySQL:   `MySQLDB (a.k.a. mysql-python) <http://sourceforge.net/projects/mysql-python>`_
- - MySQL on Jython: `JDBC Driver for MySQL <http://www.mysql.com/products/connector/>`_
+ - MySQL on Jython: `MySQL Connector/J JDBC driver <http://dev.mysql.com/downloads/connector/j/>`_
  - Oracle:  `cx_Oracle <http://cx-oracle.sourceforge.net/>`_
+ - Oracle on Jython:  `Oracle JDBC Driver <http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html>`_
  - Firebird:  `kinterbasdb <http://kinterbasdb.sourceforge.net/>`_
  - MS-SQL, MSAccess:  `pyodbc <http://pyodbc.sourceforge.net/>`_ (recommended) `adodbapi <http://adodbapi.sourceforge.net/>`_  `pymssql <http://pymssql.sourceforge.net/>`_
+ - MS-SQL on Jython:  `jTDS JDBC Driver <http://jtds.sourceforge.net/>`_
 
 * Experimental Dialects
  - MSAccess:  `pyodbc <http://pyodbc.sourceforge.net/>`_
@@ -90,7 +92,7 @@ SQLAlchemy indicates the source of an Engine strictly via `RFC-1738 <http://rfc.
 
     dialect+driver://username:password@host:port/database
 
-Dialect names include the identifying name of the SQLAlchemy dialect which include ``sqlite``, ``mysql``, ``postgresql``, ``oracle``, ``mssql``, and ``firebird``.  The drivername is the name of the DBAPI to be used to connect to the database using all lowercase letters.   If not specified, a "default" DBAPI will be imported if available - this default is typically the most widely known driver available for that backend (i.e. cx_oracle, pysqlite/sqlite3, psycopg2, mysqldb).   For Jython connections, the driver is always `zxjdbc`, which is the JDBC-DBAPI bridge included with Jython.
+Dialect names include the identifying name of the SQLAlchemy dialect which include ``sqlite``, ``mysql``, ``postgresql``, ``oracle``, ``mssql``, and ``firebird``.  The drivername is the name of the DBAPI to be used to connect to the database using all lowercase letters.   If not specified, a "default" DBAPI will be imported if available - this default is typically the most widely known driver available for that backend (i.e. cx_oracle, pysqlite/sqlite3, psycopg2, mysqldb).   For Jython connections, specify the `zxjdbc`, driver, which is the JDBC-DBAPI bridge included with Jython.
 
 .. sourcecode:: python+sql
 
diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index f18bffb7b8..5e3b945591 100644
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -82,7 +82,7 @@ This documentation covers SQLAlchemy version 0.6.  If you're working on a system
 
      >>> import sqlalchemy
      >>> sqlalchemy.__version__ # doctest: +SKIP
-     0.5.0
+     0.6.0
 
 0.5 to 0.6 Migration 
 =====================
diff --git a/doc/build/reference/dialects/mssql.rst b/doc/build/reference/dialects/mssql.rst
index 68c0f0462c..029919f36e 100644
--- a/doc/build/reference/dialects/mssql.rst
+++ b/doc/build/reference/dialects/mssql.rst
@@ -15,4 +15,7 @@ pymssql
 -------
 .. automodule:: sqlalchemy.dialects.mssql.pymssql
 
+zxjdbc Notes
+--------------
 
+.. automodule:: sqlalchemy.dialects.mssql.zxjdbc
diff --git a/doc/build/reference/dialects/oracle.rst b/doc/build/reference/dialects/oracle.rst
index 584dfbf814..79d2742e1e 100644
--- a/doc/build/reference/dialects/oracle.rst
+++ b/doc/build/reference/dialects/oracle.rst
@@ -8,3 +8,7 @@ cx_Oracle Notes
 
 .. automodule:: sqlalchemy.dialects.oracle.cx_oracle
 
+zxjdbc Notes
+--------------
+
+.. automodule:: sqlalchemy.dialects.oracle.zxjdbc
-- 
2.47.2