summaryrefslogtreecommitdiffstats
path: root/Doc/reference/executionmodel.rst
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2018-12-19 06:09:46 (GMT)
committerGitHub <noreply@github.com>2018-12-19 06:09:46 (GMT)
commit2b57c43f21f891df4c6f2294a3b9e1b9029a16b6 (patch)
tree0a875796fdcf96a15280d181efbf0c5fbb09eba6 /Doc/reference/executionmodel.rst
parent82d73554e4764350bfd8f13957c5e024ac95c4af (diff)
downloadcpython-2b57c43f21f891df4c6f2294a3b9e1b9029a16b6.zip
cpython-2b57c43f21f891df4c6f2294a3b9e1b9029a16b6.tar.gz
cpython-2b57c43f21f891df4c6f2294a3b9e1b9029a16b6.tar.bz2
bpo-35506: Remove redundant and incorrect links from keywords. (GH-11174)
Diffstat (limited to 'Doc/reference/executionmodel.rst')
-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 1a69e97..ba7130d 100644
--- a/Doc/reference/executionmodel.rst
+++ b/Doc/reference/executionmodel.rst
@@ -58,8 +58,8 @@ The following constructs bind names: formal parameters to functions,
:keyword:`import` statements, class and function definitions (these bind the
class or function name in the defining block), and targets that are identifiers
if occurring in an assignment, :keyword:`for` loop header, or after
-:keyword:`as` in a :keyword:`with` statement or :keyword:`except` clause.
-The :keyword:`import` statement
+:keyword:`!as` in a :keyword:`with` statement or :keyword:`except` clause.
+The :keyword:`!import` statement
of the form ``from ... import *`` binds all names defined in the imported
module, except those beginning with an underscore. This form may only be used
at the module level.
@@ -123,7 +123,7 @@ namespace. Names are resolved in the top-level namespace by searching the
global namespace, i.e. the namespace of the module containing the code block,
and the builtins namespace, the namespace of the module :mod:`builtins`. The
global namespace is searched first. If the name is not found there, the
-builtins namespace is searched. The :keyword:`global` statement must precede
+builtins namespace is searched. The :keyword:`!global` statement must precede
all uses of the name.
The :keyword:`global` statement has the same scope as a name binding operation