[3.7] bpo-35506: Remove redundant and incorrect links from keywords. (GH-11174). (GH-11232)

(cherry picked from commit 2b57c43f21f891df4c6f2294a3b9e1b9029a16b6)
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index b8d98dd..fb8ff2a 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -332,7 +332,7 @@
       names, attribute access, operators or function calls which all return a
       value.  In contrast to many other languages, not all language constructs
       are expressions.  There are also :term:`statement`\s which cannot be used
-      as expressions, such as :keyword:`if`.  Assignments are also statements,
+      as expressions, such as :keyword:`while`.  Assignments are also statements,
       not expressions.
 
    extension module
@@ -444,8 +444,8 @@
 
    generator expression
       An expression that returns an iterator.  It looks like a normal expression
-      followed by a :keyword:`for` expression defining a loop variable, range,
-      and an optional :keyword:`if` expression.  The combined expression
+      followed by a :keyword:`!for` clause defining a loop variable, range,
+      and an optional :keyword:`!if` clause.  The combined expression
       generates values for an enclosing function::
 
          >>> sum(i*i for i in range(10))         # sum of squares 0, 1, 4, ... 81