corrected a bunch of spelling typos

12 files changed, 30 insertions, 30 deletions

diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 2ed270cda..4de507fa5 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -886,7 +886,7 @@ def synonym(name, map_column=False, descriptor=None,
                         comparator_factory=None, doc=None):
     """Denote an attribute name as a synonym to a mapped property.
 
-    .. note:: :func:`.synonym` is superceded as of 0.7 by 
+    .. note:: :func:`.synonym` is superseded as of 0.7 by 
        the :mod:`~sqlalchemy.ext.hybrid` extension.  See 
        the documentation for hybrids at :ref:`hybrids_toplevel`.
 
@@ -928,7 +928,7 @@ def comparable_property(comparator_factory, descriptor=None):
     """Provides a method of applying a :class:`.PropComparator` 
     to any Python descriptor attribute.
 
-    .. note:: :func:`.comparable_property` is superceded as of 0.7 by 
+    .. note:: :func:`.comparable_property` is superseded as of 0.7 by 
        the :mod:`~sqlalchemy.ext.hybrid` extension.  See the example 
        at :ref:`hybrid_custom_comparators`.
        
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index 74e85f065..437de685c 100644
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -971,7 +971,7 @@ def backref_listeners(attribute, key, uselist):
 
 class History(tuple):
     """A 3-tuple of added, unchanged and deleted values,
-    representing the changes which have occured on an instrumented
+    representing the changes which have occurred on an instrumented
     attribute.
 
     Each tuple member is an iterable sequence.
diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py
index 338ecfb55..5dddd02dd 100644
--- a/lib/sqlalchemy/orm/dependency.py
+++ b/lib/sqlalchemy/orm/dependency.py
@@ -58,7 +58,7 @@ class DependencyProcessor(object):
         """establish actions and dependencies related to a flush.
 
         These actions will operate on all relevant states in
-        the aggreagte.
+        the aggregate.
 
         """
         uow.register_preprocessor(self, True)
diff --git a/lib/sqlalchemy/orm/deprecated_interfaces.py b/lib/sqlalchemy/orm/deprecated_interfaces.py
index 135664469..9ebf9a57e 100644
--- a/lib/sqlalchemy/orm/deprecated_interfaces.py
+++ b/lib/sqlalchemy/orm/deprecated_interfaces.py
@@ -423,13 +423,13 @@ class SessionExtension(object):
         transaction is ongoing."""
 
     def after_commit(self, session):
-        """Execute after a commit has occured.
+        """Execute after a commit has occurred.
 
         Note that this may not be per-flush if a longer running
         transaction is ongoing."""
 
     def after_rollback(self, session):
-        """Execute after a rollback has occured.
+        """Execute after a rollback has occurred.
 
         Note that this may not be per-flush if a longer running
         transaction is ongoing."""
@@ -454,7 +454,7 @@ class SessionExtension(object):
 
         This will be when the 'new', 'dirty', and 'deleted' lists are in
         their final state.  An actual commit() may or may not have
-        occured, depending on whether or not the flush started its own
+        occurred, depending on whether or not the flush started its own
         transaction or participated in a larger transaction. """
 
     def after_begin( self, session, transaction, connection):
diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py
index d8a4bc8cf..634da34f1 100644
--- a/lib/sqlalchemy/orm/descriptor_props.py
+++ b/lib/sqlalchemy/orm/descriptor_props.py
@@ -4,7 +4,7 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-"""Descriptor proprerties are more "auxilliary" properties
+"""Descriptor properties are more "auxiliary" properties
 that exist as configurational elements, but don't participate
 as actively in the load/persist ORM loop.
 
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index de2147d36..fdbee98b3 100644
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -800,7 +800,7 @@ class SessionEvents(event.Events):
                 not issubclass(target.session_factory, Session):
                 raise exc.ArgumentError(
                             "Session event listen on a ScopedSession "
-                            "requries that its creation callable "
+                            "requires that its creation callable "
                             "is a Session subclass.")
             return target.session_factory
         elif isinstance(target, type):
@@ -824,13 +824,13 @@ class SessionEvents(event.Events):
         transaction is ongoing."""
 
     def after_commit(self, session):
-        """Execute after a commit has occured.
+        """Execute after a commit has occurred.
 
         Note that this may not be per-flush if a longer running
         transaction is ongoing."""
 
     def after_rollback(self, session):
-        """Execute after a rollback has occured.
+        """Execute after a rollback has occurred.
 
         Note that this may not be per-flush if a longer running
         transaction is ongoing."""
@@ -855,7 +855,7 @@ class SessionEvents(event.Events):
 
         This will be when the 'new', 'dirty', and 'deleted' lists are in
         their final state.  An actual commit() may or may not have
-        occured, depending on whether or not the flush started its own
+        occurred, depending on whether or not the flush started its own
         transaction or participated in a larger transaction. """
 
     def after_begin( self, session, transaction, connection):
diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py
index 39bc61290..907dd4bf5 100644
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -543,7 +543,7 @@ def _reduce_path(path):
 
     This is used to allow more open ended selection of loader strategies, i.e.
     Mapper -> prop1 -> Subclass -> prop2, where Subclass is a sub-mapper
-    of the mapper referened by Mapper.prop1.
+    of the mapper referenced by Mapper.prop1.
 
     """
     return tuple([i % 2 != 0 and 
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index fae47ac05..0cc28c8e8 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -199,7 +199,7 @@ class Mapper(object):
         self.configured = False
 
         # prevent this mapper from being constructed
-        # while a configure_mappers() is occuring (and defer a configure_mappers()
+        # while a configure_mappers() is occurring (and defer a configure_mappers()
         # until construction succeeds)
         _COMPILE_MUTEX.acquire()
         try:
@@ -1686,7 +1686,7 @@ class Mapper(object):
                                     has_all_pks = False
                                 elif col.default is None and \
                                      col.server_default is None:
-                                     params[col.key] = value
+                                    params[col.key] = value
 
                             elif isinstance(value, sql.ClauseElement):
                                 value_params[col] = value
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 68e3196df..969905641 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -709,7 +709,7 @@ class RelationshipProperty(StrategizedProperty):
                 if inheriting is not self.parent \
                     and inheriting.has_property(self.key):
                     util.warn("Warning: relationship '%s' on mapper "
-                              "'%s' supercedes the same relationship "
+                              "'%s' supersedes the same relationship "
                               "on inherited mapper '%s'; this can "
                               "cause dependency issues during flush"
                               % (self.key, self.parent, inheriting))
@@ -781,7 +781,7 @@ class RelationshipProperty(StrategizedProperty):
 
     def _sync_pairs_from_join(self, join_condition, primary):
         """Given a join condition, figure out what columns are foreign
-        and are part of a binary "equated" condition to their referecned
+        and are part of a binary "equated" condition to their referenced
         columns, and convert into a list of tuples of (primary col->foreign col).
 
         Make several attempts to determine if cols are compared using 
@@ -1173,7 +1173,7 @@ class RelationshipProperty(StrategizedProperty):
 
         # adjust the join condition for single table inheritance,
         # in the case that the join is to a subclass
-        # this is analgous to the "_adjust_for_single_table_inheritance()"
+        # this is analogous to the "_adjust_for_single_table_inheritance()"
         # method in Query.
 
         dest_mapper = of_type or self.mapper
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 6f79d7c9c..534985084 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -272,7 +272,7 @@ class Query(object):
 
     @property
     def _mapper_entities(self):
-        # TODO: this is wrong, its hardcoded to "priamry entity" when
+        # TODO: this is wrong, its hardcoded to "primary entity" when
         # for the case of __all_equivs() it should not be
         # the name of this accessor is wrong too
         for ent in self._entities:
@@ -444,7 +444,7 @@ class Query(object):
         """Return the full SELECT statement represented by this :class:`.Query`, converted 
         to a scalar subquery with a label of the given name.
 
-        Analagous to :meth:`sqlalchemy.sql._SelectBaseMixin.label`.
+        Analogous to :meth:`sqlalchemy.sql._SelectBaseMixin.label`.
 
         New in 0.6.5.
 
@@ -457,7 +457,7 @@ class Query(object):
         """Return the full SELECT statement represented by this :class:`.Query`, converted 
         to a scalar subquery.
 
-        Analagous to :meth:`sqlalchemy.sql._SelectBaseMixin.as_scalar`.
+        Analogous to :meth:`sqlalchemy.sql._SelectBaseMixin.as_scalar`.
 
         New in 0.6.5.
 
@@ -856,12 +856,12 @@ class Query(object):
         self._setup_aliasizers(self._entities[l:])
 
     @util.pending_deprecation("0.7", 
-                ":meth:`.add_column` is superceded by :meth:`.add_columns`", 
+                ":meth:`.add_column` is superseded by :meth:`.add_columns`", 
                 False)
     def add_column(self, column):
         """Add a column expression to the list of result columns to be returned.
 
-        Pending deprecation: :meth:`.add_column` will be superceded by 
+        Pending deprecation: :meth:`.add_column` will be superseded by 
         :meth:`.add_columns`.
 
         """
@@ -1165,7 +1165,7 @@ class Query(object):
         A two-element form of \*props may also be passed.   In this form,
         the first element is a target class or selectable, the second
         is a string property name, class-mapped attribute, or clause
-        construct representing an "ON" clause.   This supercedes the
+        construct representing an "ON" clause.   This supersedes the
         previous "tuple" calling form - multiple join() calls should
         be used for multiple (target, onclause) pairs.
 
@@ -1235,7 +1235,7 @@ class Query(object):
 
     def outerjoin(self, *props, **kwargs):
         """Create a left outer join against this ``Query`` object's criterion
-        and apply generatively, retunring the newly resulting ``Query``.
+        and apply generatively, returning the newly resulting ``Query``.
 
         Usage is the same as the ``join()`` method.
 
@@ -2760,7 +2760,7 @@ class _ColumnEntity(_QueryEntity):
 
         # look for ORM entities represented within the
         # given expression.  Try to count only entities
-        # for columns whos FROM object is in the actual list
+        # for columns whose FROM object is in the actual list
         # of FROMs for the overall expression - this helps
         # subqueries which were built from ORM constructs from
         # leaking out their entities into the main select construct
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 74e8a766f..eb148bc78 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -674,7 +674,7 @@ class Session(object):
         :param close_with_result: Passed to :meth:`Engine.connect`, indicating
           the :class:`.Connection` should be considered "single use", automatically
           closing when the first result set is closed.  This flag only has 
-          an effect if this :class:`.Session` is configued with ``autocommit=True``
+          an effect if this :class:`.Session` is configured with ``autocommit=True``
           and does not already have a  transaction in progress.
 
         :param \**kw:
@@ -950,7 +950,7 @@ class Session(object):
     def expire_all(self):
         """Expires all persistent instances within this Session.
 
-        When any attributes on a persitent instance is next accessed, 
+        When any attributes on a persistent instance is next accessed, 
         a query will be issued using the
         :class:`.Session` object's current transactional context in order to
         load all expired attributes for the given instance.   Note that
@@ -1086,7 +1086,7 @@ class Session(object):
                 not mapper.allow_partial_pks or \
                 _none_set.issuperset(instance_key[1]):
                 raise exc.FlushError('Instance %s has a NULL identity '
-                        'key.  Check if this flush is occuring at an '
+                        'key.  Check if this flush is occurring at an '
                         'inappropriate time, such as during a load '
                         'operation.' % mapperutil.state_str(state))
 
diff --git a/lib/sqlalchemy/orm/sync.py b/lib/sqlalchemy/orm/sync.py
index 60a8bcb9a..15d35d2a5 100644
--- a/lib/sqlalchemy/orm/sync.py
+++ b/lib/sqlalchemy/orm/sync.py
@@ -31,7 +31,7 @@ def populate(source, source_mapper, dest, dest_mapper,
         except exc.UnmappedColumnError:
             _raise_col_to_prop(True, source_mapper, l, dest_mapper, r)
 
-        # techically the "r.primary_key" check isn't
+        # technically the "r.primary_key" check isn't
         # needed here, but we check for this condition to limit
         # how often this logic is invoked for memory/performance
         # reasons, since we only need this info for a primary key