summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-04-27 14:32:36 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-04-27 14:32:36 (GMT)
commit0abb8b74d911607d8535bd79a042918295627454 (patch)
tree3befd7d1b5ea324119d42d0112bac00257e3aa69 /Doc/library
parent7fb624fe51a25580427ed19c6a84e8003df77dc8 (diff)
parent944d16c6c490f5e3933f8a729d810f60d3bab1d3 (diff)
downloadcpython-0abb8b74d911607d8535bd79a042918295627454.zip
cpython-0abb8b74d911607d8535bd79a042918295627454.tar.gz
cpython-0abb8b74d911607d8535bd79a042918295627454.tar.bz2
Merge 3.2
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/__future__.rst2
-rw-r--r--Doc/library/sys.rst4
-rw-r--r--Doc/library/wsgiref.rst2
3 files changed, 4 insertions, 4 deletions
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 @@ Each statement in :file:`__future__.py` is of the form::
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 @@ always available.
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 @@ input, output, and error streams.
.. 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()