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

[yury.selivanov]

https://hg.python.org/cpython/rev/ed9bd661f627
changeset:   96673:ed9bd661f627
branch:      3.5
parent:      96670:e9c34e16f445
parent:      96672:5f1ce5afd3ee
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Thu Jun 25 11:54:49 2015 -0400
summary:
  Merge 3.4

files:
  Doc/library/asyncio-eventloop.rst |  4 ++--
  1 files changed, 2 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
@@ -164,8 +164,8 @@
    The :func:`asyncio.sleep` function.
 
 
-Coroutines
-----------
+Tasks
+-----
 
 .. method:: BaseEventLoop.create_task(coro)
 

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