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

diff --git a/usr/src/man/man3mpapi/MP_SetTPGAccess.3mpapi b/usr/src/man/man3mpapi/MP_SetTPGAccess.3mpapi
index c34d79bc1d..ea872a388b 100644
--- a/usr/src/man/man3mpapi/MP_SetTPGAccess.3mpapi
+++ b/usr/src/man/man3mpapi/MP_SetTPGAccess.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_SetTPGAccess 3MPAPI "15 Feb 2006" "SunOS 5.11" "Common Multipath Management Library Functions"
+.TH MP_SETTPGACCESS 3MPAPI "Feb 15, 2006"
 .SH NAME
 MP_SetTPGAccess \- set a target port group access state
 .SH SYNOPSIS
@@ -20,34 +20,28 @@ cc [ \fIflag\fR\&.\|.\|. ] \fIfile\fR\&.\|.\|. \fB-lMPAPI\fR [ \fIlibrary\fR\&.\
 .SH PARAMETERS
 .sp
 .ne 2
-.mk
 .na
 \fB\fIluOid\fR\fR
 .ad
 .RS 17n
-.rt  
 An object ID that has type \fBMP_MULTIPATH_LOGICAL_UNIT\fR.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIcount\fR\fR
 .ad
 .RS 17n
-.rt  
 The number of valid items in the \fIpTpgStateList\fR.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIpTpgStateList\fR\fR
 .ad
 .RS 17n
-.rt  
 A pointer to an array of data structure \fBMP_TPG_STATE_PAIR\fR. This array
 must contain the same number of elements as \fIcount\fR.
 .RE
@@ -81,7 +75,6 @@ list by calling         \fBMP_FreeOidList\fR.
 .SH RETURN VALUES
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_ACCESS_STATE_INVALID\fR\fR
 .ad
@@ -93,7 +86,6 @@ establish an illegal combination of access states.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_FAILED\fR\fR
 .ad
@@ -105,7 +97,6 @@ The underlying interface failed the command for some reason other than
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_INVALID_OBJECT_TYPE\fR\fR
 .ad
@@ -117,7 +108,6 @@ happen if an uninitialized object ID is passed to the API.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_OBJECT_NOT_FOUND\fR\fR
 .ad
@@ -128,7 +118,6 @@ The \fIluOid\fR owner ID or object sequence number is invalid.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_INVALID_PARAMETER\fR\fR
 .ad
@@ -141,7 +130,6 @@ type subfield other than \fBMP_OBJECT_TYPE_MULTIPATH_LU\fR.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_SUCCESS\fR\fR
 .ad
@@ -152,7 +140,6 @@ The operation is successful.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBMP_STATUS_UNSUPPORTED\fR\fR
 .ad
@@ -169,17 +156,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