[Python-checkins] r58581 - in python/trunk/Doc: c-api/abstract.rst library/os.rst library/pty.rst

[georg.brandl]

Author: georg.brandl
Date: Sun Oct 21 12:46:24 2007
New Revision: 58581

Modified:
   python/trunk/Doc/c-api/abstract.rst
   python/trunk/Doc/library/os.rst
   python/trunk/Doc/library/pty.rst
Log:
Unify "file-descriptor" to "file descriptor".


Modified: python/trunk/Doc/c-api/abstract.rst
==============================================================================
--- python/trunk/Doc/c-api/abstract.rst	(original)
+++ python/trunk/Doc/c-api/abstract.rst	Sun Oct 21 12:46:24 2007
@@ -351,7 +351,7 @@
 
 .. cfunction:: int PyObject_AsFileDescriptor(PyObject *o)
 
-   Derives a file-descriptor from a Python object.  If the object is an integer or
+   Derives a file descriptor from a Python object.  If the object is an integer or
    long integer, its value is returned.  If not, the object's :meth:`fileno` method
    is called if it exists; the method must return an integer or long integer, which
    is returned as the file descriptor value.  Returns ``-1`` on failure.

Modified: python/trunk/Doc/library/os.rst
==============================================================================
--- python/trunk/Doc/library/os.rst	(original)
+++ python/trunk/Doc/library/os.rst	Sun Oct 21 12:46:24 2007
@@ -651,7 +651,7 @@
 .. function:: ttyname(fd)
 
    Return a string which specifies the terminal device associated with
-   file-descriptor *fd*.  If *fd* is not associated with a terminal device, an
+   file descriptor *fd*.  If *fd* is not associated with a terminal device, an
    exception is raised. Availability:Macintosh, Unix.
 
 

Modified: python/trunk/Doc/library/pty.rst
==============================================================================
--- python/trunk/Doc/library/pty.rst	(original)
+++ python/trunk/Doc/library/pty.rst	Sun Oct 21 12:46:24 2007
@@ -43,6 +43,6 @@
    reading from the controlling terminal.
 
    The functions *master_read* and *stdin_read* should be functions which read from
-   a file-descriptor. The defaults try to read 1024 bytes each time they are
+   a file descriptor. The defaults try to read 1024 bytes each time they are
    called.