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

[georg.brandl]

http://hg.python.org/cpython/rev/e832ffd0388f
changeset:   75156:e832ffd0388f
branch:      3.2
parent:      75142:0e8bd4785ea0
parent:      75155:358aee0a9ad5
user:        Georg Brandl <georg at python.org>
date:        Tue Feb 21 22:36:37 2012 +0100
summary:
  merge with 3.2

files:
  Doc/using/cmdline.rst |  2 +-
  Misc/python.man       |  2 +-
  Modules/main.c        |  6 +++---
  3 files changed, 5 insertions(+), 5 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/Misc/python.man b/Misc/python.man
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -163,7 +163,7 @@
 .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
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -105,9 +105,9 @@
 "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\
 ";
 

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