Unify "file-descriptor" to "file descriptor".

diff --git a/Doc/c-api/abstract.rst b/Doc/c-api/abstract.rst
index 9a539874040fcd5c52459d6b0a3e04aae9b889e5..5ea8aced130a517b50fae87db3bcbcc80b2e7528 100644 (file)
--- a/Doc/c-api/abstract.rst
+++ b/Doc/c-api/abstract.rst
@@ -351,7 +351,7 @@ is considered sufficient for this determination.
 
 .. 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.

diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 24830d2394a0141d6571b68d9c27a2083085def1..bc4cf4284a0cdf4d2e48f5777208024bb95bcc29 100644 (file)
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -651,7 +651,7 @@ by file descriptors.
 .. 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.
 
 

diff --git a/Doc/library/pty.rst b/Doc/library/pty.rst
index 5e1da225dc471de9d8564320ee44793def3abc32..ec1c75f22a095f62a76370abcf608956ba809469 100644 (file)
--- a/Doc/library/pty.rst
+++ b/Doc/library/pty.rst
@@ -43,6 +43,6 @@ The :mod:`pty` module defines the following functions:
    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.