summaryrefslogtreecommitdiffstats
path: root/Doc/reference
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-10-06 08:56:53 (GMT)
committerGeorg Brandl <georg@python.org>2010-10-06 08:56:53 (GMT)
commit4b05466e25b686fed9084452e88e7a8b7728a843 (patch)
tree6119674ce9a9904c8ecd0f8de2b3e9a9214e467d /Doc/reference
parent57a5e3f0e288b70267297511f5af2c92721d7e2d (diff)
downloadcpython-4b05466e25b686fed9084452e88e7a8b7728a843.zip
cpython-4b05466e25b686fed9084452e88e7a8b7728a843.tar.gz
cpython-4b05466e25b686fed9084452e88e7a8b7728a843.tar.bz2
Merged revisions 84945 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r84945 | georg.brandl | 2010-09-21 16:48:28 +0200 (Di, 21 Sep 2010) | 1 line #9911: doc copyedits. ........
Diffstat (limited to 'Doc/reference')
-rw-r--r--Doc/reference/expressions.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index f6a90cc..7baad6b 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -344,7 +344,7 @@ All of this makes generator functions quite similar to coroutines; they yield
multiple times, they have more than one entry point and their execution can be
suspended. The only difference is that a generator function cannot control
where should the execution continue after it yields; the control is always
-transfered to the generator's caller.
+transferred to the generator's caller.
The :keyword:`yield` statement is allowed in the :keyword:`try` clause of a
:keyword:`try` ... :keyword:`finally` construct. If the generator is not