changelog adjustments

include backport markings

Change-Id: I810923a641977569b8b4d9967e84b8cb684e7a52

diff --git a/doc/build/changelog/changelog_14.rst b/doc/build/changelog/changelog_14.rst
index dc699e7f156481b81d12b8380ebf45931f899ab4..b7d3a428364b8631f718688de065b87448dc6776 100644 (file)
--- a/doc/build/changelog/changelog_14.rst
+++ b/doc/build/changelog/changelog_14.rst
@@ -24,6 +24,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, orm
         :tickets: 8862
+        :versions: 2.0.0rc1
 
         Fixed bug where :meth:`_orm.Session.merge` would fail to preserve the
         current loaded contents of relationship attributes that were indicated with
@@ -49,6 +50,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, orm
         :tickets: 8881
+        :versions: 2.0.0rc1
 
         Fixed issues in :func:`_orm.with_expression` where expressions that were
         composed of columns that were referenced from the enclosing SELECT would
@@ -92,6 +94,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, postgresql
         :tickets: 8748
+        :versions: 2.0.0rc1
 
         Made an adjustment to how the PostgreSQL dialect considers column types
         when it reflects columns from a table, to accommodate for alternative
@@ -100,6 +103,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: usecase, sqlite
         :tickets: 8903
+        :versions: 2.0.0rc1
 
         Added support for the SQLite backend to reflect the "DEFERRABLE" and
         "INITIALLY" keywords which may be present on a foreign key construct. Pull
@@ -108,6 +112,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: usecase, sql
         :tickets: 8800
+        :versions: 2.0.0rc1
 
         An informative re-raise is now thrown in the case where any "literal
         bindparam" render operation fails, indicating the value itself and
@@ -117,6 +122,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: usecase, sqlite
         :tickets: 8804
+        :versions: 2.0.0rc1
 
         Added support for reflection of expression-oriented WHERE criteria included
         in indexes on the SQLite dialect, in a manner similar to that of the
@@ -125,6 +131,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, sql
         :tickets: 8827
+        :versions: 2.0.0rc1
 
         Fixed a series of issues regarding the position and sometimes the identity
         of rendered bound parameters, such as those used for SQLite, asyncpg,
@@ -147,6 +154,7 @@ This document details individual issue-level changes made throughout
     .. change::
         :tags: bug, engine
         :tickets: 8963
+        :versions: 2.0.0rc1
 
         Fixed issue where :meth:`_engine.Result.freeze` method would not work for
         textual SQL using either :func:`_sql.text` or

diff --git a/doc/build/changelog/unreleased_14/8974.rst b/doc/build/changelog/unreleased_14/8974.rst
index 6400c95b452681d40e500c5e319a7d5d4bf3a2ad..a8ae491ad19b452e3987e10769b1cc76956f4fc5 100644 (file)
--- a/doc/build/changelog/unreleased_14/8974.rst
+++ b/doc/build/changelog/unreleased_14/8974.rst
@@ -1,6 +1,7 @@
 .. change::
-    :tags: bug, pool
+    :tags: bug, engine
     :tickets: 8974
+    :versions: 2.0.0rc1
 
     Fixed a long-standing race condition in the connection pool which could
     occur under eventlet/gevent monkeypatching schemes in conjunction with the

diff --git a/doc/build/changelog/unreleased_14/8995.rst b/doc/build/changelog/unreleased_14/8995.rst
index 5191b58de9a15384bb67473e23264b980b3c2f7c..034e7b3f7cda5676a4fea42feec7e1eb7d8636c4 100644 (file)
--- a/doc/build/changelog/unreleased_14/8995.rst
+++ b/doc/build/changelog/unreleased_14/8995.rst
@@ -1,6 +1,7 @@
 .. change::
-    :tags: bug, installation
+    :tags: bug, general
     :tickets: 8995
+    :versions: 2.0.0rc1
 
     Fixed regression where the base compat module was calling upon
     ``platform.architecture()`` in order to detect some system properties,

diff --git a/doc/build/changelog/unreleased_14/9002.rst b/doc/build/changelog/unreleased_14/9002.rst
index c2d3f01b9f89c14f4f22bb7fcd6e10b45feea3dd..61d491410d4beafa81584df51bf664bc3ca41008 100644 (file)
--- a/doc/build/changelog/unreleased_14/9002.rst
+++ b/doc/build/changelog/unreleased_14/9002.rst
@@ -1,6 +1,7 @@
 .. change::
     :tags: bug, tests
     :tickets: 9002
+    :versions: 2.0.0rc1
 
     Added new exclusion rule for third party dialects called
     ``unusual_column_name_characters``, which can be "closed" for third party

diff --git a/doc/build/changelog/unreleased_14/9023.rst b/doc/build/changelog/unreleased_14/9023.rst
index d17a0cc983c379a5136b3c23f06b88c3dfa9db34..3bbbd0f3fbe84e2c6b2ba251ed45b54f81e48dda 100644 (file)
--- a/doc/build/changelog/unreleased_14/9023.rst
+++ b/doc/build/changelog/unreleased_14/9023.rst
@@ -1,6 +1,7 @@
 .. change::
     :tags: bug, postgresql
     :tickets: 9023
+    :versions: 2.0.0rc1
 
     Fixed bug where the PostgreSQL
     :paramref:`_postgresql.OnConflictClause.constraint` parameter would accept

diff --git a/doc/build/changelog/unreleased_14/9029.rst b/doc/build/changelog/unreleased_14/9029.rst
index 38114e9637c0aefcd6a79541601bdc43a4d03583..dd3c24ee4cb5f40fb5d1c4b73b44a0793f416f67 100644 (file)
--- a/doc/build/changelog/unreleased_14/9029.rst
+++ b/doc/build/changelog/unreleased_14/9029.rst
@@ -1,8 +1,9 @@
 .. change::
     :tags: bug, sql
     :tickets: 9029
+    :versions: 2.0.0rc1
 
     Fixed issue in lambda SQL feature where the calculated type of a literal
     value would not take into account the type coercion rules of the "compared
     to type", leading to a lack of typing information for SQL expressions, such
-    as comparisons to :class:`.JSON` elements and similar.
+    as comparisons to :class:`_types.JSON` elements and similar.

diff --git a/doc/build/changelog/unreleased_14/9033.rst b/doc/build/changelog/unreleased_14/9033.rst
index d0b0d2f3fec069b03ebeefbfb93cf9ace2417042..e0e39db38877b68d3e7ae8c2160c5fc7a8828da5 100644 (file)
--- a/doc/build/changelog/unreleased_14/9033.rst
+++ b/doc/build/changelog/unreleased_14/9033.rst
@@ -1,6 +1,7 @@
 .. change::
     :tags: bug, orm
     :tickets: 9033
+    :versions: 2.0.0rc1
 
     Fixed issue in the internal SQL traversal for DML statements like
     :class:`_dml.Update` and :class:`_dml.Delete` which would cause among other

diff --git a/doc/build/changelog/unreleased_14/tox_fix.rst b/doc/build/changelog/unreleased_14/tox_fix.rst
index f37829fc370e4080b22a58339aa423bd6cef5859..7d9b799e01d0bd0614930d7a7bd0a9bd969b4b11 100644 (file)
--- a/doc/build/changelog/unreleased_14/tox_fix.rst
+++ b/doc/build/changelog/unreleased_14/tox_fix.rst
@@ -1,5 +1,6 @@
 .. change::
     :tags: bug, tests
+    :versions: 2.0.0rc1
 
     Fixed issue in tox.ini file where changes in the tox 4.0 series to the
     format of "passenv" caused tox to not function correctly, in particular

diff --git a/doc/build/changelog/unreleased_20/horiz_typing.rst b/doc/build/changelog/unreleased_20/horiz_typing.rst
index 55b794d0b0bff087cf2d0464adeb8c50c5645d86..45a5755230a8f59b003730a372f25f2fd19d2b9c 100644 (file)
--- a/doc/build/changelog/unreleased_20/horiz_typing.rst
+++ b/doc/build/changelog/unreleased_20/horiz_typing.rst
@@ -1,6 +1,9 @@
 .. change::
     :tags: bug, typing
-    :tickets: 6810
+    :tickets: 6810, 9025
+
+    pep-484 typing has been completed for the
+    ``sqlalchemy.ext.horizontal_shard`` extension as well as the
+    ``sqlalchemy.orm.events`` module. Thanks to Gleb Kisenkov for their
+    efforts.
 
-    The horizontal sharding extension is now pep-484 typed. Thanks to Gleb
-    Kisenkov for their efforts on this.