Issue #19147: merge from 3.3

This commit is contained in:
Ned Deily 2013-10-02 12:22:05 -07:00
commit f55697ca6d

View file

@ -309,7 +309,7 @@ PyDoc_STRVAR(flock_doc,
"flock(fd, operation)\n\ "flock(fd, operation)\n\
\n\ \n\
Perform the lock operation op on file descriptor fd. See the Unix \n\ Perform the lock operation op on file descriptor fd. See the Unix \n\
manual page for flock(3) for details. (On some systems, this function is\n\ manual page for flock(2) for details. (On some systems, this function is\n\
emulated using fcntl().)"); emulated using fcntl().)");