From: John Whitlock <jwhitlock@mozilla.com>
Date: Wed, 24 Feb 2021 15:41:02 +0000 (-0600)
Subject: As of 1.1, there are five object states
X-Git-Tag: rel_1_4_0~25^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5972%2Fhead;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

As of 1.1, there are five object states
---

diff --git a/doc/build/orm/tutorial.rst b/doc/build/orm/tutorial.rst
index 59cc9cfab2..c64e1fc3b2 100644
--- a/doc/build/orm/tutorial.rst
+++ b/doc/build/orm/tutorial.rst
@@ -518,7 +518,7 @@ The level of reloading is configurable as is described in :doc:`/orm/session`.
 
    As our ``User`` object moved from being outside the :class:`.Session`, to
    inside the :class:`.Session` without a primary key, to actually being
-   inserted, it moved between three out of four
+   inserted, it moved between three out of five
    available "object states" - **transient**, **pending**, and **persistent**.
    Being aware of these states and what they mean is always a good idea -
    be sure to read :ref:`session_object_states` for a quick overview.
@@ -2248,4 +2248,4 @@ Session Reference: :doc:`/orm/session`
 ..  Setup code, not for display
 
     >>> session.close()
-    ROLLBACK
\ No newline at end of file
+    ROLLBACK