From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 13 Oct 2010 22:25:26 +0000 (+0000)
Subject: Merged revisions 85436 via svnmerge from
X-Git-Tag: v2.7.1rc1~169
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5cb39f2ec84fdcc852773496333e397b7c61fbc;p=python

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

diff --git a/Misc/python.man b/Misc/python.man
index 261a118944..ddfccef8a4 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -401,9 +401,18 @@ files).
 .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.