[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[georg.brandl]

http://hg.python.org/cpython/rev/69259657d5c2
changeset:   75157:69259657d5c2
parent:      75154:524a032c8e0f
parent:      75156:e832ffd0388f
user:        Georg Brandl <georg at python.org>
date:        Tue Feb 21 22:37:36 2012 +0100
summary:
  merge with 3.2

files:
  Doc/using/cmdline.rst |  2 +-
  Modules/main.c        |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -236,7 +236,7 @@
 
    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
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -104,7 +104,7 @@
 "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\

-- 
Repository URL: http://hg.python.org/cpython