summaryrefslogtreecommitdiffstats
path: root/Misc/SpecialBuilds.txt
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-03-14 10:56:14 (GMT)
committerGeorg Brandl <georg@python.org>2010-03-14 10:56:14 (GMT)
commit93dc9eb2a39ccc84d50012f8133f05e81183e8a6 (patch)
tree6f4fd2b8f7c457f56508450b8ba735e7169ebae1 /Misc/SpecialBuilds.txt
parentc0e22b7889a4b8b5002a1ac4ae25273e6d30ea6f (diff)
downloadcpython-93dc9eb2a39ccc84d50012f8133f05e81183e8a6.zip
cpython-93dc9eb2a39ccc84d50012f8133f05e81183e8a6.tar.gz
cpython-93dc9eb2a39ccc84d50012f8133f05e81183e8a6.tar.bz2
Merged revisions 78760,78771-78773,78802,78922,78952 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78760 | georg.brandl | 2010-03-07 16:23:59 +0100 (So, 07 Mär 2010) | 1 line #5341: more built-in vs builtin fixes. ........ r78771 | georg.brandl | 2010-03-07 21:58:31 +0100 (So, 07 Mär 2010) | 1 line #8085: The function is called PyObject_NewVar, not PyObject_VarNew. ........ r78772 | georg.brandl | 2010-03-07 22:12:28 +0100 (So, 07 Mär 2010) | 1 line #8039: document conditional expressions better, giving them their own section. ........ r78773 | georg.brandl | 2010-03-07 22:32:06 +0100 (So, 07 Mär 2010) | 1 line #8044: document Py_{Enter,Leave}RecursiveCall functions. ........ r78802 | georg.brandl | 2010-03-08 17:28:40 +0100 (Mo, 08 Mär 2010) | 1 line Fix typo. ........ r78922 | georg.brandl | 2010-03-13 14:41:58 +0100 (Sa, 13 Mär 2010) | 1 line Update for new download location. ........ r78952 | georg.brandl | 2010-03-14 10:55:08 +0100 (So, 14 Mär 2010) | 1 line #8137: add iso-8859-16 to the standard encodings table. ........
Diffstat (limited to 'Misc/SpecialBuilds.txt')
-rw-r--r--Misc/SpecialBuilds.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/SpecialBuilds.txt b/Misc/SpecialBuilds.txt
index fa87d92..25bb6d1 100644
--- a/Misc/SpecialBuilds.txt
+++ b/Misc/SpecialBuilds.txt
@@ -37,7 +37,7 @@ Py_TRACE_REFS introduced in 1.4
Turn on heavy reference debugging. This is major surgery. Every PyObject
grows two more pointers, to maintain a doubly-linked list of all live
-heap-allocated objects. Most builtin type objects are not in this list,
+heap-allocated objects. Most built-in type objects are not in this list,
as they're statically allocated. Starting in Python 2.3, if COUNT_ALLOCS
(see below) is also defined, a static type object T does appear in this
list if at least one object of type T has been created.