[Python-checkins] cpython (merge 3.3 -> default): Issue #19147: merge from 3.3

[ned.deily]

http://hg.python.org/cpython/rev/1cb0c05d71af
changeset:   85935:1cb0c05d71af
parent:      85932:6e7b1aadea2f
parent:      85934:735d8b856928
user:        Ned Deily <nad at acm.org>
date:        Wed Oct 02 12:22:05 2013 -0700
summary:
  Issue #19147: merge from 3.3

files:
  Modules/fcntlmodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
--- a/Modules/fcntlmodule.c
+++ b/Modules/fcntlmodule.c
@@ -309,7 +309,7 @@
 "flock(fd, operation)\n\
 \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().)");
 
 

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