summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-09-01 17:54:05 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-09-01 17:54:05 (GMT)
commit7ce05e07c01378a7187135cc2df89ecd6e57f9ab (patch)
tree680fdb405c71285571d75f27dfe43b4ab0d03e32 /Doc
parenta7cbe28bcc8016d22e499b72babd87c93394aa7b (diff)
downloadcpython-7ce05e07c01378a7187135cc2df89ecd6e57f9ab.zip
cpython-7ce05e07c01378a7187135cc2df89ecd6e57f9ab.tar.gz
cpython-7ce05e07c01378a7187135cc2df89ecd6e57f9ab.tar.bz2
Fix some markup and one typo
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/init.rst4
-rw-r--r--Doc/faq/design.rst2
-rw-r--r--Doc/faq/windows.rst2
-rw-r--r--Doc/library/argparse.rst2
4 files changed, 5 insertions, 5 deletions
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 7c70281..c323eef 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -126,7 +126,7 @@ Process-wide parameters
program name is ``'/usr/local/bin/python'``, the prefix is ``'/usr/local'``. The
returned string points into static storage; the caller should not modify its
value. This corresponds to the :makevar:`prefix` variable in the top-level
- :file:`Makefile` and the :option:`--prefix` argument to the :program:`configure`
+ :file:`Makefile` and the ``--prefix`` argument to the :program:`configure`
script at build time. The value is available to Python code as ``sys.prefix``.
It is only useful on Unix. See also the next function.
@@ -139,7 +139,7 @@ Process-wide parameters
program name is ``'/usr/local/bin/python'``, the exec-prefix is
``'/usr/local'``. The returned string points into static storage; the caller
should not modify its value. This corresponds to the :makevar:`exec_prefix`
- variable in the top-level :file:`Makefile` and the :option:`--exec-prefix`
+ variable in the top-level :file:`Makefile` and the ``--exec-prefix``
argument to the :program:`configure` script at build time. The value is
available to Python code as ``sys.exec_prefix``. It is only useful on Unix.
diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst
index 0943796..962b4ef 100644
--- a/Doc/faq/design.rst
+++ b/Doc/faq/design.rst
@@ -684,7 +684,7 @@ construction of large programs.
Python 2.6 adds an :mod:`abc` module that lets you define Abstract Base Classes
(ABCs). You can then use :func:`isinstance` and :func:`issubclass` to check
whether an instance or a class implements a particular ABC. The
-:mod:`collections` modules defines a set of useful ABCs such as
+:mod:`collections` module defines a set of useful ABCs such as
:class:`Iterable`, :class:`Container`, and :class:`MutableMapping`.
For Python, many of the advantages of interface specifications can be obtained
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index 47c09ad..96d1c51 100644
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -542,7 +542,7 @@ A trick to get it to run an arbitrary file is to construct a call to
:func:`execfile` with the name of your file as argument.
Also note that you can not mix-and-match Debug and Release versions. If you
-wish to use the Debug Multithreaded DLL, then your module *must* have an "_d"
+wish to use the Debug Multithreaded DLL, then your module *must* have ``_d``
appended to the base name.
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
index bf0899d..09f97a9 100644
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -153,7 +153,7 @@ ArgumentParser objects
conflicting optionals.
* prog_ - The name of the program (default:
- :data:`sys.argv[0]`)
+ ``sys.argv[0]``)
* usage_ - The string describing the program usage (default: generated)