summaryrefslogtreecommitdiffstats
path: root/Doc/library/threading.rst
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-12-12 21:08:54 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-12-12 21:08:54 (GMT)
commitfa66d583f6eb79c95ff07a84cbae1d44c81f5b8e (patch)
tree40be8187ab18d5f2122201c668c91d7d44ee44de /Doc/library/threading.rst
parenta92d1f5041bac091435f1537be5cf216ae52f79b (diff)
downloadcpython-fa66d583f6eb79c95ff07a84cbae1d44c81f5b8e.zip
cpython-fa66d583f6eb79c95ff07a84cbae1d44c81f5b8e.tar.gz
cpython-fa66d583f6eb79c95ff07a84cbae1d44c81f5b8e.tar.bz2
Merged revisions 87197-87198 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87197 | antoine.pitrou | 2010-12-12 21:34:49 +0100 (dim., 12 déc. 2010) | 3 lines Homogenize the "optional OS services" menu ........ r87198 | antoine.pitrou | 2010-12-12 21:57:12 +0100 (dim., 12 déc. 2010) | 3 lines Improve readability of the socket docs ........
Diffstat (limited to 'Doc/library/threading.rst')
-rw-r--r--Doc/library/threading.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 8b4babc..910e49d 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