5 files changed, 207 insertions, 15 deletions
diff --git a/usr/src/man/man1/grep.1 b/usr/src/man/man1/grep.1
index e93f3a19ca..0269a5c7dc 100644
--- a/usr/src/man/man1/grep.1
+++ b/usr/src/man/man1/grep.1
@@ -16,26 +16,28 @@ grep \- search a file for a pattern
 .SH SYNOPSIS
 .LP
 .nf
-\fB/usr/bin/grep\fR [\fB-c\fR | \fB-l\fR | \fB-q\fR] [\fB-bhinsvw\fR] \fIlimited-regular-expression\fR
-     [\fIfilename\fR]...
+\fB/usr/bin/grep\fR [\fB-c\fR | \fB-l\fR |\fB-q\fR] [\fB-r\fR | \fB-R\fR] [\fB-bhinsvw\fR]
+    \fIlimited-regular-expression\fR [\fIfilename\fR]...
 .fi
 
 .LP
 .nf
-\fB/usr/xpg4/bin/grep\fR [\fB-E\fR | \fB-F\fR] [\fB-c\fR | \fB-l\fR | \fB-q\fR] [\fB-bhinsvwx\fR] \fB-e\fR \fIpattern_list\fR...
-     [\fB-f\fR \fIpattern_file\fR]... [\fIfile\fR]...
+\fB/usr/xpg4/bin/grep\fR [\fB-E\fR | \fB-F\fR] [\fB-c\fR | \fB-l\fR | \fB-q\fR] [\fB-r\fR | \fB-R\fR]
+    [\fB-bhinsvwx\fR] \fB-e\fR \fIpattern_list\fR... [\fB-f\fR \fIpattern_file\fR]...
+    [\fIfile\fR]...
 .fi
 
 .LP
 .nf
-\fB/usr/xpg4/bin/grep\fR [\fB-E\fR | \fB-F\fR] [\fB-c\fR | \fB-l\fR | \fB-q\fR] [\fB-bhinsvwx\fR]
-     [\fB-e\fR \fIpattern_list\fR]... \fB-f\fR \fIpattern_file\fR... [\fIfile\fR]...
+\fB/usr/xpg4/bin/grep\fR [\fB-E\fR | \fB-F\fR] [\fB-c\fR | \fB-l\fR | \fB-q\fR] [\fB-r\fR | \fB-R\fR]
+    [\fB-bhinsvwx\fR] [\fB-e\fR \fIpattern_list\fR]... \fB-f\fR \fIpattern_file\fR...
+    [\fIfile\fR]...
 .fi
 
 .LP
 .nf
-\fB/usr/xpg4/bin/grep\fR [\fB-E\fR | \fB-F\fR] [\fB-c\fR | \fB-l\fR | \fB-q\fR] [\fB-bhinsvwx\fR] \fIpattern\fR
-     [\fIfile\fR]...
+\fB/usr/xpg4/bin/grep\fR [\fB-E\fR | \fB-F\fR] [\fB-c\fR | \fB-l\fR | \fB-q\fR] [\fB-r\fR | \fB-R\fR]
+    [\fB-bhinsvwx\fR] \fIpattern\fR [\fIfile\fR]...
 .fi
 
 .SH DESCRIPTION
@@ -135,6 +137,26 @@ Precedes each line by its line number in the file (first line is 1).
 .sp
 .ne 2
 .na
+\fB\fB-r\fR\fR
+.ad
+.RS 6n
+Read all files under each directory, recursively. Follow symbolic links on
+the command line, but skip symlinks that are encountered recursively. If file
+is a device, FIFO, or socket, skip it.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fB-R\fR\fR
+.ad
+.RS 6n
+Read all files under each directory, recursively, following all symbolic links.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fB-q\fR\fR
 .ad
 .RS 6n
diff --git a/usr/src/man/man1/ld.1 b/usr/src/man/man1/ld.1
index e448bf51f0..be9394d829 100644
--- a/usr/src/man/man1/ld.1
+++ b/usr/src/man/man1/ld.1
@@ -5,7 +5,7 @@
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LD 1 "Sep 18, 2009"
+.TH LD 1 "Oct 24, 2012"
 .SH NAME
 ld \- link-editor for object files
 .SH SYNOPSIS
@@ -25,6 +25,7 @@ ld \- link-editor for object files
 [\fB-z\fR direct | nodirect] [\fB-z\fR endfiltee]
 [\fB-z\fR fatal-warnings | nofatal-warnings ] [\fB-z\fR finiarray=\fIfunction\fR]
 [\fB-z\fR globalaudit] [\fB-z\fR groupperm | nogroupperm] [\fB-z\fR help ]
+[\fB-z\fR guidance[=\fIid1\fR,\fIid2\fR...] [\fB-z\fR help ]
 [\fB-z\fR ignore | record] [\fB-z\fR initarray=\fIfunction\fR] [\fB-z\fR initfirst]
 [\fB-z\fR interpose] [\fB-z\fR lazyload | nolazyload]
 [\fB-z\fR ld32=\fIarg1\fR,\fIarg2\fR,...] [\fB-z\fR ld64=\fIarg1\fR,\fIarg2\fR,...]
@@ -1013,6 +1014,102 @@ had been built using the \fB-B\fR \fBgroup\fR option.
 .sp
 .ne 2
 .na
+\fB-z\fR \fBguidance\fR[=\fIid1\fR,\fIid2\fR...]
+.ad
+.sp .6
+.RS 4n
+Give messages suggesting link-editor features that could improve the resulting
+dynamic object.
+.LP
+Specific classes of suggestion can be silenced by specifying an optional comma separated
+list of guidance identifiers.
+.LP
+The current classes of suggestion provided are:
+
+.sp
+.ne 2
+.na
+Enable use of direct binding
+.ad
+.sp .6
+.RS 4n
+Suggests that \fB-z direct\fR or \fB-B direct\fR be present prior to any
+specified dependency.  This allows predictable symbol binding at runtime.
+
+Can be disabled with \fB-z guidance=nodirect\fR 
+.RE
+
+.sp
+.ne 2
+.na
+Enable lazy dependency loading
+.ad
+.sp .6
+.RS 4n
+Suggests that \fB-z lazyload\fR be present prior to any specified dependency.
+This allows the dynamic object to be loaded more quickly.
+
+Can be disabled with \fB-z guidance=nolazyload\fR.
+.RE
+
+.sp
+.ne 2
+.na
+Shared objects should define all their dependencies.
+.ad
+.sp .6
+.RS 4n
+Suggests that \fB-z defs\fR be specified on the link-editor command line.
+Shared objects that explicitly state all their dependencies behave more
+predictably when used.
+
+Can be be disabled with \fB-z guidance=nodefs\fR
+.RE
+
+.sp
+.ne 2
+.na
+Version 2 mapfile syntax
+.ad
+.sp .6
+.RS 4n
+Suggests that any specified mapfiles use the more readable version 2 syntax.
+
+Can be disabled with \fB-z guidance=nomapfile\fR.
+.RE
+
+.sp
+.ne 2
+.na
+Read-only text segment
+.ad
+.sp .6
+.RS 4n
+Should any runtime relocations within the text segment exist, suggests that
+the object be compiled with position independent code (PIC).  Keeping large
+allocatable sections read-only allows them to be shared between processes
+using a given shared object.
+
+Can be disabled with \fB-z guidance=notext\fR
+.RE
+
+.sp
+.ne 2
+.na
+No unused dependencies
+.ad
+.sp .6
+.RS 4n
+Suggests that any dependency not referenced by the resulting dynamic object be
+removed from the link-editor command line.
+
+Can be disabled with \fB-z guidance=nounused\fR.
+.RE
+.RE 
+
+.sp
+.ne 2
+.na
 \fB\fB-z\fR \fBhelp\fR\fR
 .ad
 .br
diff --git a/usr/src/man/man1/ld.so.1.1 b/usr/src/man/man1/ld.so.1.1
index b86dfdce5e..4b14ca4f1a 100644
--- a/usr/src/man/man1/ld.so.1.1
+++ b/usr/src/man/man1/ld.so.1.1
@@ -1,9 +1,9 @@
-'\" te
+'\"
 .\" Copyright (c) 2009, Sun Microsystems, Inc. All Rights Reserved
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
 .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with
 .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH LD.SO.1 1 "Aug 26, 2009"
+.TH LD.SO.1 1 "Oct 5, 2012"
 .SH NAME
 ld.so.1 \- runtime linker for dynamic objects
 .SH SYNOPSIS
@@ -232,6 +232,21 @@ If both \fBLD_BIND_NOW\fR and \fBLD_BIND_LAZY\fR are specified, then
 .sp
 .ne 2
 .na
+\fBLD_CAP_FILES\fR, \fBLD_CAP_FILES_32\fR, and \fBLD_CAP_FILES_64\fR
+.ad
+.sp .6
+.RS 4n
+A comma-separated list of executables and shared libraries to which the
+alternative capabilities specified by \fBLD_MACHCAP\fR, \fBLD_PLATCAP\fR,
+\fBLD_HWCAP\fR and \fBLD_SFCAP\fR should apply.
+.LP
+Executables and libraries may be specified either by their SONAME or their
+full real pathname.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBLD_CONFIG\fR, \fBLD_CONFIG_32\fR, and \fBLD_CONFIG_64\fR\fR
 .ad
 .sp .6
@@ -285,6 +300,37 @@ EXAMPLES.
 .sp
 .ne 2
 .na
+\fBLD_HWCAP\fR, \fBLD_HWCAP_32\fR, and \fBLD_HWCAP_64\fR
+.ad
+.sp .6
+.RS 4n
+Specify a comma-separated set of alternative hardware capabilities.  A
+leading '+' indicates that the capabilities should be included in addition to
+the default set, a leading '-' indicates that the capabilities should be
+excluded from the default set, and neither indicates that the set should
+replace the default set.
+.LP
+Capabilities may be specified either by name, or as hexadecimal integers with
+an optional leading bracketed index number specifying the capabilities family.
+.nf
+LD_HWCAP=[1]01 # Sets CA_SUN_HW_1 to 0x1
+LD_HWCAP=[2]20 # Sets CA_SUN_HW_2 to 0x20
+.fi
+.RE
+
+.sp
+.ne 2
+.na
+\fBLD_MACHCAP\fR
+.ad
+.sp .6
+.RS 4n
+Specify an alternative machine hardware capability name.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBLD_LIBRARY_PATH\fR, \fBLD_LIBRARY_PATH_32\fR, and
 \fBLD_LIBRARY_PATH_64\fR\fR
 .ad
@@ -445,6 +491,16 @@ default thus making this option redundant.
 .sp
 .ne 2
 .na
+\fBLD_PLATCAP\fR
+.ad
+.sp .6
+.RS 4n
+Specify an alternative platform hardware capability name.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBLD_PRELOAD\fR, \fBLD_PRELOAD_32\fR, and \fBLD_PRELOAD_64\fR\fR
 .ad
 .sp .6
@@ -489,6 +545,22 @@ objects.
 .sp
 .ne 2
 .na
+\fBLD_SFCAP\fR, \fBLD_SFCAP_32\fR, and \fBLD_SFCAP_64\fR
+.ad
+.sp .6
+.RS 4n
+Specify a comma-separated set of alternative software capabilities.  A
+leading '+' indicates that the capabilities should be included in addition to
+the default set, a leading '-' indicates that the capabilities should be
+excluded from the default set, and neither indicates that the set should
+replace the default set.
+.LP
+Capabilities may be specified either by name, or as hexadecimal integers.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBLD_SIGNAL\fR, \fBLD_SIGNAL_32\fR, and \fBLD_SIGNAL_64\fR\fR
 .ad
 .sp .6
diff --git a/usr/src/man/man1/proc.1 b/usr/src/man/man1/proc.1
index 21a9134844..cd20e215e3 100644
--- a/usr/src/man/man1/proc.1
+++ b/usr/src/man/man1/proc.1
@@ -1,10 +1,11 @@
 '\" te
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved
 .\" Portions Copyright 2008 Chad Mynhier
+.\" Copyright 2012 DEY Storage Systems, Inc.  All rights reserved.
 .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
 .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.TH PROC 1 "Dec 10, 2008"
+.TH PROC 1 "Oct 23, 2012"
 .SH NAME
 proc, pflags, pcred, pldd, psig, pstack, pfiles, pwdx, pstop, prun, pwait,
 ptime \- proc tools
@@ -46,7 +47,7 @@ ptime \- proc tools
 
 .LP
 .nf
-\fB/usr/bin/pfiles\fR [\fB-Fn\fR] \fIpid\fR...
+\fB/usr/bin/pfiles\fR [\fB-Fn\fR] \fIpid\fR | \fIcore\fR...
 .fi
 
 .LP
diff --git a/usr/src/man/man1/ps.1 b/usr/src/man/man1/ps.1
index 1713a18502..674e326e29 100644
--- a/usr/src/man/man1/ps.1
+++ b/usr/src/man/man1/ps.1
@@ -1104,8 +1104,8 @@ The home lgroup of the process.
 \fB\fBdmodel\fR\fR
 .ad
 .RS 11n
-The data model of the process, printed in the same manner as
-via \fBpflags\fR(1).
+The data model of the process, printed in the same manner as via
+\fBpflags\fR(1). The currently supported data models are _ILP32 and _LP64.
 .RE
 
 .sp