| commit | aee9dfba4a9230f2832dd69d67e92f8e0490a163 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Feb 20 21:44:56 2012 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Feb 20 21:44:56 2012 -0500 |
| tree | 27a9896969ac7ff79dc75017cff121a077c3eb6e | |
| parent | 34b345b8885e5db8ab6627c081ca86a8b78b6989 [diff] [blame] | |
| parent | b19fb2462eac776746f6cb40cc84b0587c83b9bc [diff] [blame] |
merge 2.6 with hash randomization fix
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index a52b0d6..3873eb8 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst
@@ -286,6 +286,7 @@ :const:`verbose` :option:`-v` :const:`unicode` :option:`-U` :const:`bytes_warning` :option:`-b` + :const:`hash_randomization` :option:`-R` ============================= =================================== .. versionadded:: 2.6