summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-01-10 11:48:53 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2016-01-10 11:48:53 -0500
commitd03477d4b761132f44c48417be09d622ad9adfd3 (patch)
tree751a02a7fff23e4f2035bfbf3c52521e5287cbb7
parentddba8b0e7f89bd5274534112e2bd3ea3baca6dbe (diff)
downloadsqlalchemy-d03477d4b761132f44c48417be09d622ad9adfd3.tar.gz
- 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
-rw-r--r--doc/build/core/metadata.rst2
-rw-r--r--doc/build/core/tutorial.rst2
-rw-r--r--doc/build/orm/session_events.rst2
-rw-r--r--lib/sqlalchemy/ext/automap.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/build/core/metadata.rst b/doc/build/core/metadata.rst
index 74802b1c3..24df3bc49 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 5773cab40..06fc44ce8 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 ecfc5176f..27e17717f 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 218ed64e1..616cd070d 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.