[Python-checkins] r79587 - python/trunk/Doc/glossary.rst

[georg.brandl]

Author: georg.brandl
Date: Fri Apr  2 11:11:49 2010
New Revision: 79587

Log:
#8012: clarification in generator glossary entry.

Modified:
   python/trunk/Doc/glossary.rst

Modified: python/trunk/Doc/glossary.rst
==============================================================================
--- python/trunk/Doc/glossary.rst	(original)
+++ python/trunk/Doc/glossary.rst	Fri Apr  2 11:11:49 2010
@@ -217,6 +217,8 @@
       performs garbage collection via reference counting and a cyclic garbage
       collector that is able to detect and break reference cycles.
 
+      .. index:: single: generator
+
    generator
       A function which returns an iterator.  It looks like a normal function
       except that values are returned to the caller using a :keyword:`yield`
@@ -230,7 +232,7 @@
       .. index:: single: generator expression
 
    generator expression
-      An expression that returns a generator.  It looks like a normal 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
       generates values for an enclosing function::