From: vpsx <19900057+vpsx@users.noreply.github.com>
Date: Wed, 17 Apr 2019 23:48:40 +0000 (-0500)
Subject: Use "parent object" instead of "primary object"
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75838cca3d0a4b95c3f22329862e48cac06974a3;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Use "parent object" instead of "primary object"

(cherry picked from commit 6758a459597e5221607a81a693bd98352bb1c94f)
---

diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index be2903b78b..356b673b66 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -707,8 +707,8 @@ class RelationshipProperty(StrategizedProperty):
 
         :param primaryjoin:
           a SQL expression that will be used as the primary
-          join of this child object against the parent object, or in a
-          many-to-many relationship the join of the primary object to the
+          join of the child object against the parent object, or in a
+          many-to-many relationship the join of the parent object to the
           association table. By default, this value is computed based on the
           foreign key relationships of the parent and child tables (or
           association table).