bpo-46777: Fix incorrect use of directives in asyncio documentation (GH-31388)
(cherry picked from commit 2923d87ca258b9d421e8147b12f0d98295ee3f8e)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index b1700c9..300092d 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -343,7 +343,7 @@
the name of the task using :meth:`Task.set_name`.
.. versionchanged:: 3.8
- Added the ``name`` parameter.
+ Added the *name* parameter.
.. method:: loop.set_task_factory(factory)
@@ -456,7 +456,20 @@
to wait for the TLS handshake to complete before aborting the connection.
``60.0`` seconds if ``None`` (default).
- .. versionadded:: 3.8
+ .. versionchanged:: 3.5
+
+ Added support for SSL/TLS in :class:`ProactorEventLoop`.
+
+ .. versionchanged:: 3.6
+
+ The socket option :py:data:`~socket.TCP_NODELAY` is set by default
+ for all TCP connections.
+
+ .. versionchanged:: 3.7
+
+ Added the *ssl_handshake_timeout* parameter.
+
+ .. versionchanged:: 3.8
Added the *happy_eyeballs_delay* and *interleave* parameters.
@@ -471,19 +484,6 @@
For more information: https://tools.ietf.org/html/rfc6555
- .. versionadded:: 3.7
-
- The *ssl_handshake_timeout* parameter.
-
- .. versionchanged:: 3.6
-
- The socket option :py:data:`~socket.TCP_NODELAY` is set by default
- for all TCP connections.
-
- .. versionchanged:: 3.5
-
- Added support for SSL/TLS in :class:`ProactorEventLoop`.
-
.. seealso::
The :func:`open_connection` function is a high-level alternative
@@ -588,12 +588,8 @@
.. availability:: Unix.
- .. versionadded:: 3.7
-
- The *ssl_handshake_timeout* parameter.
-
.. versionchanged:: 3.7
-
+ Added the *ssl_handshake_timeout* parameter.
The *path* parameter can now be a :term:`path-like object`.
@@ -672,15 +668,6 @@
:meth:`Server.serve_forever` to make the server to start accepting
connections.
- .. versionadded:: 3.7
-
- Added *ssl_handshake_timeout* and *start_serving* parameters.
-
- .. versionchanged:: 3.6
-
- The socket option :py:data:`~socket.TCP_NODELAY` is set by default
- for all TCP connections.
-
.. versionchanged:: 3.5
Added support for SSL/TLS in :class:`ProactorEventLoop`.
@@ -689,6 +676,12 @@
The *host* parameter can be a sequence of strings.
+ .. versionchanged:: 3.6
+
+ Added *ssl_handshake_timeout* and *start_serving* parameters.
+ The socket option :py:data:`~socket.TCP_NODELAY` is set by default
+ for all TCP connections.
+
.. seealso::
The :func:`start_server` function is a higher-level alternative API
@@ -713,12 +706,9 @@
.. availability:: Unix.
- .. versionadded:: 3.7
-
- The *ssl_handshake_timeout* and *start_serving* parameters.
-
.. versionchanged:: 3.7
+ Added the *ssl_handshake_timeout* and *start_serving* parameters.
The *path* parameter can now be a :class:`~pathlib.Path` object.
.. coroutinemethod:: loop.connect_accepted_socket(protocol_factory, \
@@ -746,12 +736,12 @@
Returns a ``(transport, protocol)`` pair.
- .. versionadded:: 3.7
-
- The *ssl_handshake_timeout* parameter.
-
.. versionadded:: 3.5.3
+ .. versionchanged:: 3.7
+
+ Added the *ssl_handshake_timeout* parameter.
+
Transferring files
^^^^^^^^^^^^^^^^^^