svn commit: r228070 - stable/9/lib/libc/sys

[Robert Watson]

Author: rwatson
Date: Mon Nov 28 14:39:56 2011
New Revision: 228070
URL: http://svn.freebsd.org/changeset/base/228070

Log:
  Merge r228040 from head to stable/9:
  
    Cross-reference capsicum.4 from cap_enter.2 and cap_new.2.
  
    Sponsored by:	Google, Inc.
  
  Approved by:	re (kib)

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

Modified: stable/9/lib/libc/sys/cap_enter.2
==============================================================================
--- stable/9/lib/libc/sys/cap_enter.2	Mon Nov 28 14:36:06 2011	(r228069)
+++ stable/9/lib/libc/sys/cap_enter.2	Mon Nov 28 14:39:56 2011	(r228070)
@@ -89,7 +89,8 @@ acquired rights as possible.
 .Rv -std cap_enter cap_getmode
 .Sh SEE ALSO
 .Xr cap_new 2 ,
-.Xr fexecve 2
+.Xr fexecve 2 ,
+.Xr capsicum 4
 .Sh HISTORY
 Support for capabilities and capabilities mode was developed as part of the
 .Tn TrustedBSD

Modified: stable/9/lib/libc/sys/cap_new.2
==============================================================================
--- stable/9/lib/libc/sys/cap_new.2	Mon Nov 28 14:36:06 2011	(r228069)
+++ stable/9/lib/libc/sys/cap_new.2	Mon Nov 28 14:39:56 2011	(r228070)
@@ -456,6 +456,7 @@ argument is not a capability.
 .Xr sem_post 3 ,
 .Xr sem_trywait 3 ,
 .Xr sem_wait 3 ,
+.Xr capsicum 4 ,
 .Xr snp 4
 .Sh HISTORY
 Support for capabilities and capabilities mode was developed as part of the