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/man3socket/sctp_getpaddrs.3socket b/usr/src/man/man3socket/sctp_getpaddrs.3socket
index f3deaa5ef6..d816a3723c 100644
--- a/usr/src/man/man3socket/sctp_getpaddrs.3socket
+++ b/usr/src/man/man3socket/sctp_getpaddrs.3socket
@@ -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 sctp_getpaddrs 3SOCKET "23 Jan 2008" "SunOS 5.11" "Sockets Library Functions"
+.TH SCTP_GETPADDRS 3SOCKET "Jan 23, 2008"
 .SH NAME
 sctp_getpaddrs, sctp_freepaddrs \- returns all peer addresses on an SCTP
 association
@@ -63,57 +63,47 @@ The \fBsctp_getpaddrs()\fR succeeds unless one of the following conditions
 exist.
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEBADF\fR\fR
 .ad
 .RS 12n
-.rt  
 The \fIsock\fR argument is an invalid file descriptor.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOTSOCK\fR\fR
 .ad
 .RS 12n
-.rt  
 The \fIsock\fR argument is not a socket.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 12n
-.rt  
 The \fIaddrs\fR argument is \fINULL\fR.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 12n
-.rt  
 The \fIid\fR argument is an invalid association identifier for a one-to-many
 style STP socket.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOTCONN\fR\fR
 .ad
 .RS 12n
-.rt  
 The specified socket is not connected.
 .RE
 
@@ -125,15 +115,14 @@ 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 StabilityCommitted
+Interface Stability	Committed
 _
-MT-LevelSafe
+MT-Level	Safe
 .TE
 
 .SH SEE ALSO