Break up the 'someos' docs classification based on a more user-focused scheme, includ...

diff --git a/Doc/library/concurrency.rst b/Doc/library/concurrency.rst
new file mode 100644 (file)
index 0000000..56fe3f2
--- /dev/null
+++ b/Doc/library/concurrency.rst
@@ -0,0 +1,31 @@
+.. _concurrency:
+
+********************
+Concurrent Execution
+********************
+
+The modules described in this chapter provide support for concurrent
+execution of code. The appropriate choice of tool will depend on the
+task to be executed (CPU bound vs IO bound) and preferred style of
+development (event driven cooperative multitasking vs preemptive
+multitasking) Here's an overview:
+
+
+.. toctree::
+
+   threading.rst
+   multiprocessing.rst
+   concurrent.futures.rst
+   subprocess.rst
+   sched.rst
+   queue.rst
+   select.rst
+
+
+The following are support modules for some of the above services:
+
+.. toctree::
+
+   dummy_threading.rst
+   _thread.rst
+   _dummy_thread.rst

diff --git a/Doc/library/datatypes.rst b/Doc/library/datatypes.rst
index 8e33c1ff4e6f641c8e9f63b3a89006feb7cd78a4..d0382e0f7a58bd7ef50f34182fbbdf78fada37ba 100644 (file)
--- a/Doc/library/datatypes.rst
+++ b/Doc/library/datatypes.rst
@@ -25,8 +25,6 @@ The following modules are documented in this chapter:
    heapq.rst
    bisect.rst
    array.rst
-   sched.rst
-   queue.rst
    weakref.rst
    types.rst
    copy.rst

diff --git a/Doc/library/index.rst b/Doc/library/index.rst
index dc35b09dff66e92a0edbac91773d9b7e8394c613..ba2036119f5ecd235c7add5dc73566604d6a4ef5 100644 (file)
--- a/Doc/library/index.rst
+++ b/Doc/library/index.rst
@@ -57,7 +57,7 @@ the `Python Package Index <http://pypi.python.org/pypi>`_.
    fileformats.rst
    crypto.rst
    allos.rst
-   someos.rst
+   concurrency.rst
    ipc.rst
    netdata.rst
    markup.rst

diff --git a/Doc/library/ipc.rst b/Doc/library/ipc.rst
index c873065472cf182f5b9c6a9f71e19641a3cfb22b..91ec69368cc5dfba19fac904bb57ae575976d6d9 100644 (file)
--- a/Doc/library/ipc.rst
+++ b/Doc/library/ipc.rst
@@ -8,7 +8,7 @@ The modules described in this chapter provide mechanisms for different processes
 to communicate.
 
 Some modules only work for two processes that are on the same machine, e.g.
-:mod:`signal` and :mod:`subprocess`.  Other modules support networking protocols
+:mod:`signal` and :mod:`mmap`.  Other modules support networking protocols
 that two or more processes can used to communicate across machines.
 
 The list of modules described in this chapter is:
@@ -16,9 +16,9 @@ The list of modules described in this chapter is:
 
 .. toctree::
 
-   subprocess.rst
    socket.rst
    ssl.rst
-   signal.rst
    asyncore.rst
    asynchat.rst
+   signal.rst
+   mmap.rst

diff --git a/Doc/library/someos.rst b/Doc/library/someos.rst
deleted file mode 100644 (file)
index d2009bb..0000000
--- a/Doc/library/someos.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _someos:
-
-**********************************
-Optional Operating System Services
-**********************************
-
-The modules described in this chapter provide interfaces to operating system
-features that are available on selected operating systems only. The interfaces
-are generally modeled after the Unix or C interfaces but they are available on
-some other systems as well (e.g. Windows).  Here's an overview:
-
-
-.. toctree::
-
-   select.rst
-   threading.rst
-   multiprocessing.rst
-   concurrent.futures.rst
-   mmap.rst
-   readline.rst
-   rlcompleter.rst
-   dummy_threading.rst
-   _thread.rst
-   _dummy_thread.rst

diff --git a/Doc/library/text.rst b/Doc/library/text.rst
index 939ed4f65e227de53611d00e1589b9ecd87b3f6f..47b678434fc899c6bd39bf4726217b3a8c783b6b 100644 (file)
--- a/Doc/library/text.rst
+++ b/Doc/library/text.rst
@@ -21,4 +21,6 @@ Python's built-in string type in :ref:`textseq`.
    textwrap.rst
    unicodedata.rst
    stringprep.rst
+   readline.rst
+   rlcompleter.rst
 

diff --git a/Misc/NEWS b/Misc/NEWS
index abed92ab101422d9eb2a88af4df4ff903a9d19e8..fe685360ef1bf04f19b59fbf0ac51f9089a8131d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -55,6 +55,13 @@ Tools/Demos
 Documentation
 -------------
 
+- Create a 'Concurrent Execution' section in the docs, and split up the
+  'Optional Operating System Services' section to use a more user-centric
+  classification scheme (splitting them across the new CE section, IPC and
+  text processing). Operating system limitatons can be reflected with
+  the Sphinx :platform: tag, it doesn't make sense as part of the Table of
+  Contents.
+
 - Issue #4966: Bring the sequence docs up to date for the Py3k transition
   and the many language enhancements since they were original written