Merged revisions 85274 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r85274 | georg.brandl | 2010-10-06 12:26:05 +0200 (Mi, 06 Okt 2010) | 1 line
Fix errors found by "make suspicious".
........
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index 456c1a0..26d9946 100644
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -925,7 +925,7 @@
d.toordinal() - date(d.year, 1, 1).toordinal() + 1`` is the day number within
the current year starting with ``1`` for January 1st. The :attr:`tm_isdst` flag
of the result is set according to the :meth:`dst` method: :attr:`tzinfo` is
- ``None`` or :meth:`dst`` returns ``None``, :attr:`tm_isdst` is set to ``-1``;
+ ``None`` or :meth:`dst` returns ``None``, :attr:`tm_isdst` is set to ``-1``;
else if :meth:`dst` returns a non-zero value, :attr:`tm_isdst` is set to ``1``;
else ``tm_isdst`` is set to ``0``.
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index afb30a1..f0d1cf3 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -179,7 +179,7 @@
:class:`BufferedReader`, and :class:`BufferedRWPair` buffer streams that are
readable, writable, and both readable and writable. :class:`BufferedRandom`
provides a buffered interface to random access streams. Another
-:class`BufferedIOBase` subclass, :class:`BytesIO`, is a stream of in-memory
+:class:`BufferedIOBase` subclass, :class:`BytesIO`, is a stream of in-memory
bytes.
The :class:`TextIOBase` ABC, another subclass of :class:`IOBase`, deals with
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
index 918e3ec..0009998 100644
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -1206,7 +1206,7 @@
:func:`float` and :func:`complex`, with similar error-handling.
``"choice"`` options are a subtype of ``"string"`` options. The
-:attr:`~Option.choices`` option attribute (a sequence of strings) defines the
+:attr:`~Option.choices` option attribute (a sequence of strings) defines the
set of allowed option arguments. :func:`optparse.check_choice` compares
user-supplied option arguments against this master list and raises
:exc:`OptionValueError` if an invalid string is given.
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index 0c441f8..7402ad5 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -239,6 +239,7 @@
.. function:: getstatusoutput(cmd)
+
Return ``(status, output)`` of executing *cmd* in a shell.
Execute the string *cmd* in a shell with :func:`os.popen` and return a 2-tuple
@@ -258,6 +259,7 @@
.. function:: getoutput(cmd)
+
Return output (stdout and stderr) of executing *cmd* in a shell.
Like :func:`getstatusoutput`, except the exit status is ignored and the return
diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst
index 4ac8df7..fda9e70 100644
--- a/Doc/library/wsgiref.rst
+++ b/Doc/library/wsgiref.rst
@@ -708,7 +708,7 @@
# use a function (note that you're not limited to a function, you can
# use a class for example). The first argument passed to the function
# is a dictionary containing CGI-style envrironment variables and the
- # second variable is the callable object (see PEP333)
+ # second variable is the callable object (see PEP 333).
def hello_world_app(environ, start_response):
status = b'200 OK' # HTTP Status
headers = [(b'Content-type', b'text/plain; charset=utf-8')] # HTTP Headers