diff options
author | Georg Brandl <georg@python.org> | 2010-10-06 08:54:16 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-10-06 08:54:16 (GMT) |
commit | 57a5e3f0e288b70267297511f5af2c92721d7e2d (patch) | |
tree | 7348a8135f76e90360e39b8e9c88b87a591be46d /Modules | |
parent | 23b4f927d5e1c55ee0ff26570dfcaf3f307254fe (diff) | |
download | cpython-57a5e3f0e288b70267297511f5af2c92721d7e2d.zip cpython-57a5e3f0e288b70267297511f5af2c92721d7e2d.tar.gz cpython-57a5e3f0e288b70267297511f5af2c92721d7e2d.tar.bz2 |
Merged revisions 84249,84264,84326-84327,84407,84476,84480-84482,84484,84530-84531,84553,84619,84684,84915-84916 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r84249 | georg.brandl | 2010-08-22 01:20:01 +0200 (So, 22 Aug 2010) | 1 line
Remove usage of rexec in tkinter demo.
........
r84264 | georg.brandl | 2010-08-22 22:23:38 +0200 (So, 22 Aug 2010) | 1 line
#9649: fix default value description.
........
r84326 | georg.brandl | 2010-08-26 16:30:15 +0200 (Do, 26 Aug 2010) | 1 line
#9689: add links from overview to in-depth class API descriptions.
........
r84327 | georg.brandl | 2010-08-26 16:30:56 +0200 (Do, 26 Aug 2010) | 1 line
#9681: typo.
........
r84407 | georg.brandl | 2010-09-01 23:02:50 +0200 (Mi, 01 Sep 2010) | 1 line
#9677: fix link.
........
r84476 | georg.brandl | 2010-09-04 00:14:52 +0200 (Sa, 04 Sep 2010) | 1 line
Use tabs consistently.
........
r84480 | georg.brandl | 2010-09-04 00:33:27 +0200 (Sa, 04 Sep 2010) | 1 line
More inclusive title.
........
r84481 | georg.brandl | 2010-09-04 00:36:22 +0200 (Sa, 04 Sep 2010) | 1 line
#9767: doctest run over json docs.
........
r84482 | georg.brandl | 2010-09-04 00:40:02 +0200 (Sa, 04 Sep 2010) | 1 line
#9760: clarify what context expression is.
........
r84484 | georg.brandl | 2010-09-04 00:49:27 +0200 (Sa, 04 Sep 2010) | 1 line
Fix missing word.
........
r84530 | georg.brandl | 2010-09-05 19:07:12 +0200 (So, 05 Sep 2010) | 1 line
#9747: fix copy-paste error in getresgid() doc.
........
r84531 | georg.brandl | 2010-09-05 19:09:18 +0200 (So, 05 Sep 2010) | 1 line
#9776: fix some spacing.
........
r84553 | georg.brandl | 2010-09-06 08:49:07 +0200 (Mo, 06 Sep 2010) | 1 line
#9780: both { and } are not valid fill characters.
........
r84619 | georg.brandl | 2010-09-08 12:43:45 +0200 (Mi, 08 Sep 2010) | 1 line
Add Lukasz.
........
r84684 | georg.brandl | 2010-09-10 22:43:53 +0200 (Fr, 10 Sep 2010) | 1 line
release() is probably not the most important method
........
r84915 | georg.brandl | 2010-09-20 08:27:02 +0200 (Mo, 20 Sep 2010) | 1 line
Fix typo.
........
r84916 | georg.brandl | 2010-09-20 08:29:01 +0200 (Mo, 20 Sep 2010) | 1 line
Mention % as string formatting.
........
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/fcntlmodule.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c index 6eb3a2a..bfc5985 100644 --- a/Modules/fcntlmodule.c +++ b/Modules/fcntlmodule.c @@ -82,10 +82,10 @@ PyDoc_STRVAR(fcntl_doc, Perform the requested operation on file descriptor fd. The operation\n\ is defined by op and is operating system dependent. These constants are\n\ available from the fcntl module. The argument arg is optional, and\n\ -defaults to 0; it may be an int or a string. If arg is given as a string,\n\ +defaults to 0; it may be an int or a string. If arg is given as a string,\n\ the return value of fcntl is a string of that length, containing the\n\ -resulting value put in the arg buffer by the operating system.The length\n\ -of the arg string is not allowed to exceed 1024 bytes. If the arg given\n\ +resulting value put in the arg buffer by the operating system. The length\n\ +of the arg string is not allowed to exceed 1024 bytes. If the arg given\n\ is an integer or if none is specified, the result value is an integer\n\ corresponding to the return value of the fcntl call in the C code."); |