[Python-checkins] cpython (merge 3.5 -> default): Closes #24947: Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/b76346142b49
changeset:   97531:b76346142b49
parent:      97528:b0e3eef95d3e
parent:      97530:563d6f9fecfe
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Thu Aug 27 15:55:48 2015 -0500
summary:
  Closes #24947: Merge with 3.5

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