diff options
author | Georg Brandl <georg@python.org> | 2012-02-21 21:36:37 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2012-02-21 21:36:37 (GMT) |
commit | 7ef825fdabdc8cfa7117f3f8ad40f7f622ce823b (patch) | |
tree | 94e72070f14a581bf0c29e48c8ba84d73df0ab9f /Doc/using | |
parent | 86838b02f04a01445778584afb7acd0b05081335 (diff) | |
parent | c9a42070a64af6d75529118b6169ab172218c170 (diff) | |
download | cpython-7ef825fdabdc8cfa7117f3f8ad40f7f622ce823b.zip cpython-7ef825fdabdc8cfa7117f3f8ad40f7f622ce823b.tar.gz cpython-7ef825fdabdc8cfa7117f3f8ad40f7f622ce823b.tar.bz2 |
merge with 3.2
Diffstat (limited to 'Doc/using')
-rw-r--r-- | Doc/using/cmdline.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index d0b330d..0d12126 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -236,7 +236,7 @@ Miscellaneous options 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 + construction, O(n^2) complexity. See http://www.ocert.org/advisories/ocert-2011-003.html for details. Changing hash values affects the order in which keys are retrieved from a |