[Python-checkins] r85280 - in python/branches/release27-maint: Doc/faq/library.rst Doc/faq/windows.rst Doc/library/argparse.rst Doc/library/datetime.rst Doc/library/optparse.rst Doc/library/wsgiref.rst

[georg.brandl]

Author: georg.brandl
Date: Wed Oct  6 12:41:31 2010
New Revision: 85280

Log:
Merged revisions 85274 via svnmerge from 
svn+ssh://pythondev@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".
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Doc/faq/library.rst
   python/branches/release27-maint/Doc/faq/windows.rst
   python/branches/release27-maint/Doc/library/argparse.rst
   python/branches/release27-maint/Doc/library/datetime.rst
   python/branches/release27-maint/Doc/library/optparse.rst
   python/branches/release27-maint/Doc/library/wsgiref.rst

Modified: python/branches/release27-maint/Doc/faq/library.rst
==============================================================================
--- python/branches/release27-maint/Doc/faq/library.rst	(original)
+++ python/branches/release27-maint/Doc/faq/library.rst	Wed Oct  6 12:41:31 2010
@@ -458,7 +458,7 @@
 
 To truncate a file, open it using ``f = open(filename, "r+")``, and use
 ``f.truncate(offset)``; offset defaults to the current seek position.  There's
-also ```os.ftruncate(fd, offset)`` for files opened with :func:`os.open`, where
+also ``os.ftruncate(fd, offset)`` for files opened with :func:`os.open`, where
 ``fd`` is the file descriptor (a small integer).
 
 The :mod:`shutil` module also contains a number of functions to work on files

Modified: python/branches/release27-maint/Doc/faq/windows.rst
==============================================================================
--- python/branches/release27-maint/Doc/faq/windows.rst	(original)
+++ python/branches/release27-maint/Doc/faq/windows.rst	Wed Oct  6 12:41:31 2010
@@ -594,7 +594,7 @@
 
 The Python installer issues a warning like this::
 
-   This version uses ``CTL3D32.DLL`` which is not the correct version.
+   This version uses CTL3D32.DLL which is not the correct version.
    This version is used for windows NT applications only.
 
 Tim Peters:

Modified: python/branches/release27-maint/Doc/library/argparse.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/argparse.rst	(original)
+++ python/branches/release27-maint/Doc/library/argparse.rst	Wed Oct  6 12:41:31 2010
@@ -737,14 +737,14 @@
 * N (an integer).  N args from the command-line will be gathered together into a
   list.  For example::
 
-    >>> parser = argparse.ArgumentParser()
-    >>> parser.add_argument('--foo', nargs=2)
-    >>> parser.add_argument('bar', nargs=1)
-    >>> parser.parse_args('c --foo a b'.split())
-    Namespace(bar=['c'], foo=['a', 'b'])
+     >>> parser = argparse.ArgumentParser()
+     >>> parser.add_argument('--foo', nargs=2)
+     >>> parser.add_argument('bar', nargs=1)
+     >>> parser.parse_args('c --foo a b'.split())
+     Namespace(bar=['c'], foo=['a', 'b'])
 
-   Note that ``nargs=1`` produces a list of one item.  This is different from
-   the default, in which the item is produced by itself.
+  Note that ``nargs=1`` produces a list of one item.  This is different from
+  the default, in which the item is produced by itself.
 
 * ``'?'``. One arg will be consumed from the command-line if possible, and
   produced as a single item.  If no command-line arg is present, the value from

Modified: python/branches/release27-maint/Doc/library/datetime.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/datetime.rst	(original)
+++ python/branches/release27-maint/Doc/library/datetime.rst	Wed Oct  6 12:41:31 2010
@@ -944,7 +944,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 :attr:`tm_isdst` is set to ``0``.
 

Modified: python/branches/release27-maint/Doc/library/optparse.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/optparse.rst	(original)
+++ python/branches/release27-maint/Doc/library/optparse.rst	Wed Oct  6 12:41:31 2010
@@ -1216,7 +1216,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.

Modified: python/branches/release27-maint/Doc/library/wsgiref.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/wsgiref.rst	(original)
+++ python/branches/release27-maint/Doc/library/wsgiref.rst	Wed Oct  6 12:41:31 2010
@@ -712,7 +712,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 :pep:`333`)
+   # second variable is the callable object (see PEP 333).
    def hello_world_app(environ, start_response):
        status = '200 OK' # HTTP Status
        headers = [('Content-type', 'text/plain')] # HTTP Headers