cpython (merge 3.4 -> default): Merge with 3.4
https://hg.python.org/cpython/rev/7fe7ef360941 changeset: 93610:7fe7ef360941 parent: 93608:c8bcede1b37a parent: 93609:6fce36de7916 user: Zachary Ware <zachary.ware@gmail.com> date: Wed Nov 26 22:58:25 2014 -0600 summary: Merge with 3.4 files: Doc/library/pydoc.rst | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst --- a/Doc/library/pydoc.rst +++ b/Doc/library/pydoc.rst @@ -66,11 +66,6 @@ documentation at ``http://localhost:1234/`` in your preferred Web browser. Specifying ``0`` as the port number will select an arbitrary unused port. -: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. The ``-g`` option is deprecated, since the server can -now be controlled directly from HTTP clients. - :program:`pydoc -b` will start the server and additionally open a web browser to a module index page. Each served page has a navigation bar at the top where you can *Get* help on an individual item, *Search* all modules with a @@ -90,7 +85,10 @@ Reference Manual pages. .. versionchanged:: 3.2 - Added the ``-b`` option, deprecated the ``-g`` option. + Added the ``-b`` option. + +.. versionchanged:: 3.3 + The ``-g`` command line option was removed. .. versionchanged:: 3.4 :mod:`pydoc` now uses :func:`inspect.signature` rather than -- Repository URL: https://hg.python.org/cpython
participants (1)
-
zach.ware