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

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

1 files changed, 6 insertions, 13 deletions

diff --git a/usr/src/man/man3ldap/cldap_setretryinfo.3ldap b/usr/src/man/man3ldap/cldap_setretryinfo.3ldap
index ddf719bb72..97a9e55e9f 100644
--- a/usr/src/man/man3ldap/cldap_setretryinfo.3ldap
+++ b/usr/src/man/man3ldap/cldap_setretryinfo.3ldap
@@ -4,7 +4,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 cldap_setretryinfo 3LDAP "27 Jan 2002" "SunOS 5.11" "LDAP Library Functions"
+.TH CLDAP_SETRETRYINFO 3LDAP "Jan 27, 2002"
 .SH NAME
 cldap_setretryinfo \- set connectionless LDAP request retransmission parameters
 .SH SYNOPSIS
@@ -20,34 +20,28 @@ cc[ \fIflag\fR... ] \fIfile\fR... -lldap[ \fIlibrary\fR... ]
 .SH PARAMETERS
 .sp
 .ne 2
-.mk
 .na
 \fB\fIld\fR \fR
 .ad
 .RS 12n
-.rt  
 LDAP pointer returned from a previous call to \fBcldap_open\fR(3LDAP).
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fItries\fR \fR
 .ad
 .RS 12n
-.rt  
 Maximum number of times to send a request.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fItimeout\fR \fR
 .ad
 .RS 12n
-.rt  
 Initial time, in seconds, to wait  before re-sending a request.
 .RE
 
@@ -67,12 +61,11 @@ See \fBattributes\fR(5) for a description of the following attributes:
 
 .sp
 .TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-Interface StabilityEvolving
+box;
+c | c
+l | l .
+ATTRIBUTE TYPE	ATTRIBUTE VALUE
+Interface Stability	Evolving
 .TE
 
 .SH SEE ALSO