- remove inconsistent/obsolete comments

- update rfc references
- make the Rs/Re blocks more consistent

4 files changed, 35 insertions, 48 deletions

diff --git a/lib/libc/net/inet6_opt_init.3 b/lib/libc/net/inet6_opt_init.3
index 21880a6382b..644f984e09e 100644
--- a/lib/libc/net/inet6_opt_init.3
+++ b/lib/libc/net/inet6_opt_init.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_opt_init.3,v 1.3 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: inet6_opt_init.3,v 1.4 2012/08/21 16:35:16 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: May 31 2007 $
+.Dd $Mdocdate: August 21 2012 $
 .Dt INET6_OPT_INIT 3
 .Os
 .\"
@@ -65,13 +65,6 @@ complicated.
 The advanced sockets API defines a set of functions to
 help applications create and manipulate Hop-by-Hop and Destination
 options.
-.\"This man page describes the functions specified in
-.\"IETF Draft RFC 3542 while the
-.\".Xr inet6_options_space 3
-.\"man page documents the functions defined in RFC 2292.
-.\"It is expected
-.\"that this set of functions will supersede those in RFC 2292 but for
-.\"the time being both APIs are retained.
 These functions use the
 formatting rules specified in Appendix B in RFC 2460, i.e. that the
 largest field is placed last in the option.
@@ -314,20 +307,20 @@ on an error.
 .\"
 .Sh SEE ALSO
 .Rs
+.%A S. Deering
+.%A R. Hinden
+.%D December 1998
+.%R RFC 2460
+.%T Internet Protocol, Version 6 (IPv6) Specification
+.Re
+.Rs
 .%A W. Stevens
 .%A M. Thomas
 .%A E. Nordmark
 .%A T. Jinmei
-.%T "Advanced Sockets API for IPv6"
-.%N RFC 3542
-.%D October 2002
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC 2460
-.%D December 1998
+.%D May 2003
+.%R RFC 3542
+.%T Advanced Sockets Application Program Interface (API) for IPv6
 .Re
 .Sh STANDARDS
 The functions are documented in
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index 8aa79a6d0bc..9eab87f2259 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.21 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: inet6_option_space.3,v 1.22 2012/08/21 16:35:16 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: May 31 2007 $
+.Dd $Mdocdate: August 21 2012 $
 .Dt INET6_OPTION_SPACE 3
 .Os
 .\"
@@ -422,16 +422,16 @@ value.
 .Rs
 .%A W. Stevens
 .%A M. Thomas
-.%T "Advanced Sockets API for IPv6"
-.%N RFC 2292
 .%D February 1998
+.%R RFC 2292
+.%T Advanced Sockets API for IPv6
 .Re
 .Rs
 .%A S. Deering
 .%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC 2460
 .%D December 1998
+.%R RFC 2460
+.%T Internet Protocol, Version 6 (IPv6) Specification
 .Re
 .\"
 .Sh STANDARDS
diff --git a/lib/libc/net/inet6_rth_space.3 b/lib/libc/net/inet6_rth_space.3
index 326521def74..fdd9e67c2dd 100644
--- a/lib/libc/net/inet6_rth_space.3
+++ b/lib/libc/net/inet6_rth_space.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_rth_space.3,v 1.3 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: inet6_rth_space.3,v 1.4 2012/08/21 16:35:16 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: May 31 2007 $
+.Dd $Mdocdate: August 21 2012 $
 .Dt INET6_RTH_SPACE 3
 .Os
 .\"
@@ -200,20 +200,20 @@ functions return 0 on success, or \-1 upon an error.
 .\"
 .Sh SEE ALSO
 .Rs
+.%A S. Deering
+.%A R. Hinden
+.%D December 1998
+.%R RFC 2460
+.%T Internet Protocol, Version 6 (IPv6) Specification
+.Re
+.Rs
 .%A W. Stevens
 .%A M. Thomas
 .%A E. Nordmark
 .%A T. Jinmei
-.%T "Advanced Sockets API for IPv6"
-.%N RFC 3542
 .%D May 2003
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC 2460
-.%D December 1998
+.%R RFC 3542
+.%T Advanced Sockets Application Programming Interface (API) for IPv6
 .Re
 .Sh HISTORY
 The implementation first appeared in KAME advanced networking kit.
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index 3287bfe009a..f3b8edd7ba6 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.20 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: inet6_rthdr_space.3,v 1.21 2012/08/21 16:35:16 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: May 31 2007 $
+.Dd $Mdocdate: August 21 2012 $
 .Dt INET6_RTHDR_SPACE 3
 .Os
 .\"
@@ -64,12 +64,6 @@
 .Fn inet6_rthdr_getflags "const struct cmsghdr *cmsg" "int index"
 .\"
 .Sh DESCRIPTION
-.\"The RFC 2292 IPv6 Advanced API has been deprecated in favor of the
-.\"newer, RFC 3542 APIs.
-.\"On platforms that support it, currently only
-.\"FreeBSD, please use the newer API to manipulate routing header
-.\"options.
-.\".Pp
 Note:
 RFC 2292 has been superseded by RFC 3542.
 The use of functions described in this page is deprecated.
@@ -288,16 +282,16 @@ functions return \-1 on error.
 .Rs
 .%A W. Stevens
 .%A M. Thomas
-.%T "Advanced Sockets API for IPv6"
-.%N RFC 2292
 .%D February 1998
+.%R RFC 2292
+.%T Advanced Sockets API for IPv6
 .Re
 .Rs
 .%A S. Deering
 .%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC 2460
 .%D December 1998
+.%R RFC 2460
+.%T Internet Protocol, Version 6 (IPv6) Specification
 .Re
 .\"
 .Sh HISTORY