summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-02-21 21:36:37 (GMT)
committerGeorg Brandl <georg@python.org>2012-02-21 21:36:37 (GMT)
commit7ef825fdabdc8cfa7117f3f8ad40f7f622ce823b (patch)
tree94e72070f14a581bf0c29e48c8ba84d73df0ab9f /Misc
parent86838b02f04a01445778584afb7acd0b05081335 (diff)
parentc9a42070a64af6d75529118b6169ab172218c170 (diff)
downloadcpython-7ef825fdabdc8cfa7117f3f8ad40f7f622ce823b.zip
cpython-7ef825fdabdc8cfa7117f3f8ad40f7f622ce823b.tar.gz
cpython-7ef825fdabdc8cfa7117f3f8ad40f7f622ce823b.tar.bz2
merge with 3.2
Diffstat (limited to 'Misc')
-rw-r--r--Misc/python.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/python.man b/Misc/python.man
index fc3566f..20beded 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -163,7 +163,7 @@ not predictable between repeated invocations of Python.
.IP
This is intended to provide protection against a denial of service
caused by carefully-chosen inputs that exploit the worst case performance
-of a dict insertion, O(n^2) complexity. See
+of a dict construction, O(n^2) complexity. See
http://www.ocert.org/advisories/ocert-2011-003.html
for details.
.TP