summaryrefslogtreecommitdiffstats
path: root/Doc/library/pydoc.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/pydoc.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/pydoc.rst')
-rw-r--r--Doc/library/pydoc.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst
index cbb8af8..3ab3303 100644
--- a/Doc/library/pydoc.rst
+++ b/Doc/library/pydoc.rst
@@ -40,25 +40,25 @@ produced for that file.
executed on that occasion. Use an ``if __name__ == '__main__':`` guard to
only execute code when a file is invoked as a script and not just imported.
-Specifying a :option:`-w` flag before the argument will cause HTML documentation
+Specifying a ``-w`` flag before the argument will cause HTML documentation
to be written out to a file in the current directory, instead of displaying text
on the console.
-Specifying a :option:`-k` flag before the argument will search the synopsis
+Specifying a ``-k`` flag before the argument will search the synopsis
lines of all available modules for the keyword given as the argument, again in a
manner similar to the Unix :program:`man` command. The synopsis line of a
module is the first line of its documentation string.
You can also use :program:`pydoc` to start an HTTP server on the local machine
-that will serve documentation to visiting Web browsers. :program:`pydoc`
-:option:`-p 1234` will start a HTTP server on port 1234, allowing you to browse
+that will serve documentation to visiting Web browsers. :program:`pydoc -p 1234`
+will start a HTTP server on port 1234, allowing you to browse
the documentation at ``http://localhost:1234/`` in your preferred Web browser.
-:program:`pydoc` :option:`-g` will start the server and additionally bring up a
+:program:`pydoc -g` will start the server and additionally bring up a
small :mod:`tkinter`\ -based graphical interface to help you search for
documentation pages.
When :program:`pydoc` generates documentation, it uses the current environment
-and path to locate modules. Thus, invoking :program:`pydoc` :option:`spam`
+and path to locate modules. Thus, invoking :program:`pydoc spam`
documents precisely the version of the module you would get if you started the
Python interpreter and typed ``import spam``.