summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-01-05 19:44:22 (GMT)
committerGeorg Brandl <georg@python.org>2008-01-05 19:44:22 (GMT)
commitf725b9587ce8fb1f63244e69e59763cef0750658 (patch)
tree147e583f659c303a48a6e00e03d4ebc6f3776466 /Modules
parent6265833d91b53aec0d710d81ec91cee142b0e204 (diff)
downloadcpython-f725b9587ce8fb1f63244e69e59763cef0750658.zip
cpython-f725b9587ce8fb1f63244e69e59763cef0750658.tar.gz
cpython-f725b9587ce8fb1f63244e69e59763cef0750658.tar.bz2
Doc patch #1730 from Robin Stocker; minor corrections mostly to os.rst.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/fcntlmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
index 4e49a7d..1e4a254 100644
--- a/Modules/fcntlmodule.c
+++ b/Modules/fcntlmodule.c
@@ -378,7 +378,7 @@ following values:\n\
LOCK_SH - acquire a shared lock\n\
LOCK_EX - acquire an exclusive lock\n\
\n\
-When operation is LOCK_SH or LOCK_EX, it can also be bit-wise OR'd with\n\
+When operation is LOCK_SH or LOCK_EX, it can also be bitwise ORed with\n\
LOCK_NB to avoid blocking on lock acquisition. If LOCK_NB is used and the\n\
lock cannot be acquired, an IOError will be raised and the exception will\n\
have an errno attribute set to EACCES or EAGAIN (depending on the operating\n\