[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

zach.ware python-checkins at python.org
Thu Nov 27 06:57:09 CET 2014

changeset:   93617:1c97f373fe49
parent:      93615:b6ee02acaae9
parent:      93616:589c65dc528c
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Wed Nov 26 23:56:10 2014 -0600
  Merge with 3.4

  Doc/library/pydoc.rst |  4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst
--- a/Doc/library/pydoc.rst
+++ b/Doc/library/pydoc.rst
@@ -51,6 +51,10 @@
    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.
+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.
 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.

Repository URL: https://hg.python.org/cpython

More information about the Python-checkins mailing list