typo fixes

Change-Id: I8f3a1d755d03e6c11fa1f783f111977b7ddc22fb
(cherry picked from commit 96a50e381ed97dfa92900e3212e1598bc99123a7)

diff --git a/doc/build/changelog/unreleased_20/11200.rst b/doc/build/changelog/unreleased_20/11200.rst
index 61ab6506b1c3fd97a1c5f4676305d3f9c3a518b8..e600d1a149afe6496ae71bdbb85b6e70c757b499 100644 (file)
--- a/doc/build/changelog/unreleased_20/11200.rst
+++ b/doc/build/changelog/unreleased_20/11200.rst
@@ -2,9 +2,8 @@
     :tags: bug, typing, regression
     :tickets: 11200
 
-    Fixed typing regression caused by PR :ticket:`11055` in version 2.0.29 that
-    attempted to add ``ParamSpec`` to the asyncio ``run_sync()`` methods, where
-    using :meth:`_asyncio.AsyncConnection.run_sync` with
-    :meth:`_schema.MetaData.reflect` would fail on mypy due to a bug.
-    See https://github.com/python/mypy/issues/17093 for details.
-    Pull request courtesy of Francisco R. Del Roio
+    Fixed typing regression caused by :ticket:`11055` in version 2.0.29 that
+    added ``ParamSpec`` to the asyncio ``run_sync()`` methods, where using
+    :meth:`_asyncio.AsyncConnection.run_sync` with
+    :meth:`_schema.MetaData.reflect` would fail on mypy due to a mypy issue.
+    Pull request courtesy of Francisco R. Del Roio.

diff --git a/doc/build/changelog/unreleased_20/11220.rst b/doc/build/changelog/unreleased_20/11220.rst
index 4f04cbf23da14456c361d626e31556b7446e9e6c..f58a624f10d364522cd5aec66fd6779ffa037db7 100644 (file)
--- a/doc/build/changelog/unreleased_20/11220.rst
+++ b/doc/build/changelog/unreleased_20/11220.rst
@@ -2,8 +2,8 @@
     :tags: bug, orm
     :tickets: 11220
 
-    Added new attribute :attr:`_orm.ORMExecuteState.is_from_statement`, to
-    detect statements of the form ``select().from_statement()``, and also
+    Added new attribute :attr:`_orm.ORMExecuteState.is_from_statement` to
+    detect statements created using :meth:`_sql.Select.from_statement`, and
     enhanced ``FromStatement`` to set :attr:`_orm.ORMExecuteState.is_select`,
     :attr:`_orm.ORMExecuteState.is_insert`,
     :attr:`_orm.ORMExecuteState.is_update`, and

diff --git a/doc/build/changelog/unreleased_20/11291.rst b/doc/build/changelog/unreleased_20/11291.rst
index e341ff8aff84eb98f08ba68bda005d5ee67b2914..c676c9c40a627ed80672d91b545186d46418004c 100644 (file)
--- a/doc/build/changelog/unreleased_20/11291.rst
+++ b/doc/build/changelog/unreleased_20/11291.rst
@@ -2,7 +2,7 @@
     :tags: bug, orm
     :tickets: 11291
 
-    Fixed issue in  :func:`_orm.selectin_polymorhpic` loader option where
+    Fixed issue in  :func:`_orm.selectin_polymorphic` loader option where
     attributes defined with :func:`_orm.composite` on a superclass would cause
     an internal exception on load.
 

diff --git a/doc/build/changelog/unreleased_20/11327.rst b/doc/build/changelog/unreleased_20/11327.rst
index f7169ad98033756ea62301ee2450622803591c7d..c5fe3e15463073e81d8d52a9c482b4b7dc791690 100644 (file)
--- a/doc/build/changelog/unreleased_20/11327.rst
+++ b/doc/build/changelog/unreleased_20/11327.rst
@@ -2,7 +2,7 @@
     :tags: bug, orm
     :tickets: 11327
 
-    Fixed issue in :func:`_orm.selectin_polymorhpic` loader option where the
+    Fixed issue in :func:`_orm.selectin_polymorphic` loader option where the
     SELECT emitted would only accommodate for the child-most class among the
     result rows that were returned, leading intermediary-class attributes to be
     unloaded if there were no concrete instances of that intermediary-class

diff --git a/doc/build/changelog/unreleased_20/11332.rst b/doc/build/changelog/unreleased_20/11332.rst
index c8f748654c6190ea405c26e75d608e9f4d42ecbf..2c23dc6de15d938e2065ef4d615f66498b322c97 100644 (file)
--- a/doc/build/changelog/unreleased_20/11332.rst
+++ b/doc/build/changelog/unreleased_20/11332.rst
@@ -2,6 +2,7 @@
     :tags: bug, orm
     :tickets: 11332
 
-    Fixes issue in :meth:`_orm.Session.bulk_save_objects` where it would write a
-    wrong identity key when using ``return_defaults=True``.
-    The wrong identity key could lead to an index error when entities are then pickled.
+    Fixed issue in :meth:`_orm.Session.bulk_save_objects` where the form of the
+    identity key produced when using ``return_defaults=True`` would be
+    incorrect. This could lead to an errors during pickling as well as identity
+    map mismatches.