Merge heads

4 files changed, 9 insertions, 3 deletions

diff --git a/Doc/library/asynchat.rst b/Doc/library/asynchat.rst
index 55c61d7..7050f0c 100644
--- a/Doc/library/asynchat.rst
+++ b/Doc/library/asynchat.rst
@@ -10,6 +10,9 @@
 
 --------------
 
+Note: This module exists for backwards compatibility only.  For new code we
+recommend using :module:`asyncio`.
+
 This module builds on the :mod:`asyncore` infrastructure, simplifying
 asynchronous clients and servers and making it easier to handle protocols
 whose elements are terminated by arbitrary strings, or are of variable length.
diff --git a/Doc/library/asyncore.rst b/Doc/library/asyncore.rst
index 8f494d0..d0a30f8 100644
--- a/Doc/library/asyncore.rst
+++ b/Doc/library/asyncore.rst
@@ -13,6 +13,9 @@
 
 --------------
 
+Note: This module exists for backwards compatibility only.  For new code we
+recommend using :module:`asyncio`.
+
 This module provides the basic infrastructure for writing asynchronous  socket
 service clients and servers.
 
diff --git a/Doc/library/concurrency.rst b/Doc/library/concurrency.rst
index e016694..0de281b 100644
--- a/Doc/library/concurrency.rst
+++ b/Doc/library/concurrency.rst
@@ -20,9 +20,6 @@ multitasking). Here's an overview:
    subprocess.rst
    sched.rst
    queue.rst
-   select.rst
-   selectors.rst
-   asyncio.rst
 
 
 The following are support modules for some of the above services:
diff --git a/Doc/library/ipc.rst b/Doc/library/ipc.rst
index 91ec693..2440bd4 100644
--- a/Doc/library/ipc.rst
+++ b/Doc/library/ipc.rst
@@ -18,6 +18,9 @@ The list of modules described in this chapter is:
 
    socket.rst
    ssl.rst
+   select.rst
+   selectors.rst
+   asyncio.rst
    asyncore.rst
    asynchat.rst
    signal.rst