diff -r 8906713d5704 Doc/c-api/typeobj.rst
--- a/Doc/c-api/typeobj.rst	Fri Aug 16 19:36:18 2013 +0200
+++ b/Doc/c-api/typeobj.rst	Fri Aug 16 21:25:21 2013 +0300
@@ -192,7 +192,7 @@
    An optional pointer to the instance print function.
 
    The print function is only called when the instance is printed to a *real* file;
-   when it is printed to a pseudo-file (like a :class:`StringIO` instance), the
+   when it is printed to a pseudo-file (like a :class:`io.StringIO` instance), the
    instance's :c:member:`~PyTypeObject.tp_repr` or :c:member:`~PyTypeObject.tp_str` function is called to convert it to
    a string.  These are also called when the type's :c:member:`~PyTypeObject.tp_print` field is
    *NULL*.  A type should never implement :c:member:`~PyTypeObject.tp_print` in a way that produces

diff -r 8906713d5704 Doc/library/gzip.rst
--- a/Doc/library/gzip.rst	Fri Aug 16 19:36:18 2013 +0200
+++ b/Doc/library/gzip.rst	Fri Aug 16 21:25:21 2013 +0300
@@ -62,7 +62,7 @@
    value.
 
    The new class instance is based on *fileobj*, which can be a regular file, a
-   :class:`StringIO` object, or any other object which simulates a file.  It
+   :class:`io.BytesIO` object, or any other object which simulates a file.  It
    defaults to ``None``, in which case *filename* is opened to provide a file
    object.
 
diff -r 8906713d5704 Doc/library/mailbox.rst
--- a/Doc/library/mailbox.rst	Fri Aug 16 19:36:18 2013 +0200
+++ b/Doc/library/mailbox.rst	Fri Aug 16 21:25:21 2013 +0300
@@ -674,8 +674,8 @@
 
       In Babyl mailboxes, the headers of a message are not stored contiguously
       with the body of the message. To generate a file-like representation, the
-      headers and body are copied together into a :class:`StringIO` instance
-      (from the :mod:`StringIO` module), which has an API identical to that of a
+      headers and body are copied together into a :class:`io.BytesIO` instance,
+      which has an API identical to that of a
       file. As a result, the file-like object is truly independent of the
       underlying mailbox but does not save memory compared to a string
       representation.
diff -r 8906713d5704 Doc/library/tempfile.rst
--- a/Doc/library/tempfile.rst	Fri Aug 16 19:36:18 2013 +0200
+++ b/Doc/library/tempfile.rst	Fri Aug 16 21:25:21 2013 +0300
@@ -82,7 +82,7 @@
    causes the file to roll over to an on-disk file regardless of its size.
 
    The returned object is a file-like object whose :attr:`_file` attribute
-   is either a :class:`BytesIO` or :class:`StringIO` object (depending on
+   is either a :class:`io.BytesIO` or :class:`io.StringIO` object (depending on
    whether binary or text *mode* was specified) or a true file
    object, depending on whether :func:`rollover` has been called.  This
    file-like object can be used in a :keyword:`with` statement, just like
diff -r 8906713d5704 Doc/library/unittest.mock.rst
--- a/Doc/library/unittest.mock.rst	Fri Aug 16 19:36:18 2013 +0200
+++ b/Doc/library/unittest.mock.rst	Fri Aug 16 21:25:21 2013 +0300
@@ -1104,9 +1104,9 @@
       ...
     TypeError: 'NonCallableMock' object is not callable
 
-Another use case might be to replace an object with a `StringIO` instance:
-
-    >>> from StringIO import StringIO
+Another use case might be to replace an object with a `io.StringIO` instance:
+
+    >>> from io import StringIO
     >>> def foo():
     ...     print 'Something'
     ...
--- a/Doc/library/xml.dom.minidom.rst	Fri Aug 16 19:36:18 2013 +0200
+++ b/Doc/library/xml.dom.minidom.rst	Fri Aug 16 21:25:21 2013 +0300
@@ -55,7 +55,7 @@
 .. function:: parseString(string, parser=None)
 
    Return a :class:`Document` that represents the *string*. This method creates a
-   :class:`StringIO` object for the string and passes that on to :func:`parse`.
+   :class:`io.StringIO` object for the string and passes that on to :func:`parse`.
 
 Both functions return a :class:`Document` object representing the content of the
 document.