From: Mike Bayer Date: Sun, 10 Jan 2016 16:48:53 +0000 (-0500) Subject: - fix link to types in metadata, fixes #3618 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8ccf585c0b384b8a859e533d2b18aabfd166df9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - 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 c55472105b..b36684656a 100644 --- 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 38183f9ff4..6899c58bbb 100644 --- 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 4b98a1bacc..7e194834e5 100644 --- 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.