diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-11-27 04:58:25 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-11-27 04:58:25 (GMT) |
| commit | 9b4cc6bc6b5af18e2f90adc2ef0c81847edbd8c5 (patch) | |
| tree | 5306010ad7621201e402c5fb410838f944b77287 | |
| parent | 8007cbc4d52da93237c9476da473840b047a9a14 (diff) | |
| parent | 61aebca09da7080b7920d6fa7befdb7d760ca9e6 (diff) | |
| download | cpython-9b4cc6bc6b5af18e2f90adc2ef0c81847edbd8c5.zip cpython-9b4cc6bc6b5af18e2f90adc2ef0c81847edbd8c5.tar.gz cpython-9b4cc6bc6b5af18e2f90adc2ef0c81847edbd8c5.tar.bz2 | |
Merge with 3.4
| -rw-r--r-- | Doc/library/pydoc.rst | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst index 6037310..cec8a9a 100644 --- a/Doc/library/pydoc.rst +++ b/Doc/library/pydoc.rst @@ -66,11 +66,6 @@ will start a HTTP server on port 1234, allowing you to browse the 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 @@ to a different URL or to a local directory containing the Library 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 |