[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/2a8378e69d75
changeset:   94159:2a8378e69d75
parent:      94156:31ae2dcaaed8
parent:      94158:3e4d4c4968bb
user:        Georg Brandl <georg at python.org>
date:        Thu Jan 15 08:16:25 2015 +0100
summary:
  merge with 3.4

files:
  Doc/glossary.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -292,7 +292,7 @@
    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

-- 
Repository URL: https://hg.python.org/cpython