summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2011-01-31 19:41:53 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2011-01-31 19:41:53 (GMT)
commit070f050c3aaf8b67477426afd40465122d749906 (patch)
tree91e5f4f17bcd84d3ffb9bc67f1acbc499ce6ae29
parent8ce0fac6c88c1238c2d3c351622feb9ce11302bc (diff)
downloadcpython-070f050c3aaf8b67477426afd40465122d749906.zip
cpython-070f050c3aaf8b67477426afd40465122d749906.tar.gz
cpython-070f050c3aaf8b67477426afd40465122d749906.tar.bz2
Merged revisions 88281 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88281 | brian.curtin | 2011-01-31 13:35:02 -0600 (Mon, 31 Jan 2011) | 2 lines #11083 typo: RuntimeException -> RuntimeError ........
-rw-r--r--Doc/library/threading.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 7d5370d..fb18809 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -268,7 +268,7 @@ impossible to detect the termination of alien threads.
It must be called at most once per thread object. It arranges for the
object's :meth:`run` method to be invoked in a separate thread of control.
- This method will raise a :exc:`RuntimeException` if called more than once
+ This method will raise a :exc:`RuntimeError` if called more than once
on the same thread object.
.. method:: run()