From: Ezio Melotti Date: Fri, 25 Dec 2009 02:18:56 +0000 (+0000) Subject: Merged revisions 77052 via svnmerge from X-Git-Tag: v3.1.2rc1~222 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb65775e22d54df312cd992a33c2e208f15c9d8a;p=thirdparty%2FPython%2Fcpython.git 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 ........ ................ --- diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst index 9262a09445ec..be26b63b3836 100644 --- 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 | +------------------------------+------------------------------------------+