[OS-663] Post-6.5 Illumos sync

Merge https://github.com/illumos/illumos-gate

Conflicts:
	exception_lists/packaging
	usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.include.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
	usr/src/cmd/lp/Makefile
	usr/src/cmd/lp/cmd/lpadmin/options.c
	usr/src/cmd/lp/cmd/lpfilter.c
	usr/src/cmd/lp/cmd/lpforms.c
	usr/src/cmd/lp/cmd/lpusers.c
	usr/src/cmd/lp/lib/lp/isterminfo.c
	usr/src/cmd/lp/lib/lp/tidbit.c
	usr/src/cmd/terminfo/att.ti
	usr/src/cmd/zpool/zpool_main.c
	usr/src/common/dis/i386/dis_tables.c
	usr/src/lib/libdtrace/common/dt_options.c
	usr/src/lib/libzfs/common/libzfs_dataset.c
	usr/src/man/man1m/dladm.1m
	usr/src/man/man1m/flowadm.1m
	usr/src/man/man1m/zoneadm.1m
	usr/src/man/man1m/zonecfg.1m
	usr/src/pkg/manifests/print-lp-print-client-commands.mf
	usr/src/pkg/manifests/print-lp.mf
	usr/src/uts/common/fs/zfs/sys/zio.h
	usr/src/uts/common/fs/zfs/zio.c
	usr/src/uts/i86pc/ml/mach_offsets.in
	usr/src/uts/intel/amd64/ml/mach_offsets.in
	usr/src/uts/intel/sys/tss.h

1 files changed, 7 insertions, 34 deletions

diff --git a/usr/src/man/man3socket/sctp_send.3socket b/usr/src/man/man3socket/sctp_send.3socket
index 4f31389942..81322ed3c1 100644
--- a/usr/src/man/man3socket/sctp_send.3socket
+++ b/usr/src/man/man3socket/sctp_send.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_send 3SOCKET "19 Mar 2004" "SunOS 5.11" "Sockets Library Functions"
+.TH SCTP_SEND 3SOCKET "Mar 19, 2004"
 .SH NAME
 sctp_send \- send message from an SCTP socket
 .SH SYNOPSIS
@@ -25,34 +25,28 @@ The \fBsctp_send()\fR function sends messages from one-to-one and one-to-many
 style SCTP endpoints. The following parameters can be set:
 .sp
 .ne 2
-.mk
 .na
 \fB\fIs\fR\fR
 .ad
 .RS 7n
-.rt  
 Socket created by \fBsocket\fR(3SOCKET)
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fImsg\fR\fR
 .ad
 .RS 7n
-.rt  
 Message to be sent
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIlen\fR\fR
 .ad
 .RS 7n
-.rt  
 Size of the message to be sent in bytes
 .RE
 
@@ -77,113 +71,93 @@ of bytes sent. The function returns \fB-1\fR if an error occurs.
 The \fBsctp_send()\fR function fails under the following conditions.
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEBADF\fR\fR
 .ad
 .RS 16n
-.rt  
 The \fIs\fR argument is an invalid file descriptor.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOTSOCK\fR\fR
 .ad
 .RS 16n
-.rt  
 The \fIs\fR argument is not a socket.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEOPNOTSUPP\fR\fR
 .ad
 .RS 16n
-.rt  
 \fBMSG_ABORT\fR or \fBMSG_EOF\fR is set in the \fBsinfo_flags\fR field of
 \fBsinfo\fR for a one-to-one style SCTP socket.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEPIPE\fR\fR
 .ad
 .RS 16n
-.rt  
 The socket is shutting down and no more writes are allowed.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEAGAIN\fR\fR
 .ad
 .RS 16n
-.rt  
 The socket is non-blocking and the transmit queue is full.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOTCONN\fR\fR
 .ad
 .RS 16n
-.rt  
 There is no established association.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 16n
-.rt  
 Control message length is incorrect.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 16n
-.rt  
 Specified destination address does not belong to the association.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 16n
-.rt  
 The \fBstream_no\fR is outside the number of outbound streams supported by the
 association.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEAFNOSUPPORT\fR\fR
 .ad
 .RS 16n
-.rt  
 Address family of the specified destination address is other than \fBAF_INET\fR
 or \fBAF_INET6\fR.
 .RE
@@ -196,15 +170,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 StabilityEvolving
+Interface Stability	Evolving
 _
-MT-LevelSafe
+MT-Level	Safe
 .TE
 
 .SH SEE ALSO