rfc 3542 obsoletes rfc 2292; ok guenther

3 files changed, 18 insertions, 16 deletions

diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index 1a5b1050bfd..b5004f9ffc6 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: icmp6.4,v 1.25 2011/09/03 22:59:07 jmc Exp $
+.\"	$OpenBSD: icmp6.4,v 1.26 2012/06/21 19:57:14 jmc Exp $
 .\"	$KAME: icmp6.4,v 1.6 2004/12/27 05:30:56 itojun Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
@@ -27,7 +27,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.Dd $Mdocdate: September 3 2011 $
+.Dd $Mdocdate: June 21 2012 $
 .Dt ICMP6 4
 .Os
 .Sh NAME
@@ -237,13 +237,6 @@ structure as the option value.
 .Xr ip6 4 ,
 .Xr netintro 4
 .Rs
-.%A W. Stevens
-.%A M. Thomas
-.%T Advanced Sockets API for IPv6
-.%N RFC 2292
-.%D February 1998
-.Re
-.Rs
 .%A A. Conta
 .%A S. Deering
 .%T "Internet Control Message Protocol (ICMPv6) for the Internet" \
@@ -251,3 +244,12 @@ structure as the option value.
 .%N RFC 2463
 .%D December 1998
 .Re
+.Rs
+.%A W. Stevens
+.%A M. Thomas
+.%A E. Nordmark
+.%A T. Jinmei
+.%T Advanced Sockets Application Program Interface (API) for IPv6
+.%R RFC 3542
+.%D May 2003
+.Re
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index ee5f735b9f3..43929a5a811 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6.4,v 1.29 2009/12/13 15:48:21 sobrado Exp $
+.\"	$OpenBSD: inet6.4,v 1.30 2012/06/21 19:57:14 jmc Exp $
 .\"	$KAME: inet6.4,v 1.19 2000/11/24 10:13:18 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 13 2009 $
+.Dd $Mdocdate: June 21 2012 $
 .Dt INET6 4
 .Os
 .Sh NAME
@@ -102,7 +102,7 @@ like link-local or site-local address.
 A scoped address is ambiguous to the kernel,
 if it is specified without a scope identifier.
 To manipulate scoped addresses properly from userland,
-programs must use the advanced API defined in RFC 2292.
+programs must use the advanced API defined in RFC 3542.
 A compact description of the advanced API is available in
 .Xr ip6 4 .
 If scoped addresses are specified without explicit scope,
@@ -314,7 +314,7 @@ sockets.
 .Sh HISTORY
 The
 .Nm
-protocol interface is defined in RFC 2553 and RFC 2292.
+protocol interface is defined in RFC 2553 and RFC 3542.
 The implementation described herein appeared in WIDE/KAME project.
 .Sh BUGS
 The IPv6 support is subject to change as the Internet protocols develop.
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index e25ea0ad400..07f754bfab6 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: route6d.8,v 1.21 2011/04/23 10:14:59 sobrado Exp $
+.\"	$OpenBSD: route6d.8,v 1.22 2012/06/21 19:57:14 jmc Exp $
 .\"	$KAME: route6d.8,v 1.11 2002/06/02 15:00:30 itojun Exp $
 .\"
 .\" Copyright (c) 1996 WIDE Project. All rights reserved.
@@ -15,7 +15,7 @@
 .\" LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 .\" A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: April 23 2011 $
+.Dd $Mdocdate: June 21 2012 $
 .Dt ROUTE6D 8
 .Os
 .Sh NAME
@@ -243,7 +243,7 @@ signal.
 .Sh NOTES
 .Nm
 uses the advanced IPv6 API,
-defined in RFC 2292,
+defined in RFC 3542,
 for communicating with peers using link-local addresses.
 .Pp
 Internally