summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-08-27 20:55:24 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-08-27 20:55:24 (GMT)
commitdcc47c6064cfa7b44a13853f14e4819185c8f2a2 (patch)
tree743959805557f8c58fde5c7bc04df00600d6d745 /Doc
parent73c2194d0715b463b4e6e7e32deb4eb513d563f5 (diff)
parent5e580da0b6a75c3cafecb0306c3f166d1e5d3edc (diff)
downloadcpython-dcc47c6064cfa7b44a13853f14e4819185c8f2a2.zip
cpython-dcc47c6064cfa7b44a13853f14e4819185c8f2a2.tar.gz
cpython-dcc47c6064cfa7b44a13853f14e4819185c8f2a2.tar.bz2
Issue #24947: Merge 3.4
Diffstat (limited to 'Doc')
-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).