summaryrefslogtreecommitdiffstats
path: root/Doc/using/cmdline.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-02-21 21:37:36 (GMT)
committerGeorg Brandl <georg@python.org>2012-02-21 21:37:36 (GMT)
commit42ae472798d4be46038ea7769ee4cabbcc0e3be0 (patch)
tree837af0440d7bac0476e33530596315b73d223193 /Doc/using/cmdline.rst
parent65532111b41b7ad57f377997bf2c653495b2207a (diff)
parent7ef825fdabdc8cfa7117f3f8ad40f7f622ce823b (diff)
downloadcpython-42ae472798d4be46038ea7769ee4cabbcc0e3be0.zip
cpython-42ae472798d4be46038ea7769ee4cabbcc0e3be0.tar.gz
cpython-42ae472798d4be46038ea7769ee4cabbcc0e3be0.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc/using/cmdline.rst')
-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 64d453e..40e850e 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