you'll all miss the last of the ASCII art

diff --git a/doc/build/core/engines.rst b/doc/build/core/engines.rst
index c6364b2fd54a34e980d241a3379da23bbf89ce86..02c904f189dfeb08c58b3d61d1fcb1e530e77e82 100644 (file)
--- a/doc/build/core/engines.rst
+++ b/doc/build/core/engines.rst
@@ -9,15 +9,9 @@ The **Engine** is the starting point for any SQLAlchemy application. It's
 application through a connection pool and a **Dialect**, which describes how
 to talk to a specific kind of database/DBAPI combination.
 
-The general structure is this::
-
-                                         +-----------+                        __________
-                                     /---|   Pool    |---\                   (__________)
-                 +-------------+    /    +-----------+    \     +--------+   |          |
-    connect() <--|   Engine    |---x                       x----| DBAPI  |---| database |
-                 +-------------+    \    +-----------+    /     +--------+   |          |
-                                     \---|  Dialect  |---/                   |__________|
-                                         +-----------+                       (__________)
+The general structure can be illustrated as follows:
+
+.. image:: sqla_engine_arch.png
 
 Where above, a :class:`~sqlalchemy.engine.base.Engine` references both a
 :class:`~sqlalchemy.engine.base.Dialect` and :class:`~sqlalchemy.pool.Pool`,

diff --git a/doc/build/core/sqla_engine_arch.png b/doc/build/core/sqla_engine_arch.png
new file mode 100644 (file)
index 0000000..f54d105
Binary files /dev/null and b/doc/build/core/sqla_engine_arch.png differ

diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index f111953f1a34d0b1894ea204fc9ad7fb07000daa..bf57f8d73a2c06ce4879b5b249218f3abaa92da5 100644 (file)
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -8,11 +8,22 @@ Overview
 ========
 
 
-The SQLAlchemy SQL Toolkit and Object Relational Mapper is a comprehensive set of tools for working with databases and Python.  It has several distinct areas of functionality which can be used individually or combined together.  Its major components are illustrated below.  The arrows represent the general dependencies of components:
-
-.. image:: sqla_arch_small.jpg
-
-Above, the two most significant front-facing portions of SQLAlchemy are the **Object Relational Mapper** and the **SQL Expression Language**.  SQL Expressions can be used independently of the ORM.  When using the ORM, the SQL Expression language remains part of the public facing API as it is used within object-relational configurations and queries.
+The SQLAlchemy SQL Toolkit and Object Relational Mapper
+is a comprehensive set of tools for working with
+databases and Python. It has several distinct areas of
+functionality which can be used individually or combined
+together. Its major components are illustrated below. The
+arrows represent the general dependencies of components:
+
+.. image:: sqla_arch_small.png
+
+Above, the two most significant front-facing portions of
+SQLAlchemy are the **Object Relational Mapper** and the
+**SQL Expression Language**. SQL Expressions can be used
+independently of the ORM. When using the ORM, the SQL
+Expression language remains part of the public facing API
+as it is used within object-relational configurations and
+queries.
 
 Documentation Overview
 ======================

diff --git a/doc/build/sqla_arch_small.jpg b/doc/build/sqla_arch_small.jpg
deleted file mode 100644 (file)
index 2976030..0000000
Binary files a/doc/build/sqla_arch_small.jpg and /dev/null differ

diff --git a/doc/build/sqla_arch_small.png b/doc/build/sqla_arch_small.png
new file mode 100644 (file)
index 0000000..521a081
Binary files /dev/null and b/doc/build/sqla_arch_small.png differ