Merged revisions 79579-79580,79585-79587 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79579 | georg.brandl | 2010-04-02 08:34:41 +0000 (Fr, 02 Apr 2010) | 1 line
Add 2.6.5.
........
r79580 | georg.brandl | 2010-04-02 08:39:09 +0000 (Fr, 02 Apr 2010) | 1 line
#2768: add a note on how to get a file descriptor.
........
r79585 | georg.brandl | 2010-04-02 09:03:18 +0000 (Fr, 02 Apr 2010) | 1 line
Remove col-spanning cells in logging docs.
........
r79586 | georg.brandl | 2010-04-02 09:07:42 +0000 (Fr, 02 Apr 2010) | 1 line
Document PyImport_ExecCodeModuleEx().
........
r79587 | georg.brandl | 2010-04-02 09:11:49 +0000 (Fr, 02 Apr 2010) | 1 line
#8012: clarification in generator glossary entry.
........
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index bf14413..1bc9126 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -525,6 +525,10 @@
is slightly deceptive; on Unix platforms, sockets and pipes are also referenced
by file descriptors.
+The :meth:`~file.fileno` method can be used to obtain the file descriptor
+associated with a file object when required. Note that using the file
+descriptor directly will bypass the file object methods, ignoring aspects such
+as internal buffering of data.
.. function:: close(fd)