summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-01-09 08:04:37 (GMT)
committerGeorg Brandl <georg@python.org>2011-01-09 08:04:37 (GMT)
commitcbb2e49c3cddd9c191b175877a91e73c5fdea47d (patch)
treed183b37d2a74a741f22072ac4c45a963dc2763f5 /Doc/reference
parentc40e921d62e053b4ba21ae04ad13172195ebeef5 (diff)
downloadcpython-cbb2e49c3cddd9c191b175877a91e73c5fdea47d.zip
cpython-cbb2e49c3cddd9c191b175877a91e73c5fdea47d.tar.gz
cpython-cbb2e49c3cddd9c191b175877a91e73c5fdea47d.tar.bz2
Hand-port parts of r87789.
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/executionmodel.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst
index 4e38536..91ac72f 100644
--- a/Doc/reference/executionmodel.rst
+++ b/Doc/reference/executionmodel.rst
@@ -140,9 +140,9 @@ weak form of restricted execution.
The namespace for a module is automatically created the first time a module is
imported. The main module for a script is always called :mod:`__main__`.
-The global statement has the same scope as a name binding operation in the same
-block. If the nearest enclosing scope for a free variable contains a global
-statement, the free variable is treated as a global.
+The :keyword:`global` statement has the same scope as a name binding operation
+in the same block. If the nearest enclosing scope for a free variable contains
+a global statement, the free variable is treated as a global.
A class definition is an executable statement that may use and define names.
These references follow the normal rules for name resolution. The namespace of