formatting tweaks

diff --git a/doc/build/gen_docstrings.py b/doc/build/gen_docstrings.py
index 28e8c1dc88220d65f1216e4ce2aba2c6c56f5d24..a22a823d83f8f8c1fd803d8f7a48b2dfdf86de9c 100644 (file)
--- a/doc/build/gen_docstrings.py
+++ b/doc/build/gen_docstrings.py
@@ -36,7 +36,7 @@ def make_all_docs():
                                                orm.collections.MappedCollection,
                                                orm.collections.CollectionAdapter]),
         make_doc(obj=orm.interfaces),
-        make_doc(obj=orm.mapperlib, classes=[orm.mapperlib.MapperExtension, orm.mapperlib.Mapper]),
+        make_doc(obj=orm.mapperlib, classes=[orm.mapperlib.Mapper]),
         make_doc(obj=orm.properties),
         make_doc(obj=orm.query, classes=[orm.query.Query]),
         make_doc(obj=orm.session, classes=[orm.session.Session]),

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index ab12d4c14e1f2a9cac44eeb1c6a644ef76a43bd0..48b71c799dbcf53e6032f7ba0b31293edd5e8acb 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -210,22 +210,22 @@ class Session(object):
     
     SQLAlchemy's unit of work includes these functions:
 
-      * The ability to track in-memory changes on scalar- and collection-based object
-        attributes, such that database persistence operations can be assembled based on those
-        changes.
-
-      * The ability to organize individual SQL queries and population of newly generated
-        primary and foreign key-holding attributes during a persist operation
-        such that referential integrity is maintained at all times.  
-      
-      * The ability to maintain insert ordering against the order in which
-        new instances were added to the session.  
-      
-      * an Identity Map, which is a dictionary keying instances to their unique primary key
-        identity. This ensures that only one copy of a particular entity is ever present
-        within the session, even if repeated load operations for the same entity occur. This
-        allows many parts of an application to get a handle to a particular object without
-        any chance of modifications going to two different places.
+    * The ability to track in-memory changes on scalar- and collection-based object
+      attributes, such that database persistence operations can be assembled based on those
+      changes.
+
+    * The ability to organize individual SQL queries and population of newly generated
+      primary and foreign key-holding attributes during a persist operation such that
+      referential integrity is maintained at all times.
+
+    * The ability to maintain insert ordering against the order in which new instances were
+      added to the session.
+
+    * an Identity Map, which is a dictionary keying instances to their unique primary key
+      identity. This ensures that only one copy of a particular entity is ever present
+      within the session, even if repeated load operations for the same entity occur. This
+      allows many parts of an application to get a handle to a particular object without
+      any chance of modifications going to two different places.
 
     When dealing with instances of mapped classes, an instance may be *attached* to a
     particular Session, else it is *unattached* . An instance also may or may not correspond