summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-07-17 10:29:13 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-07-17 10:29:13 -0400
commit2eeea03973868f01aa1b85f41bdff3561be71838 (patch)
tree0c923f2bc5e0a7689ab637320692fd4addc66bff
parent3cb29af876024e137b2d8b5faa1f007ad12ef7d7 (diff)
parentc6b46759829633e6745b561861891a8ffb85fbb8 (diff)
downloadsqlalchemy-2eeea03973868f01aa1b85f41bdff3561be71838.tar.gz
Merge branch 'patch-2' of https://github.com/pablogamboa/sqlalchemy
-rw-r--r--doc/build/orm/loading_relationships.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/build/orm/loading_relationships.rst b/doc/build/orm/loading_relationships.rst
index 6d3beb94d..a4b2ad99b 100644
--- a/doc/build/orm/loading_relationships.rst
+++ b/doc/build/orm/loading_relationships.rst
@@ -288,7 +288,7 @@ using the :func:`.joinedload` loader option:
The JOIN emitted by default is a LEFT OUTER JOIN, to allow for a lead object
that does not refer to a related row. For an attribute that is guaranteed
to have an element, such as a many-to-one
-reference to a related object where the referencing foriegn key is NOT NULL,
+reference to a related object where the referencing foreign key is NOT NULL,
the query can be made more efficient by using an inner join; this is available
at the mapping level via the :paramref:`.relationship.innerjoin` flag::