Merge 3.5 (asyncio doc)

334536fb · Victor Stinner · 44879a0b · 60208a16 · 334536fb
Commit 334536fb authored Sep 15, 2015 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Doc/library/asyncio-eventloop.rst Doc/library/asyncio-eventloop.rst +6 -2

No files found.
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -275,7 +275,9 @@ Creating connections
     to bind the socket to locally.  The *local_host* and *local_port*
     are looked up using getaddrinfo(), similarly to *host* and *port*.

-   On Windows with :class:`ProactorEventLoop`, SSL/TLS is not supported.
+   .. versionchanged:: 3.5
+
+      On Windows with :class:`ProactorEventLoop`, SSL/TLS is now supported.

   .. seealso::

@@ -358,7 +360,9 @@ Creating listening connections

   This method is a :ref:`coroutine <coroutine>`.

-   On Windows with :class:`ProactorEventLoop`, SSL/TLS is not supported.
+   .. versionchanged:: 3.5
+
+      On Windows with :class:`ProactorEventLoop`, SSL/TLS is now supported.

   .. seealso::