diff -r 743cf3319862 Lib/pydoc.py --- a/Lib/pydoc.py Sat Jun 09 22:51:39 2012 -0700 +++ b/Lib/pydoc.py Sun Jun 10 15:48:41 2012 +0200 @@ -1818,7 +1818,24 @@ def help(self, request): if type(request) is type(''): request = request.strip() - if request == 'help': self.intro() + if request == 'help': + pager(''' +Help on built-in function help: + +help(...) +Invoke the built-in help system. + + help() + The interactive help system starts on the interpreter + console. + + help(string) + The string is looked up as the name of a module, function, class, method, + keyword, or documentation topic, and a help page is printed on the + console. + + help(object) + Generates a help page on the given object.''') elif request == 'keywords': self.listkeywords() elif request == 'symbols': self.listsymbols() elif request == 'topics': self.listtopics() diff -r 743cf3319862 Misc/ACKS --- a/Misc/ACKS Sat Jun 09 22:51:39 2012 -0700 +++ b/Misc/ACKS Sun Jun 10 15:48:41 2012 +0200 @@ -1160,3 +1160,4 @@ Kai Zhu Tarek Ziadé Peter Åstrand +Petr Kubat