Documentation updates for ResultProxy -> Result

This is based off of
I8091919d45421e3f53029b8660427f844fee0228 and includes
all documentation-only changes as a separate merge,
once the parent is merged.

Change-Id: I711adea23df0f9f0b1fe7c76210bd2de6d31842d

4 files changed, 7 insertions, 7 deletions

diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index 5409b9d7f..f5d191860 100644
--- a/lib/sqlalchemy/orm/events.py
+++ b/lib/sqlalchemy/orm/events.py
@@ -1747,7 +1747,7 @@ class SessionEvents(event.Events):
               :meth:`_query.Query.update`.
             * ``context`` The :class:`.QueryContext` object, corresponding
               to the invocation of an ORM query.
-            * ``result`` the :class:`_engine.ResultProxy`
+            * ``result`` the :class:`_engine.CursorResult`
               returned as a result of the
               bulk UPDATE operation.
 
@@ -1783,7 +1783,7 @@ class SessionEvents(event.Events):
               was called upon.
             * ``context`` The :class:`.QueryContext` object, corresponding
               to the invocation of an ORM query.
-            * ``result`` the :class:`_engine.ResultProxy`
+            * ``result`` the :class:`_engine.CursorResult`
               returned as a result of the
               bulk DELETE operation.
 
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 6ec520a3e..1fc299cec 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -3497,7 +3497,7 @@ class Query(Generative):
         ]
 
     def instances(self, result_proxy, context=None):
-        """Return an ORM result given a :class:`_engine.ResultProxy` and
+        """Return an ORM result given a :class:`_engine.CursorResult` and
         :class:`.QueryContext`.
 
         """
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 4ca715dd3..b053b8d96 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1128,7 +1128,7 @@ class Session(_SessionClassMethods):
         r"""Execute a SQL expression construct or string statement within
         the current transaction.
 
-        Returns a :class:`_engine.ResultProxy` representing
+        Returns a :class:`_engine.CursorResult` representing
         results of the statement execution, in the same manner as that of an
         :class:`_engine.Engine` or
         :class:`_engine.Connection`.
@@ -1196,7 +1196,7 @@ class Session(_SessionClassMethods):
 
         The :meth:`.Session.execute` method does *not* invoke autoflush.
 
-        The :class:`_engine.ResultProxy` returned by the :meth:`.Session.
+        The :class:`_engine.CursorResult` returned by the :meth:`.Session.
         execute`
         method is returned with the "close_with_result" flag set to true;
         the significance of this flag is that if this :class:`.Session` is
@@ -1204,7 +1204,7 @@ class Session(_SessionClassMethods):
         :class:`_engine.Connection` available, a temporary
         :class:`_engine.Connection` is
         established for the statement execution, which is closed (meaning,
-        returned to the connection pool) when the :class:`_engine.ResultProxy`
+        returned to the connection pool) when the :class:`_engine.CursorResult`
         has
         consumed all available data. This applies *only* when the
         :class:`.Session` is configured with autocommit=True and no
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index 16aa98adb..3558a7c5f 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -313,7 +313,7 @@ def identity_key(*args, **kwargs):
         (<class '__main__.MyClass'>, (1, 2), None)
 
       :param class: mapped class (must be a positional argument)
-      :param row: :class:`.Row` row returned by a :class:`_engine.ResultProxy`
+      :param row: :class:`.Row` row returned by a :class:`_engine.CursorResult`
        (must be given as a keyword arg)
       :param identity_token: optional identity token