summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-10-24 10:39:43 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-10-24 10:39:43 -0400
commit0236ab56945482b0dc52f6892eb9582d756e0e62 (patch)
treecb05e03497f35d262ede4c8d342d503f806dec6e
parent9018be2dfd822171d40475bcec8b2b4904f78dbc (diff)
parent3380390b7a4160df56c409e078ab53de7c6590a1 (diff)
downloadsqlalchemy-0236ab56945482b0dc52f6892eb9582d756e0e62.tar.gz
Merge remote-tracking branch 'origin/pr/359'
-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 a4b2ad99b..7173b40b2 100644
--- a/doc/build/orm/loading_relationships.rst
+++ b/doc/build/orm/loading_relationships.rst
@@ -365,7 +365,7 @@ that the database driver in use supports multiple, simultaneous cursors
The Zen of Joined Eager Loading
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Since joined eager loading seems to have many resemblences to the use of
+Since joined eager loading seems to have many resemblances to the use of
:meth:`.Query.join`, it often produces confusion as to when and how it should
be used. It is critical to understand the distinction that while
:meth:`.Query.join` is used to alter the results of a query, :func:`.joinedload`