summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-07-24 06:33:32 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-07-24 06:33:32 (GMT)
commit2e57dcc87e82cd4161b38e3fa109a6473818b7fa (patch)
treeef4c2a0d6dfa589853596ae70bb22a5673a1e4cb
parenta819105fdd45ca94cf5a94b1c737984918d83d60 (diff)
parentc935a9530c8583e17c5c5ceeec2097c96016e1d9 (diff)
downloadcpython-2e57dcc87e82cd4161b38e3fa109a6473818b7fa.zip
cpython-2e57dcc87e82cd4161b38e3fa109a6473818b7fa.tar.gz
cpython-2e57dcc87e82cd4161b38e3fa109a6473818b7fa.tar.bz2
Merge with 3.4
-rw-r--r--Doc/library/asyncio-task.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
index 316a694..db688f5 100644
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -261,7 +261,7 @@ Example combining a :class:`Future` and a :ref:`coroutine function
print(future.result())
loop.close()
-The coroutine function is responsible of the computation (which takes 1 second)
+The coroutine function is responsible for the computation (which takes 1 second)
and it stores the result into the future. The
:meth:`~BaseEventLoop.run_until_complete` method waits for the completion of
the future.