[Python-checkins] cpython (merge default -> default): Merged upstream changes.

[vinay.sajip]

http://hg.python.org/cpython/rev/0fee31f0cc7f
changeset:   75223:0fee31f0cc7f
parent:      75222:ef060b833183
parent:      75216:54a3f30c58c0
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Thu Feb 23 20:51:57 2012 +0000
summary:
  Merged upstream changes.

files:
  Doc/library/subprocess.rst |  2 +-
  Doc/library/sys.rst        |  5 +++--
  2 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -240,7 +240,7 @@
    When *stdout* or *stderr* are pipes and *universal_newlines* is
    :const:`True` then the output data is assumed to be encoded as UTF-8 and
    will automatically be decoded to text. All line endings will be converted
-   to ``'\n'`` as described for the universal newlines `'U'`` mode argument
+   to ``'\n'`` as described for the universal newlines ``'U'`` mode argument
    to :func:`open`.
 
    If *shell* is :const:`True`, the specified command will be executed through
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -195,7 +195,7 @@
    be set at build time with the ``--exec-prefix`` argument to the
    :program:`configure` script.  Specifically, all configuration files (e.g. the
    :file:`pyconfig.h` header file) are installed in the directory
-   :file:`{exec_prefix}/lib/python{X.Y}/config', and shared library modules are
+   :file:`{exec_prefix}/lib/python{X.Y}/config`, and shared library modules are
    installed in :file:`{exec_prefix}/lib/python{X.Y}/lib-dynload`, where *X.Y*
    is the version number of Python, for example ``3.2``.
 
@@ -756,6 +756,7 @@
       always use the ``startswith`` idiom presented above.
 
    .. seealso::
+
       :attr:`os.name` has a coarser granularity.  :func:`os.uname` gives
       system-dependent version information.
 
@@ -771,7 +772,7 @@
    argument to the :program:`configure` script.  The main collection of Python
    library modules is installed in the directory :file:`{prefix}/lib/python{X.Y}``
    while the platform independent header files (all except :file:`pyconfig.h`) are
-   stored in :file:`{prefix}/include/python{X.Y}``, where *X.Y* is the version
+   stored in :file:`{prefix}/include/python{X.Y}`, where *X.Y* is the version
    number of Python, for example ``3.2``.
 
 

-- 
Repository URL: http://hg.python.org/cpython