summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-08-27 20:55:48 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-08-27 20:55:48 (GMT)
commita51ffd309925980704d252d5b5d9f2c954d8b8e1 (patch)
tree34c1acbf186dd65d910cb7fe1e88026bee0a9ce3
parent54f0e197662c37ddbccd47f959ee987a72a27378 (diff)
parentdcc47c6064cfa7b44a13853f14e4819185c8f2a2 (diff)
downloadcpython-a51ffd309925980704d252d5b5d9f2c954d8b8e1.zip
cpython-a51ffd309925980704d252d5b5d9f2c954d8b8e1.tar.gz
cpython-a51ffd309925980704d252d5b5d9f2c954d8b8e1.tar.bz2
Closes #24947: Merge with 3.5
-rw-r--r--Doc/library/asyncio-eventloop.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst
index 7d7caa8..146c8c9 100644
--- a/Doc/library/asyncio-eventloop.rst
+++ b/Doc/library/asyncio-eventloop.rst
@@ -6,7 +6,7 @@ Base Event Loop
===============
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).