[Python-checkins] r80258 - in python/branches/release26-maint: Doc/library/functions.rst

[ezio.melotti]

Author: ezio.melotti
Date: Tue Apr 20 12:43:38 2010
New Revision: 80258

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

........
  r80082 | georg.brandl | 2010-04-15 00:36:49 +0300 (Thu, 15 Apr 2010) | 1 line
  
  #8370: fix module name in backported doc addition.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/functions.rst

Modified: python/branches/release26-maint/Doc/library/functions.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/functions.rst	(original)
+++ python/branches/release26-maint/Doc/library/functions.rst	Tue Apr 20 12:43:38 2010
@@ -1439,8 +1439,8 @@
       programming.
 
    This function is invoked by the :keyword:`import` statement.  It can be
-   replaced (by importing the :mod:`builtins` module and assigning to
-   ``builtins.__import__``) in order to change semantics of the
+   replaced (by importing the :mod:`__builtin__` module and assigning to
+   ``__builtin__.__import__``) in order to change semantics of the
    :keyword:`import` statement, but nowadays it is usually simpler to use import
    hooks (see :pep:`302`).  Direct use of :func:`__import__` is rare, except in
    cases where you want to import a module whose name is only known at runtime.