Merge with 3.4

e8567106 · Victor Stinner · 59d77e8a · 4bfb14ac · e8567106
Commit e8567106 authored Jul 12, 2014 by Victor Stinner
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

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

No files found.
--- 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.