From: mike bayer <mike_mp@zzzcomputing.com>
Date: Sun, 25 Aug 2013 16:08:00 +0000 (-0700)
Subject: Merge pull request #23 from yoloseem/master
X-Git-Tag: rel_0_8_3~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fa0088d438c0abed6027779990f8878c2ceecc4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge pull request #23 from yoloseem/master

Fixed two typos.
---

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 0f9ea1429c..bbe5b56c9b 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1486,7 +1486,7 @@ class Mapper(_InspectionAttr):
 
         Normally, this is equivalent to :attr:`.mapped_table`, unless
         the ``with_polymorphic`` feature is in use, in which case the
-        full "polymoprhic" selectable is returned.
+        full "polymorphic" selectable is returned.
 
         """
         return self._with_polymorphic_selectable
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py
index c479d880d8..2fa954a9d4 100644
--- a/lib/sqlalchemy/orm/state.py
+++ b/lib/sqlalchemy/orm/state.py
@@ -527,13 +527,13 @@ class AttributeState(object):
     to a particular attribute on a particular mapped object.
 
     The :class:`.AttributeState` object is accessed
-    via the :attr:`.InstanceState.attr` collection
+    via the :attr:`.InstanceState.attrs` collection
     of a particular :class:`.InstanceState`::
 
         from sqlalchemy import inspect
 
         insp = inspect(some_mapped_object)
-        attr_state = insp.attr.some_attribute
+        attr_state = insp.attrs.some_attribute
 
     """