- add cross-linking for passive_deletes / passive_updates

2 files changed, 15 insertions, 4 deletions

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 70df9a679..4747c075d 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -315,11 +315,11 @@ class Mapper(_InspectionAttr):
 
            When False, it is assumed that the database does not enforce
            referential integrity and will not be issuing its own CASCADE
-           operation for an update.  The :class:`.Mapper` here will
+           operation for an update.  The unit of work process will
            emit an UPDATE statement for the dependent columns during a
            primary key change.
 
-           ..seealso::
+           .. seealso::
 
                :ref:`passive_updates` - description of a similar feature as
                used with :func:`.relationship`
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index 879fe7c78..46dd91c6e 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -514,6 +514,11 @@ class RelationshipProperty(StrategizedProperty):
            after a flush occurs so this is a very special use-case
            setting.
 
+           .. seealso::
+
+                :ref:`passive_deletes` - Introductory documentation
+                and examples.
+
         :param passive_updates=True:
           Indicates loading and INSERT/UPDATE/DELETE behavior when the
           source of a foreign key value changes (i.e. an "on update"
@@ -540,10 +545,16 @@ class RelationshipProperty(StrategizedProperty):
           are expected and the database in use doesn't support CASCADE
           (i.e. SQLite, MySQL MyISAM tables).
 
+          .. seealso::
+
+                :ref:`passive_updates` - Introductory documentation and
+                examples.
+
+                :paramref:`.mapper.passive_updates` - a similar flag which
+                takes effect for joined-table inheritance mappings.
+
           Also see the passive_updates flag on ``mapper()``.
 
-          A future SQLAlchemy release will provide a "detect" feature for
-          this flag.
 
         :param post_update:
           this indicates that the relationship should be handled by a