From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 21:06:48 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 9C5641065676;
	Sat, 30 Jan 2010 21:06:48 +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 8CF308FC16;
	Sat, 30 Jan 2010 21:06:48 +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 o0UL6mCx008604;
	Sat, 30 Jan 2010 21:06:48 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UL6mhv008602;
	Sat, 30 Jan 2010 21:06:48 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001302106.o0UL6mhv008602@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 21:06:48 +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: r203255 - projects/capabilities8/libexec/rtld-elf-cap
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 21:06:48 -0000

Author: rwatson
Date: Sat Jan 30 21:06:48 2010
New Revision: 203255
URL: http://svn.freebsd.org/changeset/base/203255

Log:
  Catch another uncommitted portion of c173936 from the p4 TrustedBSD
  Capabilities branch and merge to capabilities8:
  
    Clean up some loose end references to libcapability.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/libexec/rtld-elf-cap/rtld-elf-cap.1

Modified: projects/capabilities8/libexec/rtld-elf-cap/rtld-elf-cap.1
==============================================================================
--- projects/capabilities8/libexec/rtld-elf-cap/rtld-elf-cap.1	Sat Jan 30 21:02:31 2010	(r203254)
+++ projects/capabilities8/libexec/rtld-elf-cap/rtld-elf-cap.1	Sat Jan 30 21:06:48 2010	(r203255)
@@ -45,7 +45,7 @@ The
 is a version of
 .Xr ld-elf.so.1 1
 specific to the sandbox environment created using
-.Xr libcapability 3 ,
+.Xr libcapsicum 3 ,
 which provides certain extended or modified linker services for that
 environment:
 .Bl -bullet
@@ -72,7 +72,7 @@ environmental variable set by sandbox st
 allowing file descriptors for binaries and libraries passed across
 .Xr fexecve 2
 to be used by
-.Xr libcapability 3 ,
+.Xr libcapsicum 3 ,
 as well as applications.
 .It
 Implements a version of
@@ -88,7 +88,7 @@ will need to export it as a dynamic symb
 command line flag.
 .Pp
 Most capability-mode applications will be started using the APIs defined in
-.Xr libcapability 3 ,
+.Xr libcapsicum 3 ,
 which properly set up the run-time environment for
 .Nm .
 .Sh SEE ALSO
@@ -96,7 +96,7 @@ which properly set up the run-time envir
 .Xr ld-elf.so.1 1 ,
 .Xr cap_enter 2 ,
 .Xr fexecve 2 ,
-.Xr libcapability 3
+.Xr libcapsicum 3
 .Sh HISTORY
 Support for capabilities and capabilities mode was developed as part of the
 .Tn TrustedBSD