https://github.com/python/cpython/commit/f5b1510e6ba4a70a9afb07a1516da26a282505ea commit: f5b1510e6ba4a70a9afb07a1516da26a282505ea branch: 3.13 author: Miss Islington (bot) <[email protected]> committer: AA-Turner <[email protected]> date: 2024-10-29T23:23:18Z summary:
[3.13] Doc: Note that pydoc uses and prefers ``MANPAGER`` (GH-125362) (#126152) Doc: Note that pydoc uses and prefers ``MANPAGER`` (GH-125362) (cherry picked from commit 0e45b1fd0ffbb165f580ecdfd5234c1d54389501) Co-authored-by: Matthieu Ancellin <[email protected]> Co-authored-by: Adam Turner <[email protected]> files: M Doc/conf.py M Doc/library/pydoc.rst diff --git a/Doc/conf.py b/Doc/conf.py index 5e65d52f3c08c1..73d7d5db26ff7b 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -199,6 +199,7 @@ ('envvar', 'LC_TIME'), ('envvar', 'LINES'), ('envvar', 'LOGNAME'), + ('envvar', 'MANPAGER'), ('envvar', 'PAGER'), ('envvar', 'PATH'), ('envvar', 'PATHEXT'), diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst index 70e9c604ebac4f..e8f153ee1b35ce 100644 --- a/Doc/library/pydoc.rst +++ b/Doc/library/pydoc.rst @@ -52,8 +52,9 @@ produced for that file. only execute code when a file is invoked as a script and not just imported. When printing output to the console, :program:`pydoc` attempts to paginate the -output for easier reading. If the :envvar:`PAGER` environment variable is set, -:program:`pydoc` will use its value as a pagination program. +output for easier reading. If either the :envvar:`MANPAGER` or the +:envvar:`PAGER` environment variable is set, :program:`pydoc` will use its +value as a pagination program. When both are set, :envvar:`MANPAGER` is used. 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 _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: [email protected]
