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

diff --git a/usr/src/man/man3socket/accept.3socket b/usr/src/man/man3socket/accept.3socket
index c6ad97671a..e9ff5df69c 100644
--- a/usr/src/man/man3socket/accept.3socket
+++ b/usr/src/man/man3socket/accept.3socket
@@ -1,10 +1,10 @@
 '\" te
-.\" Copyright 1989 AT&T  
+.\" Copyright 1989 AT&T
 .\" Copyright (C) 2002, Sun Microsystems, Inc. All Rights Reserved
 .\" 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 accept 3SOCKET "24 Jan 2002" "SunOS 5.11" "Sockets Library Functions"
+.TH ACCEPT 3SOCKET "Jan 24, 2002"
 .SH NAME
 accept \- accept a connection on a socket
 .SH SYNOPSIS
@@ -68,137 +68,113 @@ returns a non-negative integer that is a descriptor for the accepted socket.
 \fBaccept()\fR will fail if:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEBADF\fR\fR
 .ad
 .RS 16n
-.rt  
 The descriptor is invalid.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBECONNABORTED\fR\fR
 .ad
 .RS 16n
-.rt  
 The remote side aborted the connection before the \fBaccept()\fR operation
 completed.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEFAULT\fR\fR
 .ad
 .RS 16n
-.rt  
 The \fIaddr\fR parameter or the \fIaddrlen\fR parameter is invalid.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINTR\fR\fR
 .ad
 .RS 16n
-.rt  
 The \fBaccept()\fR attempt was interrupted by the delivery of a signal.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEMFILE\fR\fR
 .ad
 .RS 16n
-.rt  
 The per-process descriptor table is full.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENODEV\fR\fR
 .ad
 .RS 16n
-.rt  
 The protocol family and type corresponding to  \fIs\fR could not be found in
 the \fBnetconfig\fR file.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOMEM\fR\fR
 .ad
 .RS 16n
-.rt  
 There was insufficient user memory available to complete the operation.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOSR\fR\fR
 .ad
 .RS 16n
-.rt  
 There were insufficient \fBSTREAMS\fR resources available to complete the
 operation.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOTSOCK\fR\fR
 .ad
 .RS 16n
-.rt  
 The descriptor does not reference a socket.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEOPNOTSUPP\fR\fR
 .ad
 .RS 16n
-.rt  
 The referenced socket is not of type \fBSOCK_STREAM\fR.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEPROTO\fR\fR
 .ad
 .RS 16n
-.rt  
 A protocol error has occurred; for example, the \fBSTREAMS\fR protocol stack
 has not been initialized or the connection has already been released.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEWOULDBLOCK\fR\fR
 .ad
 .RS 16n
-.rt  
 The socket is marked as non-blocking and no connections are present to be
 accepted.
 .RE
@@ -211,13 +187,12 @@ 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
 _
-MT-LevelSafe
+MT-Level	Safe
 .TE
 
 .SH SEE ALSO