summaryrefslogtreecommitdiffstats
path: root/Doc/library/doctest.rst
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-11-18 16:38:46 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-11-18 16:38:46 (GMT)
commit713d3039dc7d5b8e1a8fdd0f3517fa7053175ed5 (patch)
tree99bdc854fa7a540ee5339de5a2a6888bdc7d003e /Doc/library/doctest.rst
parentdaa29d01b749daa4843bcac80bd0067a827cfb8a (diff)
downloadcpython-713d3039dc7d5b8e1a8fdd0f3517fa7053175ed5.zip
cpython-713d3039dc7d5b8e1a8fdd0f3517fa7053175ed5.tar.gz
cpython-713d3039dc7d5b8e1a8fdd0f3517fa7053175ed5.tar.bz2
Fix usage of :option: in the docs (#9312).
:option: is used to create a link to an option of python, not to mark up any instance of any arbitrary command-line option. These were changed to ````. For modules which do have a command-line interface, lists of options have been properly marked up with the program/cmdoption directives combo. Options defined in such blocks can be linked to with :option: later in the same file, they won’t link to an option of python. Finally, the markup of command-line fragments in optparse.rst has been cleaned to use ``x`` instead of ``"x"``, keeping that latter form for actual Python strings. Patch by Eli Bendersky and Éric Araujo.
Diffstat (limited to 'Doc/library/doctest.rst')
-rw-r--r--Doc/library/doctest.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index 795c074..159ab18 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -88,7 +88,7 @@ works its magic::
$
There's no output! That's normal, and it means all the examples worked. Pass
-:option:`-v` to the script, and :mod:`doctest` prints a detailed log of what
+``-v`` to the script, and :mod:`doctest` prints a detailed log of what
it's trying, and prints a summary at the end::
$ python example.py -v
@@ -151,7 +151,7 @@ example(s) and the cause(s) of the failure(s) are printed to stdout, and the
final line of output is ``***Test Failed*** N failures.``, where *N* is the
number of examples that failed.
-Run it with the :option:`-v` switch instead::
+Run it with the ``-v`` switch instead::
python M.py -v
@@ -160,7 +160,7 @@ with assorted summaries at the end.
You can force verbose mode by passing ``verbose=True`` to :func:`testmod`, or
prohibit it by passing ``verbose=False``. In either of those cases,
-``sys.argv`` is not examined by :func:`testmod` (so passing :option:`-v` or not
+``sys.argv`` is not examined by :func:`testmod` (so passing ``-v`` or not
has no effect).
There is also a command line shortcut for running :func:`testmod`. You can
@@ -229,7 +229,7 @@ See section :ref:`doctest-basic-api` for a description of the optional arguments
that can be used to tell it to look for files in other locations.
Like :func:`testmod`, :func:`testfile`'s verbosity can be set with the
-:option:`-v` command-line switch or with the optional keyword argument
+``-v`` command-line switch or with the optional keyword argument
*verbose*.
There is also a command line shortcut for running :func:`testfile`. You can
@@ -1377,7 +1377,7 @@ DocTestRunner objects
verbosity. If *verbose* is ``True``, then information is printed about each
example, as it is run. If *verbose* is ``False``, then only failures are
printed. If *verbose* is unspecified, or ``None``, then verbose output is used
- iff the command-line switch :option:`-v` is used.
+ iff the command-line switch ``-v`` is used.
The optional keyword argument *optionflags* can be used to control how the test
runner compares expected output to actual output, and how it displays failures.