- section reorder

- macro cleanup

8 files changed, 65 insertions, 66 deletions

diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index 12b55004367..619e272bb4a 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getaddrinfo.3,v 1.21 2003/05/01 19:10:09 jmc Exp $
+.\"	$OpenBSD: getaddrinfo.3,v 1.22 2003/05/30 21:37:59 jmc Exp $
 .\"	$KAME: getaddrinfo.3,v 1.29 2001/02/12 09:24:45 itojun Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
@@ -564,9 +564,6 @@ indicate an unknown error.
 .%D June 2000
 .Re
 .\"
-.Sh HISTORY
-The implementation first appeared in WIDE Hydrangea IPv6 protocol stack kit.
-.\"
 .Sh STANDARDS
 The
 .Fn getaddrinfo
@@ -575,6 +572,9 @@ and documented in
 .Dq Basic Socket Interface Extensions for IPv6
 .Pq RFC2553 .
 .\"
+.Sh HISTORY
+The implementation first appeared in WIDE Hydrangea IPv6 protocol stack kit.
+.\"
 .Sh BUGS
 The current implementation is not thread-safe.
 .Pp
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
index d90ea55542c..570d939ce29 100644
--- a/lib/libc/net/gethostbyname.3
+++ b/lib/libc/net/gethostbyname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gethostbyname.3,v 1.17 2002/04/30 16:31:42 mpech Exp $
+.\"	$OpenBSD: gethostbyname.3,v 1.18 2003/05/30 21:37:59 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -215,13 +215,27 @@ will result in an answer;
 for example, a mail-forwarder may be registered for this domain.
 .El
 .Sh SEE ALSO
-.Xr resolver 3 ,
 .Xr getaddrinfo 3 ,
 .Xr getnameinfo 3 ,
+.Xr resolver 3 ,
 .Xr hosts 5 ,
 .Xr resolv.conf 5 ,
 .Xr hostname 7 ,
 .Xr named 8
+.Sh HISTORY
+The
+.Fn herror
+function appeared in
+.Bx 4.3 .
+The
+.Fn endhostent ,
+.Fn gethostbyaddr ,
+.Fn gethostbyname ,
+.Fn gethostent ,
+and
+.Fn sethostent
+functions appeared in
+.Bx 4.2 .
 .Sh CAVEATS
 If the search routines in
 .Xr resolv.conf 5
@@ -248,20 +262,6 @@ or
 The
 .Fn endhostent
 function closes the file.
-.Sh HISTORY
-The
-.Fn herror
-function appeared in
-.Bx 4.3 .
-The
-.Fn endhostent ,
-.Fn gethostbyaddr ,
-.Fn gethostbyname ,
-.Fn gethostent ,
-and
-.Fn sethostent
-functions appeared in
-.Bx 4.2 .
 .Sh BUGS
 These functions use static data storage;
 if the data is needed for future use, it should be
diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
index 03064689cd1..9287b3b7347 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getifaddrs.3,v 1.9 2003/03/06 04:07:37 david Exp $
+.\"	$OpenBSD: getifaddrs.3,v 1.10 2003/05/30 21:37:59 jmc Exp $
 .\"	BSDI	getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
 .\"
 .\" Copyright (c) 1995, 1999
@@ -133,16 +133,6 @@ for any of the errors specified for the library routines
 .Xr malloc 3 ,
 or
 .Xr sysctl 3 .
-.Sh BUGS
-If both
-.Aq Pa net/if.h
-and
-.Aq Pa ifaddrs.h
-are being included,
-.Aq Pa net/if.h
-.Em must
-be included before
-.Aq Pa ifaddrs.h .
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr socket 2 ,
@@ -157,3 +147,13 @@ The function is supplied on
 .Ox
 since
 .Ox 2.7 .
+.Sh BUGS
+If both
+.Aq Pa net/if.h
+and
+.Aq Pa ifaddrs.h
+are being included,
+.Aq Pa net/if.h
+.Em must
+be included before
+.Aq Pa ifaddrs.h .
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index 24fb89d8383..f1b31a6e873 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getnameinfo.3,v 1.19 2003/05/03 20:05:07 jmc Exp $
+.\"	$OpenBSD: getnameinfo.3,v 1.20 2003/05/30 21:37:59 jmc Exp $
 .\"	$KAME: getnameinfo.3,v 1.20 2001/01/05 13:37:37 itojun Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
@@ -275,9 +275,6 @@ The error code can be found in errno.
 .%D June 2000
 .Re
 .\"
-.Sh HISTORY
-The implementation first appeared in WIDE Hydrangea IPv6 protocol stack kit.
-.\"
 .Sh STANDARDS
 The
 .Fn getnameinfo
@@ -286,6 +283,9 @@ and documented in
 .Dq Basic Socket Interface Extensions for IPv6
 .Pq RFC2553 .
 .\"
+.Sh HISTORY
+The implementation first appeared in WIDE Hydrangea IPv6 protocol stack kit.
+.\"
 .Sh BUGS
 The current implementation is not thread-safe.
 .Pp
diff --git a/lib/libc/net/getrrsetbyname.3 b/lib/libc/net/getrrsetbyname.3
index 5ff45cbbe3d..a786ff87478 100644
--- a/lib/libc/net/getrrsetbyname.3
+++ b/lib/libc/net/getrrsetbyname.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getrrsetbyname.3,v 1.10 2003/05/01 19:04:02 jmc Exp $
+.\" $OpenBSD: getrrsetbyname.3,v 1.11 2003/05/30 21:37:59 jmc Exp $
 .\"
 .\" Copyright (C) 2000, 2001  Internet Software Consortium.
 .\"
@@ -118,7 +118,7 @@ If the EDNS0 option is activated in
 .Xr resolv.conf 5 ,
 .Fn getrrsetbyname
 will request DNSSEC authentication using the EDNS0 DNSSEC OK (DO) bit.
-.Sh "RETURN VALUES"
+.Sh RETURN VALUES
 .Fn getrrsetbyname
 returns zero on success, and one of the following error
 codes if an error occurred:
@@ -139,20 +139,13 @@ other failure
 .Xr resolver 3 ,
 .Xr resolv.conf 5 ,
 .Xr named 8
-.Sh AUTHORS
-Jakob Schlyter
-.Aq jakob@openbsd.org
 .Sh HISTORY
 .Fn getrrsetbyname
 first appeared in
 .Ox 3.0 .
 The API first appeared in ISC BIND version 9.
-.Sh BUGS
-The data in
-.Li *rdi_data
-should be returned in uncompressed wire format.
-Currently, the data is in compressed format and the caller can't
-uncompress since it doesn't have the full message.
+.Sh AUTHORS
+.An Jakob Schlyter Aq jakob@openbsd.org
 .Sh CAVEATS
 The
 .Dv RRSET_VALIDATED
@@ -164,3 +157,9 @@ This flag
 .Em should not
 be trusted unless the transport between the nameserver and the resolver
 is secure (e.g. IPsec, trusted network, loopback communication).
+.Sh BUGS
+The data in
+.Li *rdi_data
+should be returned in uncompressed wire format.
+Currently, the data is in compressed format and the caller can't
+uncompress since it doesn't have the full message.
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index 5150b191bd7..cc30ac3978a 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/lib/libc/net/inet6_option_space.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_option_space.3,v 1.10 2003/05/01 19:17:37 jmc Exp $
+.\"	$OpenBSD: inet6_option_space.3,v 1.11 2003/05/30 21:37:59 jmc Exp $
 .\"	$KAME: inet6_option_space.3,v 1.7 2000/05/17 14:32:13 itojun Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
@@ -54,7 +54,7 @@
 .Ft "int"
 .Fn inet6_option_append "struct cmsghdr *cmsg" "const u_int8_t *typep" "int multx" "int plusy"
 .Ft "u_int8_t *"
-.Fn inet6_option_alloc "struct cmsghdr *cmsg" "int datalen" "int multx" "int plusy";
+.Fn inet6_option_alloc "struct cmsghdr *cmsg" "int datalen" "int multx" "int plusy"
 .Ft "int"
 .Fn inet6_option_next "const struct cmsghdr *cmsg" "u_int8_t **tptrp"
 .Ft "int"
@@ -389,6 +389,9 @@ and
 is not
 .Dv NULL .
 .\"
+.Sh EXAMPLES
+RFC2292 gives comprehensive examples in chapter 6.
+.\"
 .Sh DIAGNOSTICS
 .Fn inet6_option_init
 and
@@ -416,9 +419,6 @@ to non
 .Dv NULL
 value.
 .\"
-.Sh EXAMPLES
-RFC2292 gives comprehensive examples in chapter 6.
-.\"
 .Sh SEE ALSO
 .Rs
 .%A W. Stevens
@@ -435,14 +435,14 @@ RFC2292 gives comprehensive examples in chapter 6.
 .%D December 1998
 .Re
 .\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
 .Sh STANDARDS
 The functions
 are documented in
 .Dq Advanced Sockets API for IPv6
 .Pq RFC2292 .
 .\"
+.Sh HISTORY
+The implementation first appeared in KAME advanced networking kit.
+.\"
 .Sh BUGS
 The text was shamelessly copied from RFC2292.
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index 06a56715b59..de88f48515a 100644
--- a/lib/libc/net/inet6_rthdr_space.3
+++ b/lib/libc/net/inet6_rthdr_space.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_rthdr_space.3,v 1.10 2003/05/01 19:17:37 jmc Exp $
+.\"	$OpenBSD: inet6_rthdr_space.3,v 1.11 2003/05/30 21:37:59 jmc Exp $
 .\"	$KAME: inet6_rthdr_space.3,v 1.8 2000/05/17 14:30:15 itojun Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
@@ -264,6 +264,9 @@ Upon an error the return value of the function is -1.
 Note: Addresses are indexed starting at 1, and flags starting at 0,
 to maintain consistency with the terminology and figures in RFC2460.
 .\"
+.Sh EXAMPLES
+RFC2292 gives comprehensive examples in chapter 8.
+.\"
 .Sh DIAGNOSTICS
 .Fn inet6_rthdr_space
 returns 0 on errors.
@@ -286,9 +289,6 @@ and
 .Fn inet6_rthdr_getflags
 return -1 on error.
 .\"
-.Sh EXAMPLES
-RFC2292 gives comprehensive examples in chapter 8.
-.\"
 .Sh SEE ALSO
 .Rs
 .%A W. Stevens
@@ -305,15 +305,15 @@ RFC2292 gives comprehensive examples in chapter 8.
 .%D December 1998
 .Re
 .\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
 .Sh STANDARDS
 The functions
 are documented in
 .Dq Advanced Sockets API for IPv6
 .Pq RFC2292 .
 .\"
+.Sh HISTORY
+The implementation first appeared in KAME advanced networking kit.
+.\"
 .Sh BUGS
 The text was shamelessly copied from RFC2292.
 .Pp
diff --git a/lib/libc/net/rcmdsh.3 b/lib/libc/net/rcmdsh.3
index e993d2c9d50..674d0f479d1 100644
--- a/lib/libc/net/rcmdsh.3
+++ b/lib/libc/net/rcmdsh.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcmdsh.3,v 1.9 2003/05/05 22:13:03 millert Exp $
+.\"	$OpenBSD: rcmdsh.3,v 1.10 2003/05/30 21:37:59 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -89,12 +89,12 @@ It returns \-1 on error and prints a diagnostic message on the standard error.
 .Xr socketpair 2 ,
 .Xr rcmd 3 ,
 .Xr rshd 8
-.Sh BUGS
-If
-.Xr rsh 1
-encounters an error, a file descriptor is still returned instead of \-1.
 .Sh HISTORY
 The
 .Fn rcmdsh
 function first appeared in
 .Ox 2.0 .
+.Sh BUGS
+If
+.Xr rsh 1
+encounters an error, a file descriptor is still returned instead of \-1.