Update to upstream util-linux 2.20.1

[framework/base/util-linux-ng.git] / sys-utils / flock.1

diff --git a/sys-utils/flock.1 b/sys-utils/flock.1
index 6d60ff7..4f0332a 100644 (file)
--- a/sys-utils/flock.1
+++ b/sys-utils/flock.1
@@ -24,9 +24,9 @@
 .\"   OTHER DEALINGS IN THE SOFTWARE.
 .\"
 .\" -----------------------------------------------------------------------
-.TH FLOCK "1" "4 Feb 2006" "flock utility" "H. Peter Anvin"
+.TH FLOCK 1 "February 2006" "util-linux" "User Commands"
 .SH NAME
-flock \- Manage locks from shell scripts
+flock \- manage locks from shell scripts
 .SH SYNOPSIS
 \fBflock\fP [\fB\-sxon\fP] [\fB\-w\fP \fItimeout\fP] \fIlockfile\fP [\fB\-c\fP] \fIcommand...\fP
 .PP
@@ -51,11 +51,11 @@ used the following manner:
 .PP
 \fC(
 .br
-  flock -s 200
+  flock -n 9 || exit 1
 .br
   # ... commands executed under lock ...
 .br
-) 200>/var/lock/mylockfile\fP
+) 9>/var/lock/mylockfile\fP
 .PP
 The mode used to open the file doesn't matter to \fBflock\fP; using
 \fC>\fP or \fP>>\fP allows the lockfile to be created if it does not
@@ -92,7 +92,7 @@ Fail (with an exit code of 1) if the lock cannot be acquired within
 \fB\-o\fP, \fB\-\-close\fP
 Close the file descriptor on which the lock is held before executing
 \fIcommand\fP.  This is useful if \fIcommand\fP spawns a child process
-which should not be hold ing the lock.
+which should not be holding the lock.
 .TP
 \fB\-c\fP, \fB\-\-command\fP \fIcommand\fP
 Pass a single \fIcommand\fP to the shell with \fB\-c\fP.
@@ -109,5 +109,5 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 .SH "SEE ALSO"
 .BR flock (2)
 .SH AVAILABILITY
-The flock command is part of the util-linux-ng package and is available from
-ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/.
+The flock command is part of the util-linux package and is available from
+ftp://ftp.kernel.org/pub/linux/utils/util-linux/.