From owner-svn-src-stable@FreeBSD.ORG  Fri Nov 18 21:10:13 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 74095106567A;
	Fri, 18 Nov 2011 21:10:13 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 62D668FC16;
	Fri, 18 Nov 2011 21:10:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAILADaj098807;
	Fri, 18 Nov 2011 21:10:13 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAILADoc098805;
	Fri, 18 Nov 2011 21:10:13 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201111182110.pAILADoc098805@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 18 Nov 2011 21:10:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227681 - stable/9/lib/libc/sys
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Nov 2011 21:10:13 -0000

Author: dougb
Date: Fri Nov 18 21:10:13 2011
New Revision: 227681
URL: http://svn.freebsd.org/changeset/base/227681

Log:
  MFC r227416:
  
  Document that flock can return ENOLCK
  
  Approved by:	re (kib)

Modified:
  stable/9/lib/libc/sys/flock.2
Directory Properties:
  stable/9/lib/libc/   (props changed)
  stable/9/lib/libc/stdtime/   (props changed)

Modified: stable/9/lib/libc/sys/flock.2
==============================================================================
--- stable/9/lib/libc/sys/flock.2	Fri Nov 18 21:09:03 2011	(r227680)
+++ stable/9/lib/libc/sys/flock.2	Fri Nov 18 21:10:13 2011	(r227681)
@@ -28,7 +28,7 @@
 .\"     @(#)flock.2	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd January 22, 2008
+.Dd November 9, 2011
 .Dt FLOCK 2
 .Os
 .Sh NAME
@@ -154,6 +154,8 @@ refers to an object other than a file.
 The argument
 .Fa fd
 refers to an object that does not support file locking.
+.It Bq Er ENOLCK
+A lock was requested, but no locks are available.
 .El
 .Sh SEE ALSO
 .Xr close 2 ,