summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/expression.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-09-03 18:01:59 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2010-09-03 18:01:59 -0400
commit904466a29320844ccc164bad4699198d3916159d (patch)
treee5aee78a187485fbdfbc19fce47ef5a65bbde797 /lib/sqlalchemy/sql/expression.py
parent1dc927f16c72aa72f09f72ae879b4cfdc630f672 (diff)
parent6e83926657057c97239bef114e640f2b102be02c (diff)
downloadsqlalchemy-904466a29320844ccc164bad4699198d3916159d.tar.gz
merge latest tip
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r--lib/sqlalchemy/sql/expression.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 6f593ab48..d184816ab 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -4045,15 +4045,15 @@ class Select(_SelectBaseMixin, FromClause):
"""return a new select() construct which will correlate the given FROM
clauses to that of an enclosing select(), if a match is found.
- By "match", the given fromclause must be present in this select's
+ By "match", the given fromclause must be present in this select's
list of FROM objects and also present in an enclosing select's list of
FROM objects.
- Calling this method turns off the select's default behavior of
+ Calling this method turns off the select's default behavior of
"auto-correlation". Normally, select() auto-correlates all of its FROM
clauses to those of an embedded select when compiled.
- If the fromclause is None, correlation is disabled for the returned
+ If the fromclause is None, correlation is disabled for the returned
select().
"""