From: Mike Bayer Date: Sun, 10 Jan 2016 16:48:53 +0000 (-0500) Subject: - fix link to types in metadata, fixes #3618 X-Git-Tag: rel_1_1_0b1~84^2~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d03477d4b761132f44c48417be09d622ad9adfd3;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 --- diff --git a/doc/build/core/metadata.rst b/doc/build/core/metadata.rst index 74802b1c31..24df3bc49c 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/core/tutorial.rst b/doc/build/core/tutorial.rst index 5773cab402..06fc44ce8e 100644 --- a/doc/build/core/tutorial.rst +++ b/doc/build/core/tutorial.rst @@ -869,7 +869,7 @@ need to refer to any pre-established :class:`.Table` metadata: :ref:`orm_tutorial_literal_sql` - integrating ORM-level queries with :func:`.text` -.. fchanged:: 1.0.0 +.. versionchanged:: 1.0.0 The :func:`.select` construct emits warnings when string SQL fragments are coerced to :func:`.text`, and :func:`.text` should be used explicitly. See :ref:`migration_2992` for background. diff --git a/doc/build/orm/session_events.rst b/doc/build/orm/session_events.rst index ecfc5176f2..27e17717f3 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 218ed64e11..616cd070d5 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.