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

[yury.selivanov]

https://hg.python.org/cpython/rev/afdfb9d53bec
changeset:   97562:afdfb9d53bec
parent:      97559:501c9ab07996
parent:      97561:833db9e2ed14
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Mon Aug 31 11:45:11 2015 -0400
summary:
  Merge 3.5

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


diff --git a/Doc/library/asyncio.rst b/Doc/library/asyncio.rst
--- a/Doc/library/asyncio.rst
+++ b/Doc/library/asyncio.rst
@@ -4,6 +4,13 @@
 .. module:: asyncio
    :synopsis: Asynchronous I/O, event loop, coroutines and tasks.
 
+.. note::
+
+   The asyncio package has been included in the standard library on a
+   :term:`provisional basis <provisional package>`. Backwards incompatible
+   changes (up to and including removal of the module) may occur if deemed
+   necessary by the core developers.
+
 .. versionadded:: 3.4
 
 **Source code:** :source:`Lib/asyncio/`

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