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
........

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index c7be1311b1a573dc351d360f2ee4cb94c1958fc9..7041dd468c17e7994d44f5cb8029a4ee8a4b05e9 100644 (file)
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -275,6 +275,8 @@ always available.
    +------------------------------+------------------------------------------+
    | :const:`dont_write_bytecode` | -B                                       |
    +------------------------------+------------------------------------------+
+   | :const:`no_user_site`        | -s                                       |
+   +------------------------------+------------------------------------------+
    | :const:`no_site`             | -S                                       |
    +------------------------------+------------------------------------------+
    | :const:`ignore_environment`  | -E                                       |
@@ -285,6 +287,8 @@ always available.
    +------------------------------+------------------------------------------+
    | :const:`unicode`             | -U                                       |
    +------------------------------+------------------------------------------+
+   | :const:`bytes_warning`       | -b                                       |
+   +------------------------------+------------------------------------------+
 
    .. versionadded:: 2.6