Corrected a couple of lingering transactional=True statements in the docs.

diff --git a/doc/build/content/plugins.txt b/doc/build/content/plugins.txt
index 5f795d49743115b01e563cae40743534ed284e0a..29d9c4b62375cfaa24c314d53b7e026b9389b8df 100644 (file)
--- a/doc/build/content/plugins.txt
+++ b/doc/build/content/plugins.txt
@@ -217,7 +217,7 @@ and Table objects. A typical application setup using `scoped_session` might look
 
     {python}
     engine = create_engine('postgres://scott:tiger@localhost/test')
-    Session = scoped_session(sessionmaker(transactional=True, autoflush=False, bind=engine))
+    Session = scoped_session(sessionmaker(autocommit=False, autoflush=False, bind=engine))
     Base = declarative_base()
     
 Mapped instances then make usage of `Session` in the usual way.

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index 68a0d8e81d7bc621c8149bbfa6406e3cfc41effc..f8008ab8b0a662e094e27772e3d3fe52e58c0b2a 100644 (file)
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -192,7 +192,7 @@ objects.  A typical application setup using ``scoped_session`` might look
 like::
 
     engine = create_engine('postgres://scott:tiger@localhost/test')
-    Session = scoped_session(sessionmaker(transactional=True,
+    Session = scoped_session(sessionmaker(autocommit=False,
                                           autoflush=False,
                                           bind=engine))
     Base = declarative_base()

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 289294f4ce4f2daff12a4c2bf64885c8bf81cdb0..fbfcd51c6b29cc4f95fc435e315002c162183596 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -746,7 +746,7 @@ class Session(object):
 
         This clears all items and ends any transaction in progress.
 
-        If this session were created with ``transactional=True``, a new
+        If this session were created with ``autocommit=False``, a new
         transaction is immediately begun.  Note that this new transaction does
         not use any connection resources until they are first needed.