diff options
| author | Georg Brandl <georg@python.org> | 2012-02-21 21:36:27 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-02-21 21:36:27 (GMT) |
| commit | 3aec568e6ea6deec2f3a3471004c9054ee34cce3 (patch) | |
| tree | c7dbad61cc55f39f711249f41e7b15016a9baf25 | |
| parent | 4e171d12da0e75ddcf5e019d5ca4553ca86265cd (diff) | |
| download | cpython-3aec568e6ea6deec2f3a3471004c9054ee34cce3.zip cpython-3aec568e6ea6deec2f3a3471004c9054ee34cce3.tar.gz cpython-3aec568e6ea6deec2f3a3471004c9054ee34cce3.tar.bz2 | |
Remove reST markup from --help output. Also: O(n**2) is dict construction, not single insertion.
| -rw-r--r-- | Doc/using/cmdline.rst | 2 | ||||
| -rw-r--r-- | Misc/python.man | 2 | ||||
| -rw-r--r-- | Modules/main.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 38d724f..9c1473e 100644 --- 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 0a3eca4..434f040 100644 --- 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 12376ae..824fb3a 100644 --- 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\ "; |