From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 31 Oct 2012 04:55:43 +0000 (-0400)
Subject: update the intro
X-Git-Tag: rel_0_8_0b2~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0a9d39634d214672ab5171c7b8178abf2cbea94;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

update the intro
---

diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index 1493e2c4bf..fc7e1142e9 100644
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -74,11 +74,14 @@ Supported Platforms
 
 SQLAlchemy has been tested against the following platforms:
 
-* cPython since version 2.4, through the 2.xx series
+* cPython since version 2.5, through the 2.xx series
 * cPython version 3, throughout all 3.xx series
 * `Jython <http://www.jython.org/>`_ 2.5 or greater
 * `Pypy <http://pypy.org/>`_ 1.5 or greater
 
+.. versionchanged:: 0.8
+   Python 2.5 is now the minimum Python version supported.
+
 Supported Installation Methods
 -------------------------------
 
@@ -99,11 +102,6 @@ SQLAlchemy supports installation using standard Python "distutils" or
   rides on top of ``setuptools`` or ``distribute``, replacing the usage
   of ``easy_install``.  It is often preferred for its simpler mode of usage.
 
-.. note::
-
-   It is strongly recommended that either ``setuptools`` or ``distribute`` be installed.
-   Python's built-in ``distutils`` lacks many widely used installation features.
-
 Install via easy_install or pip
 -------------------------------
 
@@ -166,10 +164,10 @@ work with a non-Distribute setuptools installation.
 Installing a Database API
 ----------------------------------
 
-SQLAlchemy is designed to operate with a `DB-API
-<http://www.python.org/doc/peps/pep-0249/>`_ implementation built for a
-particular database, and includes support for the most popular databases. The
-current list is at :ref:`supported_dbapis`.
+SQLAlchemy is designed to operate with a :term:`DBAPI` implementation built for a
+particular database, and includes support for the most popular databases.
+The individual database sections in :doc:`/dialects/index` enumerate
+the available DBAPIs for each database, including external links.
 
 Checking the Installed SQLAlchemy Version
 ------------------------------------------
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index 8f9680911e..72c430b381 100644
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -1102,7 +1102,7 @@ class SessionEvents(event.Events):
     def after_transaction_create(self, session, transaction):
         """Execute when a new :class:`.SessionTransaction` is created.
 
-        :param session: the target :class:.`Session`.
+        :param session: the target :class:`.Session`.
         :param transaction: the target :class:`.SessionTransaction`.
 
         .. versionadded:: 0.8
@@ -1112,7 +1112,7 @@ class SessionEvents(event.Events):
     def after_transaction_end(self, session, transaction):
         """Execute when the span of a :class:`.SessionTransaction` ends.
 
-        :param session: the target :class:.`Session`.
+        :param session: the target :class:`.Session`.
         :param transaction: the target :class:`.SessionTransaction`.
 
         .. versionadded:: 0.8