formatting

diff --git a/doc/build/ormtutorial.rst b/doc/build/ormtutorial.rst
index a3157781acaac48b47399072639d7237e10914f2..f9ea28640bd4cb475a7184e2218a17e37481c19d 100644 (file)
--- a/doc/build/ormtutorial.rst
+++ b/doc/build/ormtutorial.rst
@@ -873,7 +873,7 @@ Note that when :meth:`~sqlalchemy.orm.query.Query.join` is called with an explic
     session.query(Foo).join(
                             Foo.bars, 
                             (Bat, bar.bats),
-                            (Widget, (Bat.widget_id==Widget.id))
+                            (Widget, Bat.widget_id==Widget.id)
                             )
 
 The above would produce SQL something like ``foo JOIN bars ON <onclause> JOIN bats ON <onclause> JOIN widgets ON <onclause>``.

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index d7b60dfa3cc7f6be5c445e0544aaf03bc3c01c5e..1b5bcb7fe42928dc997f2fda56af45e91db9f296 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1308,7 +1308,7 @@ class Query(object):
 
     def first(self):
         """Return the first result of this ``Query`` or 
-           None if the result doesn't contain any row.
+        None if the result doesn't contain any row.
            
         first() applies a limit of one within the generated SQL, so that
         only one primary entity row is generated on the server side 
@@ -1360,8 +1360,8 @@ class Query(object):
 
     def scalar(self):
         """Return the first element of the first result or None
-           if no rows present.  If multiple rows are returned,
-           raises MultipleResultsFound.
+        if no rows present.  If multiple rows are returned,
+        raises MultipleResultsFound.
 
           >>> session.query(Item).scalar()
           <Item>
@@ -1400,7 +1400,7 @@ class Query(object):
 
     def instances(self, cursor, __context=None):
         """Given a ResultProxy cursor as returned by connection.execute(),
-          return an ORM result as an iterator.
+        return an ORM result as an iterator.
 
         e.g.::