[Python-checkins] cpython (merge default -> default): merge

[georg.brandl]

http://hg.python.org/cpython/rev/513ad970a2aa
changeset:   88471:513ad970a2aa
parent:      88470:a3cde638ede0
parent:      88468:7b67ce011d4c
user:        Georg Brandl <georg at python.org>
date:        Tue Jan 14 12:27:44 2014 +0100
summary:
  merge

files:
  Doc/library/select.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/select.rst b/Doc/library/select.rst
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -313,7 +313,7 @@
 
 .. method:: epoll.modify(fd, eventmask)
 
-   Modify a register file descriptor.
+   Modify a registered file descriptor.
 
 
 .. method:: epoll.unregister(fd)

-- 
Repository URL: http://hg.python.org/cpython