gen: Doc touchups

diff --git a/docs/gen.rst b/docs/gen.rst
index 1f1b2c1d7dafe642947c01ff7aeed345a6eede00..0f0bfdeefb70a249a0c4ddfbaea2d36af3bc38fb 100644 (file)
--- a/docs/gen.rst
+++ b/docs/gen.rst
@@ -34,17 +34,6 @@
 
    .. autofunction:: multi_future
 
-   .. autofunction:: Task
-
-   .. class:: Arguments
-
-      The result of a `Task` or `Wait` whose callback had more than one
-      argument (or keyword arguments).
-
-      The `Arguments` object is a `collections.namedtuple` and can be
-      used either as a tuple ``(args, kwargs)`` or an object with attributes
-      ``args`` and ``kwargs``.
-
    .. autofunction:: convert_yielded
 
    .. autofunction:: maybe_future
@@ -70,3 +59,18 @@
    .. autoclass:: WaitAll
 
    .. autoclass:: MultiYieldPoint
+
+   .. autofunction:: Task
+
+   .. class:: Arguments
+
+      The result of a `Task` or `Wait` whose callback had more than one
+      argument (or keyword arguments).
+
+      The `Arguments` object is a `collections.namedtuple` and can be
+      used either as a tuple ``(args, kwargs)`` or an object with attributes
+      ``args`` and ``kwargs``.
+
+      .. deprecated:: 5.1
+
+         This class will be removed in 6.0.

diff --git a/tornado/gen.py b/tornado/gen.py
index 579939a19f19c7b396636cfd8bac69b12a2761ae..cc59402e5ee9df10f9be2e2d6ddf305826cd437e 100644 (file)
--- a/tornado/gen.py
+++ b/tornado/gen.py
@@ -261,9 +261,6 @@ def coroutine(func):
     ``callback`` argument is not visible inside the decorated
     function; it is handled by the decorator itself.
 
-    From the caller's perspective, ``@gen.coroutine`` is similar to
-    the combination of ``@return_future`` and ``@gen.engine``.
-
     .. warning::
 
        When exceptions occur inside a coroutine, the exception