#15949, 15899: merge with 3.2.

ezio-melotti · ezio-melotti · commit fb436c4ebaff · 2012-09-22T11:25:22.000+03:00
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
@@ -262,8 +262,8 @@ Unicode result).  The following examples show the differences::
         ...
     UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 0:
       invalid start byte
-    >>> b'\x80abc'.decode("utf-8", "replace")
-    '�abc'
+    >>> b'\x80abc'.decode("utf-8", "replace")  #doctest: +SKIP
+    '?abc'
     >>> b'\x80abc'.decode("utf-8", "ignore")
     'abc'
 
