From bb75e4e5d243a32cf31b91543b06b829c63e2c70 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 21 Oct 2007 10:46:24 +0000 Subject: Unify "file-descriptor" to "file descriptor". --- Doc/c-api/abstract.rst | 2 +- Doc/library/os.rst | 2 +- Doc/library/pty.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/c-api/abstract.rst b/Doc/c-api/abstract.rst index 9a53987..5ea8ace 100644 --- 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 24830d2..bc4cf42 100644 --- 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 5e1da22..ec1c75f 100644 --- 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. -- cgit v0.12