--- c:\cpython\lib\pydoc.py	2014-12-26T22:40:05.093146+00:00
+++ pydoc.py	2014-12-26T23:04:35.023791+00:00
@@ -1573,7 +1573,9 @@
     if isinstance(thing, str):
         object = locate(thing, forceload)
         if not object:
-            raise ImportError('no Python documentation found for %r' % thing)
+            raise ImportError('No Python documentation found for %r.\n'
+                'Use help("help") or just help() to get the interactive help utility.\n'
+                'Use help(str) for help on the str class.' % thing)
         return object, thing
     else:
         name = getattr(thing, '__name__', None)
@@ -1858,7 +1860,7 @@
     def help(self, request):
         if type(request) is type(''):
             request = request.strip()
-            if request == 'help': self.intro()
+            if request == 'help': self()
             elif request == 'keywords': self.listkeywords()
             elif request == 'symbols': self.listsymbols()
             elif request == 'topics': self.listtopics()
@@ -1872,6 +1874,7 @@
             elif request in self.keywords: self.showtopic(request)
             elif request in self.topics: self.showtopic(request)
             elif request: doc(request, 'Help on %s:', output=self._output)
+            else: doc(str, 'Help on %s:', output=self._output)
         elif isinstance(request, Helper): self()
         else: doc(request, 'Help on %s:', output=self._output)
         self.output.write('\n')
--- c:\cpython\lib\test\test_pydoc.py	2014-10-12T17:54:17.742230+01:00
+++ test_pydoc.py	2014-12-26T23:54:41.861265+00:00
@@ -249,8 +249,10 @@
                                       for s in expected_data_docstrings)
 
 # output pattern for missing module
-missing_pattern = "no Python documentation found for '%s'"
-
+missing_pattern = os.linesep.join(['No Python documentation found for %r.',
+    'Use help("help") or just help() to get the interactive help utility.',
+    'Use help(str) for help on the str class.'])
+ 
 # output pattern for module with bad imports
 badimport_pattern = "problem in %s - ImportError: No module named %r"