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

diff --git a/usr/src/man/man3nsl/nlsrequest.3nsl b/usr/src/man/man3nsl/nlsrequest.3nsl
index d1887634f2..380aa1902e 100644
--- a/usr/src/man/man3nsl/nlsrequest.3nsl
+++ b/usr/src/man/man3nsl/nlsrequest.3nsl
@@ -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 nlsrequest 3NSL "14 Nov 2002" "SunOS 5.11" "Networking Services Library Functions"
+.TH NLSREQUEST 3NSL "Nov 14, 2002"
 .SH NAME
 nlsrequest \- format and send listener service request message
 .SH SYNOPSIS
@@ -34,12 +34,10 @@ Zero indicates success, other negative  values indicate \fBnlsrequest()\fR
 failures as follows:
 .sp
 .ne 2
-.mk
 .na
 \fB\fB\(mi1\fR\fR
 .ad
 .RS 9n
-.rt  
 Error encountered by \fBnlsrequest()\fR, see \fBt_errno\fR.
 .RE
 
@@ -49,34 +47,28 @@ Positive values are error return codes from the \fIlistener\fR process.
 Mnemonics for these codes are defined in \fB<listen.h>\fR\&.
 .sp
 .ne 2
-.mk
 .na
 \fB\fB2\fR\fR
 .ad
 .RS 5n
-.rt  
 Request message not interpretable.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB3\fR\fR
 .ad
 .RS 5n
-.rt  
 Request service code unknown.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB4\fR\fR
 .ad
 .RS 5n
-.rt  
 Service code known, but currently disabled.
 .RE
 
@@ -93,12 +85,10 @@ stderr. Initially, \fB_nlslog\fR is zero.
 .SH FILES
 .sp
 .ne 2
-.mk
 .na
 \fB\fB/usr/lib/libnls.so.1\fR\fR
 .ad
 .RS 24n
-.rt  
 shared object
 .RE
 
@@ -110,13 +100,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-LevelUnsafe
+MT-Level	Unsafe
 .TE
 
 .SH SEE ALSO