summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-03-07 15:23:59 (GMT)
committerGeorg Brandl <georg@python.org>2010-03-07 15:23:59 (GMT)
commit21e99f492419f97b4e5818081440742ecfde269f (patch)
tree94ec0f7c638ae647ff6ff97962b7995b7d4d10ef /Doc/reference
parentc02bbe328df8d0edf646c56fb4b7748a54500e6c (diff)
downloadcpython-21e99f492419f97b4e5818081440742ecfde269f.zip
cpython-21e99f492419f97b4e5818081440742ecfde269f.tar.gz
cpython-21e99f492419f97b4e5818081440742ecfde269f.tar.bz2
#5341: more built-in vs builtin fixes.
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/executionmodel.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst
index 9f6170d..4e38536 100644
--- a/Doc/reference/executionmodel.rst
+++ b/Doc/reference/executionmodel.rst
@@ -119,7 +119,7 @@ searched. The global statement must precede all uses of the name.
.. index:: pair: restricted; execution
-The built-in namespace associated with the execution of a code block is actually
+The builtins namespace associated with the execution of a code block is actually
found by looking up the name ``__builtins__`` in its global namespace; this
should be a dictionary or a module (in the latter case the module's dictionary
is used). By default, when in the :mod:`__main__` module, ``__builtins__`` is
@@ -131,7 +131,7 @@ weak form of restricted execution.
.. impl-detail::
Users should not touch ``__builtins__``; it is strictly an implementation
- detail. Users wanting to override values in the built-in namespace should
+ detail. Users wanting to override values in the builtins namespace should
:keyword:`import` the :mod:`__builtin__` (no 's') module and modify its
attributes appropriately.