summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-09-15 20:43:05 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-09-15 20:43:05 (GMT)
commit334536fb60f30537970f5e7a28f64cd63e36bcfb (patch)
treee2bc0e321aab7d40f0e3701aac95fa17dbe1e69f /Doc
parent44879a0b18048e2d722a866e3ec0485012bce732 (diff)
parent60208a161df5e77af91ae8230e089a0f2805872b (diff)
downloadcpython-334536fb60f30537970f5e7a28f64cd63e36bcfb.zip
cpython-334536fb60f30537970f5e7a28f64cd63e36bcfb.tar.gz
cpython-334536fb60f30537970f5e7a28f64cd63e36bcfb.tar.bz2
Merge 3.5 (asyncio doc)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/asyncio-eventloop.rst8
1 files changed, 6 insertions, 2 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index 6022c2d..889c8e2 100644
--- 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::