Merge branch 'master' of http://github.com/illumos/illumos-gate into gcc/upgrade

Conflicts:
	usr/src/cmd/avs/dsw/iiadm.c

1 files changed, 8 insertions, 21 deletions

diff --git a/usr/src/man/man3sip/sip_sendmsg.3sip b/usr/src/man/man3sip/sip_sendmsg.3sip
index 5820513497..fd3bc5f4c9 100644
--- a/usr/src/man/man3sip/sip_sendmsg.3sip
+++ b/usr/src/man/man3sip/sip_sendmsg.3sip
@@ -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 sip_sendmsg 3SIP "25 Jan 2007" "SunOS 5.11" "Session Initiation Protocol Library Functions"
+.TH SIP_SENDMSG 3SIP "Jan 25, 2007"
 .SH NAME
 sip_sendmsg \- send an outbound SIP message to the SIP stack for processing
 .SH SYNOPSIS
@@ -12,7 +12,7 @@ sip_sendmsg \- send an outbound SIP message to the SIP stack for processing
 \fBcc\fR [ \fIflag\fR ... ] \fIfile\fR ... \fB-lsip\fR [ \fIlibrary\fR ... ]
 #include <sip.h>
 
-\fBint\fR \fIsip_sendmsg\fR(\fBsip_conn_object_t\fR \fIobj\fR, \fBsip_msg_t\fR \fIsip_msg\fR, 
+\fBint\fR \fIsip_sendmsg\fR(\fBsip_conn_object_t\fR \fIobj\fR, \fBsip_msg_t\fR \fIsip_msg\fR,
      \fBsip_dialog_t\fR \fIdialog\fR, \fBuint32_t\fR \fIflags\fR);
 .fi
 
@@ -26,12 +26,10 @@ provides the dialog associated with the message, if one exists. The value of
 flags is the result of ORing the following, as required:
 .sp
 .ne 2
-.mk
 .na
 \fBSIP_SEND_STATEFUL\fR
 .ad
 .RS 22n
-.rt  
 Send the request or response statefully. This results in the stack creating and
 maintaining a transaction for this request/response. If this flag is not set
 transactions are not created for the request/response.
@@ -39,12 +37,10 @@ transactions are not created for the request/response.
 
 .sp
 .ne 2
-.mk
 .na
 \fBSIP_DIALOG_ON_FORK\fR
 .ad
 .RS 22n
-.rt  
 When this flag is set, the stack may create multiple dialogs for a dialog
 completing response. This may result due to forking of the dialog creating
 request. If this flag is not set, the first response to a dialog creating
@@ -68,12 +64,10 @@ The \fBsip_sendmsg()\fR function can return one of the following errors on
 failure:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEINVAL\fR\fR
 .ad
 .RS 10n
-.rt  
 If a message is being statefully sent and the \fIbranchid\fR in the \fBVIA\fR
 header does not conform to RFC 3261 or when accessing \fBCSEQ\fR header while
 creating a transaction.
@@ -81,36 +75,30 @@ creating a transaction.
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOENT\fR\fR
 .ad
 .RS 10n
-.rt  
 If a message is being statefully sent, error getting the \fBCSEQ\fR header
 while creating a transaction.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBEPROTO\fR\fR
 .ad
 .RS 10n
-.rt  
 If a message is being statefully sent, error getting the \fBCSEQ\fR value while
 creating a transaction.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBENOMEM\fR\fR
 .ad
 .RS 10n
-.rt  
 If the message is being statefully sent, error allocating memory for creating
 or adding a transaction or during transaction related processing.
 .RE
@@ -123,15 +111,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-LevelMT-Safe
+MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO