summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-11-15 14:26:32 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-11-15 14:26:32 (GMT)
commit2495c6af3baad44a85d2ec9b9aacae2cbad158c0 (patch)
tree6c62ef27e13564ca5d853a98b1427e4dfb3d8dea
parent13f8b682a7f5f57fef6fdd3c59b0e8f5e771170b (diff)
parentf450c1b9e0fa258894d64c3140efdb04814527d3 (diff)
downloadcpython-2495c6af3baad44a85d2ec9b9aacae2cbad158c0.zip
cpython-2495c6af3baad44a85d2ec9b9aacae2cbad158c0.tar.gz
cpython-2495c6af3baad44a85d2ec9b9aacae2cbad158c0.tar.bz2
Merge
-rw-r--r--Doc/library/select.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 12b05d2..72fba73 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -26,6 +26,7 @@ The module defines the following:
.. function:: devpoll()
+
(Only supported on Solaris and derivatives.) Returns a ``/dev/poll``
polling object; see section :ref:`devpoll-objects` below for the
methods supported by devpoll objects.
@@ -33,7 +34,7 @@ The module defines the following:
:c:func:`devpoll` objects are linked to the number of file
descriptors allowed at the time of instantiation. If your program
reduces this value, :c:func:`devpoll` will fail. If your program
- increases this value, c:func:`devpoll` may return an
+ increases this value, :c:func:`devpoll` may return an
incomplete list of active file descriptors.
.. versionadded:: 3.3