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

[yury.selivanov]

https://hg.python.org/cpython/rev/a497e7faa09b
changeset:   96674:a497e7faa09b
parent:      96671:15b8a62da6ff
parent:      96673:ed9bd661f627
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Thu Jun 25 11:55:02 2015 -0400
summary:
  Merge 3.5

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