[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (asyncio doc)

[victor.stinner]

https://hg.python.org/cpython/rev/73f8fca329cb
changeset:   98016:73f8fca329cb
parent:      98014:edbc35d8babb
parent:      98015:d371ce905395
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Tue Sep 15 22:43:05 2015 +0200
summary:
  Merge 3.5 (asyncio doc)

files:
  Doc/library/asyncio-eventloop.rst |  8 ++++++--
  1 files changed, 6 insertions(+), 2 deletions(-)


diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -275,7 +275,9 @@
      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 @@
 
    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::
 

-- 
Repository URL: https://hg.python.org/cpython