summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-12-20 15:23:22 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-12-20 15:23:22 (GMT)
commit1c2353b0d958d1ab7a3db473bab7c78429cb7e8e (patch)
tree6863533e1e9d80ac19de18bcca3b7cf1c9286b1c
parent6ab5d083f20aa63d689ed095e7660aef4241cd22 (diff)
downloadcpython-1c2353b0d958d1ab7a3db473bab7c78429cb7e8e.zip
cpython-1c2353b0d958d1ab7a3db473bab7c78429cb7e8e.tar.gz
cpython-1c2353b0d958d1ab7a3db473bab7c78429cb7e8e.tar.bz2
builtin-ins -> builtins
-rw-r--r--Doc/library/future_builtins.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/future_builtins.rst b/Doc/library/future_builtins.rst
index 16e7d4b..04f2052 100644
--- a/Doc/library/future_builtins.rst
+++ b/Doc/library/future_builtins.rst
@@ -1,5 +1,5 @@
-:mod:`future_builtins` --- Python 3 built-ins
-=============================================
+:mod:`future_builtins` --- Python 3 builtins
+============================================
.. module:: future_builtins
.. sectionauthor:: Georg Brandl
@@ -8,7 +8,7 @@
This module provides functions that exist in 2.x, but have different behavior in
Python 3, so they cannot be put into the 2.x builtins namespace.
-Instead, if you want to write code compatible with Python 3 built-ins, import
+Instead, if you want to write code compatible with Python 3 builtins, import
them from this module, like this::
from future_builtins import map, filter
@@ -16,17 +16,17 @@ them from this module, like this::
... code using Python 3-style map and filter ...
The :term:`2to3` tool that ports Python 2 code to Python 3 will recognize
-this usage and leave the new built-ins alone.
+this usage and leave the new builtins alone.
.. note::
- The Python 3 :func:`print` function is already in the built-ins, but cannot be
+ The Python 3 :func:`print` function is already in the builtins, but cannot be
accessed from Python 2 code unless you use the appropriate future statement::
from __future__ import print_function
-Available built-ins are:
+Available builtins are:
.. function:: ascii(object)