diff -r 8c355edc5b1d Doc/library/os.rst
--- a/Doc/library/os.rst	Sat Dec 17 08:02:20 2011 -0500
+++ b/Doc/library/os.rst	Sat Dec 17 18:55:33 2011 +0100
@@ -1648,8 +1648,9 @@
    entries ``'.'`` and ``'..'`` even if they are present in the directory.
 
    This function can be called with a bytes or string argument, and returns
-   filenames of the same datatype.
-
+   filenames of the same datatype. On Unix, non-decodable bytes are handled by
+   ``surrogateescape`` error handler, see :pep:`383`.
+   
    Availability: Unix, Windows.
 
    .. versionchanged:: 3.2