new copyright notice

[unix-history] / usr / src / lib / libc / sys / flock.2

diff --git a/usr/src/lib/libc/sys/flock.2 b/usr/src/lib/libc/sys/flock.2
index 3893485..a50b134 100644 (file)
--- a/usr/src/lib/libc/sys/flock.2
+++ b/usr/src/lib/libc/sys/flock.2
@@ -1,8 +1,9 @@
-.\" Copyright (c) 1983 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1983 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.\"    @(#)flock.2     6.1 (Berkeley) %G%
+.\" %sccs.include.redist.man%
+.\"
+.\"    @(#)flock.2     6.6 (Berkeley) %G%

 .\"
 .TH FLOCK 2 ""
 .UC 5
 .\"
 .TH FLOCK 2 ""
 .UC 5


@@ -32,7 +33,7 @@ lock on the file associated with the file descriptor
 .IR fd .
 A lock is applied by specifying an
 .I operation
 .IR fd .
 A lock is applied by specifying an
 .I operation

-parameter which is the inclusive or of
+parameter that is the inclusive or of

 LOCK_SH or LOCK_EX and, possibly, LOCK_NB.  To unlock
 an existing lock
 .I operation
 LOCK_SH or LOCK_EX and, possibly, LOCK_NB.  To unlock
 an existing lock
 .I operation


@@ -40,7 +41,7 @@ should be LOCK_UN.
 .PP
 Advisory locks allow cooperating processes to perform
 consistent operations on files, but do not guarantee
 .PP
 Advisory locks allow cooperating processes to perform
 consistent operations on files, but do not guarantee

-consistency (i.e. processes may still access files
+consistency (i.e., processes may still access files

 without using advisory locks possibly resulting in
 inconsistencies).
 .PP
 without using advisory locks possibly resulting in
 inconsistencies).
 .PP


@@ -60,8 +61,8 @@ the appropriate lock type; this results in the previous
 lock being released and the new lock applied (possibly
 after other processes have gained and released the lock).
 .PP
 lock being released and the new lock applied (possibly
 after other processes have gained and released the lock).
 .PP

-Requesting a lock on an object which is already locked
-normally causes the caller to blocked until the lock may be
+Requesting a lock on an object that is already locked
+normally causes the caller to be blocked until the lock may be

 acquired.  If LOCK_NB is included in
 .IR operation ,
 then this will not happen; instead the call will fail and
 acquired.  If LOCK_NB is included in
 .IR operation ,
 then this will not happen; instead the call will fail and