From 67bcd1103b9fc43012e902543d3f773368b8abe0 Mon Sep 17 00:00:00 2001
From: Kevin Ryde <user42@zip.com.au>
Date: Wed, 19 Jan 2005 23:32:44 +0000
Subject: [PATCH] (Ports and File Descriptors): In flock, for LOCK_NB note
 logior for LOCK_NB and EWOULDBLOCK error, and note flock doesn't work over
 NFS.

---
 doc/ref/posix.texi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/ref/posix.texi b/doc/ref/posix.texi
index 1897bef28..43aec4802 100644
--- a/doc/ref/posix.texi
+++ b/doc/ref/posix.texi
@@ -525,12 +525,16 @@ for a given file at a given time.
 Unlock the file.
 @end defvar
 @defvar LOCK_NB
-Don't block when locking.  May be specified by bitwise OR'ing
-it to one of the other operations.
+Don't block when locking.  This is combined with one of the other
+operations using @code{logior} (@pxref{Bitwise Operations}).  If
+@code{flock} would block an @code{EWOULDBLOCK} error is thrown
+(@pxref{Conventions}).
 @end defvar
 
 The return value is not specified. @var{file} may be an open
 file descriptor or an open file descriptor port.
+
+Note that @code{flock} does not lock files across NFS.
 @end deffn
 
 @deffn {Scheme Procedure} select reads writes excepts [secs [usecs]]