Merged revisions 77052 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77052 | ezio.melotti | 2009-12-25 04:16:56 +0200 (Fri, 25 Dec 2009) | 9 lines Merged revisions 77050 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77050 | ezio.melotti | 2009-12-25 04:12:01 +0200 (Fri, 25 Dec 2009) | 1 line Updated sys.flags table in Doc ........ ................

Merged revisions 77052 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77052 | ezio.melotti | 2009-12-25 04:16:56 +0200 (Fri, 25 Dec 2009) | 9 lines Merged revisions 77050 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77050 | ezio.melotti | 2009-12-25 04:12:01 +0200 (Fri, 25 Dec 2009) | 1 line Updated sys.flags table in Doc ........ ................
596cc44a · Ezio Melotti · 9842427f · 596cc44a
Commit 596cc44a authored Dec 25, 2009 by Ezio Melotti
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

Doc/library/sys.rst Doc/library/sys.rst +3 -5

No files found.
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -199,12 +199,8 @@ always available.
   +==============================+==========================================+
   | :const:`debug`               | -d                                       |
   +------------------------------+------------------------------------------+
-   | :const:`py3k_warning`        | -3                                       |
-   +------------------------------+------------------------------------------+
   | :const:`division_warning`    | -Q                                       |
   +------------------------------+------------------------------------------+
-   | :const:`division_new`        | -Qnew                                    |
-   +------------------------------+------------------------------------------+
   | :const:`inspect`             | -i                                       |
   +------------------------------+------------------------------------------+
   | :const:`interactive`         | -i                                       |
@@ -213,13 +209,15 @@ always available.
   +------------------------------+------------------------------------------+
   | :const:`dont_write_bytecode` | -B                                       |
   +------------------------------+------------------------------------------+
+   | :const:`no_user_site`        | -s                                       |
+   +------------------------------+------------------------------------------+
   | :const:`no_site`             | -S                                       |
   +------------------------------+------------------------------------------+
   | :const:`ignore_environment`  | -E                                       |
   +------------------------------+------------------------------------------+
   | :const:`verbose`             | -v                                       |
   +------------------------------+------------------------------------------+
-   | :const:`unicode`             | -U                                       |
+   | :const:`bytes_warning`       | -b                                       |
   +------------------------------+------------------------------------------+