summaryrefslogtreecommitdiffstats
path: root/Doc/glossary.rst
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-05-28 22:56:39 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-05-28 22:56:39 (GMT)
commit601aba6f15fe77b9ebfd40b8324d789e4250a194 (patch)
treef7fe470f0bc52558263b6b212f59033d7e461fa4 /Doc/glossary.rst
parent05010706697ce9c18e7f8a8e571753b0bcfd6548 (diff)
parentc5069e00705a499c2db37deb5d0eefae791d39ea (diff)
downloadcpython-601aba6f15fe77b9ebfd40b8324d789e4250a194.zip
cpython-601aba6f15fe77b9ebfd40b8324d789e4250a194.tar.gz
cpython-601aba6f15fe77b9ebfd40b8324d789e4250a194.tar.bz2
Merge touch-ups and fixes for #9831 (+port fix to packaging) and #9223 from 3.2
Diffstat (limited to 'Doc/glossary.rst')
-rw-r--r--Doc/glossary.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 4e425c3..1042a81 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -247,7 +247,7 @@ Glossary
processing, remembering the location execution state (including local
variables and pending try-statements). When the generator resumes, it
picks-up where it left-off (in contrast to functions which start fresh on
- every invocation.
+ every invocation).
.. index:: single: generator expression