Merge branch 'master' of http://github.com/illumos/illumos-gate into gcc/upgrade

Conflicts:
	usr/src/cmd/avs/dsw/iiadm.c

1 files changed, 7 insertions, 17 deletions

diff --git a/usr/src/man/man3mpapi/MP_SetProbingPollingRate.3mpapi b/usr/src/man/man3mpapi/MP_SetProbingPollingRate.3mpapi
index d83b2d2478..47860b00f9 100644
--- a/usr/src/man/man3mpapi/MP_SetProbingPollingRate.3mpapi
+++ b/usr/src/man/man3mpapi/MP_SetProbingPollingRate.3mpapi
@@ -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 MP_SetProbingPollingRate 3MPAPI "15 Feb 2006" "SunOS 5.11" "Common Multipath Management Library Functions"
+.TH MP_SETPROBINGPOLLINGRATE 3MPAPI "Feb 15, 2006"
 .SH NAME
 MP_SetProbingPollingRate \- set the polling rate
 .SH SYNOPSIS
@@ -20,23 +20,19 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lMPAPI\fR [ \fIlibrary\fR\&.\
 .SH PARAMETERS
 .sp
 .ne 2
-.mk
 .na
 \fB\fIoid\fR\fR
 .ad
 .RS 15n
-.rt  
 An object ID of either the plugin or a multipath logical unit.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIpollingRate\fR\fR
 .ad
 .RS 15n
-.rt  
 The value to be set in \fBMP_PLUGIN_PROPERTIES\fR
 \fIcurrentProbingPollingRate\fR or
 \fBMP_MULTIPATH_LOGICAL_UNIT_PROPERTIES\fR \fIProbingPollingRate\fR.
@@ -56,7 +52,6 @@ object ID refers to a multipath logical unit, this sets the
 .SH RETURN VALUES
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_INVALID_OBJECT_TYPE\fR\fR
 .ad
@@ -68,7 +63,6 @@ happen if an uninitialized object ID is passed to the API.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_INVALID_PARAMETER\fR\fR
 .ad
@@ -81,7 +75,6 @@ the \fIoid\fR has a type subfield other than \fBMP_OBJECT_TYPE_PLUGIN\fR or
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_OBJECT_NOT_FOUND\fR\fR
 .ad
@@ -92,7 +85,6 @@ The \fIoid\fR ownerID or sequence number is invalid.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_SUCCESS\fR\fR
 .ad
@@ -103,7 +95,6 @@ The operation is successful.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_UNSUPPORTED\fR\fR
 .ad
@@ -120,17 +111,16 @@ See \fBattributes\fR(5) for descriptions of the following attributes:
 
 .sp
 .TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
+box;
+c | c
+l | l .
+ATTRIBUTE TYPE	ATTRIBUTE VALUE
 _
-Interface StabilityT{
+Interface Stability	T{
 Standard: ANSI INCITS 412 Multipath Management API
 T}
 _
-MT-LevelSafe
+MT-Level	Safe
 .TE
 
 .SH SEE ALSO