[Python-checkins] r82100 - in python/branches/py3k-signalfd-issue8407/Doc: glossary.rst library/signal.rst

[jean-paul.calderone]

Author: jean-paul.calderone
Date: Sat Jun 19 22:49:50 2010
New Revision: 82100

Log:
add file descriptors and descriptions to the glossary

Modified:
   python/branches/py3k-signalfd-issue8407/Doc/glossary.rst
   python/branches/py3k-signalfd-issue8407/Doc/library/signal.rst

Modified: python/branches/py3k-signalfd-issue8407/Doc/glossary.rst
==============================================================================
--- python/branches/py3k-signalfd-issue8407/Doc/glossary.rst	(original)
+++ python/branches/py3k-signalfd-issue8407/Doc/glossary.rst	Sat Jun 19 22:49:50 2010
@@ -179,6 +179,16 @@
       A module written in C or C++, using Python's C API to interact with the core and
       with user code.
 
+   file description
+      The data structure (usually in the kernel) containing the details of
+      an open file.  A file description is referred to by one or more
+      :term:`file descriptors <file descriptor>`.
+
+   file descriptor
+      An abstract reference to a file, socket, or other file-like entity.
+      For example, the integer returned by :func:`os.open`, :func:`os.dup`,
+      or :meth:`io.IOBase.fileno`.
+
    finder
       An object that tries to find the :term:`loader` for a module. It must
       implement a method named :meth:`find_module`. See :pep:`302` for

Modified: python/branches/py3k-signalfd-issue8407/Doc/library/signal.rst
==============================================================================
--- python/branches/py3k-signalfd-issue8407/Doc/library/signal.rst	(original)
+++ python/branches/py3k-signalfd-issue8407/Doc/library/signal.rst	Sat Jun 19 22:49:50 2010
@@ -147,7 +147,7 @@
 .. data:: SFD_NONBLOCK
 
    A possible flag in the *flags* parameter to :func:`signalfd` which causes
-   the new file *description* (**not** *descriptor*) to be set non-blocking.
+   the new :term:`file description` to be set non-blocking.
 
    .. versionadded:: 3.2