summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2015-01-15 07:16:25 (GMT)
committerGeorg Brandl <georg@python.org>2015-01-15 07:16:25 (GMT)
commit0443c92ee129535318c5d6b121390e3d8a245eff (patch)
treef7914ed5079511af2344de2045c3a308aba10b50 /Doc
parent61f50bb488dc8cc3560ee7b91d244bd2ae96507a (diff)
parentcaa12dab690aace565a53d17bfed1eea9ed5d9cd (diff)
downloadcpython-0443c92ee129535318c5d6b121390e3d8a245eff.zip
cpython-0443c92ee129535318c5d6b121390e3d8a245eff.tar.gz
cpython-0443c92ee129535318c5d6b121390e3d8a245eff.tar.bz2
merge with 3.4
Diffstat (limited to 'Doc')
-rw-r--r--Doc/glossary.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index f5ce9d9..578fd11 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -292,7 +292,7 @@ Glossary
generator
A function which returns an iterator. It looks like a normal function
except that it contains :keyword:`yield` statements for producing a series
- a values usable in a for-loop or that can be retrieved one at a time with
+ of values usable in a for-loop or that can be retrieved one at a time with
the :func:`next` function. Each :keyword:`yield` temporarily suspends
processing, remembering the location execution state (including local
variables and pending try-statements). When the generator resumes, it