summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-09-13 22:56:13 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2010-09-13 22:56:13 -0400
commit46196ea723484f354ac17204ccd489004baaac95 (patch)
tree3f99c126c84e0e0d43460fb642945021ba8b957b
parent03523970d993b06ff8bed86e2af3ea153cd6112b (diff)
parent439d57ddaf5c589e1d4e01feba42349cb5345cbe (diff)
downloadsqlalchemy-46196ea723484f354ac17204ccd489004baaac95.tar.gz
merge tip
-rw-r--r--doc/build/orm/interfaces.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/build/orm/interfaces.rst b/doc/build/orm/interfaces.rst
index 8cac2ef21..321660ac9 100644
--- a/doc/build/orm/interfaces.rst
+++ b/doc/build/orm/interfaces.rst
@@ -89,7 +89,7 @@ value, and allows the extension to change what is ultimately persisted.
Instrumentation Events and Re-implementation
---------------------------------------------
-:class:`.InstrumentationManager` can be subclassed in order to receieve class
+:class:`.InstrumentationManager` can be subclassed in order to receive class
instrumentation events as well as to change how class instrumentation
proceeds. This class exists for the purposes of integration with other object
management frameworks which would like to entirely modify the instrumentation
@@ -104,4 +104,4 @@ For an example of :class:`.InstrumentationManager`, see the example
.. autoclass:: InstrumentationManager
:members:
- :undoc-members: \ No newline at end of file
+ :undoc-members: