- fix link to types in metadata, fixes #3618

- fix "version" got whacked into "f" in core tutorial
- fix short underline in automap
- fix unmatched boldface in session events

(cherry picked from commit d03477d4b761132f44c48417be09d622ad9adfd3)

diff --git a/doc/build/core/metadata.rst b/doc/build/core/metadata.rst
index c55472105b9faf2b4d9a222965bd9d3985b040a1..b36684656a7b7375689e214b7668cc5e2fc4a087 100644 (file)
--- a/doc/build/core/metadata.rst
+++ b/doc/build/core/metadata.rst
@@ -45,7 +45,7 @@ Note also that each column describes its datatype using objects corresponding
 to genericized types, such as :class:`~sqlalchemy.types.Integer` and
 :class:`~sqlalchemy.types.String`. SQLAlchemy features dozens of types of
 varying levels of specificity as well as the ability to create custom types.
-Documentation on the type system can be found at :ref:`types`.
+Documentation on the type system can be found at :ref:`types_toplevel`.
 
 Accessing Tables and Columns
 ----------------------------

diff --git a/doc/build/orm/session_events.rst b/doc/build/orm/session_events.rst
index 38183f9ff4440a4a790ea01f7c32b50055bf1280..6899c58bbb1817fc962f1f63f9db0bf3a074ee54 100644 (file)
--- a/doc/build/orm/session_events.rst
+++ b/doc/build/orm/session_events.rst
@@ -50,7 +50,7 @@ examples such as :ref:`examples_versioned_history` and
 ^^^^^^^^^^^^^^^^^
 
 The :meth:`.SessionEvents.after_flush` hook is called after the SQL has been
-emitted for a flush process, but **before* the state of the objects that
+emitted for a flush process, but **before** the state of the objects that
 were flushed has been altered.  That is, you can still inspect
 the :attr:`.Session.new`, :attr:`.Session.dirty` and
 :attr:`.Session.deleted` collections to see what was just flushed, and

diff --git a/lib/sqlalchemy/ext/automap.py b/lib/sqlalchemy/ext/automap.py
index 4b98a1bacc98d1f0d229755a3b7c0b252f16f90a..7e194834e55546af6752376405eff56c26bbaa4b 100644 (file)
--- a/lib/sqlalchemy/ext/automap.py
+++ b/lib/sqlalchemy/ext/automap.py
@@ -112,7 +112,7 @@ explicit table declaration::
         Base.classes.user_order
 
 Specifying Classes Explicitly
-============================
+=============================
 
 The :mod:`.sqlalchemy.ext.automap` extension allows classes to be defined
 explicitly, in a way similar to that of the :class:`.DeferredReflection` class.