diff options
author | Georg Brandl <georg@python.org> | 2012-02-23 20:17:27 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2012-02-23 20:17:27 (GMT) |
commit | 335d628a6673f0c44f13b4ea9f996cfc4539f3d5 (patch) | |
tree | 285c9c9a48fff09d2d6351ee7fe281101b078efa | |
parent | 57c223791de6edb7fd302bd682630ab1e259a06b (diff) | |
parent | bada35bdf5207fd11065858989e29b8a1591e965 (diff) | |
download | cpython-335d628a6673f0c44f13b4ea9f996cfc4539f3d5.zip cpython-335d628a6673f0c44f13b4ea9f996cfc4539f3d5.tar.gz cpython-335d628a6673f0c44f13b4ea9f996cfc4539f3d5.tar.bz2 |
merge with 3.2
-rw-r--r-- | Doc/library/subprocess.rst | 2 | ||||
-rw-r--r-- | Doc/library/sys.rst | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 427e4a0..ee88379 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -240,7 +240,7 @@ default values. The arguments that are most commonly needed are: 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 index 3af4354..da87be7 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -195,7 +195,7 @@ always available. 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 available. 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 @@ always available. 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``. |