Skip to content

Commit f5b1510

Browse files
miss-islingtonmancellinAA-Turner
authored
[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 0e45b1f) Co-authored-by: Matthieu Ancellin <[email protected]> Co-authored-by: Adam Turner <[email protected]>
1 parent 35108c1 commit f5b1510

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Doc/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
('envvar', 'LC_TIME'),
200200
('envvar', 'LINES'),
201201
('envvar', 'LOGNAME'),
202+
('envvar', 'MANPAGER'),
202203
('envvar', 'PAGER'),
203204
('envvar', 'PATH'),
204205
('envvar', 'PATHEXT'),

Doc/library/pydoc.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ produced for that file.
5252
only execute code when a file is invoked as a script and not just imported.
5353

5454
When printing output to the console, :program:`pydoc` attempts to paginate the
55-
output for easier reading. If the :envvar:`PAGER` environment variable is set,
56-
:program:`pydoc` will use its value as a pagination program.
55+
output for easier reading. If either the :envvar:`MANPAGER` or the
56+
:envvar:`PAGER` environment variable is set, :program:`pydoc` will use its
57+
value as a pagination program. When both are set, :envvar:`MANPAGER` is used.
5758

5859
Specifying a ``-w`` flag before the argument will cause HTML documentation
5960
to be written out to a file in the current directory, instead of displaying text

0 commit comments

Comments
 (0)