summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-12-01 12:51:26 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2017-12-01 12:51:26 -0500
commit5da41e46d3e293df03a9741073ed02e2fcca08a2 (patch)
tree88aeb2acf9a838e98f73c0aa097074776e7b529f
parentbb21dea84cd6bc70ab12acb61d1f4511a013f90d (diff)
parent096bace0da15c0fc903e55873518c7f47efbce19 (diff)
downloadsqlalchemy-5da41e46d3e293df03a9741073ed02e2fcca08a2.tar.gz
Merge remote-tracking branch 'origin/pr/401'
-rw-r--r--doc/build/orm/basic_relationships.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/build/orm/basic_relationships.rst b/doc/build/orm/basic_relationships.rst
index 6a121be9f..2836fe94c 100644
--- a/doc/build/orm/basic_relationships.rst
+++ b/doc/build/orm/basic_relationships.rst
@@ -324,7 +324,7 @@ is stored along with each association between ``Parent`` and
__tablename__ = 'right'
id = Column(Integer, primary_key=True)
-As always, the bidirectional version make use of :paramref:`.relationship.back_populates`
+As always, the bidirectional version makes use of :paramref:`.relationship.back_populates`
or :paramref:`.relationship.backref`::
class Association(Base):