18 files changed, 129 insertions, 124 deletions
diff --git a/usr/src/man/man1m/mount_nfs.1m b/usr/src/man/man1m/mount_nfs.1m
index e1ed473b4a..63ce0d4805 100644
--- a/usr/src/man/man1m/mount_nfs.1m
+++ b/usr/src/man/man1m/mount_nfs.1m
@@ -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 MOUNT_NFS 1M "Sep 8, 2015"
+.TH MOUNT_NFS 1M "Mar 13, 2016"
 .SH NAME
 mount_nfs \- mount remote NFS resources
 .SH SYNOPSIS
@@ -585,7 +585,7 @@ The server can require authenticated \fBNFS\fR requests from the client.
 .ad
 .sp .6
 .RS 4n
-If the \fBpublic\fR option is specified, or if the \fIresource\fR includes and
+If the \fBpublic\fR option is specified, or if the \fIresource\fR includes an
 \fBNFS\fR \fBURL\fR, \fBmount\fR attempts to connect to the server using the
 public file handle lookup protocol. See \fIWebNFS Client Specification\fR, RFC
 2054. If the server supports the public file handle, the attempt is successful;
diff --git a/usr/src/man/man1m/zpool.1m b/usr/src/man/man1m/zpool.1m
index 9f2db8d946..937406b314 100644
--- a/usr/src/man/man1m/zpool.1m
+++ b/usr/src/man/man1m/zpool.1m
@@ -24,7 +24,7 @@
 .\" Copyright (c) 2013 by Delphix. All rights reserved.
 .\" Copyright 2016 Nexenta Systems, Inc.
 .\"
-.Dd February 15, 2016
+.Dd March 25, 2016
 .Dt ZPOOL 1M
 .Os
 .Sh NAME
@@ -236,8 +236,8 @@ see the
 .Sx Intent Log
 section.
 .It Sy cache
-A device used to cache storage pool data. A cache device cannot be cannot be
-configured as a mirror or raidz group. For more information, see the
+A device used to cache storage pool data. A cache device cannot be configured
+as a mirror or raidz group. For more information, see the
 .Sx Cache Devices
 section.
 .El
diff --git a/usr/src/man/man3c/Makefile b/usr/src/man/man3c/Makefile
index 517fd867d0..049e767a7a 100644
--- a/usr/src/man/man3c/Makefile
+++ b/usr/src/man/man3c/Makefile
@@ -1213,6 +1213,7 @@ MANLINKS=	FD_CLR.3c				\
 	 	thr_setconcurrency.3c			\
 	 	thr_setprio.3c				\
 	 	thr_setspecific.3c			\
+		timegm.3c				\
 	 	timer_getoverrun.3c			\
 	 	timer_gettime.3c			\
 	 	timerclear.3c				\
@@ -2250,6 +2251,8 @@ thr_setspecific.3c			:= LINKSRC = thr_keycreate.3c
 
 thr_continue.3c				:= LINKSRC = thr_suspend.3c
 
+timegm.3c				:= LINKSRC = mktime.3c
+
 timer_getoverrun.3c			:= LINKSRC = timer_settime.3c
 timer_gettime.3c			:= LINKSRC = timer_settime.3c
 
diff --git a/usr/src/man/man3c/atomic_bits.3c b/usr/src/man/man3c/atomic_bits.3c
index 41edc51bfe..34ac0a78fa 100644
--- a/usr/src/man/man3c/atomic_bits.3c
+++ b/usr/src/man/man3c/atomic_bits.3c
@@ -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 ATOMIC_BITS 3C "May 13, 2005"
+.TH ATOMIC_BITS 3C "Mar 13, 2016"
 .SH NAME
 atomic_bits, atomic_set_long_excl, atomic_clear_long_excl \- atomic set and
 clear bit operations
@@ -21,7 +21,6 @@ clear bit operations
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBatomic_set_long_excl()\fR and \fBatomic_clear_long_excl()\fR functions
 perform an exclusive atomic bit set or clear operation on \fItarget\fR. The
@@ -30,17 +29,14 @@ target. Bits are numbered from zero to one less than the maximum number of bits
 in a \fBlong\fR. If the value of bit falls outside of this range, the result of
 the operation is undefined.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBatomic_set_long_excl()\fR and \fBatomic_clear_long_excl()\fR functions
 return 0 if \fIbit\fR was successfully set or cleared. They return -1 if
 \fIbit\fR was already set or cleared.
 .SH ERRORS
-.sp
 .LP
 No errors are defined.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -58,9 +54,8 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBatomic_add\fR(3C), \fBatomic_and\fR(3C), \fBatomic_cas\fR(3C),
-\fBatomic_dec\fR(3C), \fBatomic_inc\fR(3C), \fBatomic_or\fR(3C),
-\fBatomic_swap\fR(3C), \fBmembar_ops\fR(3C), \fBattributes\fR(5),
-\fBatomic_ops\fR(9F)
+\fBatomic_dec\fR(3C), \fBatomic_inc\fR(3C), \fBatomic_ops\fR(3C),
+\fBatomic_or\fR(3C), \fBatomic_swap\fR(3C), \fBmembar_ops\fR(3C),
+\fBattributes\fR(5)
diff --git a/usr/src/man/man3c/ctype.3c b/usr/src/man/man3c/ctype.3c
index 5d5435f221..f8a0cc044b 100644
--- a/usr/src/man/man3c/ctype.3c
+++ b/usr/src/man/man3c/ctype.3c
@@ -1,5 +1,6 @@
 '\" te
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
+.\" Copyright 2016 Joyent, Inc.
 .\" Copyright 1989 AT&T.  Copyright (c) 1992, X/Open Company Limited  All Rights Reserved.  Portions Copyright (c) 2005, Sun Microsystems, Inc.  All Rights Reserved.
 .\" Sun Microsystems, Inc. gratefully acknowledges The Open Group for permission to reproduce portions of its copyrighted documentation. Original documentation from The Open Group can be obtained online at
 .\" http://www.opengroup.org/bookstore/.
@@ -8,12 +9,12 @@
 .\" 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 CTYPE 3C "Jun 27, 2014"
+.TH CTYPE 3C "Mar 14, 2016"
 .SH NAME
 ctype, isalpha, isalnum, isascii, isblank, iscntrl, isdigit, islower,
 isprint, isspace, isupper, ispunct, isgraph, isxdigit, isalpha_l,
 isalnum_l, isblank_l, iscntrl_l, isdigit_l, islower_l, isprint_l,
-isspace_l, isupper_l, ispunct_l, isgraph_l \- character handling
+isspace_l, isupper_l, ispunct_l, isgraph_l isxdigit_l \- character handling
 .SH SYNOPSIS
 .LP
 .nf
@@ -113,6 +114,10 @@ isspace_l, isupper_l, ispunct_l, isgraph_l \- character handling
 .nf
 \fBint\fR \fBisupper_l\fR(\fBint\fR \fIc\fR, \fBlocale_t\fR \fIloc\fR);
 .fi
+.LP
+.nf
+\fBint\fR \fBisxdigit_l\fR(\fBint\fR \fIc\fR, \fBlocale_t\fR \fIloc\fR);
+.fi
 .SH DESCRIPTION
 .LP
 These functions classify character-coded integer values. Each is a
@@ -126,12 +131,12 @@ characters are classified according to the rules of the \fBUS-ASCII\fR
 7-bit coded character set.
 .LP
 The functions \fBisalnum_l()\fR, \fBisalpha_l()\fR, \fBisblank_l()\fR,
-\fBiscntrl_l\fR, \fBisdigit_l()\fR, \fBislower_l()\fR,
-\fBisprint_l()\fR, \fBispunct_l()\fR, \fBisspace_l()\fR,
-\fBisupper_l()\fR, all behave identically to their counterparts without
-the '\fB_l\fR' prefix, except that instead of acting on the current
-locale, that perform the test on the locale specified in the argument
-\fIloc\fR.
+\fBiscntrl_l\fR, \fBisdigit_l()\fR, \fBisgraph_l()\fr,
+\fBislower_l()\fR, \fBisprint_l()\fR, \fBispunct_l()\fR,
+\fBisspace_l()\fR, \fBisupper_l()\fR, and \fBisxdigit_l()\fR all behave
+identically to their counterparts without the '\fB_l\fR' prefix, except
+that instead of acting on the current locale, they perform the test on
+the locale specified in the argument \fIloc\fR.
 .LP
 The \fBisascii()\fR macro is defined on all integer values. The rest are
 defined only where the argument is an \fBint\fR, the value of which is
@@ -294,7 +299,6 @@ the function, the result is undefined. Otherwise, the macro or function returns
 non-zero if the classification is \fBTRUE\fR and \fB0\fR if the classification
 is \fBFALSE\fR.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .TS
diff --git a/usr/src/man/man3c/mktime.3c b/usr/src/man/man3c/mktime.3c
index 33ade2440d..e3caabf297 100644
--- a/usr/src/man/man3c/mktime.3c
+++ b/usr/src/man/man3c/mktime.3c
@@ -1,5 +1,6 @@
 '\" te
 .\" Copyright (c) 2003, Sun Microsystems, Inc.  All Rights Reserved.
+.\" Copyright 2016 Joyent, Inc.
 .\" Copyright 1989 AT&T
 .\" Portions Copyright (c) 2001, the Institute of Electrical and Electronics Engineers, Inc. and The Open Group. All Rights Reserved.
 .\" Sun Microsystems, Inc. gratefully acknowledges The Open Group for permission to reproduce portions of its copyrighted documentation. Original documentation from The Open Group can be obtained online at
@@ -9,9 +10,9 @@
 .\" 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 MKTIME 3C "Nov 1, 2003"
+.TH MKTIME 3C "Mar 14, 2016"
 .SH NAME
-mktime \- converts a tm structure to a calendar time
+mktime, timegm \- convert a tm structure to a calendar time
 .SH SYNOPSIS
 .LP
 .nf
@@ -19,9 +20,12 @@ mktime \- converts a tm structure to a calendar time
 
 \fBtime_t\fR \fBmktime\fR(\fBstruct tm *\fR\fItimeptr\fR);
 .fi
+.LP
+.nf
+\fBtime_t\fR \fBtimegm\fR(\fBstruct tm *\fR\fItimeptr\fR);
+.fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBmktime()\fR function converts the time represented by the \fBtm\fR
 structure pointed to by \fItimeptr\fR into a calendar time  (the number of
@@ -81,17 +85,22 @@ specified time.
 .LP
 Local timezone information is used as if \fBmktime()\fR had called
 \fBtzset()\fR. See \fBctime\fR(3C).
-.SH RETURN VALUES
 .sp
 .LP
-If the calendar time can be represented in an object of type \fBtime_t\fR,
-\fBmktime()\fR returns the specified calendar time without changing
-\fBerrno\fR. If the calendar time cannot be represented, the function returns
-the value (\fBtime_t\fR)\(mi1 and sets \fBerrno\fR to indicate the error.
+The \fBtimegm()\fR function is identical to the \fBmktime()\fR function,
+except that the \fBtimegm()\fR function ignores both the current time
+zone and the \fBtm_isdst\fR member and operates as though the time zone
+were set to UTC.
+.SH RETURN VALUES
+.LP
+If the calendar time can be represented in an object of type
+\fBtime_t\fR, the \fBmktime()\fR and \fBtimegm()\fR functions return the
+specified calendar time without changing \fBerrno\fR. If the calendar
+time cannot be represented, the function returns the value
+(\fBtime_t\fR)\(mi1 and sets \fBerrno\fR to indicate the error.
 .SH ERRORS
-.sp
 .LP
-The \fBmktime()\fR function will fail if:
+The \fBmktime()\fR and \fBtimegm()\fR functions will fail if:
 .sp
 .ne 2
 .na
@@ -104,22 +113,23 @@ to the standards specify a different value.
 .RE
 
 .SH USAGE
-.sp
 .LP
-The  \fBmktime()\fR function is MT-Safe in multithreaded applications, as long
-as no user-defined function directly modifies one of the following variables:
-\fBtimezone\fR, \fBaltzone\fR, \fBdaylight\fR, and \fBtzname\fR. See
-\fBctime\fR(3C).
+The \fBmktime()\fR and \fBtimegm()\fR functions are MT-Safe in
+multithreaded applications, as long as no user-defined function directly
+modifies one of the following variables: \fBtimezone\fR, \fBaltzone\fR,
+\fBdaylight\fR, and \fBtzname\fR. See \fBctime\fR(3C).
 .sp
 .LP
-Note that \(mi1 can be a valid return value for the time that is one second
-before the Epoch.  The user should clear \fBerrno\fR before calling
-\fBmktime()\fR. If \fBmktime()\fR then returns \(mi1, the user should check
-\fBerrno\fR to determine whether or not an error actually occurred.
+Note that \(mi1 can be a valid return value for the time that is one
+second before the Epoch.  The user should clear \fBerrno\fR before
+calling \fBmktime()\fR and \fBtimegm()\fR. If \fBmktime()\fR or
+\fBtimegm()\fR then returns \(mi1, the user should check \fBerrno\fR to
+determine whether or not an error actually occurred.
 .sp
 .LP
-The  \fBmktime()\fR function assumes Gregorian dates. Times before the adoption
-of the Gregorian calendar will not match historial records.
+The \fBmktime()\fR and \fBtimegm()\fR functions assume Gregorian dates.
+Times before the adoption of the Gregorian calendar will not match
+historial records.
 .SH EXAMPLES
 .LP
 \fBExample 1 \fRSample code using \fBmktime()\fR.
@@ -152,15 +162,13 @@ printf("%s\en", wday[time_str.tm_wday]);
 .in -2
 
 .SH BUGS
-.sp
 .LP
 The \fBzoneinfo\fR timezone data files do not transition past Tue Jan 19
 03:14:07 2038 UTC.  Therefore for 64-bit applications using \fBzoneinfo\fR
 timezones, calculations beyond this date may not use the correct offset from
 standard time, and could return incorrect values. This affects the 64-bit
-version of \fBmktime()\fR.
+versions of \fBmktime()\fR and \fBtimegm()\fR.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -178,7 +186,6 @@ MT-Level	MT-Safe with exceptions
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBctime\fR(3C), \fBgetenv\fR(3C), \fBTIMEZONE\fR(4), \fBattributes\fR(5),
 \fBstandards\fR(5)
diff --git a/usr/src/man/man3c/string.3c b/usr/src/man/man3c/string.3c
index 882705284d..25207eb151 100644
--- a/usr/src/man/man3c/string.3c
+++ b/usr/src/man/man3c/string.3c
@@ -13,7 +13,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 STRING 3C "Sep 14, 2015"
+.TH STRING 3C "Mar 23, 2016"
 .SH NAME
 string, strcasecmp, strcasecmp_l, strncasecmp, strncasecmp_l, strcat, strncat,
 strlcat, strchr, strchrnul, strrchr, strcmp, strncmp, stpcpy, stpncpy, strcpy,
@@ -232,11 +232,12 @@ the current locale, they instead operate in the locale specified by \fIloc\fR.
 .LP
 The \fBstrcat()\fR function appends a copy of string \fIs2\fR, including the
 terminating null character, to the end of string \fIs1\fR. The \fBstrncat()\fR
-function appends at most \fIn\fR characters. Each returns a pointer to the
-null-terminated result. The initial character of  \fIs2\fR overrides the null
-character at the end of \fIs1\fR. If copying takes place between objects that
-overlap, the behavior of \fBstrcat()\fR, \fBstrncat()\fR, and \fBstrlcat()\fR
-is undefined.
+function appends at most \fIn\fR characters of \fIs2\fR to \fIs1\fR, not
+including any terminating null character, and then appends a null character.
+Each returns a pointer to the null-terminated result. The initial character of
+\fIs2\fR overrides the null character at the end of \fIs1\fR. If copying takes
+place between objects that overlap, the behavior of \fBstrcat()\fR,
+\fBstrncat()\fR, and \fBstrlcat()\fR is undefined.
 .LP
 The \fBstrlcat()\fR function appends  at most
 (\fIdstsize\fR-\fBstrlen\fR(\fIdst\fR)-1) characters of \fIsrc\fR to \fIdst\fR
diff --git a/usr/src/man/man3c/thr_sigsetmask.3c b/usr/src/man/man3c/thr_sigsetmask.3c
index 716bb424eb..9689a5dc0e 100644
--- a/usr/src/man/man3c/thr_sigsetmask.3c
+++ b/usr/src/man/man3c/thr_sigsetmask.3c
@@ -10,7 +10,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 THR_SIGSETMASK 3C "Mar 23, 2005"
+.TH THR_SIGSETMASK 3C "Mar 13, 2016"
 .SH NAME
 thr_sigsetmask \- change or examine calling thread's signal mask
 .SH SYNOPSIS
@@ -24,7 +24,6 @@ cc -mt [ \fIflag\fR... ] \fIfile\fR... [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBthr_sigsetmask()\fR function changes or examines a calling thread's
 signal mask. Each thread has its own signal mask. A new thread inherits the
@@ -32,7 +31,7 @@ calling thread's signal mask and priority; however, pending signals are not
 inherited. Signals pending for a new thread will be empty.
 .sp
 .LP
-If the value of the argument \fIset\fR is not  \fINULL,\fR \fBset\fR points to
+If the value of the argument \fIset\fR is not  \fINULL,\fR \fIset\fR points to
 a set of signals that can modify the currently blocked set. If the value of
 \fIset\fR is \fINULL\fR, the value of \fIhow\fR is insignificant and the
 thread's signal mask is unmodified; thus, \fBthr_sigsetmask()\fR can be used to
@@ -68,7 +67,7 @@ from the current signal mask.
 .ad
 .RS 15n
 \fIset\fR corresponds to the new signal mask. The current signal mask is
-replaced by \fBset\fR.
+replaced by \fIset\fR.
 .RE
 
 .sp
@@ -76,12 +75,10 @@ replaced by \fBset\fR.
 If the value of \fIoset\fR is not \fINULL\fR, it points to the location where
 the previous signal mask is stored.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, the \fBthr_sigsetmask()\fR function returns
 \fB0\fR. Otherwise, it returns a non-zero value.
 .SH ERRORS
-.sp
 .LP
 The \fBthr_sigsetmask()\fR function will fail if:
 .sp
@@ -290,7 +287,6 @@ thread can be used by passing the argument \fBTHR_DAEMON\fR to
 \fBthr_create()\fR.
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -306,7 +302,6 @@ MT-Level	MT-Safe and Async-Signal-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsigaction\fR(2), \fBsigprocmask\fR(2), \fBsigwait\fR(2),
 \fBcond_wait\fR(3C), \fBpthread_cancel\fR(3C), \fBpthread_create\fR(3C),
@@ -314,7 +309,6 @@ MT-Level	MT-Safe and Async-Signal-Safe
 \fBsigemptyset\fR(3C), \fBsigsetops\fR(3C), \fBsleep\fR(3C),
 \fBattributes\fR(5), \fBcancellation\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 It is not possible to block signals that cannot be caught or ignored (see
 \fBsigaction\fR(2)). It is also not possible to block or unblock
@@ -334,7 +328,7 @@ blocks waiting for signals, the blocking thread cannot receive a synchronously
 generated signal.
 .sp
 .LP
-Calling the\fBsigprocmask\fR(2) function will be the same as if
+Calling the \fBsigprocmask\fR(2) function will be the same as if
 \fBthr_sigsetmask()\fR or \fBpthread_sigmask()\fR has been called. POSIX leaves
 the semantics of the call to \fBsigprocmask\fR(2) unspecified in a
 multi-threaded process, so programs that care about POSIX portability should
diff --git a/usr/src/man/man3lib/libnvpair.3lib b/usr/src/man/man3lib/libnvpair.3lib
index 947fbf6b48..0279ba94a2 100644
--- a/usr/src/man/man3lib/libnvpair.3lib
+++ b/usr/src/man/man3lib/libnvpair.3lib
@@ -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 LIBNVPAIR 3LIB "Aug 1, 2008"
+.TH LIBNVPAIR 3LIB "Mar 13, 2016"
 .SH NAME
 libnvpair \- name-value pair library
 .SH SYNOPSIS
@@ -14,7 +14,6 @@ cc [ \fIflag\fR... ] \fIfile\fR... \fB-lnvpair\fR [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBlibnvpair\fR library exports a set of functions for managing name-value
 pairs.
@@ -97,7 +96,6 @@ Pack an \fBnvlist_t\fR into a contiguous buffer.
 Expand a packed nvlist into a searchable \fBnvlist_t\fR.
 .RE
 .SH INTERFACES
-.sp
 .LP
 The shared object \fBlibnvpair.so.1\fR provides the public interfaces defined
 below. See \fBIntro\fR(3) for additional information on shared object
@@ -122,7 +120,8 @@ l l .
 \fBnvlist_add_uint16_array\fR	\fBnvlist_add_uint32\fR
 \fBnvlist_add_uint32_array\fR	\fBnvlist_add_uint64\fR
 \fBnvlist_add_uint64_array\fR	\fBnvlist_alloc\fR
-\fBnvlist_dup\fR	\fBnvlist_exists\fR
+\fBnvlist_dup\fR	\fBnvpair_empty\fR
+\fBnvlist_exists\fR
 \fBnvlist_free\fR	\fBnvlist_lookup_boolean\fR
 \fBnvlist_lookup_boolean_value\fR	\fBnvlist_lookup_boolean_array\fR
 \fBnvlist_lookup_byte\fR	\fBnvlist_lookup_byte_array\fR
@@ -162,7 +161,6 @@ l l .
 .TE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/lib/libnvpair.so.1\fR\fR
@@ -181,7 +179,6 @@ shared object
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for description of the following attributes:
 .sp
@@ -199,6 +196,5 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBIntro\fR(3), \fBattributes\fR(5)
diff --git a/usr/src/man/man3nvpair/Makefile b/usr/src/man/man3nvpair/Makefile
index 3cdd21e34d..9366fcc54b 100644
--- a/usr/src/man/man3nvpair/Makefile
+++ b/usr/src/man/man3nvpair/Makefile
@@ -56,6 +56,7 @@ MANLINKS=	nv_alloc_fini.3nvpair			\
 		nvlist_add_uint8.3nvpair		\
 		nvlist_add_uint8_array.3nvpair		\
 		nvlist_dup.3nvpair			\
+		nvlist_empty.3nvpair			\
 		nvlist_exists.3nvpair			\
 		nvlist_free.3nvpair			\
 		nvlist_lookup_boolean_array.3nvpair	\
@@ -190,6 +191,7 @@ nvlist_lookup_uint64_array.3nvpair	:= LINKSRC = nvlist_lookup_boolean.3nvpair
 nvlist_lookup_uint8.3nvpair		:= LINKSRC = nvlist_lookup_boolean.3nvpair
 nvlist_lookup_uint8_array.3nvpair	:= LINKSRC = nvlist_lookup_boolean.3nvpair
 
+nvlist_empty.3nvpair			:= LINKSRC = nvlist_lookup_nvpair.3nvpair
 nvlist_exists.3nvpair			:= LINKSRC = nvlist_lookup_nvpair.3nvpair
 
 nvpair_name.3nvpair			:= LINKSRC = nvlist_next_nvpair.3nvpair
diff --git a/usr/src/man/man3nvpair/nvlist_lookup_nvpair.3nvpair b/usr/src/man/man3nvpair/nvlist_lookup_nvpair.3nvpair
index f83435a51c..05799bf2a2 100644
--- a/usr/src/man/man3nvpair/nvlist_lookup_nvpair.3nvpair
+++ b/usr/src/man/man3nvpair/nvlist_lookup_nvpair.3nvpair
@@ -1,11 +1,12 @@
 '\" te
 .\" Copyright (c) 2007, Sun Microsystems Inc. All Rights Reserved.
+.\" Copyright 2016 Joyent, Inc.
 .\" 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 NVLIST_LOOKUP_NVPAIR 3NVPAIR "Oct 24, 2007"
+.TH NVLIST_LOOKUP_NVPAIR 3NVPAIR "Mar 13, 2016"
 .SH NAME
-nvlist_lookup_nvpair, nvlist_exists \- lookup named pairs
+nvlist_lookup_nvpair, nvlist_exists, nvlist_empty \- lookup named pairs
 .SH SYNOPSIS
 .LP
 .nf
@@ -21,8 +22,12 @@ nvlist_lookup_nvpair, nvlist_exists \- lookup named pairs
 \fBboolean_t\fR \fBnvlist_exists\fR(\fBnvlist_t *\fR\fInvl\fR, \fBconst char *\fR\fIname\fR);
 .fi
 
+.LP
+.nf
+\fBboolean_t\fR \fBnvlist_empty\fR(\fBnvlist_t *\fR\fInvl\fR);
+.fi
+
 .SH DESCRIPTION
-.sp
 .LP
 The \fBnvlist_lookup_nvpair()\fR function returns the nvpair with the matching
 name, regardless of type. It is valid only for lists allocated with
@@ -31,18 +36,24 @@ name, regardless of type. It is valid only for lists allocated with
 .LP
 The \fBnvlist_exists()\fR function returns success if any nvpair exists with
 the given name. It is valid for all types of lists.
-.SH RETURN VALUES
 .sp
 .LP
+The \fBnvlist_empty()\fR function returns success if the list \fInvl\fR
+contains no nvpairs. It is valid for all types of lists.
+.SH RETURN VALUES
+.LP
 The \fBnvlist_lookup_nvpair()\fR function returns 0 on success and an error
 value on failure.
 .sp
 .LP
 The \fBnvlist_exists()\fR function returns \fBB_TRUE\fR if an nvpair with the
 given name exists and \fBB_FALSE\fR otherwise.
-.SH ERRORS
 .sp
 .LP
+The \fBnvlist_empty()\fR function returns \fBB_TRUE\fR if the given
+list, \fInvl\fR, contains no nvpairs and \fBB_FALSE\fR otherwise.
+.SH ERRORS
+.LP
 The \fBnvlist_lookup_nvpair()\fR function will fail if:
 .sp
 .ne 2
@@ -72,7 +83,6 @@ The list was not allocated with \fBNV_UNIQUE_NAME\fR.
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -90,7 +100,6 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBlibnvpair\fR(3LIB), \fBnvlist_alloc\fR(3NVPAIR), \fBattributes\fR(5),
 \fBnvlist_lookup_nvpair\fR(9F)
diff --git a/usr/src/man/man5/mdoc.5 b/usr/src/man/man5/mdoc.5
index a981edd5ff..5be6dfb4a8 100644
--- a/usr/src/man/man5/mdoc.5
+++ b/usr/src/man/man5/mdoc.5
@@ -19,7 +19,7 @@
 .\" Copyright 2014 Garrett D'Amore <garrett@dmaore.org>
 .\" Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 .\"
-.Dd Oct 18, 2015
+.Dd Mar 13, 2016
 .Dt MDOC 5
 .Os
 .Sh NAME
@@ -487,11 +487,11 @@ Indicates that the library is safe for use within a signal handler.  An
 interface can be made
 .Nm Async-Signal-Safe
 by ensuring that it blocks signals when acquiring locks.
-.It Nm Safe with Exections
+.It Nm Safe with Exceptions
 As for
 .Nm Safe
 but with specific exceptions noted.
-.It Nm MT-Safe with Exections
+.It Nm MT-Safe with Exceptions
 As for
 .Nm MT-Safe
 but with specific exceptions noted.
diff --git a/usr/src/man/man9e/tran_setup_pkt.9e b/usr/src/man/man9e/tran_setup_pkt.9e
index c839c1624c..04628358e2 100644
--- a/usr/src/man/man9e/tran_setup_pkt.9e
+++ b/usr/src/man/man9e/tran_setup_pkt.9e
@@ -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 TRAN_SETUP_PKT 9E "Jan 29, 2009"
+.TH TRAN_SETUP_PKT 9E "Mar 13, 2016"
 .SH NAME
 tran_setup_pkt, tran_teardown_pkt, tran_pkt_constructor, tran_pkt_destructor \-
 SCSI HBA packet allocation and deallocation
@@ -12,7 +12,7 @@ SCSI HBA packet allocation and deallocation
 .nf
 #include <sys/scsi/scsi.h>
 
-\fBstruct scsi_pkt *\fR\fBprefix_tran_setup_pkt\fR(\fBstruct scsi_pkt *\fR\fIpkt\fR,
+\fBint \fR\fBprefix_tran_setup_pkt\fR(\fBstruct scsi_pkt *\fR\fIpkt\fR,
      \fBint (*\fR\fIcallback\fR) (\fIcaddr_t\fR), \fBcaddr_t\fR \fIarg\fR);
 .fi
 
@@ -34,11 +34,9 @@ SCSI HBA packet allocation and deallocation
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris architecture specific (Solaris DDI).
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIpkt\fR\fR
@@ -84,7 +82,6 @@ Either \fBKM_SLEEP\fR or \fBKM_NOSLEEP\fR.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBtran_setup_pkt()\fR and \fBtran_destroy_pkt()\fR vectors in the
 \fBscsi_hba_tran\fR(9S) structure are alternatives to the \fBtran_init_pkt()\fR
@@ -92,7 +89,6 @@ and \fBtran_destroy_pkt()\fR entry points. They are initialized during the
 \fBHBA\fR driver's \fBattach\fR(9E) and they are used when a target driver
 calls \fBscsi_init_pkt\fR(9F) and \fBscsi_destroy_pkt\fR(9F).
 .SS "tran_setup_pkt(\|)"
-.sp
 .LP
 The \fBtran_setup_pkt()\fR vector is the entry point into the \fBHBA\fR which
 is used to initialize \fBHBA\fR specific information in a \fBscsi_pkt\fR
@@ -119,8 +115,8 @@ pointed to by \fBpkt_private\fR, allocated on behalf of the SCSI target driver.
 The \fBpkt_scblen\fR field contains the length of the SCSI status completion
 block pointed to by \fBpkt_scbp\fR. If the status length is greater than or
 equal to sizeof (\fBstruct\fR \fBscsi_arq_status\fR) and the
-\fBauto_rqsensecapability\fR has been set, automatic request sense (\fBARS\fR)
-is enabled for this packet. If the status \fBlengthislessthansizeof\fR
+\fBauto-rqsense\fR capability has been set, automatic request sense (\fBARS\fR)
+is enabled for this packet. If the status length is less than \fBsizeof\fR
 (\fBstruct\fR \fBscsi_arq_status\fR), automatic request sense should be
 disabled for this pkt if the \fBHBA\fR driver is capable of disabling \fBARQ\fR
 on a per-packet basis.
@@ -138,7 +134,7 @@ when resources are not available:
 \fB\fBNULL_FUNC\fR\fR
 .ad
 .RS 14n
-Do not wait for resources. Return a \fINULL\fR pointer.
+Do not wait for resources. Return \fB-1\fR when resources are not available.
 .RE
 
 .sp
@@ -151,13 +147,11 @@ Wait indefinitely for resources.
 .RE
 
 .SS "tran_teardown_pkt(\|)"
-.sp
 .LP
 The \fBtran_teardown_pkt()\fR is the entry point into the \fBHBA\fR that must
 free all of the resources that were allocated to the \fBscsi_pkt\fR(9S)
 structure during \fBtran_setup_pkt()\fR.
 .SS "tran_pkt_constructor(\|) tran_pkt_destructor(\|)"
-.sp
 .LP
 When using \fBtran_pkt_setup()\fR and \fBtran_pkt_teardown()\fR,
 \fBtran_pkt_constructor()\fR and \fBtran_pkt_destructor()\fR are additional
@@ -225,11 +219,9 @@ HBA drivers that implement \fBtran_setup_pkt()\fR must signal
 use of  the \fBscsi_pkt\fR \fIpkt_comp\fR field is not permitted and results in
 undefined behavior.
 .SH RETURN VALUES
-.sp
 .LP
 \fBtran_setup_pkt()\fR must return zero on success, and \fB-1\fR on failure.
 .SH SEE ALSO
-.sp
 .LP
 \fBattach\fR(9E), \fBtran_sync_pkt\fR(9E), \fBbioerror\fR(9F),
 \fBddi_dma_buf_bind_handle\fR(9F), \fBkmem_cache_create\fR(9F),
diff --git a/usr/src/man/man9e/tran_tgt_init.9e b/usr/src/man/man9e/tran_tgt_init.9e
index 0100cd0f3e..12c358785c 100644
--- a/usr/src/man/man9e/tran_tgt_init.9e
+++ b/usr/src/man/man9e/tran_tgt_init.9e
@@ -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 TRAN_TGT_INIT 9E "Nov 1, 1993"
+.TH TRAN_TGT_INIT 9E "Mar 13, 2016"
 .SH NAME
 tran_tgt_init \- request to initialize HBA resources on behalf of a particular
 target
@@ -14,16 +14,14 @@ target
 
 
 
-\fBvoid prefix\fR\fBtran_tgt_init\fR(\fBdev_info_t *\fR\fIhba_dip\fR, \fBdev_info_t *\fR\fItgt_dip\fR,
+\fBint prefix\fR\fBtran_tgt_init\fR(\fBdev_info_t *\fR\fIhba_dip\fR, \fBdev_info_t *\fR\fItgt_dip\fR,
      \fBscsi_hba_tran_t *\fR\fIhba_tran\fR, \fBstruct scsi_device *\fR\fIsd\fR);
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris architecture specific (Solaris DDI).
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIhba_dip\fR \fR
@@ -63,7 +61,6 @@ Pointer to a  \fBscsi_device\fR(9S) structure, describing the target.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBtran_tgt_init()\fR vector in the \fBscsi_hba_tran\fR(9S) structure may
 be initialized during the \fBHBA\fR driver's \fBattach\fR(9E) to point to an
@@ -84,7 +81,6 @@ initialize the \fItran_tgt_private\fR field in the structure pointed to by
 \fIhba_tran\fR, to point to the data specific to the particular target device
 instance.
 .SH RETURN VALUES
-.sp
 .LP
 \fBtran_tgt_init()\fR must return:
 .sp
@@ -110,7 +106,6 @@ instance of the target device will not be continued, the target driver's
 .RE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBattach\fR(9E), \fBprobe\fR(9E), \fBtran_tgt_free\fR(9E),
 \fBtran_tgt_probe\fR(9E), \fBscsi_hba_attach_setup\fR(9F),
diff --git a/usr/src/man/man9f/Makefile b/usr/src/man/man9f/Makefile
index 9c45ac55f6..066f5373f6 100644
--- a/usr/src/man/man9f/Makefile
+++ b/usr/src/man/man9f/Makefile
@@ -13,7 +13,7 @@
 # Copyright 2011, Richard Lowe
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore>
-# Copyright (c) 2015 Joyent, Inc.  All rights reserved.
+# Copyright 2016 Joyent, Inc.
 #
 
 include		$(SRC)/Makefile.master
@@ -643,6 +643,7 @@ MANLINKS=	SIZEOF_PTR.9f				\
 		avl_last.9f				\
 		avl_nearest.9f				\
 		avl_numnodes.9f				\
+		avl_remove.9f				\
 		avl_swap.9f				\
 		AVL_NEXT.9f				\
 		AVL_PREV.9f				\
@@ -1132,6 +1133,7 @@ MANLINKS=	SIZEOF_PTR.9f				\
 	 	sema_tryp.9f				\
 	 	sema_v.9f				\
 	 	strcasecmp.9f				\
+	 	strcat.9f				\
 	 	strchr.9f				\
 	 	strcmp.9f				\
 	 	strcpy.9f				\
@@ -1333,6 +1335,7 @@ avl_is_empty.9f				:= LINKSRC = avl.9f
 avl_last.9f				:= LINKSRC = avl.9f
 avl_nearest.9f				:= LINKSRC = avl.9f
 avl_numnodes.9f				:= LINKSRC = avl.9f
+avl_remove.9f				:= LINKSRC = avl.9f
 avl_swap.9f				:= LINKSRC = avl.9f
 AVL_NEXT.9f				:= LINKSRC = avl.9f
 AVL_PREV.9f				:= LINKSRC = avl.9f
@@ -1951,6 +1954,7 @@ numtos.9f				:= LINKSRC = stoi.9f
 
 ddi_strdup.9f				:= LINKSRC = string.9f
 strcasecmp.9f				:= LINKSRC = string.9f
+strcat.9f				:= LINKSRC = string.9f
 strchr.9f				:= LINKSRC = string.9f
 strcmp.9f				:= LINKSRC = string.9f
 strcpy.9f				:= LINKSRC = string.9f
diff --git a/usr/src/man/man9f/avl.9f b/usr/src/man/man9f/avl.9f
index f1166ccdf4..4e7f594730 100644
--- a/usr/src/man/man9f/avl.9f
+++ b/usr/src/man/man9f/avl.9f
@@ -9,9 +9,9 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright 2015 Joyent, Inc.
+.\" Copyright 2016 Joyent, Inc.
 .\"
-.Dd May 08, 2015
+.Dd Mar 13, 2016
 .Dt AVL 9F
 .Os
 .Sh NAME
@@ -28,6 +28,7 @@
 .Nm avl_last ,
 .Nm avl_nearest ,
 .Nm avl_numnodes ,
+.Nm avl_remove ,
 .Nm avl_swap ,
 .Nm AVL_NEXT ,
 .Nm AVL_PREV ,
@@ -81,6 +82,7 @@ for more information on synchronization primitives.
 .Xr AVL_NEXT 3AVL ,
 .Xr avl_numnodes 3AVL ,
 .Xr AVL_PREV 3AVL ,
+.Xr avl_remove 3AVL ,
 .Xr avl_swap 3AVL ,
 .Xr libavl 3LIB
 .Rs
diff --git a/usr/src/man/man9f/ddi_fm_service_impact.9f b/usr/src/man/man9f/ddi_fm_service_impact.9f
index 0a985b2992..f7ac58fb2d 100644
--- a/usr/src/man/man9f/ddi_fm_service_impact.9f
+++ b/usr/src/man/man9f/ddi_fm_service_impact.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 DDI_FM_SERVICE_IMPACT 9F "May 14, 2007"
+.TH DDI_FM_SERVICE_IMPACT 9F "Mar 13, 2016"
 .SH NAME
 ddi_fm_service_impact \- report the impact of an error
 .SH SYNOPSIS
@@ -11,15 +11,13 @@ ddi_fm_service_impact \- report the impact of an error
 .nf
 #include <sys/ddifm.h>
 
-\fBvoid\fR \fBddi_fm_service_impact\fR(\fBdev_info_t\fR *\fIdip\fR, \fBint\fR *\fIimpact\fR);
+\fBvoid\fR \fBddi_fm_service_impact\fR(\fBdev_info_t\fR *\fIdip\fR, \fBint\fR \fIimpact\fR);
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI)
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIdip\fR\fR
@@ -38,7 +36,6 @@ Impact of error
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 The following service impact values are accepted by
 \fBddi_fm_service_impact()\fR:
@@ -88,12 +85,10 @@ The service provided by the device was unaffected by the error.
 .RE
 
 .SH CONTEXT
-.sp
 .LP
 The \fBddi_fm_service_impact()\fR function can be called from user, kernel, or
 high-level interrupt context.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -109,7 +104,6 @@ Interface Stability	Committed
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBfmd\fR(1M), \fBattributes\fR(5), \fBddi_fm_ereport_post\fR(9F),
 \fBpci_ereport_post\fR(9F)
diff --git a/usr/src/man/man9f/string.9f b/usr/src/man/man9f/string.9f
index fccd40887b..49d6e957c7 100644
--- a/usr/src/man/man9f/string.9f
+++ b/usr/src/man/man9f/string.9f
@@ -3,11 +3,11 @@
 .\" 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 STRING 9F "Sep 14, 2015"
+.TH STRING 9F "Mar 14, 2016"
 .SH NAME
-string, strcasecmp, strncasecmp, strncat, strlcat, strchr, strrchr, strcmp,
-strncmp, strcpy, strncpy, strlcpy, strfree, strspn, strdup, ddi_strdup, strlen,
-strnlen \- string operations
+string, strcasecmp, strncasecmp, strcat, strncat, strlcat, strchr,
+strrchr, strcmp, strncmp, strcpy, strncpy, strlcpy, strfree, strspn,
+strdup, ddi_strdup, strlen, strnlen \- string operations
 .SH SYNOPSIS
 .LP
 .nf
@@ -24,6 +24,11 @@ strnlen \- string operations
 
 .LP
 .nf
+\fBchar *\fR\fBstrcat\fR(\fBchar *\fR \fIs1\fR, \fBconst char *\fR \fIs2\fR);
+.fi
+
+.LP
+.nf
 \fBchar *\fR\fBstrncat\fR(\fBchar *\fR \fIs1\fR, \fBconst char *\fR \fIs2\fR, \fBsize_t\fR \fIn\fR);
 .fi
 
@@ -114,14 +119,16 @@ The \fBstrcasecmp()\fR and \fBstrncasecmp()\fR functions are case-insensitive
 versions of  \fBstrcmp()\fR and \fBstrncmp()\fR respectively, described below.
 They assume the \fBASCII\fR character set and ignore differences in case when
 comparing lower and upper case characters.
-.SS "\fBstrncat()\fR, \fBstrlcat()\fR"
-.LP
-The \fBstrncat()\fR function appends at most \fIn\fR characters of string
-\fIs2\fR, including the terminating null character, to the end of string
-\fIs1\fR. It returns a pointer to the null-terminated result. The initial
-character of  \fIs2\fR overrides the null character at the end of \fIs1\fR. If
-copying takes place between objects that overlap, the behavior of
-\fBstrncat()\fRand \fBstrlcat()\fR is undefined.
+.SS "\fBstrcat()\fR, \fBstrncat()\fR, and \fBstrlcat()\fR"
+.LP
+The \fBstrcat()\fR function appends a copy of string \fIs2\fR, including the
+terminating null character, to the end of string \fIs1\fR. The \fBstrncat()\fR
+function appends at most \fIn\fR characters of \fIs2\fR to \fIs1\fR, not
+including any terminating null character, and then appends a null character.
+Each returns a pointer to the null-terminated result. The initial character of
+\fIs2\fR overrides the null character at the end of \fIs1\fR. If copying takes
+place between objects that overlap, the behavior of \fBstrcat()\fR,
+\fBstrncat()\fR, and \fBstrlcat()\fR is undefined.
 .sp
 .LP
 The \fBstrlcat()\fR function appends  at most