Branch merge

diff --cc Doc/library/sys.rst
index e4cdccb652aa22899f0e81e1227796d230f5270f,56906e7887edf7e44a7779caf6ad3db230f51e1a..5ecc46f472cad64db13ddf08b50c2de81d74ee28
--- 1/Doc/library/sys.rst
--- 2/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@@ -227,22 -227,31 +227,21 @@@ always available
     The struct sequence *flags* exposes the status of command line flags. The
     attributes are read only.
  
 -   +------------------------------+------------------------------------------+
 -   | attribute                    | flag                                     |
 -   +==============================+==========================================+
 -   | :const:`debug`               | -d                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`inspect`             | -i                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`interactive`         | -i                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`optimize`            | -O or -OO                                |
 -   +------------------------------+------------------------------------------+
 -   | :const:`dont_write_bytecode` | -B                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`no_user_site`        | -s                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`no_site`             | -S                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`ignore_environment`  | -E                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`verbose`             | -v                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`bytes_warning`       | -b                                       |
 -   +------------------------------+------------------------------------------+
 -   | :const:`quiet`               | -q                                       |
 -   +------------------------------+------------------------------------------+
 +   ============================= =============================
 +   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`
 +   :const:`dont_write_bytecode`  :option:`-B`
 +   :const:`no_user_site`         :option:`-s`
 +   :const:`no_site`              :option:`-S`
 +   :const:`ignore_environment`   :option:`-E`
 +   :const:`verbose`              :option:`-v`
 +   :const:`bytes_warning`        :option:`-b`
 +   :const:`quiet`                :option:`-q`
 +   ============================= =============================
  
     .. versionchanged:: 3.2
        Added ``quiet`` attribute for the new :option:`-q` flag.

diff --cc Misc/NEWS
Simple merge