From: Nils Philippsen Date: Sat, 5 Aug 2017 11:31:06 +0000 (+0200) Subject: fix "constrast" typos X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f34181a42b66251771c74d2cd6492c0fef7c985;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git fix "constrast" typos (cherry picked from commit 7765724d51f78690c814eda6533fc0ac81ca9077) --- diff --git a/doc/build/orm/extensions/declarative/mixins.rst b/doc/build/orm/extensions/declarative/mixins.rst index 577ed140f4..e99b8b2476 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 diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index f6eaccb02d..483bae93f4 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -730,7 +730,7 @@ class MapperEvents(event.Events): def go(): # ... - Constrast this event to :meth:`.MapperEvents.after_configured`, + Contrast this event to :meth:`.MapperEvents.after_configured`, which is invoked after the series of mappers has been configured, as well as :meth:`.MapperEvents.mapper_configured`, which is invoked on a per-mapper basis as each one is configured to the extent possible. @@ -777,7 +777,7 @@ class MapperEvents(event.Events): operation proceeds; unlike that event, when this event is invoked, all cross-configurations (e.g. backrefs) will also have been made available for any mappers that were pending. - Also constrast to :meth:`.MapperEvents.before_configured`, + Also contrast to :meth:`.MapperEvents.before_configured`, which is invoked before the series of mappers has been configured. This event can **only** be applied to the :class:`.Mapper` class