summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-06-24 15:23:12 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-06-24 15:23:12 (GMT)
commit0b40a0b10250830438c53e8a43f7f9fac2b9b889 (patch)
treef2f6a943e14b29b5dce256598612708603e7aab6
parent92c9757973e3d9a8a6c8ba7278d3ef47c6864bba (diff)
parentc645c6ada1d398fb8e1aebcff5fd8b51ca86b28f (diff)
downloadcpython-0b40a0b10250830438c53e8a43f7f9fac2b9b889.zip
cpython-0b40a0b10250830438c53e8a43f7f9fac2b9b889.tar.gz
cpython-0b40a0b10250830438c53e8a43f7f9fac2b9b889.tar.bz2
Merge
-rwxr-xr-xLib/pydoc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 8beedc1..4aa48e5 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
"""Generate Python documentation in HTML or text for interactive use.
-In the Python interpreter, do "from pydoc import help" to provide online
+In the Python interpreter, do "from pydoc import help" to provide
help. Calling help(thing) on a Python object documents the object.
Or, at the shell command line outside of Python:
@@ -1838,7 +1838,7 @@ has the same effect as typing a particular string at the help> prompt.
def intro(self):
self.output.write('''
-Welcome to Python %s! This is the online help utility.
+Welcome to Python %s! This is the interactive help utility.
If this is your first time using Python, you should definitely check out
the tutorial on the Internet at http://docs.python.org/%s/tutorial/.