14 files changed, 332 insertions, 55 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
diff --git a/usr/src/man/man1m/ldapclient.1m b/usr/src/man/man1m/ldapclient.1m
index 75fa32e9e3..14e7eec02a 100644
--- a/usr/src/man/man1m/ldapclient.1m
+++ b/usr/src/man/man1m/ldapclient.1m
@@ -235,6 +235,10 @@ following authentication methods:
 .in -2
 .br
 .in +2
+\fBtls:none\fR
+.in -2
+.br
+.in +2
 \fBtls:simple\fR
 .in -2
 .br
@@ -251,7 +255,9 @@ Note that some directory servers may not support all of these authentication
 methods. For \fBsimple\fR, be aware that the bind password will be sent in the
 clear to the LDAP server. For those authentication methods using TLS (transport
 layer security), the entire session is encrypted. You will need to install the
-appropriate certificate databases to use TLS.
+appropriate certificate databases to use TLS. Note that the \fBtls:none\fR
+authentication method requires a \fBcredentialLevel\fR of \fBproxy\fR to
+take effect.
 .SS "Commands"
 .sp
 .LP
@@ -371,6 +377,25 @@ attributeMap: passwd:uid=employeeNumber
 
 the LDAP client would use the LDAP attribute \fBemployeeNumber\fR rather than
 \fBuid\fR for the \fBpasswd\fR service. This is a multivalued attribute.
+.sp
+To use rfc2307bis style groups (with a DN rather than username as the
+attribute value), map the \fBmemberUid\fR attribute to the group attribute
+being used (typically either \fBuniqueMember\fR or \fBmember\fR), for example:
+.sp
+.in +2
+.nf
+attributeMap: group:memberUid=uniqueMember
+.fi
+.in -2
+.sp
+
+Group membership in a given directory is expected to be maintained with
+either username format member attributes, or DN format member attributes. If
+both are present they must describe identical memberships or unexpected
+results may be obtained. For DN format attributes, the username is required
+to be the RDN of the entry. Note that nested groups are not currently
+supported, and unexpected results may be obtained if they are used.
+
 .RE
 
 .sp
diff --git a/usr/src/man/man1m/zdb.1m b/usr/src/man/man1m/zdb.1m
index 106dcfbb59..5336e1e25f 100644
--- a/usr/src/man/man1m/zdb.1m
+++ b/usr/src/man/man1m/zdb.1m
@@ -11,6 +11,7 @@
 .\"
 .\"
 .\" Copyright 2012, Richard Lowe.
+.\" Copyright (c) 2012 by Delphix. All rights reserved.
 .\"
 .TH "ZDB" "1M" "February 15, 2012" "" ""
 
@@ -19,21 +20,23 @@
 
 .SH "SYNOPSIS"
 \fBzdb\fR [-CumdibcsDvhLXFPA] [-e [-p \fIpath\fR...]] [-t \fItxg\fR]
-    \fIpoolname\fR [\fIobject\fR ...]
+    [-U \fIcache\fR] [-M \fIinflight I/Os\fR] [\fIpoolname\fR
+    [\fIobject\fR ...]]
 
 .P
-\fBzdb\fR [-divPA] [-e [-p \fIpath\fR...]] \fIdataset\fR [\fIobject\fR ...]
+\fBzdb\fR [-divPA] [-e [-p \fIpath\fR...]] [-U \fIcache\fR]
+    \fIdataset\fR [\fIobject\fR ...]
 
 .P
-\fBzdb\fR -m [-LXFPA] [-t \fItxg\fR] [-e [-p \fIpath\fR...]] \fIpoolname\fR
-    [\fIvdev\fR [\fImetaslab\fR ...]]
+\fBzdb\fR -m [-LXFPA] [-t \fItxg\fR] [-e [-p \fIpath\fR...]] [-U \fIcache\fR]
+    \fIpoolname\fR [\fIvdev\fR [\fImetaslab\fR ...]]
 
 .P
-\fBzdb\fR -R [-A] [-e [-p \fIpath\fR...]] \fIpoolname\fR
+\fBzdb\fR -R [-A] [-e [-p \fIpath\fR...]] [-U \fIcache\fR] \fIpoolname\fR
     \fIvdev\fR:\fIoffset\fR:\fIsize\fR[:\fIflags\fR]
 
 .P
-\fBzdb\fR -S [-AP] [-e [-p \fIpath\fR...]] \fIpoolname\fR
+\fBzdb\fR -S [-AP] [-e [-p \fIpath\fR...]] [-U \fIcache\fR] \fIpoolname\fR
 
 .P
 \fBzdb\fR -l [-uA] \fIdevice\fR
@@ -357,6 +360,18 @@ transactions.
 .sp
 .ne 2
 .na
+\fB-M \fIinflight I/Os\fR \fR
+.ad
+.sp .6
+.RS 4n
+Limit the number of outstanding checksum I/Os to the specified value. The
+default value is 200. This option affects the performance of the \fB-c\fR
+option.
+.RE
+
+.sp
+.ne 2
+.na
 \fB-P\fR
 .ad
 .sp .6
@@ -384,8 +399,7 @@ and their associated transaction numbers.
 .ad
 .sp .6
 .RS 4n
-Use a cache file other than \fB/etc/zfs/zpool.cache\fR. This option is only
-valid with \fB-C\fR
+Use a cache file other than \fB/etc/zfs/zpool.cache\fR.
 .RE
 
 .sp
diff --git a/usr/src/man/man1m/zpool.1m b/usr/src/man/man1m/zpool.1m
index a55ca387cc..19d6dda8eb 100644
--- a/usr/src/man/man1m/zpool.1m
+++ b/usr/src/man/man1m/zpool.1m
@@ -114,6 +114,11 @@ zpool \- configures ZFS storage pools
 
 .LP
 .nf
+\fBzpool reopen\fR \fIpool\fR
+.fi
+
+.LP
+.nf
 \fBzpool remove\fR \fIpool\fR \fIdevice\fR ...
 .fi
 
@@ -1574,8 +1579,18 @@ become available to the pool.
 .ad
 .sp .6
 .RS 4n
-Generates a new unique identifier for the pool.  You must ensure that all devices in this pool are online and
-healthy before performing this action.
+Generates a new unique identifier for the pool. You must ensure that all
+devices in this pool are online and healthy before performing this action.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fBzpool reopen\fR \fIpool\fR
+.ad
+.sp .6
+.RS 4n
+Reopen all the vdevs associated with the pool.
 .RE
 
 .sp
diff --git a/usr/src/man/man4/core.4 b/usr/src/man/man4/core.4
index 6c0d1e2006..c6bc9ea373 100644
--- a/usr/src/man/man4/core.4
+++ b/usr/src/man/man4/core.4
@@ -1,10 +1,11 @@
 '\" te
 .\" Copyright (C) 2008, Sun Microsystems, Inc. All Rights Reserved.
+.\" Copyright 2012 DEY Storage Systems, Inc.  All rights reserved.
 .\" Copyright 1989 AT&T
 .\" 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 CORE 4 "May 13, 2008"
+.TH CORE 4 "Oct 23, 2012"
 .SH NAME
 core \- process core file
 .SH DESCRIPTION
@@ -307,7 +308,7 @@ is defined in <\fBsys/utsname.h\fR>.
 .RS 20n
 \fBn_type\fR: \fBNT_PRCRED\fR. This structure contains the process credentials,
 including the real, saved, and effective user and group IDs. The \fBprcred_t\fR
-structure is defined in <\fBaasys/procfs.h\fR>. Following the structure is an
+structure is defined in <\fBsys/procfs.h\fR>. Following the structure is an
 optional array of supplementary group IDs. The total number of supplementary
 group IDs is given by the \fBpr_ngroups\fR member of the \fBprcred_t\fR
 structure, and the structure includes space for one supplementary group. If
@@ -330,6 +331,18 @@ with the numerical ID returned by \fBgetzoneid\fR(3C).
 .sp
 .ne 2
 .na
+\fB\fBprfdinfo_t\fR\fR
+.ad
+.RS 20n
+\fBn_type\fR: \fBNT_FDINFO\fR. This structure contains information about
+any open file descriptors, including the path, flags, and
+\fBstat\fR(2) information.  The \fBprfdinfo_t\fR structure is defined in
+<\fBsys/procfs.h\fR>.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBstruct ssd\fR array\fR
 .ad
 .RS 20n
diff --git a/usr/src/man/man7d/ipmi.7d b/usr/src/man/man7d/ipmi.7d
index 1ce5594d23..50e80253de 100644
--- a/usr/src/man/man7d/ipmi.7d
+++ b/usr/src/man/man7d/ipmi.7d
@@ -1,8 +1,25 @@
-'\" te
+'\"
+.\" CDDL HEADER START
+.\"
+.\" 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]
+.\"
+.\" CDDL HEADER END
+.\"
 .\" Copyright (c) 2012, Joyent, 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 IMPI 7D "Apr 21, 2012"
 .SH NAME
 ipmi \- OpenIPMI compatible IPMI interface driver
diff --git a/usr/src/man/man9f/inb.9f b/usr/src/man/man9f/inb.9f
index 0f4ea2df4d..61fc3c1444 100644
--- a/usr/src/man/man9f/inb.9f
+++ b/usr/src/man/man9f/inb.9f
@@ -3,7 +3,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 INB 9F "Jan 16, 2006"
+.TH INB 9F "Oct 24, 2012"
 .SH NAME
 inb, inw, inl, repinsb, repinsw, repinsd \- read from an I/O port
 .SH SYNOPSIS
@@ -49,9 +49,9 @@ inb, inw, inl, repinsb, repinsw, repinsd \- read from an I/O port
 .LP
 The functions described here are obsolete. For the \fBinb()\fR, \fBinw()\fR,
 and \fBinl()\fR functions, use, respectively, \fBddi_get8\fR(9F),
-\fBddi_get8\fR(9F), and \fBddi_get8\fR(9F) instead. For \fBrepinsb()\fR,
+\fBddi_get16\fR(9F), and \fBddi_get32\fR(9F) instead. For \fBrepinsb()\fR,
 \fBrepinsw()\fR, and\fBrepinsl()\fR, use, respectively, \fBddi_rep_get8\fR(9F),
-\fBddi_rep_get8\fR(9F), and \fBddi_rep_get8\fR(9F) instead.
+\fBddi_rep_get16\fR(9F), and \fBddi_rep_get32\fR(9F) instead.
 .SH PARAMETERS
 .sp
 .ne 2
@@ -126,9 +126,9 @@ Stability Level	 Obsolete
 .SH SEE ALSO
 .sp
 .LP
-\fBisa\fR(4), \fBattributes\fR(5), \fBddi_get8\fR(9F), \fBddi_get8\fR(9F),
-\fBddi_get8\fR(9F), \fBddi_rep_get8\fR(9F), \fBddi_rep_get8\fR(9F),
-\fBddi_rep_get8\fR(9F), \fBoutb\fR(9F)
+\fBisa\fR(4), \fBattributes\fR(5), \fBddi_get8\fR(9F), \fBddi_get16\fR(9F),
+\fBddi_get32\fR(9F), \fBddi_rep_get8\fR(9F), \fBddi_rep_get16\fR(9F),
+\fBddi_rep_get32\fR(9F), \fBoutb\fR(9F)
 .sp
 .LP
 \fIWriting Device Drivers\fR
diff --git a/usr/src/man/man9f/ldi_ev_register_callbacks.9f b/usr/src/man/man9f/ldi_ev_register_callbacks.9f
index 68dddced81..07f41c8f2f 100644
--- a/usr/src/man/man9f/ldi_ev_register_callbacks.9f
+++ b/usr/src/man/man9f/ldi_ev_register_callbacks.9f
@@ -3,7 +3,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 LDI_EV_REGISTER_CALLBACKS 9F "Aug 21, 2007"
+.TH LDI_EV_REGISTER_CALLBACKS 9F "Oct 24, 2012"
 .SH NAME
 ldi_ev_register_callbacks \- add a notify and/or finalize callback
 .SH SYNOPSIS
@@ -11,8 +11,9 @@ ldi_ev_register_callbacks \- add a notify and/or finalize callback
 .nf
 #include <sys/sunldi.h>
 
-\fBint\fR \fBldi_ev_get_cookie\fR(\fIldi_handle_t lh\fR, \fIldi_ev_cookie_t *cookie\fR,
-      \fIldi_ev_callback_t *callb\fR, \fBvoid\fR \fI*arg\fR, \fIldi_ev_callback_id_t *id\fR);
+\fBint\fR \fBldi_ev_register_callbacks\fR(\fIldi_handle_t lh\fR,
+      \fIldi_ev_cookie_t *cookie\fR, \fIldi_ev_callback_t *callb\fR,
+      \fBvoid\fR \fI*arg\fR, \fIldi_callback_id_t *id\fR);
 .fi
 
 .SH INTERFACE LEVEL
@@ -106,7 +107,7 @@ Event specific data.
 .sp
 .ne 2
 .na
-\fB\fBvoid *arg\fR\fR
+\fB\fBvoid\fR *\fIarg\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -116,7 +117,7 @@ A pointer to opaque caller private data.
 .sp
 .ne 2
 .na
-\fB\fBldi_ev_callback_id_t *id\fR\fR
+\fB\fIldi_callback_id_t *id\fR\fR
 .ad
 .sp .6
 .RS 4n
@@ -322,7 +323,7 @@ and \fBldi_ev_finalize\fR(9F)).
 .sp
 .LP
 Once the registration of the callback(s) is successful, an opaque
-\fIldi_ev_callback_id_t\fR structure is returned which may be used to
+\fIldi_callback_id_t\fR structure is returned which may be used to
 unregister the callback(s) later.
 .SH RETURN VALUES
 .sp
@@ -385,7 +386,7 @@ event_register(void)
 }
 
 static void
-event_unregister(ldi_ev_callback_id_t id)
+event_unregister(ldi_callback_id_t id)
 {
         ldi_ev_remove_callbacks(id);
 }
@@ -495,7 +496,7 @@ event_register(void)
 }
 
 static void
-event_unregister(ldi_ev_callback_id_t id)
+event_unregister(ldi_callback_id_t id)
 {
         ldi_ev_remove_callbacks(id);
 }
diff --git a/usr/src/man/man9f/ldi_ev_remove_callbacks.9f b/usr/src/man/man9f/ldi_ev_remove_callbacks.9f
index 6f32406473..2a5a1b27cf 100644
--- a/usr/src/man/man9f/ldi_ev_remove_callbacks.9f
+++ b/usr/src/man/man9f/ldi_ev_remove_callbacks.9f
@@ -3,7 +3,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 LDI_EV_REMOVE_CALLBACKS 9F "Aug 21, 2007"
+.TH LDI_EV_REMOVE_CALLBACKS 9F "Oct 24, 2012"
 .SH NAME
 ldi_ev_remove_callbacks \- remove all callbacks for a given callback ID
 .SH SYNOPSIS
@@ -11,7 +11,7 @@ ldi_ev_remove_callbacks \- remove all callbacks for a given callback ID
 .nf
 #include <sys/sunldi.h>
 
-\fBvoid\fR \fBldi_ev_remove_callbacks\fR(\fIldi_ev_callback_id_t id\fR);
+\fBvoid\fR \fBldi_ev_remove_callbacks\fR(\fIldi_callback_id_t id\fR);
 .fi
 
 .SH INTERFACE LEVEL
@@ -22,7 +22,7 @@ Solaris DDI specific (Solaris DDI)
 .sp
 .ne 2
 .na
-\fB\fIldi_ev_callback_id_t id\fR\fR
+\fB\fIldi_callback_id_t id\fR\fR
 .ad
 .sp .6
 .RS 4n
diff --git a/usr/src/man/man9f/outb.9f b/usr/src/man/man9f/outb.9f
index cacd669d30..d839c2f012 100644
--- a/usr/src/man/man9f/outb.9f
+++ b/usr/src/man/man9f/outb.9f
@@ -3,7 +3,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 OUTB 9F "Jan 16, 2006"
+.TH OUTB 9F "Oct 24, 2012"
 .SH NAME
 outb, outw, outl, repoutsb, repoutsw, repoutsd \- write to an I/O port
 .SH SYNOPSIS
@@ -45,9 +45,9 @@ outb, outw, outl, repoutsb, repoutsw, repoutsd \- write to an I/O port
 .LP
 The functions described here are obsolete. For the \fBoutb()\fR, \fBoutw()\fR,
 and \fBoutl()\fR functions use, respectively, \fBddi_put8\fR(9F),
-\fBddi_put8\fR(9F), and \fBddi_put8\fR(9F) instead. For \fBrepoutsb()\fR,
+\fBddi_put16\fR(9F), and \fBddi_put32\fR(9F) instead. For \fBrepoutsb()\fR,
 \fBrepoutsw()\fR, and\fBrepoutsl()\fR, use, respectively,
-\fBddi_rep_put8\fR(9F), \fBddi_rep_put8\fR(9F), and \fBddi_rep_put8\fR(9F)
+\fBddi_rep_put8\fR(9F), \fBddi_rep_put16\fR(9F), and \fBddi_rep_put32\fR(9F)
 instead.
 .SH PARAMETERS
 .sp
@@ -127,9 +127,9 @@ Interface Stability 	Obsolete
 .SH SEE ALSO
 .sp
 .LP
-\fBisa\fR(4), \fBattributes\fR(5), \fBddi_put8\fR(9F), \fBddi_put8\fR(9F),
-\fBddi_put8\fR(9F), \fBddi_rep_put8\fR(9F), \fBddi_rep_put8\fR(9F),
-\fBddi_rep_put8\fR(9F), \fBinb\fR(9F)
+\fBisa\fR(4), \fBattributes\fR(5), \fBddi_put8\fR(9F), \fBddi_put16\fR(9F),
+\fBddi_put32\fR(9F), \fBddi_rep_put8\fR(9F), \fBddi_rep_put16\fR(9F),
+\fBddi_rep_put32\fR(9F), \fBinb\fR(9F)
 .sp
 .LP
 \fIWriting Device Drivers\fR