From: Mike Bayer Date: Tue, 18 Jan 2011 22:23:07 +0000 (-0500) Subject: then fix the typos X-Git-Tag: rel_0_6_7~47 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=252e3bfb3a0d18d86522e19a5fc35d0b057fceca;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git then fix the typos --- diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 9e3e2b78fc..ea62bd42f6 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -636,12 +636,12 @@ class Session(object): :class:`.Session` object's transactional state. If this :class:`.Session` is configured with ``autocommit=False``, - either the :class:`.Connection` correspoinding to the current transaction + either the :class:`.Connection` corresponding to the current transaction is returned, or if no transaction is in progress, a new one is begun and the :class:`.Connection` returned. Alternatively, if this :class:`.Session` is configured with ``autocommit=True``, - an ad-hoc :class:`.Connection` is returned using the :meth:`.Engine.contextual_connect` + an ad-hoc :class:`.Connection` is returned using :meth:`.Engine.contextual_connect` on the underlying :class:`.Engine`. Ambiguity in multi-bind or unbound :class:`.Session` objects can be resolved through