[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/4e5fdc3131dc
changeset:   86084:4e5fdc3131dc
parent:      86081:c57f5bde5c2d
parent:      86083:a5d645505298
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 13:17:14 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/codecs.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -65,7 +65,7 @@
       ``factory(stream, errors='strict')``
 
    The factory functions must return objects providing the interfaces defined by
-   the base classes :class:`StreamWriter` and :class:`StreamReader`, respectively.
+   the base classes :class:`StreamReader` and :class:`StreamWriter`, respectively.
    Stream codecs can maintain state.
 
    Possible values for errors are

-- 
Repository URL: http://hg.python.org/cpython