merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-29 10:27:06 +01:00
commit 794e9bf1fe
41 changed files with 145 additions and 164 deletions

View file

@ -160,10 +160,7 @@ The module defines the following:
.. _devpoll-objects:
``/dev/poll`` Polling Objects
----------------------------------------------
http://developers.sun.com/solaris/articles/using_devpoll.html
http://developers.sun.com/solaris/articles/polling_efficient.html
-----------------------------
Solaris and derivatives have ``/dev/poll``. While :c:func:`select` is
O(highest file descriptor) and :c:func:`poll` is O(number of file