From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 29 Apr 2021 13:18:15 +0000 (-0400)
Subject: changelog updates
X-Git-Tag: rel_1_4_12~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e3ef9bcf0a41bfacc4e6e836a45ed4d89c7c0fe;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

changelog updates

Change-Id: I43d6373f00d55599bc11f01a2ed8f644c4477dd5
---

diff --git a/doc/build/changelog/unreleased_14/6346.rst b/doc/build/changelog/unreleased_14/6346.rst
index 4ca26b7492..b1813d9240 100644
--- a/doc/build/changelog/unreleased_14/6346.rst
+++ b/doc/build/changelog/unreleased_14/6346.rst
@@ -2,11 +2,11 @@
     :tags: bug, orm, dataclasses
     :tickets: 6346
 
-      Adjusted the declarative scan for dataclasses so that the inheritance
-      behavior of :func:`_orm.declared_attr` established on a mixin, when using
-      the new form of having it inside of a ``dataclasses.field()`` construct and
-      not actually a descriptor attribute on the class, correctly accommodates
-      the case when the target class to be mapped is a subclass of an existing
-      mapped class which has already mapped that :func:`_orm.declared_attr`, and
-      therefore should not be re-applied to this class.
+    Adjusted the declarative scan for dataclasses so that the inheritance
+    behavior of :func:`_orm.declared_attr` established on a mixin, when using
+    the new form of having it inside of a ``dataclasses.field()`` construct and
+    not actually a descriptor attribute on the class, correctly accommodates
+    the case when the target class to be mapped is a subclass of an existing
+    mapped class which has already mapped that :func:`_orm.declared_attr`, and
+    therefore should not be re-applied to this class.
 
diff --git a/doc/build/changelog/unreleased_14/6350.rst b/doc/build/changelog/unreleased_14/6350.rst
index c2a911b7a7..7abb2bacbd 100644
--- a/doc/build/changelog/unreleased_14/6350.rst
+++ b/doc/build/changelog/unreleased_14/6350.rst
@@ -2,13 +2,14 @@
     :tags: bug, orm
     :tickets: 6350
 
-    Fixed two distinct issues, each of which would come into play under certain
-    circumstances, most likely however one which is a common mis-configuration
-    in :class:`_hybrid.hybrid_property`, where the "expression" implementation
-    would return a non :class:`_sql.ClauseElement` such as a boolean value.
-    For both issues, 1.3's behavior was to silently ignore the
-    mis-configuration and ultimately attempt to interpret the value as a
-    SQL expression, which would lead to an incorrect query.
+    Fixed two distinct issues mostly affecting
+    :class:`_hybrid.hybrid_property`, which would come into play under common
+    mis-configuration scenarios that were silently ignored in 1.3, and now
+    failed in 1.4, where the "expression" implementation would return a non
+    :class:`_sql.ClauseElement` such as a boolean value. For both issues, 1.3's
+    behavior was to silently ignore the mis-configuration and ultimately
+    attempt to interpret the value as a SQL expression, which would lead to an
+    incorrect query.
 
     * Fixed issue regarding interaction of the attribute system with
       hybrid_property, where if the ``__clause_element__()`` method of the
diff --git a/doc/build/changelog/unreleased_14/6360.rst b/doc/build/changelog/unreleased_14/6360.rst
index 880a799c3f..cfc4b3875c 100644
--- a/doc/build/changelog/unreleased_14/6360.rst
+++ b/doc/build/changelog/unreleased_14/6360.rst
@@ -2,9 +2,9 @@
     :tags: bug, orm, regression
     :tickets: 6360, 6359
 
-    Fixed issue where the new :ref:`session_autobegin` behavior failed to
-    "autobegin" in the case where an existing persistent object has an
-    attribute change, which would then impact the behavior of
+    Fixed issue where the new :ref:`autobegin <session_autobegin>` behavior
+    failed to "autobegin" in the case where an existing persistent object has
+    an attribute change, which would then impact the behavior of
     :meth:`_orm.Session.rollback` in that no snapshot was created to be rolled
     back. The "attribute modify" mechanics have been updated to ensure
     "autobegin", which does not perform any database work, does occur when
diff --git a/doc/build/changelog/unreleased_14/6386.rst b/doc/build/changelog/unreleased_14/6386.rst
index d61a2cc482..ff4ad6192c 100644
--- a/doc/build/changelog/unreleased_14/6386.rst
+++ b/doc/build/changelog/unreleased_14/6386.rst
@@ -1,5 +1,5 @@
 .. change::
-    :tags: ext, bug, regression
+    :tags: orm, bug, regression
     :tickets: 6386
 
     Fixed regression in ORM where using hybrid property to indicate an