From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 12 Oct 2011 14:23:02 +0000 (+0200)
Subject: Minimal update of select docs for PEP 3151.
X-Git-Tag: v3.3.0a1~1205
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b7fcf8c2e3a64735c72fe319141a0e76458dfbb;p=thirdparty%2FPython%2Fcpython.git

Minimal update of select docs for PEP 3151.
---

diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index f1fd126d94c3..a4bc6fc1e930 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -18,9 +18,10 @@ The module defines the following:
 
 .. exception:: error
 
-   The exception raised when an error occurs.  The accompanying value is a pair
-   containing the numeric error code from :c:data:`errno` and the corresponding
-   string, as would be printed by the C function :c:func:`perror`.
+   A deprecated alias of :exc:`OSError`.
+
+   .. versionchanged:: 3.3
+      Following :pep:`3151`, this class was made an alias of :exc:`OSError`.
 
 
 .. function:: epoll(sizehint=-1)
@@ -165,11 +166,6 @@ Edge and Level Trigger Polling (epoll) Objects
 
    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)