From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 4 Mar 2024 13:30:04 +0000 (-0500)
Subject: cherry-pick changelog from 1.4.52
X-Git-Tag: rel_2_0_28~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6625ab42d51b76150ce8e7158388b5a54cd89831;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

cherry-pick changelog from 1.4.52

(cherry picked from commit 662006d4f84f54b2bcddea5025696e8134a187f6)
---

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
index 164a10a469..250288b8ef 100644
--- a/doc/build/changelog/changelog_14.rst
+++ b/doc/build/changelog/changelog_14.rst
@@ -15,7 +15,17 @@ This document details individual issue-level changes made throughout
 
 .. changelog::
     :version: 1.4.52
-    :include_notes_from: unreleased_14
+    :released: March 4, 2024
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 10365
+
+        Fixed bug where ORM :func:`_orm.with_loader_criteria` would not apply
+        itself to a :meth:`_sql.Select.join` where the ON clause were given as a
+        plain SQL comparison, rather than as a relationship target or similar.
+
+        This is a backport of the same issue fixed in version 2.0 for 2.0.22.
 
 .. changelog::
     :version: 1.4.51
diff --git a/doc/build/changelog/unreleased_14/10365.rst b/doc/build/changelog/unreleased_14/10365.rst
deleted file mode 100644
index 5eb4f44065..0000000000
--- a/doc/build/changelog/unreleased_14/10365.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 10365
-
-    Fixed bug where ORM :func:`_orm.with_loader_criteria` would not apply
-    itself to a :meth:`_sql.Select.join` where the ON clause were given as a
-    plain SQL comparison, rather than as a relationship target or similar.
-
-    This is a backport of the same issue fixed in version 2.0 for 2.0.22.