7 files changed, 13 insertions, 117 deletions

diff --git a/usr/src/man/man3socket/Makefile b/usr/src/man/man3socket/Makefile
index 3422782a2a..d700951ae1 100644
--- a/usr/src/man/man3socket/Makefile
+++ b/usr/src/man/man3socket/Makefile
@@ -21,7 +21,6 @@ MANSECT=	3socket
 
 MANFILES=	accept.3socket		\
 		bind.3socket		\
-		byteorder.3socket	\
 		connect.3socket		\
 		ethers.3socket		\
 		getaddrinfo.3socket	\
@@ -90,9 +89,6 @@ MANLINKS=	accept4.3socket			\
 		getservbyport_r.3socket		\
 		getservent.3socket		\
 		getservent_r.3socket		\
-		htonl.3socket			\
-		htonll.3socket			\
-		htons.3socket			\
 		if_freenameindex.3socket	\
 		if_indextoname.3socket		\
 		if_nameindex.3socket		\
@@ -109,9 +105,6 @@ MANLINKS=	accept4.3socket			\
 		inet6_rth_reverse.3socket	\
 		inet6_rth_segments.3socket	\
 		inet6_rth_space.3socket		\
-		ntohl.3socket			\
-		ntohll.3socket			\
-		ntohs.3socket			\
 		rcmd_af.3socket			\
 		recvfrom.3socket		\
 		recvmsg.3socket			\
@@ -138,13 +131,6 @@ MANLINKS=	accept4.3socket			\
 
 accept4.3socket			:= LINKSRC = accept.3socket
 
-htonl.3socket			:= LINKSRC = byteorder.3socket
-htonll.3socket			:= LINKSRC = byteorder.3socket
-htons.3socket			:= LINKSRC = byteorder.3socket
-ntohl.3socket			:= LINKSRC = byteorder.3socket
-ntohll.3socket			:= LINKSRC = byteorder.3socket
-ntohs.3socket			:= LINKSRC = byteorder.3socket
-
 ether_aton.3socket		:= LINKSRC = ethers.3socket
 ether_aton_r.3socket		:= LINKSRC = ethers.3socket
 ether_hostton.3socket		:= LINKSRC = ethers.3socket
diff --git a/usr/src/man/man3socket/byteorder.3socket b/usr/src/man/man3socket/byteorder.3socket
deleted file mode 100644
index 1d08cd8204..0000000000
--- a/usr/src/man/man3socket/byteorder.3socket
+++ /dev/null
@@ -1,77 +0,0 @@
-'\" te
-.\" Copyright (c) 2008, Sun Microsystems, Inc.  All Rights Reserved
-.\" Copyright 1989 AT&T
-.\" 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 BYTEORDER 3SOCKET "Mar 10, 2016"
-.SH NAME
-byteorder, htonl, htonll, htons, ntohl, ntohll, ntohs \- convert values between
-host and network byte order
-.SH SYNOPSIS
-.LP
-.nf
-\fBcc\fR [ \fIflag\fR... ] \fIfile\fR... \fB-lsocket\fR \fB -lnsl \fR [ \fIlibrary\fR... ]
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <inttypes.h>
-
-\fBuint32_t\fR \fBhtonl\fR(\fBuint32_t\fR \fIhostlong\fR);
-.fi
-
-.LP
-.nf
-\fBuint64_t\fR \fBhtonll\fR(\fBuint64_t\fR \fIhostlonglong\fR);
-.fi
-
-.LP
-.nf
-\fBuint16_t\fR \fBhtons\fR(\fBuint16_t\fR \fIhostshort\fR);
-.fi
-
-.LP
-.nf
-\fBuint32_t\fR \fBntohl\fR(\fBuint32_t\fR \fInetlong\fR);
-.fi
-
-.LP
-.nf
-\fBuint64_t\fR \fBntohll\fR(\fBuint64_t\fR \fIhostlonglong\fR);
-.fi
-
-.LP
-.nf
-\fBuint16_t\fR \fBntohs\fR(\fBuint16_t\fR \fInetshort\fR);
-.fi
-
-.SH DESCRIPTION
-.LP
-These functions convert 16-bit, 32-bit, and 64-bit quantities between network
-byte order and host byte order. On some architectures these routines are
-defined as \fINULL\fR macros in the include file <\fBnetinet/in.h\fR>. On other
-architectures, the routines are functional when the host byte order is
-different from network byte order.
-.sp
-.LP
-These functions are most often used in conjunction with Internet addresses and
-ports as returned by \fBgethostent()\fR and \fBgetservent()\fR. See
-\fBgethostbyname\fR(3NSL) and \fBgetservbyname\fR(3SOCKET).
-.SH ATTRIBUTES
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-box;
-c | c
-l | l .
-ATTRIBUTE TYPE	ATTRIBUTE VALUE
-_
-MT-Level	Safe
-.TE
-
-.SH SEE ALSO
-.LP
-\fBgethostbyname\fR(3NSL), \fBgetservbyname\fR(3SOCKET), \fBinet.h\fR(3HEAD),
-\fBattributes\fR(5), \fBbyteorder\fR(5)
diff --git a/usr/src/man/man3socket/getaddrinfo.3socket b/usr/src/man/man3socket/getaddrinfo.3socket
index 8d43f9641b..6e24126b66 100644
--- a/usr/src/man/man3socket/getaddrinfo.3socket
+++ b/usr/src/man/man3socket/getaddrinfo.3socket
@@ -532,7 +532,7 @@ Standard	See \fBstandards\fR(5).
 .SH SEE ALSO
 .LP
 \fBipaddrsel\fR(1M), \fBgethostbyname\fR(3NSL), \fBgetipnodebyname\fR(3SOCKET),
-\fBhtonl\fR(3SOCKET), \fBinet\fR(3SOCKET), \fBsockaddr\fR(3SOCKET),
+\fBhtonl\fR(3C), \fBinet\fR(3SOCKET), \fBsockaddr\fR(3SOCKET),
 \fBnetdb.h\fR(3HEAD), \fBsocket\fR(3SOCKET), \fBhosts\fR(4),
 \fBnsswitch.conf\fR(4), \fBattributes\fR(5), \fBstandards\fR(5), \fBinet6\fR(7P)
 .sp
diff --git a/usr/src/man/man3socket/getipnodebyname.3socket b/usr/src/man/man3socket/getipnodebyname.3socket
index 7eca1e3892..89e6100e03 100644
--- a/usr/src/man/man3socket/getipnodebyname.3socket
+++ b/usr/src/man/man3socket/getipnodebyname.3socket
@@ -504,7 +504,7 @@ MT-Level	Safe
 
 .SH SEE ALSO
 .LP
-\fBgetaddrinfo\fR(3SOCKET), \fBgethostbyname\fR(3NSL), \fBhtonl\fR(3SOCKET),
+\fBgetaddrinfo\fR(3SOCKET), \fBgethostbyname\fR(3NSL), \fBhtonl\fR(3C),
 \fBinet\fR(3SOCKET), \fBnetdb.h\fR(3HEAD), \fBhosts\fR(4),
 \fBnsswitch.conf\fR(4), \fBattributes\fR(5)
 .SH NOTES
diff --git a/usr/src/man/man3socket/getservbyname.3socket b/usr/src/man/man3socket/getservbyname.3socket
index cc251a2252..b9b2f1a98b 100644
--- a/usr/src/man/man3socket/getservbyname.3socket
+++ b/usr/src/man/man3socket/getservbyname.3socket
@@ -53,7 +53,6 @@ getservent_r, setservent, endservent \- get service entry
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 These functions are used to obtain entries for Internet services.  An entry may
 come from any of the sources for \fBservices\fR specified in the
@@ -75,7 +74,7 @@ number \fIport\fR.
 .sp
 .LP
 All addresses are returned in network order. In order to  interpret the
-addresses, \fBbyteorder\fR(3SOCKET) must be used for byte order conversion. The
+addresses, \fBbyteorder\fR(3C) must be used for byte order conversion. The
 string \fIproto\fR is used by both \fBgetservbyname()\fR and
 \fBgetservbyport()\fR to restrict the search to entries with the specified
 protocol. If \fIproto\fR is \fINULL\fR, entries with any protocol can be
@@ -113,7 +112,6 @@ was using.  It is still allowed, but possibly less efficient, for the process
 to call more service entry retrieval functions after calling
 \fBendservent()\fR.
 .SS "Reentrant Interfaces"
-.sp
 .LP
 The functions \fBgetservbyname()\fR, \fBgetservbyport()\fR, and
 \fBgetservent()\fR use static storage that is re-used in each call, making
@@ -156,7 +154,6 @@ Like their non-reentrant counterparts, \fBgetservbyname_r()\fR and
 \fBgetservbyport_r()\fR leave the enumeration position in an indeterminate
 state.
 .SH RETURN VALUES
-.sp
 .LP
 Service entries are represented by the \fBstruct servent\fR structure defined
 in <\fBnetdb.h\fR>:
@@ -234,7 +231,6 @@ When the pointer returned by the reentrant functions \fBgetservbyname_r()\fR,
 \fBgetservbyport_r()\fR, and \fBgetservent_r()\fR is non-null, it is always
 equal to the \fIresult\fR pointer that was supplied by the caller.
 .SH ERRORS
-.sp
 .LP
 The reentrant functions \fBgetservbyname_r()\fR, \fBgetservbyport_r()\fR, and
 \fBgetservent_r()\fR return \fINULL\fR and set \fBerrno\fR to \fBERANGE\fR if
@@ -242,7 +238,6 @@ the length of the buffer supplied by caller is not large enough to store the
 result.  See \fBIntro\fR(2) for the proper usage and interpretation of
 \fBerrno\fR in multithreaded applications.
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/etc/services\fR\fR
@@ -270,7 +265,6 @@ configuration file for the name-service switch
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -288,24 +282,21 @@ T}
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
-\fBIntro\fR(2), \fBIntro\fR(3), \fBbyteorder\fR(3SOCKET), \fBnetdir\fR(3NSL),
+\fBIntro\fR(2), \fBIntro\fR(3), \fBbyteorder\fR(3C), \fBnetdir\fR(3NSL),
 \fBnetconfig\fR(4), \fBnsswitch.conf\fR(4), \fBservices\fR(4),
 \fBattributes\fR(5), \fBnetdb.h\fR(3HEAD)
 .SH WARNINGS
-.sp
 .LP
 The reentrant interfaces \fBgetservbyname_r()\fR, \fBgetservbyport_r()\fR, and
 \fBgetservent_r()\fR are included in this release on an uncommitted basis only,
 and are subject to change or removal in future minor releases.
 .SH NOTES
-.sp
 .LP
 The functions that return \fBstruct servent\fR return the least significant
 16-bits of the \fIs_port\fR field in \fInetwork byte order\fR.
 \fBgetservbyport()\fR and \fBgetservbyport_r()\fR also expect the input
-parameter \fIport\fR in the \fInetwork byte order\fR. See \fBhtons\fR(3SOCKET)
+parameter \fIport\fR in the \fInetwork byte order\fR. See \fBhtons\fR(3C)
 for more details on converting between host and network byte orders.
 .sp
 .LP
diff --git a/usr/src/man/man3socket/rexec.3socket b/usr/src/man/man3socket/rexec.3socket
index 34163c2d80..99461eb178 100644
--- a/usr/src/man/man3socket/rexec.3socket
+++ b/usr/src/man/man3socket/rexec.3socket
@@ -25,7 +25,6 @@ rexec, rexec_af \- return stream to a remote command
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBrexec()\fR and \fBrexec_af()\fR functions look up the host \fIahost\fR
 using \fBgetaddrinfo\fR(3SOCKET) and return \fB\(mi1\fR if the host does not
@@ -47,7 +46,7 @@ connectivity to the remote host.
 .LP
 The port \fIinport\fR specifies which \fBDARPA\fR Internet port to use for the
 connection. The port number used must be in network byte order, as supplied by
-a call to \fBhtons\fR(3XNET). The protocol for connection is described in
+a call to \fBhtons\fR(3C). The protocol for connection is described in
 detail in \fBin.rexecd\fR(1M).
 .sp
 .LP
@@ -67,7 +66,6 @@ out-of-band data.
 There is no way to specify options to the \fBsocket()\fR call made by the
 \fBrexec()\fR or \fBrexec_af()\fRfunctions.
 .SH RETURN VALUES
-.sp
 .LP
 If \fBrexec()\fR succeeds, a file descriptor number is returned of the socket
 type \fBSOCK_STREAM\fR and the address family \fBAF_INET\fR. The parameter
@@ -83,7 +81,6 @@ the socket type \fBSOCK_STREAM\fR in the address family \fBAF_INET\fR or
 .LP
 If either \fBrexec()\fR or \fBrexec_af()\fR fails, \fB\(mi1\fR is returned.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -103,8 +100,7 @@ MT-Level	Unsafe
 This interface is Unsafe in multithreaded applications. Unsafe interfaces
 should be called only from the main thread.
 .SH SEE ALSO
-.sp
 .LP
 \fBin.rexecd\fR(1M), \fBgetaddrinfo\fR(3SOCKET), \fBgethostbyname\fR(3NSL),
-\fBgetservbyname\fR(3SOCKET), \fBhtonl\fR(3XNET), \fBsocket\fR(3SOCKET),
+\fBgetservbyname\fR(3SOCKET), \fBhtonl\fR(3C), \fBsocket\fR(3SOCKET),
 \fBattributes\fR(5)
diff --git a/usr/src/man/man3socket/sockaddr.3socket b/usr/src/man/man3socket/sockaddr.3socket
index 740b80e4dd..3d5af60020 100644
--- a/usr/src/man/man3socket/sockaddr.3socket
+++ b/usr/src/man/man3socket/sockaddr.3socket
@@ -198,9 +198,9 @@ is always stored in
 .Sy Network Byte Order .
 On many systems, this differs from the native host byte order.
 Applications should read from the member with the function
-.Xr ntohs 3SOCKET
+.Xr ntohs 3C
 and write to the member with the function
-.Xr htons 3SOCKET .
+.Xr htons 3C .
 The member
 .Em sin_addr
 is the four byte IPv4 address.
@@ -264,9 +264,9 @@ byte order.
 The member
 .Em sin6_port
 describes the IPv6 port and should be manipulated with the functions
-.Xr ntohs 3SOCKET
+.Xr ntohs 3C
 and
-.Xr htons 3SOCKET .
+.Xr htons 3C .
 The member
 .Em sin6_addr
 describes the 16-byte IPv6 address.
@@ -426,9 +426,9 @@ For example, when capturing Ethernet frames the value of
 .Em sll_protocol
 is the Ethertype.
 This member is written in network byte order and applications should use
-.Xr htons 3SOCKET
+.Xr htons 3C
 and
-.Xr ntohs 3SOCKET
+.Xr ntohs 3C
 to read and write the member.
 .Lp
 The member