Merge remote-tracking branch 'origin/pr/220'

This commit is contained in:
Mike Bayer
2015-12-10 14:23:44 -05:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -1950,7 +1950,7 @@ class AttributeEvents(event.Events):
and also during replace operations::
u1.addresess = [a2, a3] # <- new collection
u1.addresses = [a2, a3] # <- new collection
:param target: the object instance receiving the event.
If the listener is registered with ``raw=True``, this will
+1 -1
View File
@@ -694,7 +694,7 @@ class Session(_SessionClassMethods):
def info(self):
"""A user-modifiable dictionary.
The initial value of this dictioanry can be populated using the
The initial value of this dictionary can be populated using the
``info`` argument to the :class:`.Session` constructor or
:class:`.sessionmaker` constructor or factory methods. The dictionary
here is always local to this :class:`.Session` and can be modified