- move out maxdb

- begin consolidating docs for dialects to be more self contained
- add a separate section for "external" dialects
- not sure how we're going to go with this yet.

5 files changed, 44 insertions, 9 deletions

diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index d23920c5e..0d2cb3c8f 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -6,8 +6,18 @@
 
 """Support for the PostgreSQL database.
 
-For information on connecting using specific drivers, see the documentation
-section regarding that driver.
+DBAPI Support
+-------------
+
+The following dialect/driver options are available:
+
+* :ref:`psycopg2`
+
+* :ref:`pg8000`
+
+* :ref:`pypostgresql`
+
+* :ref:`zxjdbc`
 
 Sequences/SERIAL
 ----------------
diff --git a/lib/sqlalchemy/dialects/postgresql/pg8000.py b/lib/sqlalchemy/dialects/postgresql/pg8000.py
index d7f74bb98..e19d84b51 100644
--- a/lib/sqlalchemy/dialects/postgresql/pg8000.py
+++ b/lib/sqlalchemy/dialects/postgresql/pg8000.py
@@ -6,11 +6,17 @@
 
 """Support for the PostgreSQL database via the pg8000 driver.
 
+DBAPI
+------
+
+    http://pybrary.net/pg8000/
+
 Connecting
 ----------
 
-URLs are of the form
-``postgresql+pg8000://user:password@host:port/dbname[?key=value&key=value...]``.
+Connect string format::
+
+    postgresql+pg8000://user:password@host:port/dbname[?key=value&key=value...]
 
 Unicode
 -------
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index c5eb9b445..14fb35456 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -6,7 +6,7 @@
 
 """Support for the PostgreSQL database via the psycopg2 driver.
 
-Driver
+DBAPI
 ------
 
 The psycopg2 driver is available at http://pypi.python.org/pypi/psycopg2/ .
@@ -18,8 +18,12 @@ Note that psycopg1 is **not** supported.
 Connecting
 ----------
 
-URLs are of the form
-``postgresql+psycopg2://user:password@host:port/dbname[?key=value&key=value...]``.
+Connect string format::
+
+    postgresql+psycopg2://user:password@host:port/dbname[?key=value&key=value...]
+
+psycopg2 Connect Arguments
+-----------------------------------
 
 psycopg2-specific keyword arguments which are accepted by
 :func:`.create_engine()` are:
diff --git a/lib/sqlalchemy/dialects/postgresql/pypostgresql.py b/lib/sqlalchemy/dialects/postgresql/pypostgresql.py
index a1ba9a3bd..cf091b311 100644
--- a/lib/sqlalchemy/dialects/postgresql/pypostgresql.py
+++ b/lib/sqlalchemy/dialects/postgresql/pypostgresql.py
@@ -6,10 +6,17 @@
 
 """Support for the PostgreSQL database via py-postgresql.
 
+DBAPI
+-----
+
+    http://python.projects.pgfoundry.org/
+
 Connecting
 ----------
 
-URLs are of the form ``postgresql+pypostgresql://user:password@host:port/dbname[?key=value&key=value...]``.
+Connect string format::
+
+    postgresql+pypostgresql://user:password@host:port/dbname[?key=value&key=value...]
 
 
 """
diff --git a/lib/sqlalchemy/dialects/postgresql/zxjdbc.py b/lib/sqlalchemy/dialects/postgresql/zxjdbc.py
index 8382da831..381424c7f 100644
--- a/lib/sqlalchemy/dialects/postgresql/zxjdbc.py
+++ b/lib/sqlalchemy/dialects/postgresql/zxjdbc.py
@@ -6,11 +6,19 @@
 
 """Support for the PostgreSQL database via the zxjdbc JDBC connector.
 
-JDBC Driver
+DBAPI
 -----------
 
 The official Postgresql JDBC driver is at http://jdbc.postgresql.org/.
 
+Connecting
+----------
+
+Connect string format::
+
+    postgresql+zxjdbc://scott:tiger@localhost/db
+
+
 """
 from ...connectors.zxJDBC import ZxJDBCConnector
 from .base import PGDialect, PGExecutionContext