Merge 3.5

asvetlov · asvetlov · commit 50e648a06db7 · 2016-03-29T09:39:22.000+03:00
diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst
@@ -675,6 +675,8 @@ Task functions
       :exc:`asyncio.TimeoutError` is raised outside of
       context manager scope.
 
+   Passing ``None`` as *timeout* argument disables the manager logic.
+
 .. coroutinefunction:: wait(futures, \*, loop=None, timeout=None,\
                             return_when=ALL_COMPLETED)
 
