[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[victor.stinner]

http://hg.python.org/cpython/rev/9b450b19aa11
changeset:   91658:9b450b19aa11
parent:      91656:5af54ed3af02
parent:      91657:23b439ac9e2d
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sat Jul 12 03:20:40 2014 +0200
summary:
  Merge with 3.4

files:
  Doc/library/asyncio-eventloop.rst |  7 +++++--
  1 files changed, 5 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
@@ -567,8 +567,11 @@
 
    .. 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.

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