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 11e2d7d9c0c8c0524ee1ce03eab74dab18b667f8..8a5b24718fa1b35a06ae5ee6ebb4646852a545c6 100644 (file)
--- 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 5b4eeef6546e89f6eb8249f03f17dd82e316d62d..22d46e6859060d863856f6b772660be8b6116967 100644 (file)
--- 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 9607cb334db25a74d36b037e43ec334691c79b0e..54cfe4a65ddd75e07e8c63dc5e55e8c6a6802d15 100644 (file)
--- 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\
 ";