summaryrefslogtreecommitdiffstats
path: root/Doc/library/__future__.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-07-26 14:54:51 (GMT)
committerGeorg Brandl <georg@python.org>2009-07-26 14:54:51 (GMT)
commit22b3431426349a424e3486c279db8b84cf671da0 (patch)
treedb3aa6b6addb5e07c53de6ff2a5e8250d472bb58 /Doc/library/__future__.rst
parent7a72b3ad7b02612254c7e256b8a67ce7ccf7994a (diff)
downloadcpython-22b3431426349a424e3486c279db8b84cf671da0.zip
cpython-22b3431426349a424e3486c279db8b84cf671da0.tar.gz
cpython-22b3431426349a424e3486c279db8b84cf671da0.tar.bz2
Merged revisions 74209 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74209 | georg.brandl | 2009-07-26 16:37:28 +0200 (So, 26 Jul 2009) | 1 line builtin -> built-in. ........
Diffstat (limited to 'Doc/library/__future__.rst')
-rw-r--r--Doc/library/__future__.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/__future__.rst b/Doc/library/__future__.rst
index b09246e..29f3109 100644
--- a/Doc/library/__future__.rst
+++ b/Doc/library/__future__.rst
@@ -52,7 +52,7 @@ Instances of class :class:`_Feature` have two corresponding methods,
:meth:`getOptionalRelease` and :meth:`getMandatoryRelease`.
*CompilerFlag* is the (bitfield) flag that should be passed in the fourth
-argument to the builtin function :func:`compile` to enable the feature in
+argument to the built-in function :func:`compile` to enable the feature in
dynamically compiled code. This flag is stored in the :attr:`compiler_flag`
attribute on :class:`_Feature` instances.