[illumos-gate merge]20151001release-20151001

commit adb26135f9399e574196b45d6ab3ba1bb470e60f
    4648 detach(9e): Extra space between 'prefix' and 'detach'
commit bcfd4cacb8887a687a4dd27cbaeec75e65f0e9de
    5663 sysinfo(2): Missing spaces in the man page
commit 118975ce0091e85fa58568a5700555eec6330843
    5678 mutex_init(3C): Extra space in man page
commit ba647289fedd78140d3b8288576aeb23fcf57043
    5706 dldump(3c)/dlopen(3c): Extra spaces in the man page
commit 9a91647e0ac8a8e02f9e9d8345e751e0c02c0b19
    6050 kstat_create(9f) should document KSTAT_TYPE_RAW and KSTAT_TYPE_TIMER
commit e057ac923deda9b3a28f8ec5b927ccf0a9479ba9
    6097 ks_snapshot(9e): Typo in the man page
commit c4921527904c6350c4ac33b0f936c4920cb38d39
    5036 taskq(9f): Typos in the man page
commit cebfa3c2fea024bb483d40f6d0cacd3298540cab
    5657 Typo in rpcbind(3nsl): ssvcaddr
commit cf6fe0ff9e996915d750fb1fc98477c23e9c5e1d
    4514 k5srvutil(1m): The default keytab file is /etc/krb5/krb5.keytab
commit 20110e4e4d2d67b7e7c7309d1733ee00a499c491
    5730 Typos in rpc_clnt_create(3nsl) man page
commit 395c7a3dcfc66b8b671dc4b3c4a2f0ca26449922
    6266 harden dtrace_difo_chunksize() with respect to malicious DIF
commit 6a9ca708361200b105f7a016216808e6058d17cb
    6263 add missing cc clobbers to intel atomic inlines

2 files changed, 25 insertions, 19 deletions

diff --git a/usr/src/man/man9f/kstat_create.9f b/usr/src/man/man9f/kstat_create.9f
index 2f6cd3e878..322b8d9d88 100644
--- a/usr/src/man/man9f/kstat_create.9f
+++ b/usr/src/man/man9f/kstat_create.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 KSTAT_CREATE 9F "Nov 13, 2006"
+.TH KSTAT_CREATE 9F "Sep 7, 2015"
 .SH NAME
 kstat_create \- create and initialize a new kstat
 .SH SYNOPSIS
@@ -20,11 +20,9 @@ kstat_create \- create and initialize a new kstat
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI)
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIks_module\fR\fR
@@ -75,10 +73,19 @@ The type of \fBkstat\fR to allocate. Valid types are:
 .sp
 .ne 2
 .na
+\fB\fBKSTAT_TYPE_RAW\fR\fR
+.ad
+.RS 20n
+Raw data; allows more than one data record per \fBkstat\fR.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBKSTAT_TYPE_NAMED\fR\fR
 .ad
 .RS 20n
-Allows more than one data record per \fBkstat\fR.
+Name=value pairs; allows more than one data record per \fBkstat\fR.
 .RE
 
 .sp
@@ -96,7 +103,16 @@ Interrupt; only one data record per \fBkstat\fR.
 \fB\fBKSTAT_TYPE_IO\fR\fR
 .ad
 .RS 20n
-\fBI/O\fR; only one data record per \fBkstat\fR
+\fBI/O\fR; only one data record per \fBkstat\fR.
+.RE
+
+.sp
+.ne 2
+.na
+\fB\fBKSTAT_TYPE_TIMER\fR\fR
+.ad
+.RS 20n
+Event timer statistics; allows more than one data record per \fBkstat\fR.
 .RE
 
 .RE
@@ -157,7 +173,6 @@ goes away.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 \fBkstat_create()\fR is used in conjunction with \fBkstat_install\fR(9F) to
 allocate and initialize a \fBkstat\fR(9S) structure. The method is generally as
@@ -183,12 +198,10 @@ have the \fBks_data\fR field set at this time. The provider may also set the
 Once the \fBkstat\fR is completely initialized, \fBkstat_install\fR(9F) is used
 to make the \fBkstat\fR accessible to the outside world.
 .SH RETURN VALUES
-.sp
 .LP
 If successful, \fBkstat_create()\fR returns a pointer to the allocated
 \fBkstat\fR. \fINULL\fR is returned upon failure.
 .SH CONTEXT
-.sp
 .LP
 \fBkstat_create()\fR can be called from user or kernel context.
 .SH EXAMPLES
@@ -207,7 +220,6 @@ pkstat_t   *ksp;
 .in -2
 
 .SH SEE ALSO
-.sp
 .LP
 \fBkstat\fR(3KSTAT), \fBddi_get_instance\fR(9F), \fBkstat_delete\fR(9F),
 \fBkstat_install\fR(9F), \fBkstat_named_init\fR(9F), \fBkstat\fR(9S),
diff --git a/usr/src/man/man9f/taskq.9f b/usr/src/man/man9f/taskq.9f
index 1426fb491e..b6017e75a6 100644
--- a/usr/src/man/man9f/taskq.9f
+++ b/usr/src/man/man9f/taskq.9f
@@ -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 TASKQ 9F "Mar 1, 2005"
+.TH TASKQ 9F "Jul 25, 2015"
 .SH NAME
 taskq, ddi_taskq_create, ddi_taskq_destroy, ddi_taskq_dispatch, ddi_taskq_wait,
 ddi_taskq_suspend, taskq_suspended, ddi_taskq_resume \- Kernel task queue
@@ -50,11 +50,9 @@ operations
 .fi
 
 .SH INTERFACE LEVEL
-.sp
 .LP
 Solaris DDI specific (Solaris DDI)
 .SH PARAMETERS
-.sp
 .ne 2
 .na
 \fB\fIdip\fR\fR
@@ -168,7 +166,6 @@ Pointer to a thread structure.
 .RE
 
 .SH DESCRIPTION
-.sp
 .LP
 A kernel task queue is a mechanism for general-purpose asynchronous task
 scheduling that enables tasks to be performed at a later time by another
@@ -187,7 +184,7 @@ You have a task that may require grabbing locks that a thread already holds.
 .RS +4
 .TP
 3.
-You have a task that needs to block (for example, to wait for memory), but a
+You have a task that needs to block (for example, to wait for memory), but you
 have a thread that cannot block in its current context.
 .RE
 .RS +4
@@ -208,9 +205,8 @@ A task queue consists of a list of tasks, together with one or more threads to
 service the list. If a task queue has a single service thread, all tasks are
 guaranteed to execute in the order they were dispatched. Otherwise they can be
 executed in any order. Note that since tasks are placed on a list, execution of
-one task and should not depend on the execution of another task or a deadlock
-may occur. A \fBtaskq\fR created with a single servicing thread guarantees that
-all the tasks are serviced in the order in which they are scheduled.
+one task should not depend on the execution of another task or a deadlock
+may occur.
 .sp
 .LP
 The \fBddi_taskq_create()\fR function creates a task queue instance.
@@ -248,7 +244,6 @@ queue is suspended.
 .LP
 The \fBddi_taskq_resume()\fR function resumes task queue execution.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBddi_taskq_create()\fR function creates an opaque handle that is used for
 all other \fBtaskq\fR operations. It returns a \fBtaskq\fR pointer on success
@@ -262,7 +257,6 @@ dispatch a task and returns \fBDDI_SUCCESS\fR if dispatch succeeded.
 The \fBddi_taskq_suspended()\fR function returns \fBB_TRUE\fR if \fBtaskq\fR is
 suspended. Otherwise \fBB_FALSE\fR is returned.
 .SH CONTEXT
-.sp
 .LP
 All functions may be called from the user or kernel contexts.
 .sp