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

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

1 files changed, 9 insertions, 24 deletions

diff --git a/usr/src/man/man3socket/getservbyname.3socket b/usr/src/man/man3socket/getservbyname.3socket
index 606ca35ff2..cc251a2252 100644
--- a/usr/src/man/man3socket/getservbyname.3socket
+++ b/usr/src/man/man3socket/getservbyname.3socket
@@ -1,7 +1,7 @@
 '\" te
-.\" Copyright (c) 1983, Regents of the University of California.  All rights reserved.  The Berkeley software License Agreement  specifies the terms and conditions for redistribution.  Copyright 1989 AT&T.  Copyright (c) 2007, Sun Microsystems, Inc. 
+.\" Copyright (c) 1983, Regents of the University of California.  All rights reserved.  The Berkeley software License Agreement  specifies the terms and conditions for redistribution.  Copyright 1989 AT&T.  Copyright (c) 2007, Sun Microsystems, Inc.
 .\" All Rights Reserved.
-.TH getservbyname 3SOCKET "31 Jan 2007" "SunOS 5.11" "Sockets Library Functions"
+.TH GETSERVBYNAME 3SOCKET "Jan 31, 2007"
 .SH NAME
 getservbyname, getservbyname_r, getservbyport, getservbyport_r, getservent,
 getservent_r, setservent, endservent \- get service entry
@@ -165,8 +165,8 @@ in <\fBnetdb.h\fR>:
 .nf
 struct  servent {
     char	*s_name;		      /* official name of service */
-    char	**s_aliases;		   /* alias list */ 
-    int	s_port;			   /* port service resides at */ 
+    char	**s_aliases;		   /* alias list */
+    int	s_port;			   /* port service resides at */
     char	*s_proto;		      /* protocol to use */
 };
 .fi
@@ -177,46 +177,38 @@ struct  servent {
 The members of this structure are:
 .sp
 .ne 2
-.mk
 .na
 \fB\fBs_name\fR\fR
 .ad
 .RS 13n
-.rt  
 The official name of the service.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBs_aliases\fR\fR
 .ad
 .RS 13n
-.rt  
 A zero terminated list of alternate names for the service.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBs_port\fR\fR
 .ad
 .RS 13n
-.rt  
 The port number at which  the  service  resides.  Port  numbers  are
 returned  in  network  byte order.
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fBs_proto\fR\fR
 .ad
 .RS 13n
-.rt  
 The name of  the  protocol  to  use when contacting the service
 .RE
 
@@ -252,34 +244,28 @@ result.  See \fBIntro\fR(2) for the proper usage and interpretation of
 .SH FILES
 .sp
 .ne 2
-.mk
 .na
 \fB\fB/etc/services\fR\fR
 .ad
 .RS 22n
-.rt  
 Internet network services
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB/etc/netconfig\fR\fR
 .ad
 .RS 22n
-.rt  
 network configuration file
 .RE
 
 .sp
 .ne 2
-.mk
 .na
 \fB\fB/etc/nsswitch.conf\fR\fR
 .ad
 .RS 22n
-.rt  
 configuration file for the name-service switch
 .RE
 
@@ -291,13 +277,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-LevelT{
+MT-Level	T{
 See "Reentrant Interfaces" in \fBDESCRIPTION\fR.
 T}
 .TE