From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 19:43:27 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 76D7F106568D;
	Sat, 30 Jan 2010 19:43:27 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 67DB98FC1F;
	Sat, 30 Jan 2010 19:43:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UJhRln089404;
	Sat, 30 Jan 2010 19:43:27 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UJhRlG089402;
	Sat, 30 Jan 2010 19:43:27 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001301943.o0UJhRlG089402@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 19:43:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203235 - projects/capabilities8/lib/libc/sys
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2010 19:43:27 -0000

Author: rwatson
Date: Sat Jan 30 19:43:27 2010
New Revision: 203235
URL: http://svn.freebsd.org/changeset/base/203235

Log:
  Merge c173657 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Clarify interaction of CAP_EVENT and CAP_KEVENT in the cap_new(2)
    man page.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/lib/libc/sys/cap_new.2

Modified: projects/capabilities8/lib/libc/sys/cap_new.2
==============================================================================
--- projects/capabilities8/lib/libc/sys/cap_new.2	Sat Jan 30 19:42:23 2010	(r203234)
+++ projects/capabilities8/lib/libc/sys/cap_new.2	Sat Jan 30 19:43:27 2010	(r203235)
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2008-2009 Robert N. M. Watson
+.\" Copyright (c) 2008-2010 Robert N. M. Watson
 .\" All rights reserved.
 .\"
 .\" WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED
@@ -224,7 +224,7 @@ global scope for some objects.
 Permit
 .Xr kevent 2 ;
 .Dv CAP_EVENT
-may also be required on file descriptors to be monitored using
+is also required on file descriptors that will be monitored using
 .Xr kevent 2 .
 .It Dv CAP_LISTEN
 Permit