Merge "Fix various source comment/doc typos" into main

diff --cc doc/build/errors.rst
Simple merge

diff --cc doc/build/orm/extensions/asyncio.rst
Simple merge

diff --cc lib/sqlalchemy/dialects/postgresql/psycopg.py
Simple merge

diff --cc lib/sqlalchemy/engine/base.py
Simple merge

diff --cc lib/sqlalchemy/engine/cursor.py
Simple merge

diff --cc lib/sqlalchemy/ext/mypy/util.py
Simple merge

diff --cc lib/sqlalchemy/orm/path_registry.py
Simple merge

diff --cc lib/sqlalchemy/orm/query.py
index 6c79055591a480667f96a6575779de534adb6955,018fb703dfc196f31bfcad3334b642f0e8c78400..ad31c24329b609df03373c85fd3ffa9706aa96cd
--- 1/lib/sqlalchemy/orm/query.py
--- 2/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@@ -376,9 -378,12 +376,9 @@@ class Query
          # it to provide a real expression object.
          #
          # from there, it starts to look much like Query itself won't be
-         # passed into the execute process and wont generate its own cache
+         # passed into the execute process and won't generate its own cache
          # key; this will all occur in terms of the ORM-enabled Select.
 -        if (
 -            not self._compile_options._set_base_alias
 -            and not self._compile_options._with_polymorphic_adapt_map
 -        ):
 +        if not self._compile_options._set_base_alias:
              # if we don't have legacy top level aliasing features in use
              # then convert to a future select() directly
              stmt = self._statement_20(for_statement=True)

diff --cc lib/sqlalchemy/orm/strategy_options.py
Simple merge

diff --cc lib/sqlalchemy/pool/base.py
Simple merge

diff --cc lib/sqlalchemy/sql/type_api.py
Simple merge

diff --cc lib/sqlalchemy/util/langhelpers.py
Simple merge

diff --cc setup.cfg
Simple merge

diff --cc test/dialect/postgresql/test_dialect.py
Simple merge

diff --cc test/dialect/postgresql/test_types.py
Simple merge

diff --cc test/dialect/test_sqlite.py
Simple merge

diff --cc test/ext/test_baked.py
Simple merge

diff --cc test/orm/inheritance/test_relationship.py
Simple merge

diff --cc test/orm/inheritance/test_single.py
Simple merge

diff --cc test/orm/test_cascade.py
Simple merge

diff --cc test/orm/test_core_compilation.py
Simple merge

diff --cc test/orm/test_deprecations.py
Simple merge

diff --cc test/orm/test_joins.py
Simple merge

diff --cc test/orm/test_mapper.py
Simple merge

diff --cc test/orm/test_relationships.py
Simple merge

diff --cc test/requirements.py
Simple merge

diff --cc test/sql/test_operators.py
Simple merge