summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-07-26 14:37:28 (GMT)
committerGeorg Brandl <georg@python.org>2009-07-26 14:37:28 (GMT)
commitd7d4fd7336baca618eb02b9a7e862bd8452d8f7d (patch)
tree2273b0b04e103df5de2a4d51d56bcf20793f1719 /Doc/whatsnew
parent9fa61bb37d68225c827aa7809382ea701c264db5 (diff)
downloadcpython-d7d4fd7336baca618eb02b9a7e862bd8452d8f7d.zip
cpython-d7d4fd7336baca618eb02b9a7e862bd8452d8f7d.tar.gz
cpython-d7d4fd7336baca618eb02b9a7e862bd8452d8f7d.tar.bz2
builtin -> built-in.
Diffstat (limited to 'Doc/whatsnew')
-rw-r--r--Doc/whatsnew/2.2.rst2
-rw-r--r--Doc/whatsnew/2.6.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/2.2.rst b/Doc/whatsnew/2.2.rst
index ec435f7..acdba83 100644
--- a/Doc/whatsnew/2.2.rst
+++ b/Doc/whatsnew/2.2.rst
@@ -1173,7 +1173,7 @@ Some of the more notable changes are:
can uncomment them. Gestalt and Internet Config modules are enabled by
default.
-* Keyword arguments passed to builtin functions that don't take them now cause a
+* Keyword arguments passed to built-in functions that don't take them now cause a
:exc:`TypeError` exception to be raised, with the message "*function* takes no
keyword arguments".
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index fb2f6fe..a629e5f 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -2819,7 +2819,7 @@ JSON (Javascript Object Notation). JSON is a lightweight interchange format
often used in web applications. For more information about JSON, see
http://www.json.org.
-:mod:`json` comes with support for decoding and encoding most builtin Python
+:mod:`json` comes with support for decoding and encoding most built-in Python
types. The following example encodes and decodes a dictionary::
>>> import json