diff options
author | Éric Araujo <merwok@netwok.org> | 2011-03-26 01:01:33 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-03-26 01:01:33 (GMT) |
commit | b3a591bf066ac262fd800939662c54b09812c566 (patch) | |
tree | 910541d6484120505b2c603724e45c0d00acdfa4 /Doc | |
parent | 5c1da90f8cf0172cfb6591f1a37e436f3eef808c (diff) | |
parent | be3bd57ba22f7bda63dc0215b49b993a530e6145 (diff) | |
download | cpython-b3a591bf066ac262fd800939662c54b09812c566.zip cpython-b3a591bf066ac262fd800939662c54b09812c566.tar.gz cpython-b3a591bf066ac262fd800939662c54b09812c566.tar.bz2 |
Branch merge
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/sys.rst | 1 | ||||
-rw-r--r-- | Doc/whatsnew/3.3.rst | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index e4cdccb..5ecc46f 100644 --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -231,7 +231,6 @@ always available. attribute flag ============================= ============================= :const:`debug` :option:`-d` - :const:`division_warning` :option:`-Q` :const:`inspect` :option:`-i` :const:`interactive` :option:`-i` :const:`optimize` :option:`-O` or :option:`-OO` diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst index 7f05a84..2199f0a 100644 --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -133,3 +133,7 @@ that may require changes to your code: ``import site`` will not add site-specific paths to the module search paths. In previous versions, it did. See changeset for doc changes in various files. Contributed by Carl Meyer with editions by Éric Araujo. + +.. Issue #10998: -Q command-line flags are related artifacts have been + removed. Code checking sys.flags.division_warning will need updating. + Contributed by Éric Araujo. |