]> granicus.if.org Git - python/commitdiff
Merge doc touchups from 3.1
authorÉric Araujo <merwok@netwok.org>
Fri, 25 Mar 2011 23:50:16 +0000 (00:50 +0100)
committerÉric Araujo <merwok@netwok.org>
Fri, 25 Mar 2011 23:50:16 +0000 (00:50 +0100)
1  2 
Doc/library/http.cookiejar.rst
Doc/library/readline.rst
Doc/library/sys.rst

Simple merge
Simple merge
index 88655bbd7161b4f807cd1cb16244a0312d73e636,e51e8eaba8396f926d9027614f7d66f1376bdc82..e03ac8a8da3ff072d53148cf9f13e37c94e8d54a
@@@ -239,37 -206,22 +239,26 @@@ always available
     The struct sequence *flags* exposes the status of command line flags. The
     attributes are read only.
  
-    +------------------------------+------------------------------------------+
-    | attribute                    | flag                                     |
-    +==============================+==========================================+
-    | :const:`debug`               | -d                                       |
-    +------------------------------+------------------------------------------+
-    | :const:`division_warning`    | -Q                                       |
-    +------------------------------+------------------------------------------+
-    | :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.
 +
  
  .. data:: float_info