merge with 3.4

diff --cc Doc/library/selectors.rst
index 980a398c28936787267ba4fdd2c82b8c7d384de4,98377c890f024220b4e652608cd56e21de6b86ac..8bd9e1ce2e2dcce09f8b4cc385075ca18d7f87c9
--- 1/Doc/library/selectors.rst
--- 2/Doc/library/selectors.rst
+++ b/Doc/library/selectors.rst
@@@ -208,16 -207,6 +208,16 @@@ below
        This returns the file descriptor used by the underlying
        :func:`select.epoll` object.
  
- .. versionadded:: 3.5
 +.. class:: DevpollSelector()
 +
 +   :func:`select.devpoll`-based selector.
 +
 +   .. method:: fileno()
 +
 +      This returns the file descriptor used by the underlying
 +      :func:`select.devpoll` object.
 +
++   .. versionadded:: 3.5
  
  .. class:: KqueueSelector()