From 59625e84c89bf82e1c6d20c55785b618eb56ea72 Mon Sep 17 00:00:00 2001
From: jmc <>
Date: Thu, 27 Sep 2012 11:31:58 +0000
Subject: last stage of rfc changes, using consistent Rs/Re blocks, and moving
 the references into a STANDARDS section;

---
 src/lib/libc/net/getaddrinfo.3        | 48 +++++++++++++++++------------------
 src/lib/libc/net/getnameinfo.3        | 40 ++++++++++++++---------------
 src/lib/libc/net/if_indextoname.3     |  8 +++---
 src/lib/libc/net/inet.3               | 32 ++++++++++++-----------
 src/lib/libc/net/inet6_opt_init.3     | 11 +++-----
 src/lib/libc/net/inet6_option_space.3 | 12 ++++-----
 src/lib/libc/net/inet6_rth_space.3    |  7 ++---
 src/lib/libc/net/inet6_rthdr_space.3  |  6 +++--
 src/lib/libc/net/resolver.3           | 15 +++++++----
 9 files changed, 91 insertions(+), 88 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libc/net/getaddrinfo.3 b/src/lib/libc/net/getaddrinfo.3
index af3df3c2f6..9ec857373e 100644
--- a/src/lib/libc/net/getaddrinfo.3
+++ b/src/lib/libc/net/getaddrinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getaddrinfo.3,v 1.50 2012/04/20 16:37:07 sthen Exp $
+.\"	$OpenBSD: getaddrinfo.3,v 1.51 2012/09/27 11:31:58 jmc Exp $
 .\"	$KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 20 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt GETADDRINFO 3
 .Os
 .Sh NAME
@@ -426,43 +426,43 @@ freeaddrinfo(res0);
 .Xr hostname 7 ,
 .Xr named 8
 .Rs
+.%A Craig Metz
+.%B Proceedings of the Freenix Track: 2000 USENIX Annual Technical Conference
+.%D June 2000
+.%T Protocol Independence Using the Sockets API
+.Re
+.Sh STANDARDS
+The
+.Fn getaddrinfo
+function is defined by the
+.St -p1003.1g-2000
+draft specification and documented in RFC 3493.
+.Pp
+The
+.Dv AI_FQDN
+flag bit first appeared in Windows 7.
+.Pp
+.Rs
 .%A R. Gilligan
 .%A S. Thomson
 .%A J. Bound
 .%A J. McCann
 .%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC 3493
 .%D February 2003
+.%R RFC 3493
+.%T Basic Socket Interface Extensions for IPv6
 .Re
+.Pp
 .Rs
 .%A S. Deering
 .%A B. Haberman
 .%A T. Jinmei
 .%A E. Nordmark
 .%A B. Zill
-.%T "IPv6 Scoped Address Architecture"
-.%R RFC 4007
 .%D March 2005
+.%R RFC 4007
+.%T IPv6 Scoped Address Architecture
 .Re
-.Rs
-.%A Craig Metz
-.%T Protocol Independence Using the Sockets API
-.%B "Proceedings of the Freenix Track: 2000 USENIX Annual Technical Conference"
-.%D June 2000
-.Re
-.Sh STANDARDS
-The
-.Fn getaddrinfo
-function is defined by the
-.St -p1003.1g-2000
-draft specification and documented in
-.Dv "RFC 3493" ,
-.Dq Basic Socket Interface Extensions for IPv6 .
-.Pp
-The
-.Dv AI_FQDN
-flag bit first appeared in Windows 7.
 .Sh BUGS
 The implementation of
 .Fn getaddrinfo
diff --git a/src/lib/libc/net/getnameinfo.3 b/src/lib/libc/net/getnameinfo.3
index 0d51ae211f..05d41b96e7 100644
--- a/src/lib/libc/net/getnameinfo.3
+++ b/src/lib/libc/net/getnameinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getnameinfo.3,v 1.42 2012/01/03 12:06:04 jmc Exp $
+.\"	$OpenBSD: getnameinfo.3,v 1.43 2012/09/27 11:31:58 jmc Exp $
 .\"	$KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 3 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt GETNAMEINFO 3
 .Os
 .Sh NAME
@@ -165,38 +165,38 @@ printf("host=%s\en", hbuf);
 .Xr hostname 7 ,
 .Xr named 8
 .Rs
+.%A Craig Metz
+.%T Protocol Independence Using the Sockets API
+.%B Proceedings of the Freenix Track: 2000 USENIX Annual Technical Conference
+.%D June 2000
+.Re
+.Sh STANDARDS
+The
+.Fn getnameinfo
+function is defined by the
+.St -p1003.1g-2000
+draft specification and documented in RFC 2553.
+.Pp
+.Rs
 .%A R. Gilligan
 .%A S. Thomson
 .%A J. Bound
 .%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC 2553
 .%D March 1999
+.%R RFC 2553
+.%T Basic Socket Interface Extensions for IPv6
 .Re
+.Pp
 .Rs
 .%A S. Deering
 .%A B. Haberman
 .%A T. Jinmei
 .%A E. Nordmark
 .%A B. Zill
-.%T "IPv6 Scoped Address Architecture"
-.%R RFC 4007
 .%D March 2005
+.%R RFC 4007
+.%T IPv6 Scoped Address Architecture
 .Re
-.Rs
-.%A Craig Metz
-.%T Protocol Independence Using the Sockets API
-.%B "Proceedings of the Freenix Track: 2000 USENIX Annual Technical Conference"
-.%D June 2000
-.Re
-.Sh STANDARDS
-The
-.Fn getnameinfo
-function is defined by the
-.St -p1003.1g-2000
-draft specification and documented in
-.Tn "RFC 2553" ,
-.Dq Basic Socket Interface Extensions for IPv6 .
 .Sh CAVEATS
 .Fn getnameinfo
 can return both numeric and FQDN forms of the address specified in
diff --git a/src/lib/libc/net/if_indextoname.3 b/src/lib/libc/net/if_indextoname.3
index 4826b985bb..df17389917 100644
--- a/src/lib/libc/net/if_indextoname.3
+++ b/src/lib/libc/net/if_indextoname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: if_indextoname.3,v 1.12 2012/08/22 18:32:47 jmc Exp $
+.\"	$OpenBSD: if_indextoname.3,v 1.13 2012/09/27 11:31:58 jmc Exp $
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\"
 .\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: August 22 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt IF_NAMETOINDEX 3
 .Os
 .Sh NAME
@@ -130,6 +130,7 @@ on errors.
 .Sh SEE ALSO
 .Xr getifaddrs 3 ,
 .Xr networking 4
+.Sh STANDARDS
 .Rs
 .%A R. Gilligan
 .%A S. Thomson
@@ -140,6 +141,3 @@ on errors.
 .%R RFC 3493
 .%T Basic Socket Interface Extensions for IPv6
 .Re
-.Sh STANDARDS
-These functions are defined in ``Basic Socket Interface Extensions for IPv6''
-.Pq RFC 3493 .
diff --git a/src/lib/libc/net/inet.3 b/src/lib/libc/net/inet.3
index 4521827466..d96a824532 100644
--- a/src/lib/libc/net/inet.3
+++ b/src/lib/libc/net/inet.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet.3,v 1.24 2012/08/20 19:38:55 jmc Exp $
+.\"	$OpenBSD: inet.3,v 1.25 2012/09/27 11:31:58 jmc Exp $
 .\"	$NetBSD: inet.3,v 1.7 1997/06/18 02:25:24 lukem Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)inet.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: August 20 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt INET 3
 .Os
 .Sh NAME
@@ -277,6 +277,20 @@ or in compressed form:
 .Xr inet_net 3 ,
 .Xr hosts 5 ,
 .Xr networks 5
+.Sh STANDARDS
+The
+.Nm inet_ntop
+and
+.Nm inet_pton
+functions conform to the IETF IPv6 BSD API and address formatting
+specifications.
+Note that
+.Nm inet_pton
+does not accept 1-, 2-, or 3-part dotted addresses; all four parts
+must be specified.
+This is a narrower input set than that accepted by
+.Nm inet_aton .
+.Pp
 .Rs
 .%A R. Gilligan
 .%A S. Thomson
@@ -287,6 +301,7 @@ or in compressed form:
 .%R RFC 3493
 .%T Basic Socket Interface Extensions for IPv6
 .Re
+.Pp
 .Rs
 .%A R. Hinden
 .%A S. Deering
@@ -294,19 +309,6 @@ or in compressed form:
 .%R RFC 4291
 .%T IP Version 6 Addressing Architecture
 .Re
-.Sh STANDARDS
-The
-.Nm inet_ntop
-and
-.Nm inet_pton
-functions conform to the IETF IPv6 BSD API and address formatting
-specifications.
-Note that
-.Nm inet_pton
-does not accept 1-, 2-, or 3-part dotted addresses; all four parts
-must be specified.
-This is a narrower input set than that accepted by
-.Nm inet_aton .
 .Sh HISTORY
 The
 .Nm inet_addr ,
diff --git a/src/lib/libc/net/inet6_opt_init.3 b/src/lib/libc/net/inet6_opt_init.3
index 644f984e09..973f1e27fb 100644
--- a/src/lib/libc/net/inet6_opt_init.3
+++ b/src/lib/libc/net/inet6_opt_init.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_opt_init.3,v 1.4 2012/08/21 16:35:16 jmc Exp $
+.\"	$OpenBSD: inet6_opt_init.3,v 1.5 2012/09/27 11:31:58 jmc Exp $
 .\"	$KAME: inet6_opt_init.3,v 1.7 2004/12/27 05:08:23 itojun Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 21 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt INET6_OPT_INIT 3
 .Os
 .\"
@@ -305,7 +305,7 @@ All the functions return
 \-1
 on an error.
 .\"
-.Sh SEE ALSO
+.Sh STANDARDS
 .Rs
 .%A S. Deering
 .%A R. Hinden
@@ -313,6 +313,7 @@ on an error.
 .%R RFC 2460
 .%T Internet Protocol, Version 6 (IPv6) Specification
 .Re
+.Pp
 .Rs
 .%A W. Stevens
 .%A M. Thomas
@@ -322,10 +323,6 @@ on an error.
 .%R RFC 3542
 .%T Advanced Sockets Application Program Interface (API) for IPv6
 .Re
-.Sh STANDARDS
-The functions are documented in
-.Dq Advanced Sockets API for IPv6
-.Pq RFC 3542 .
 .Sh HISTORY
 The implementation first appeared in KAME advanced networking kit.
 .\"
diff --git a/src/lib/libc/net/inet6_option_space.3 b/src/lib/libc/net/inet6_option_space.3
index 9eab87f225..6c282a6f81 100644
--- a/src/lib/libc/net/inet6_option_space.3
+++ b/src/lib/libc/net/inet6_option_space.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_option_space.3,v 1.22 2012/08/21 16:35:16 jmc Exp $
+.\"	$OpenBSD: inet6_option_space.3,v 1.23 2012/09/27 11:31:58 jmc Exp $
 .\"	$KAME: inet6_option_space.3,v 1.11 2005/01/05 03:00:44 itojun Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 21 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt INET6_OPTION_SPACE 3
 .Os
 .\"
@@ -419,6 +419,8 @@ value.
 .Sh SEE ALSO
 .Xr inet6 4 ,
 .Xr ip6 4
+.\"
+.Sh STANDARDS
 .Rs
 .%A W. Stevens
 .%A M. Thomas
@@ -426,6 +428,7 @@ value.
 .%R RFC 2292
 .%T Advanced Sockets API for IPv6
 .Re
+.Pp
 .Rs
 .%A S. Deering
 .%A R. Hinden
@@ -434,11 +437,6 @@ value.
 .%T Internet Protocol, Version 6 (IPv6) Specification
 .Re
 .\"
-.Sh STANDARDS
-The functions are documented in
-.Dq Advanced Sockets API for IPv6
-(RFC 2292).
-.\"
 .Sh HISTORY
 This implementation first appeared in the KAME advanced networking kit.
 .\"
diff --git a/src/lib/libc/net/inet6_rth_space.3 b/src/lib/libc/net/inet6_rth_space.3
index fdd9e67c2d..6b09e6fa88 100644
--- a/src/lib/libc/net/inet6_rth_space.3
+++ b/src/lib/libc/net/inet6_rth_space.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_rth_space.3,v 1.4 2012/08/21 16:35:16 jmc Exp $
+.\"	$OpenBSD: inet6_rth_space.3,v 1.5 2012/09/27 11:31:58 jmc Exp $
 .\"	$KAME: inet6_rth_space.3,v 1.7 2005/01/05 03:00:44 itojun Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 21 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt INET6_RTH_SPACE 3
 .Os
 .\"
@@ -198,7 +198,7 @@ and
 .Fn inet6_rth_reverse
 functions return 0 on success, or \-1 upon an error.
 .\"
-.Sh SEE ALSO
+.Sh STANDARDS
 .Rs
 .%A S. Deering
 .%A R. Hinden
@@ -206,6 +206,7 @@ functions return 0 on success, or \-1 upon an error.
 .%R RFC 2460
 .%T Internet Protocol, Version 6 (IPv6) Specification
 .Re
+.Pp
 .Rs
 .%A W. Stevens
 .%A M. Thomas
diff --git a/src/lib/libc/net/inet6_rthdr_space.3 b/src/lib/libc/net/inet6_rthdr_space.3
index f3b8edd7ba..65afc5a734 100644
--- a/src/lib/libc/net/inet6_rthdr_space.3
+++ b/src/lib/libc/net/inet6_rthdr_space.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_rthdr_space.3,v 1.21 2012/08/21 16:35:16 jmc Exp $
+.\"	$OpenBSD: inet6_rthdr_space.3,v 1.22 2012/09/27 11:31:58 jmc Exp $
 .\"	$KAME: inet6_rthdr_space.3,v 1.11 2005/01/05 03:00:44 itojun Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 21 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt INET6_RTHDR_SPACE 3
 .Os
 .\"
@@ -279,6 +279,7 @@ functions return \-1 on error.
 .Sh SEE ALSO
 .Xr inet6 4 ,
 .Xr ip6 4
+.Sh STANDARDS
 .Rs
 .%A W. Stevens
 .%A M. Thomas
@@ -286,6 +287,7 @@ functions return \-1 on error.
 .%R RFC 2292
 .%T Advanced Sockets API for IPv6
 .Re
+.Pp
 .Rs
 .%A S. Deering
 .%A R. Hinden
diff --git a/src/lib/libc/net/resolver.3 b/src/lib/libc/net/resolver.3
index d5bfb67e8d..d36b6d8d89 100644
--- a/src/lib/libc/net/resolver.3
+++ b/src/lib/libc/net/resolver.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolver.3,v 1.22 2012/08/21 06:18:23 jmc Exp $
+.\"	$OpenBSD: resolver.3,v 1.23 2012/09/27 11:31:58 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 21 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt RESOLVER 3
 .Os
 .Sh NAME
@@ -338,38 +338,43 @@ The configuration file.
 .Xr hostname 7 ,
 .Xr named 8
 .Rs
+.%T Name Server Operations Guide for BIND
+.Re
+.Sh STANDARDS
+.Rs
 .%A M. Stahl
 .%D November 1987
 .%R RFC 1032
 .%T Domain Administrators Guide
 .Re
+.Pp
 .Rs
 .%A M. Lottor
 .%D November 1987
 .%R RFC 1033
 .%T Domain Administrators Operations Guide
 .Re
+.Pp
 .Rs
 .%A P. Mockapetris
 .%D November 1987
 .%R RFC 1034
 .%T Domain Names \(en Concepts and Facilities
 .Re
+.Pp
 .Rs
 .%A P. Mockapetris
 .%D November 1987
 .%R RFC 1035
 .%T Domain Names \(en Implementation and Specification
 .Re
+.Pp
 .Rs
 .%A J. Klensin
 .%D October 2008
 .%R RFC 5321
 .%T Simple Mail Transfer Protocol
 .Re
-.Rs
-.%T Name Server Operations Guide for BIND
-.Re
 .Sh HISTORY
 The
 .Nm
-- 
cgit v1.2.3-55-g6feb