1 files changed, 64 insertions, 4 deletions

diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index b1fd3a8..973a0cc 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -14,6 +14,14 @@ it also works for other file types (in particular, on Unix, it works on pipes).
 It cannot be used on regular files to determine whether a file has grown since
 it was last read.
 
+.. note::
+
+   The :mod:`selectors` module allows high-level and efficient I/O
+   multiplexing, built upon the :mod:`select` module primitives. Users are
+   encouraged to use the :mod:`selectors` module instead, unless they want
+   precise control over the OS-level primitives used.
+
+
 The module defines the following:
 
 
@@ -37,21 +45,37 @@ The module defines the following:
    increases this value, :c:func:`devpoll` may return an
    incomplete list of active file descriptors.
 
+   The new file descriptor is :ref:`non-inheritable <fd_inheritance>`.
+
    .. versionadded:: 3.3
 
+   .. versionchanged:: 3.4
+      The new file descriptor is now non-inheritable.
+
 .. function:: epoll(sizehint=-1, flags=0)
 
    (Only supported on Linux 2.5.44 and newer.) Return an edge polling object,
    which can be used as Edge or Level Triggered interface for I/O
    events. *sizehint* is deprecated and completely ignored. *flags* can be set
    to :const:`EPOLL_CLOEXEC`, which causes the epoll descriptor to be closed
-   automatically when :func:`os.execve` is called. See section
-   :ref:`epoll-objects` below for the methods supported by epolling objects.
+   automatically when :func:`os.execve` is called.
+
+   See the :ref:`epoll-objects` section below for the methods supported by
+   epolling objects.
+
+   ``epoll`` objects support the context management protocol: when used in a
+   :keyword:`with` statement, the new file descriptor is automatically closed
+   at the end of the block.
 
+   The new file descriptor is :ref:`non-inheritable <fd_inheritance>`.
 
    .. versionchanged:: 3.3
       Added the *flags* parameter.
 
+   .. versionchanged:: 3.4
+      Support for the :keyword:`with` statement was added.
+      The new file descriptor is now non-inheritable.
+
 
 .. function:: poll()
 
@@ -66,6 +90,11 @@ The module defines the following:
    (Only supported on BSD.)  Returns a kernel queue object; see section
    :ref:`kqueue-objects` below for the methods supported by kqueue objects.
 
+   The new file descriptor is :ref:`non-inheritable <fd_inheritance>`.
+
+   .. versionchanged:: 3.4
+      The new file descriptor is now non-inheritable.
+
 
 .. function:: kevent(ident, filter=KQ_FILTER_READ, flags=KQ_EV_ADD, fflags=0, data=0, udata=0)
 
@@ -144,6 +173,27 @@ descriptors), ``/dev/poll`` is O(active file descriptors).
 object.
 
 
+.. method:: devpoll.close()
+
+   Close the file descriptor of the polling object.
+
+   .. versionadded:: 3.4
+
+
+.. attribute:: devpoll.closed
+
+   ``True`` if the polling object is closed.
+
+   .. versionadded:: 3.4
+
+
+.. method:: devpoll.fileno()
+
+   Return the file descriptor number of the polling object.
+
+   .. versionadded:: 3.4
+
+
 .. method:: devpoll.register(fd[, eventmask])
 
    Register a file descriptor with the polling object.  Future calls to the
@@ -241,6 +291,11 @@ Edge and Level Trigger Polling (epoll) Objects
    Close the control file descriptor of the epoll object.
 
 
+.. attribute:: epoll.closed
+
+   ``True`` if the epoll object is closed.
+
+
 .. method:: epoll.fileno()
 
    Return the file descriptor number of the control fd.
@@ -258,7 +313,7 @@ Edge and Level Trigger Polling (epoll) Objects
 
 .. method:: epoll.modify(fd, eventmask)
 
-   Modify a register file descriptor.
+   Modify a registered file descriptor.
 
 
 .. method:: epoll.unregister(fd)
@@ -322,7 +377,7 @@ linearly scanned again. :c:func:`select` is O(highest file descriptor), while
 
    Modifies an already registered fd. This has the same effect as
    ``register(fd, eventmask)``.  Attempting to modify a file descriptor
-   that was never registered causes an :exc:`IOError` exception with errno
+   that was never registered causes an :exc:`OSError` exception with errno
    :const:`ENOENT` to be raised.
 
 
@@ -360,6 +415,11 @@ Kqueue Objects
    Close the control file descriptor of the kqueue object.
 
 
+.. attribute:: kqueue.closed
+
+   ``True`` if the kqueue object is closed.
+
+
 .. method:: kqueue.fileno()
 
    Return the file descriptor number of the control fd.