merge 3.2

This commit is contained in:
Benjamin Peterson 2011-06-27 09:16:40 -05:00
commit dd6098b8a1
1 changed files with 1 additions and 1 deletions

View File

@ -921,7 +921,7 @@ pyepoll_register(pyEpoll_Object *self, PyObject *args, PyObject *kwds)
PyDoc_STRVAR(pyepoll_register_doc,
"register(fd[, eventmask]) -> None\n\
\n\
Registers a new fd or modifies an already registered fd.\n\
Registers a new fd or raises an IOError if the fd is already registered.\n\
fd is the target file descriptor of the operation.\n\
events is a bit set composed of the various EPOLL constants; the default\n\
is EPOLL_IN | EPOLL_OUT | EPOLL_PRI.\n\