Merged revisions 84677 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84677 | benjamin.peterson | 2010-09-10 13:50:38 -0500 (Fri, 10 Sep 2010) | 1 line

  add reference to file object
........

diff --git a/Doc/library/fcntl.rst b/Doc/library/fcntl.rst
index e21c1eda71126836f58d2495b9710d17681ae4e1..dd76d656bafa1bf5c8c687e42f4c6309fd70a8fc 100644 (file)
--- a/Doc/library/fcntl.rst
+++ b/Doc/library/fcntl.rst
@@ -16,8 +16,8 @@ interface to the :cfunc:`fcntl` and :cfunc:`ioctl` Unix routines.
 
 All functions in this module take a file descriptor *fd* as their first
 argument.  This can be an integer file descriptor, such as returned by
-``sys.stdin.fileno()``, or a file object, such as ``sys.stdin`` itself, which
-provides a :meth:`fileno` which returns a genuine file descriptor.
+``sys.stdin.fileno()``, or a :class:`io.IOBase` object, such as ``sys.stdin``
+itself, which provides a :meth:`fileno` that returns a genuine file descriptor.
 
 The module defines the following functions: