summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-02-06 18:46:57 (GMT)
committerGeorg Brandl <georg@python.org>2010-02-06 18:46:57 (GMT)
commitc4a55fccaba4936458c32f5f3b3913fcf2848b42 (patch)
treea90e0efacec59c07bc943ba8ab8593a3a1f6f4ed /Doc/tutorial
parent3102bd9afe7fe657a8e3533b5cdee3e5e9282f27 (diff)
downloadcpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.zip
cpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.tar.gz
cpython-c4a55fccaba4936458c32f5f3b3913fcf2848b42.tar.bz2
Recorded merge of revisions 78024 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78024 | georg.brandl | 2010-02-06 19:44:44 +0100 (Sa, 06 Feb 2010) | 1 line #5341: fix "builtin" where used as an adjective ("built-in" is correct). ........
Diffstat (limited to 'Doc/tutorial')
-rw-r--r--Doc/tutorial/classes.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 4e166d1..6627ffb 100644
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -717,7 +717,7 @@ object that defines the method :meth:`__next__` which accesses elements in the
container one at a time. When there are no more elements, :meth:`__next__`
raises a :exc:`StopIteration` exception which tells the :keyword:`for` loop to
terminate. You can call the :meth:`__next__` method using the :func:`next`
-builtin; this example shows how it all works::
+built-in function; this example shows how it all works::
>>> s = 'abc'
>>> it = iter(s)