Merged revisions 64130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r64130 | georg.brandl | 2008-06-11 19:57:44 +0200 (Wed, 11 Jun 2008) | 2 lines
Clarify what ":errorhandler" refers to.
........
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 5100c21..0a45aa5 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -419,6 +419,13 @@
import of source modules.
+.. envvar:: PYTHONIOENCODING
+
+ Overrides the encoding used for stdin/stdout/stderr, in the syntax
+ ``encodingname:errorhandler``. The ``:errorhandler`` part is optional and
+ has the same meaning as in :func:`str.encode`.
+
+
.. envvar:: PYTHONNOUSERSITE
If this is set, Python won't add the user site directory to sys.path
@@ -460,13 +467,6 @@
If set, Python will dump objects and reference counts still alive after
shutting down the interpreter.
-.. envvar:: PYTHONIOENCODING
-
- Overrides the encoding used for stdin/stdout/stderr, in the syntax
- encodingname:errorhandler, with the :errors part being optional.
-
- .. versionadded:: 2.6
-
.. envvar:: PYTHONMALLOCSTATS