merge with 3.2

birkenfeld · birkenfeld · commit 42ae472798d4 · 2012-02-21T22:37:36.000+01:00
diff --git 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
diff --git a/Modules/main.c b/Modules/main.c
@@ -104,7 +104,7 @@ static char *usage_5 =
 "PYTHONFAULTHANDLER: dump the Python traceback on fatal errors.\n\
 ";
 static char *usage_6 = "\
-PYTHONHASHSEED: if this variable is set to ``random``, a random value is used\n\
+PYTHONHASHSEED: if this variable is set to 'random', a random value is used\n\
    to seed the hashes of str, bytes and datetime objects.  It can also be\n\
    set to an integer in the range [0,4294967295] to get hash values with a\n\
    predictable seed.\n\
