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

[zach.ware]

https://hg.python.org/cpython/rev/563d6f9fecfe
changeset:   97530:563d6f9fecfe
branch:      3.5
parent:      97527:8270cf851d04
parent:      97529:cf15066861fc
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Thu Aug 27 15:55:24 2015 -0500
summary:
  Issue #24947: Merge 3.4

files:
  Doc/library/asyncio-eventloop.rst |  2 +-
  1 files changed, 1 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
@@ -6,7 +6,7 @@
 ===============
 
 The event loop is the central execution device provided by :mod:`asyncio`.
-It provides multiple facilities, amongst which:
+It provides multiple facilities, including:
 
 * Registering, executing and cancelling delayed calls (timeouts).
 

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