[illumos-gate merge]

commit bf773d37f3253ade20599b1f3df2732d1b2ae424
    6272 vnics/etherstubs missing initial link state
commit 55a4551ddde8feed8f8e011458f992ea74257bd9
    6225 NFSv4: setlock() can spin forever
commit 13a2dec4170017ee9fca1138eb29a04bc5c2f49e
    5726 Intro(4) should allow configurations as well
commit 632802744ef6d17e06d6980a95f631615c3b060f
    6281 prefetching should apply to 1MB reads
commit 7205e712fa5af984664437dc9b614c6101f15817
    6282 ONBLD man pages not pbchk clean
commit 44b359c66ee1fc7d3ff451ed5221ba1235e28f78
    4176 tolower(3c) refers to nonexistent _tolower(3c)
commit d7d9a6d919f92d74ea0510a53f8441396048e800
    5219 l2arc_write_buffers() may write beyond target_sz

2 files changed, 16 insertions, 6 deletions

diff --git a/usr/src/man/man3c/tolower.3c b/usr/src/man/man3c/tolower.3c
index 2a06d7bbfa..6a682b9b69 100644
--- a/usr/src/man/man3c/tolower.3c
+++ b/usr/src/man/man3c/tolower.3c
@@ -4,7 +4,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 TOLOWER 3C "Jun 21, 2014"
+.TH TOLOWER 3C "Oct 4, 2015"
 .SH NAME
 tolower, tolower_l \- transliterate upper-case characters to lower-case
 .SH SYNOPSIS
@@ -21,7 +21,7 @@ tolower, tolower_l \- transliterate upper-case characters to lower-case
 
 .SH DESCRIPTION
 .LP
-The \fBtolower()\fR function has as a domain a type \fBint\fR, the value of
+The \fBtolower()\fR function has as a domain of type \fBint\fR, the value of
 which is representable as an \fBunsigned char\fR or the value of \fBEOF\fR. If
 the argument has any other value, the argument is returned unchanged. If the
 argument of \fBtolower()\fR represents an upper-case letter, and there exists a
@@ -33,6 +33,11 @@ unchanged.
 The function \fBtolower_l()\fR behaves identically to \fBtolower()\fR, except
 instead of operating in the current locale, it operates in the locale
 specified by \fIloc\fR.
+.LP
+A macro form, \fB_tolower()\fR exists. It is defined for standards
+conformance, particularly with legacy standards. It was deprecated in
+POSIX 2008 (Issue 7), and its use is discouraged. The macro, on this
+system, is just an alias for \fBtolower()\fR.
 .SH RETURN VALUES
 .LP
 On successful completion, \fBtolower()\fR returns the lower-case letter
@@ -59,5 +64,5 @@ MT-Level	MT-Safe
 
 .SH SEE ALSO
 .LP
-\fB_tolower\fR(3C), \fBnewlocale\fR(3C), \fBsetlocale\fR(3C),
+\fBnewlocale\fR(3C), \fBsetlocale\fR(3C),
 \fBuselocale\fR(3C), \fBattributes\fR(5), \fBstandards\fR(5)
diff --git a/usr/src/man/man3c/toupper.3c b/usr/src/man/man3c/toupper.3c
index 3885d28925..daae48b4bf 100644
--- a/usr/src/man/man3c/toupper.3c
+++ b/usr/src/man/man3c/toupper.3c
@@ -4,7 +4,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 TOUPPER 3C "Jun 21, 2014"
+.TH TOUPPER 3C "Oct 4, 2015"
 .SH NAME
 toupper, toupper_l \- transliterate lower-case characters to upper-case
 .SH SYNOPSIS
@@ -21,7 +21,7 @@ toupper, toupper_l \- transliterate lower-case characters to upper-case
 
 .SH DESCRIPTION
 .LP
-The \fBtoupper()\fR function has as a domain a type \fBint\fR, the value of
+The \fBtoupper()\fR function has as a domain of type \fBint\fR, the value of
 which is representable as an \fBunsigned char\fR or the value of \fBEOF\fR. If
 the argument has any other value, the argument is returned unchanged. If the
 argument of \fBtoupper()\fR represents a lower-case letter, and there exists a
@@ -32,6 +32,11 @@ upper-case letter. All other arguments in the domain are returned unchanged.
 The function \fBtoupper_l()\fR behaves identically to \fBtoupper()\fR, except
 instead of operating in the current locale, it operates in the locale
 specified by \fIloc\fR.
+.LP
+A macro form, \fB_toupper()\fR exists. It is defined for standards
+conformance, particularly with legacy standards. It was deprecated in
+POSIX 2008 (Issue 7), and its use is discouraged. The macro, on this
+system, is just an alias for \fBtoupper()\fR.
 .SH RETURN VALUES
 .LP
 On successful completion, \fBtoupper()\fR returns the upper-case letter
@@ -57,6 +62,6 @@ MT-Level	MT-Safe
 
 .SH SEE ALSO
 .LP
-\fB_toupper\fR(3C), \fBnewlocale\fR(3C), \fBsetlocale\fR(3C),
+\fBnewlocale\fR(3C), \fBsetlocale\fR(3C),
 \fBuselocale\fR(3C),
 \fBattributes\fR(5), \fBstandards\fR(5)