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

diff --git a/usr/src/man/man3sasl/sasl_encode.3sasl b/usr/src/man/man3sasl/sasl_encode.3sasl
index ce67b691b8..7406cec38e 100644
--- a/usr/src/man/man3sasl/sasl_encode.3sasl
+++ b/usr/src/man/man3sasl/sasl_encode.3sasl
@@ -5,7 +5,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 sasl_encode 3SASL "22 Oct 2003" "SunOS 5.11" "Simple Authentication Security Layer Library Functions"
+.TH SASL_ENCODE 3SASL "Oct 22, 2003"
 .SH NAME
 sasl_encode, sasl_encodev \- encode data for transport to an authenticated host
 .SH SYNOPSIS
@@ -40,78 +40,64 @@ a character buffer.
 .SH PARAMETERS
 .sp
 .ne 2
-.mk
 .na
 \fB\fIconn\fR\fR
 .ad
 .RS 13n
-.rt  
 The SASL connection context.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIinput\fR\fR
 .ad
 .RS 13n
-.rt  
 Data.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIinputlen\fR\fR
 .ad
 .RS 13n
-.rt  
 \fIinput\fR length.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIoutput\fR\fR
 .ad
 .RS 13n
-.rt  
 The encoded data. \fIoutput\fR must be allocated or freed by the library.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIoutputlen\fR\fR
 .ad
 .RS 13n
-.rt  
 The length of \fIoutput\fR.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fIinvec\fR\fR
 .ad
 .RS 13n
-.rt  
 A pointer to set of \fBiovec\fR structures.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fInumiov\fR\fR
 .ad
 .RS 13n
-.rt  
 The number of \fBiovec\fR structures in the \fIinvec\fR set.
 .RE
 
@@ -122,12 +108,10 @@ The number of \fBiovec\fR structures in the \fIinvec\fR set.
 .SH ERRORS
 .sp
 .ne 2
-.mk
 .na
 \fB\fBSASL_OK\fR\fR
 .ad
 .RS 11n
-.rt  
 The call to \fBsasl_encode()\fR or \fBsasl_encodev()\fRwas successful.
 .RE
 
@@ -142,15 +126,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