From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 8 Feb 2019 22:48:51 +0000 (-0500)
Subject: mention no_autoflush in the flush section of the docs
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48889aae38ae5a995b965089b066023db0a0573b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

mention no_autoflush in the flush section of the docs

also remove link to wiki which is obsolete

Change-Id: I9ebd578923c3eba6e35f3b6203c01ba003dd4115
(cherry picked from commit fcb5dbf39569bcacb70a3fed05f469d73b64f116)
---

diff --git a/doc/build/orm/session_basics.rst b/doc/build/orm/session_basics.rst
index 06cd23bd28..20511d9fee 100644
--- a/doc/build/orm/session_basics.rst
+++ b/doc/build/orm/session_basics.rst
@@ -649,8 +649,11 @@ Additionally, autoflush can be temporarily disabled by setting the
     mysession = Session()
     mysession.autoflush = False
 
-Some autoflush-disable recipes are available at `DisableAutoFlush
-<http://www.sqlalchemy.org/trac/wiki/UsageRecipes/DisableAutoflush>`_.
+More conveniently, it can be turned off within a context managed block using :attr:`.Session.no_autoflush`::
+
+    with mysession.no_autoflush:
+        mysession.add(some_object)
+        mysession.flush()
 
 The flush process *always* occurs within a transaction, even if the
 :class:`~sqlalchemy.orm.session.Session` has been configured with