Merged revisions 73077 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73077 | r.david.murray | 2009-05-31 15:15:57 -0400 (Sun, 31 May 2009) | 4 lines

  Issue 3848: document the fact that epoll register raises an IOError if
  an fd is registered twice, and add some additional epoll tests.  Patch
  by Christian Heimes.
........
diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 48e289a..6dbf16f 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -154,6 +154,11 @@
 
    Register a fd descriptor with the epoll object.
 
+   .. note::
+
+     Registering a file descriptor that's already registered raises an
+     IOError -- contrary to :ref:`poll-objects`'s register.
+
 
 .. method:: epoll.modify(fd, eventmask)