summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-12-12 20:34:49 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-12-12 20:34:49 (GMT)
commit64a467d7901f5a41562b02a4c02d64775814fb55 (patch)
tree42ed6bfd2507f916015172abda0dc21e0e18e0bc /Doc/library
parentf10f162db95852ab0624f378f15735af3f38b6c9 (diff)
downloadcpython-64a467d7901f5a41562b02a4c02d64775814fb55.zip
cpython-64a467d7901f5a41562b02a4c02d64775814fb55.tar.gz
cpython-64a467d7901f5a41562b02a4c02d64775814fb55.tar.bz2
Homogenize the "optional OS services" menu
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/concurrent.futures.rst4
-rw-r--r--Doc/library/multiprocessing.rst6
-rw-r--r--Doc/library/someos.rst8
-rw-r--r--Doc/library/threading.rst6
4 files changed, 12 insertions, 12 deletions
diff --git a/Doc/library/concurrent.futures.rst b/Doc/library/concurrent.futures.rst
index 3b74aa8..aeb792e 100644
--- a/Doc/library/concurrent.futures.rst
+++ b/Doc/library/concurrent.futures.rst
@@ -1,5 +1,5 @@
-:mod:`concurrent.futures` --- Concurrent computation
-====================================================
+:mod:`concurrent.futures` --- Launching parallel tasks
+======================================================
.. module:: concurrent.futures
:synopsis: Execute computations concurrently using threads or processes.
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index a52824f..cc40a2a 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1,8 +1,8 @@
-:mod:`multiprocessing` --- Process-based "threading" interface
-==============================================================
+:mod:`multiprocessing` --- Process-based parallelism
+====================================================
.. module:: multiprocessing
- :synopsis: Process-based "threading" interface.
+ :synopsis: Process-based parallelism.
Introduction
diff --git a/Doc/library/someos.rst b/Doc/library/someos.rst
index f361330..d2009bb 100644
--- a/Doc/library/someos.rst
+++ b/Doc/library/someos.rst
@@ -14,11 +14,11 @@ some other systems as well (e.g. Windows). Here's an overview:
select.rst
threading.rst
- dummy_threading.rst
- _thread.rst
- _dummy_thread.rst
- concurrent.futures.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/threading.rst b/Doc/library/threading.rst
index 11aa4c4..282d705 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -1,8 +1,8 @@
-:mod:`threading` --- Higher-level threading interface
-=====================================================
+:mod:`threading` --- Thread-based parallelism
+=============================================
.. module:: threading
- :synopsis: Higher-level threading interface.
+ :synopsis: Thread-based parallelism.
This module constructs higher-level threading interfaces on top of the lower