summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-02-21 21:36:27 (GMT)
committerGeorg Brandl <georg@python.org>2012-02-21 21:36:27 (GMT)
commitc9a42070a64af6d75529118b6169ab172218c170 (patch)
treeb1c0129949eed96599329b1425581c773e52f823
parent69e9727657dad167215b656de910d95cefe1ee45 (diff)
downloadcpython-c9a42070a64af6d75529118b6169ab172218c170.zip
cpython-c9a42070a64af6d75529118b6169ab172218c170.tar.gz
cpython-c9a42070a64af6d75529118b6169ab172218c170.tar.bz2
Remove reST markup from --help output. Also: O(n**2) is dict construction, not single insertion.
-rw-r--r--Doc/using/cmdline.rst2
-rw-r--r--Misc/python.man2
-rw-r--r--Modules/main.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 11e2d7d..8a5b247 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -224,7 +224,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
diff --git a/Misc/python.man b/Misc/python.man
index 5b4eeef..22d46e6 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -156,7 +156,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
diff --git a/Modules/main.c b/Modules/main.c
index 9607cb3..54cfe4a 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -103,9 +103,9 @@ PYTHONCASEOK : ignore case in 'import' statements (Windows).\n\
PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.\n\
";
static char *usage_6 = "\
-PYTHONHASHSEED: if this variable is set to ``random``, the effect is the same \n\
- as specifying the :option:`-R` option: a random value is used to seed the\n\
- hashes of str, bytes and datetime objects. It can also be set to an integer\n\
+PYTHONHASHSEED: if this variable is set to 'random', the effect is the same\n\
+ as specifying the -R option: a random value is used to seed the hashes of\n\
+ str, bytes and datetime objects. It can also be set to an integer\n\
in the range [0,4294967295] to get hash values with a predictable seed.\n\
";