summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-08-09 09:32:51 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-08-09 09:32:51 -0400
commiteaceeae0f721be72cc589a310e50f0de9f24d721 (patch)
tree0b25fb39aea6550f8bedb29fb8b297ae40fd2a8e /doc
parent03560c4b83308719067ec635662c35f9a437fb7f (diff)
parent7765724d51f78690c814eda6533fc0ac81ca9077 (diff)
downloadsqlalchemy-eaceeae0f721be72cc589a310e50f0de9f24d721.tar.gz
Merge branch 'master--typos' of https://github.com/nphilipp/sqlalchemy
Diffstat (limited to 'doc')
-rw-r--r--doc/build/orm/extensions/declarative/mixins.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/build/orm/extensions/declarative/mixins.rst b/doc/build/orm/extensions/declarative/mixins.rst
index c401b9bc8..3b1146240 100644
--- a/doc/build/orm/extensions/declarative/mixins.rst
+++ b/doc/build/orm/extensions/declarative/mixins.rst
@@ -436,7 +436,7 @@ against the parent::
Mixing in Columns in Inheritance Scenarios
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In constrast to how ``__tablename__`` and other special names are handled when
+In contrast to how ``__tablename__`` and other special names are handled when
used with :class:`.declared_attr`, when we mix in columns and properties (e.g.
relationships, column properties, etc.), the function is
invoked for the **base class only** in the hierarchy. Below, only the