Remove reST markup from --help output. Also: O(n**2) is dict construction, not singl...

diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 38d724f472cf7135617e613421feb2385ed2d947..9c1473e87e64c39aaccbd2ee25e48433f28c2cee 100644 (file)
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -248,7 +248,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 0a3eca476f4d60e723eb1eaa0fa029a47c623b28..434f040c25d4046f175b8b8d109c59c5950efdcd 100644 (file)
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -162,7 +162,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 12376aea19d2ddea30d7346be4f98f2a33ab3b1a..824fb3af4bc540ca9cead4b05a24fe3e0a5b8967 100644 (file)
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -105,9 +105,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\
 ";