summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-07-12 01:20:40 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-07-12 01:20:40 (GMT)
commite8567106c05f5dcaf397666b48bb67ea202250a2 (patch)
tree7f81e9dec2a99f229548483801b6b7b4247597ab /Doc
parent59d77e8a0532c4155057b5adda61bf541779ccd3 (diff)
parent4bfb14ac10eef86652142879d02e7601d1cf6490 (diff)
downloadcpython-e8567106c05f5dcaf397666b48bb67ea202250a2.zip
cpython-e8567106c05f5dcaf397666b48bb67ea202250a2.tar.gz
cpython-e8567106c05f5dcaf397666b48bb67ea202250a2.tar.bz2
Merge with 3.4
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/asyncio-eventloop.rst7
1 files changed, 5 insertions, 2 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index 993a5de..6fe5aa1 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -567,8 +567,11 @@ Server
.. method:: close()
- Stop serving: close all sockets and set the :attr:`sockets` attribute to
- ``None``.
+ Stop serving: close listening sockets and set the :attr:`sockets`
+ attribute to ``None``.
+
+ The sockets that represent existing incoming client connections are
+ leaved open.
The server is closed asynchonously, use the :meth:`wait_closed` coroutine
to wait until the server is closed.