Commits

Mike Bayer  committed 314f845 Merge

Merge branch 'master' into rel_1_0

  • Participants
  • Parent commits 5d7a234, 7c29cff

Comments (0)

Files changed (3)

File doc/build/dialects/postgresql.rst

 Range Types
 ~~~~~~~~~~~
 
-The new range column types founds in PostgreSQL 9.2 onwards are
+The new range column types found in PostgreSQL 9.2 onwards are
 catered for by the following types:
 
 .. autoclass:: INT4RANGE

File lib/sqlalchemy/orm/events.py

 
         .. note::
 
-            The :class:`.Session` is not in an active tranasction
+            The :class:`.Session` is not in an active transaction
             when the :meth:`~.SessionEvents.after_commit` event is invoked, and therefore
             can not emit SQL.  To emit SQL corresponding to every transaction,
             use the :meth:`~.SessionEvents.before_commit` event.

File test/engine/test_transaction.py

 
     def test_mixed_nesting(self):
         """tests nesting of transactions off the TLEngine directly
-        inside of tranasctions off the connection from the TLEngine"""
+        inside of transactions off the connection from the TLEngine"""
 
         external_connection = tlengine.connect()
         self.assert_(external_connection.connection
 
     def test_more_mixed_nesting(self):
         """tests nesting of transactions off the connection from the
-        TLEngine inside of tranasctions off thbe TLEngine directly."""
+        TLEngine inside of transactions off the TLEngine directly."""
 
         external_connection = tlengine.connect()
         self.assert_(external_connection.connection