diff options
| author | Georg Brandl <georg@python.org> | 2010-08-01 21:32:08 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-08-01 21:32:08 (GMT) |
| commit | 861b522045159de57da225ac06a12d891a2647ef (patch) | |
| tree | 5d7f571545d1c662102c338ee3f763664397907c | |
| parent | 65c7d1405ebba6b25db8851ed4d4873657b80fa2 (diff) | |
| download | cpython-861b522045159de57da225ac06a12d891a2647ef.zip cpython-861b522045159de57da225ac06a12d891a2647ef.tar.gz cpython-861b522045159de57da225ac06a12d891a2647ef.tar.bz2 | |
Merged revisions 82871,82960-82961 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r82871 | georg.brandl | 2010-07-14 10:00:22 +0200 (Mi, 14 Jul 2010) | 1 line
#9258: fix copy-paste errors.
........
r82960 | georg.brandl | 2010-07-19 08:52:35 +0200 (Mo, 19 Jul 2010) | 1 line
Clarify.
........
r82961 | georg.brandl | 2010-07-19 08:57:52 +0200 (Mo, 19 Jul 2010) | 1 line
Clarify :option: description.
........
| -rw-r--r-- | Doc/documenting/markup.rst | 5 | ||||
| -rw-r--r-- | Doc/library/io.rst | 4 | ||||
| -rw-r--r-- | Doc/library/select.rst | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/Doc/documenting/markup.rst b/Doc/documenting/markup.rst index dd33e81..34a79d4 100644 --- a/Doc/documenting/markup.rst +++ b/Doc/documenting/markup.rst @@ -502,8 +502,9 @@ in a different style: .. describe:: option - A command-line option to an executable program. The leading hyphen(s) must - be included. + A command-line option of Python. The leading hyphen(s) must be included. + If a matching ``cmdoption`` directive exists, it is linked to. For options + of other programs or scripts, use simple ````code```` markup. .. describe:: program diff --git a/Doc/library/io.rst b/Doc/library/io.rst index 3e98ca9..1da8ccc 100644 --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -56,8 +56,8 @@ Module Interface Open *file* and return a corresponding stream. If the file cannot be opened, an :exc:`IOError` is raised. - *file* is either a string or bytes object giving the name (and the path if - the file isn't in the current working directory) of the file to be opened or + *file* is either a string or bytes object giving the pathname (absolute or + relative to the current working directory) of the file to be opened or an integer file descriptor of the file to be wrapped. (If a file descriptor is given, it is closed when the returned I/O object is closed, unless *closefd* is set to ``False``.) diff --git a/Doc/library/select.rst b/Doc/library/select.rst index 51fdbbe..f19cbdc 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -42,14 +42,14 @@ The module defines the following: .. function:: kqueue() - (Only supported on BSD.) Returns a kernel queue object object; see section + (Only supported on BSD.) Returns a kernel queue object; see section :ref:`kqueue-objects` below for the methods supported by kqueue objects. .. function:: kevent(ident, filter=KQ_FILTER_READ, flags=KQ_EV_ADD, fflags=0, data=0, udata=0) - (Only supported on BSD.) Returns a kernel event object object; see section - :ref:`kevent-objects` below for the methods supported by kqueue objects. + (Only supported on BSD.) Returns a kernel event object; see section + :ref:`kevent-objects` below for the methods supported by kevent objects. .. function:: select(rlist, wlist, xlist[, timeout]) |