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

[victor.stinner]

https://hg.python.org/cpython/rev/1726e5253fcf
changeset:   93894:1726e5253fcf
parent:      93892:8214675f6385
parent:      93893:a59fed8c710b
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Dec 15 17:51:16 2014 +0100
summary:
  Merge 3.4 (asyncio doc)

files:
  Doc/library/asyncio-eventloop.rst |  4 +++-
  1 files changed, 3 insertions(+), 1 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
@@ -85,7 +85,9 @@
 
 .. method:: BaseEventLoop.call_soon(callback, \*args)
 
-   Arrange for a callback to be called as soon as possible.
+   Arrange for a callback to be called as soon as possible.  The callback is
+   called after :meth:`call_soon` returns, when control returns to the event
+   loop.
 
    This operates as a FIFO queue, callbacks are called in the order in
    which they are registered.  Each callback will be called exactly once.

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