the diff below aims for some consistency in the man pages (rfc 2292):

        inet6_options_space.3
        inet6_rthdr_space.3

and the man pages that documented their newer versions (rfc 3542):

        inet6_opt_init.3
        inet6_rth_space.3

specifically i've tried to make the Rs/Re blocks more consistent
(not just within these pages, but a general consistency i'm aiming
for when we refer to RFCs in Rs/Re blocks), and removed some comments
that were either out of date (the freebsd one) or inconsistent (why
have a comment saying 3542 supersedes 2292, then providing the same
info in the actual man page; also 3542 has obsoleted 2292, so it
seems out of date).

i'm posting it here in case i've missed something (i.e. messed up).
jmc

Index: inet6_opt_init.3
===================================================================
RCS file: /cvs/src/lib/libc/net/inet6_opt_init.3,v
retrieving revision 1.3
diff -u -r1.3 inet6_opt_init.3
--- inet6_opt_init.3    31 May 2007 19:19:30 -0000      1.3
+++ inet6_opt_init.3    20 Aug 2012 20:10:36 -0000
@@ -65,13 +65,6 @@
 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 @@
 .\"
 .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
Index: inet6_option_space.3
===================================================================
RCS file: /cvs/src/lib/libc/net/inet6_option_space.3,v
retrieving revision 1.21
diff -u -r1.21 inet6_option_space.3
--- inet6_option_space.3        31 May 2007 19:19:30 -0000      1.21
+++ inet6_option_space.3        20 Aug 2012 20:10:36 -0000
@@ -422,16 +422,16 @@
 .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
Index: inet6_rth_space.3
===================================================================
RCS file: /cvs/src/lib/libc/net/inet6_rth_space.3,v
retrieving revision 1.3
diff -u -r1.3 inet6_rth_space.3
--- inet6_rth_space.3   31 May 2007 19:19:30 -0000      1.3
+++ inet6_rth_space.3   20 Aug 2012 20:10:36 -0000
@@ -200,20 +200,20 @@
 .\"
 .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.
Index: inet6_rthdr_space.3
===================================================================
RCS file: /cvs/src/lib/libc/net/inet6_rthdr_space.3,v
retrieving revision 1.20
diff -u -r1.20 inet6_rthdr_space.3
--- inet6_rthdr_space.3 31 May 2007 19:19:30 -0000      1.20
+++ inet6_rthdr_space.3 20 Aug 2012 20:10:36 -0000
@@ -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 @@
 .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

Reply via email to