From: Georg Brandl <georg@python.org>
Date: Wed, 11 Jun 2008 18:03:09 +0000 (+0000)
Subject: Merged revisions 64130 via svnmerge from
X-Git-Tag: v3.0b1~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c906f15409259f6ac7fe8772e67e6c26590322b;p=thirdparty%2FPython%2Fcpython.git

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 5100c21f1801..0a45aa54b8b3 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -419,6 +419,13 @@ These environment variables influence Python's behavior.
    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 Python was configured with the :option:`--with-pydebug` build option.
    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