summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-02-21 21:38:31 (GMT)
committerGeorg Brandl <georg@python.org>2012-02-21 21:38:31 (GMT)
commit66e565ee4825541e7bd9e544dcf8cefa999907f7 (patch)
treee64dbe969d538460e928df3ae41aabb270daa0aa /Doc
parent0607f731f26de1ae4fba3c880e5286f5418a5227 (diff)
parent3aec568e6ea6deec2f3a3471004c9054ee34cce3 (diff)
downloadcpython-66e565ee4825541e7bd9e544dcf8cefa999907f7.zip
cpython-66e565ee4825541e7bd9e544dcf8cefa999907f7.tar.gz
cpython-66e565ee4825541e7bd9e544dcf8cefa999907f7.tar.bz2
merge with 2.6
Diffstat (limited to 'Doc')
-rw-r--r--Doc/using/cmdline.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 0d2924d..4b2793f 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -262,7 +262,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