[Python-checkins] r85439 - in python/branches/release27-maint: Misc/python.man

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Oct 14 00:25:26 2010
New Revision: 85439

Log:
Merged revisions 85436 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85436 | benjamin.peterson | 2010-10-13 17:20:15 -0500 (Wed, 13 Oct 2010) | 1 line
  
  put PYTHONIOENCODING in man page
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Misc/python.man

Modified: python/branches/release27-maint/Misc/python.man
==============================================================================
--- python/branches/release27-maint/Misc/python.man	(original)
+++ python/branches/release27-maint/Misc/python.man	Thu Oct 14 00:25:26 2010
@@ -401,9 +401,18 @@
 .IP PYTHONINSPECT
 If this is set to a non-empty string it is equivalent to specifying
 the \fB\-i\fP option.
+.IP PYTHONIOENCODING
+If this is set before running the interpreter, it overrides the encoding used
+for stdin/stdout/stderr, in the syntax
+.IB encodingname ":" errorhandler
+The
+.IB errorhandler
+part is optional and has the same meaning as in str.encode. For stderr, the
+.IB errorhandler
+ part is ignored; the handler will always be \'backslashreplace\'.
 .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).
+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.