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, 18 deletions

diff --git a/usr/src/man/man3mpapi/MP_SetOverridePath.3mpapi b/usr/src/man/man3mpapi/MP_SetOverridePath.3mpapi
index 2c7404024e..287d14f7b1 100644
--- a/usr/src/man/man3mpapi/MP_SetOverridePath.3mpapi
+++ b/usr/src/man/man3mpapi/MP_SetOverridePath.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_SetOverridePath 3MPAPI "15 Feb 2006" "SunOS 5.11" "Common Multipath Management Library Functions"
+.TH MP_SETOVERRIDEPATH 3MPAPI "Feb 15, 2006"
 .SH NAME
 MP_SetOverridePath \- manually override a logical unit path
 .SH SYNOPSIS
@@ -20,23 +20,19 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lMPAPI\fR [ \fIlibrary\fR\&.\
 .SH PARAMETERS
 .sp
 .ne 2
-.mk
 .na
 \fB\fIlogicalUnitOid\fR\fR
 .ad
 .RS 18n
-.rt  
 The object ID of the multipath logical unit.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIpathOid\fR\fR
 .ad
 .RS 18n
-.rt  
 The object ID of the path logical unit.
 .RE
 
@@ -61,7 +57,6 @@ executing this command could cause failover.
 .SH RETURN VALUES
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_INVALID_OBJECT_TYPE\fR\fR
 .ad
@@ -74,7 +69,6 @@ the API.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_INVALID_PARAMETER\fR\fR
 .ad
@@ -87,7 +81,6 @@ than \fBMP_OBJECT_TYPE_PATH_LU\fR.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_OBJECT_NOT_FOUND\fR\fR
 .ad
@@ -99,7 +92,6 @@ invalid.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_SUCCESS\fR\fR
 .ad
@@ -110,7 +102,6 @@ The operation is successful.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_UNSUPPORTED\fR\fR
 .ad
@@ -121,7 +112,6 @@ The implementation does not support the API.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_PATH_NONOPERATIONAL\fR\fR
 .ad
@@ -138,17 +128,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