Merged revisions 66134,66136,66143,66154-66155,66190 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66134 | andrew.kuchling | 2008-09-01 20:13:42 -0500 (Mon, 01 Sep 2008) | 1 line
Describe the __hash__ changes
........
r66136 | andrew.kuchling | 2008-09-01 20:39:18 -0500 (Mon, 01 Sep 2008) | 1 line
typo fix
........
r66143 | mark.summerfield | 2008-09-02 02:23:16 -0500 (Tue, 02 Sep 2008) | 3 lines
a typo
........
r66154 | andrew.kuchling | 2008-09-02 08:06:00 -0500 (Tue, 02 Sep 2008) | 1 line
Clarify example; add imports
........
r66155 | andrew.kuchling | 2008-09-02 08:08:11 -0500 (Tue, 02 Sep 2008) | 1 line
Add e-mail address
........
r66190 | benjamin.peterson | 2008-09-03 16:48:20 -0500 (Wed, 03 Sep 2008) | 1 line
3.0 still has the old threading names
........
diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst
index ccd7b44..e3d3b5b 100644
--- a/Doc/library/warnings.rst
+++ b/Doc/library/warnings.rst
@@ -253,7 +253,7 @@
.. class:: catch_warnings([\*, record=False, module=None])
- A context manager that guards the warnings filter from being permanentally
+ A context manager that guards the warnings filter from being permanently
mutated. The manager returns an instance of :class:`WarningsRecorder`. The
*record* argument specifies whether warnings that would typically be
handled by :func:`showwarning` should instead be recorded by the