[Python-checkins] cpython (merge default -> default): merge

[brian.curtin]

http://hg.python.org/cpython/rev/435350b76922
changeset:   89075:435350b76922
parent:      89074:3cfaeb788e00
parent:      89073:df5f692e9368
user:        Brian Curtin <brian at python.org>
date:        Sat Feb 08 18:36:57 2014 -0600
summary:
  merge

files:
  Doc/library/asyncio-task.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
--- a/Doc/library/asyncio-task.rst
+++ b/Doc/library/asyncio-task.rst
@@ -415,7 +415,7 @@
    All futures must share the same event loop.  If all the tasks are done
    successfully, the returned future's result is the list of results (in the
    order of the original sequence, not necessarily the order of results
-   arrival).  If *result_exception* is True, exceptions in the tasks are
+   arrival).  If *return_exceptions* is True, exceptions in the tasks are
    treated the same as successful results, and gathered in the result list;
    otherwise, the first raised exception will be immediately propagated to the
    returned future.

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