summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-10-04 23:28:24 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-10-04 23:28:24 (GMT)
commit58a9153c9f49fcfe58a9e91b08167ff3483b36f3 (patch)
treee21939b71d0501592abfc6cfa71d16bc8f7db3eb
parentda27263b4a7aa6af7d2bf6967a15b0007aa1ae2b (diff)
downloadcpython-58a9153c9f49fcfe58a9e91b08167ff3483b36f3.zip
cpython-58a9153c9f49fcfe58a9e91b08167ff3483b36f3.tar.gz
cpython-58a9153c9f49fcfe58a9e91b08167ff3483b36f3.tar.bz2
Fix markup used in the documentation of sys.prefix and sys.exec_prefix.
- Using the file role with {placeholders} is IMO clearer than fake Python code. - The fact that sys.version[:3] gives '3.2' is a CPython detail and should not be advertised (see #9442), even if some stdlib modules currently rely on that detail.
-rw-r--r--Doc/library/sys.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 105f716..fdf188f 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -194,10 +194,10 @@ always available.
Python files are installed; by default, this is also ``'/usr/local'``. This can
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 ``exec_prefix +
- '/lib/pythonversion/config'``, and shared library modules are installed in
- ``exec_prefix + '/lib/pythonversion/lib-dynload'``, where *version* is equal to
- ``version[:3]``.
+ :file:`pyconfig.h` header file) are installed in the directory
+ :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``.
.. data:: executable
@@ -752,10 +752,10 @@ always available.
independent Python files are installed; by default, this is the string
``'/usr/local'``. This can be set at build time with the ``--prefix``
argument to the :program:`configure` script. The main collection of Python
- library modules is installed in the directory ``prefix + '/lib/pythonversion'``
+ 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 ``prefix + '/include/pythonversion'``, where *version* is equal to
- ``version[:3]``.
+ stored in :file:`{prefix}/include/python{X.Y}``, where *X.Y* is the version
+ number of Python, for example ``3.2``.
.. data:: ps1