Merged revisions 77877 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77877 | matthias.klose | 2010-01-31 17:14:37 +0100 (So, 31 Jan 2010) | 10 lines

  Merged revisions 77875 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r77875 | matthias.klose | 2010-01-31 17:05:13 +0100 (So, 31 Jan 2010) | 3 lines

    - Update python manual page (options -B, -O0, -s, environment variables
      PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE).
  ........
................

Misc/NEWS

@@ -368,6 +368,9 @@ Documentation
 - Issue #6556: Fixed the Distutils configuration files location explanation
   for Windows.
 
+- Update python manual page (options -B, -O0, -s, environment variables
+  PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE).
+
 
 What's New in Python 3.1.1?
 ===========================
@@ -421,7 +424,7 @@ Library
   occur when writing to a BufferedRandom object (e.g. a file opened in "rb+" or
   "wb+" mode) after having buffered a certain amount of data for reading. This
   bug was not present in the pure Python implementation.
-
+ 
 - Issue #6622: Fix "local variable 'secret' referenced before
   assignment" bug in POP3.apop.
 

Misc/python.man

@@ -8,6 +8,9 @@ python \- an interpreted, interactive, object-oriented programming language
 .SH SYNOPSIS
 .B python
 [
+.B \-B
+]
+[
 .B \-d
 ]
 [
@@ -23,15 +26,21 @@ python \- an interpreted, interactive, object-oriented programming language
 .B \-m 
 .I module-name
 ]
-[
-.B \-O
-]
 .br
        [
+.B \-O
+]
+[
+.B \-O0
+]
+[
 .B -Q
 .I argument
 ]
 [
+.B \-s
+]
+[
 .B \-S
 ]
 [
@@ -51,6 +60,9 @@ python \- an interpreted, interactive, object-oriented programming language
 [
 .B \-x
 ]
+[
+.B \-?
+]
 .br
        [
 .B \-c
@@ -89,6 +101,11 @@ viewed by running the
 program.  
 .SH COMMAND LINE OPTIONS
 .TP
+.B \-B
+Don't write
+.I .py[co]
+files on import. See also PYTHONDONTWRITEBYTECODE.
+.TP
 .BI "\-c " command
 Specify the command to execute (see next section).
 This terminates the option list (following options are passed as
@@ -102,7 +119,7 @@ compilation options).
 Ignore environment variables like PYTHONPATH and PYTHONHOME that modify
 the behavior of the interpreter.
 .TP
-.B \-h
+.B \-h ", " \-? ", "\-\-help
 Prints the usage for the interpreter executable and exits.
 .TP
 .B \-i
@@ -125,6 +142,9 @@ compiled (bytecode) files from
 .I .pyc
 to \fI.pyo\fP.  Given twice, causes docstrings to be discarded.
 .TP
+.B \-O0
+Discard docstrings in addition to the \fB-O\fP optimizations.
+.TP
 .BI "\-Q " argument
 Division control; see PEP 238.  The argument must be one of "old" (the
 default, int/int and long/long return an int or long), "new" (new
@@ -134,6 +154,9 @@ long/long), or "warnall" (old division semantics with a warning for
 all use of the division operator).  For a use of "warnall", see the
 Tools/scripts/fixdiv.py script.
 .TP
+.B \-s
+Don't add user site directory to sys.path.
+.TP
 .B \-S
 Disable the import of the module
 .I site
@@ -156,7 +179,7 @@ twice, print a message for each file that is checked for when
 searching for a module.  Also provides information on module cleanup
 at exit.
 .TP
-.B \-V
+.B \-V ", " \-\-version
 Prints the Python version number of the executable and exits.
 .TP
 .BI "\-W " argument
@@ -353,9 +376,17 @@ specifying \fB\-O\fP multiple times.
 If this is set to a non-empty string it is equivalent to specifying
 the \fB\-d\fP option. If set to an integer, it is equivalent to
 specifying \fB\-d\fP multiple times.
+.IP PYTHONDONTWRITEBYTECODE
+If this is set to a non-empty string it is equivalent to specifying
+the \fB\-B\fP option (don't try to write
+.I .py[co]
+files).
 .IP PYTHONINSPECT
 If this is set to a non-empty string it is equivalent to specifying
 the \fB\-i\fP option.
+.IP PYTHONNOUSERSITE
+If this is set to a non-empty string it is equivalent to specifying
+the \fB\-s\fP option (Don't add the user site directory to sys.path).
 .IP PYTHONUNBUFFERED
 If this is set to a non-empty string it is equivalent to specifying
 the \fB\-u\fP option.