typo: s/tranasction/transaction

Conflicts:
	test/engine/test_transaction.py

diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index e64cb8c92abde94933710dcdcb908d193c86249c..2656abfca935ea7eb3bba24509fe0e465c73ff20 100644 (file)
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -1315,7 +1315,7 @@ class SessionEvents(event.Events):
 
         .. 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.

diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index 566cc6298678da7101b60182a1aace1afa0fb69e..f9744444d296943f5e27305c1b4bc73cbd9bef43 100644 (file)
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -956,7 +956,7 @@ class TLTransactionTest(fixtures.TestBase):
 
     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