From: Brian Curtin <brian.curtin@gmail.com>
Date: Mon, 12 Apr 2010 23:33:42 +0000 (+0000)
Subject: Merged revisions 80022 via svnmerge from
X-Git-Tag: v3.2a1~1158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb1d3c1cc75eb8494dab1b0315f2eb4c0989f387;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 80022 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80022 | brian.curtin | 2010-04-12 18:30:49 -0500 (Mon, 12 Apr 2010) | 2 lines

  Fix #8364. Update the setquit docstring and change a built-in to builtin.
........
---

diff --git a/Lib/site.py b/Lib/site.py
index 3ecc5684cdb2..55e662c0b0fd 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -318,8 +318,10 @@ def setBEGINLIBPATH():
 
 
 def setquit():
-    """Define new built-ins 'quit' and 'exit'.
-    These are simply strings that display a hint on how to exit.
+    """Define new builtins 'quit' and 'exit'.
+
+    These are objects which make the interpreter exit when called.
+    The repr of each object contains a hint at how it works.
 
     """
     if os.sep == ':':
@@ -431,7 +433,7 @@ def setcopyright():
 
 
 class _Helper(object):
-    """Define the built-in 'help'.
+    """Define the builtin 'help'.
     This is a wrapper around pydoc.help (with a twist).
 
     """