Merge 3.2
diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
index afa08c9..d0d45ad 100644
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -258,7 +258,6 @@
This is the equivalent of the Python expression ``hash(o)``.
.. versionchanged:: 3.2
-
The return type is now Py_hash_t. This is a signed integer the same size
as Py_ssize_t.
diff --git a/Doc/library/__future__.rst b/Doc/library/__future__.rst
index 1e07f20..0acccc5 100644
--- a/Doc/library/__future__.rst
+++ b/Doc/library/__future__.rst
@@ -29,7 +29,7 @@
where, normally, *OptionalRelease* is less than *MandatoryRelease*, and both are
-5-tuples of the same form as ``sys.version_info``::
+5-tuples of the same form as :data:`sys.version_info`::
(PY_MAJOR_VERSION, # the 2 in 2.1.0a3; an int
PY_MINOR_VERSION, # the 1; an int
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 914db8d..ba781b3 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -540,8 +540,8 @@
This is called ``hexversion`` since it only really looks meaningful when viewed
as the result of passing it to the built-in :func:`hex` function. The
- ``version_info`` value may be used for a more human-friendly encoding of the
- same information.
+ :term:`struct sequence` :data:`sys.version_info` may be used for a more
+ human-friendly encoding of the same information.
The ``hexversion`` is a 32-bit number with the following layout
diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
index 385652b..3969ea4 100644
--- a/Doc/library/wsgiref.rst
+++ b/Doc/library/wsgiref.rst
@@ -690,7 +690,7 @@
.. attribute:: BaseHandler.wsgi_file_wrapper
A ``wsgi.file_wrapper`` factory, or ``None``. The default value of this
- attribute is the :class:`FileWrapper` class from :mod:`wsgiref.util`.
+ attribute is the :class:`wsgiref.util.FileWrapper` class.
.. method:: BaseHandler.sendfile()
diff --git a/Lib/test/tracedmodules/__init__.py b/Lib/test/tracedmodules/__init__.py
index 4628d8a..13fa4f2 100644
--- a/Lib/test/tracedmodules/__init__.py
+++ b/Lib/test/tracedmodules/__init__.py
@@ -2,8 +2,3 @@
that the exact location of functions in these modules is important, as trace.py
takes the real line numbers into account.
"""
-"""This directory contains modules that help testing the trace.py module. Note
-that the exact location of functions in these modules is important, as trace.py
-takes the real line numbers into account.
-
-"""