From 61238ae4ebba04806b520aea65c18b71227612eb Mon Sep 17 00:00:00 2001
From: sobrado <sobrado@openbsd.org>
Date: Tue, 2 Jun 2015 16:02:44 +0000
Subject: [PATCH] write Mobile IP{,v6} in a consistent way, as given in RFCs
 5944 and 6275.

ok jmc@
---
 lib/libc/gen/sysctl.3         |  6 +++---
 share/man/man4/gre.4          | 12 ++++++------
 usr.sbin/dhcpd/dhcp-options.5 |  6 +++---
 usr.sbin/rtadvd/rtadvd.8      |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 89f1b060b81..50d7b5ee59a 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.249 2015/03/12 12:40:11 jmc Exp $
+.\"	$OpenBSD: sysctl.3,v 1.250 2015/06/02 16:02:44 sobrado Exp $
 .\"
 .\" Copyright (c) 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: March 12 2015 $
+.Dd $Mdocdate: June 2 2015 $
 .Dt SYSCTL 3
 .Os
 .Sh NAME
@@ -1545,7 +1545,7 @@ to 2, no checks for spoofing of loopback addresses will be done.
 This is useful only for debugging purposes, and should never be used
 in production systems.
 .It Li mobileip.allow
-If set to 0, incoming MobileIP encapsulated packets (RFC 2004) will not be
+If set to 0, incoming Mobile IP encapsulated packets (RFC 2004) will not be
 processed.
 If set to any other value, processing will occur.
 .It Li tcp.ackonpush
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index da7ee8fb093..3a5fc6f87e4 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gre.4,v 1.41 2015/03/18 06:56:41 jmc Exp $
+.\" $OpenBSD: gre.4,v 1.42 2015/06/02 16:02:45 sobrado Exp $
 .\" $NetBSD: gre.4,v 1.10 1999/12/22 14:55:49 kleink Exp $
 .\"
 .\" Copyright 1998 (c) The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 18 2015 $
+.Dd $Mdocdate: June 2 2015 $
 .Dt GRE 4
 .Os
 .Sh NAME
@@ -40,12 +40,12 @@
 The
 .Nm
 network interface allows tunnel construction using the Cisco GRE or
-the Mobile-IP (RFC 2004) encapsulation protocols.
+the Mobile IP (RFC 2004) encapsulation protocols.
 .Pp
 .Tn GRE ,
 .Tn WCCPv1 ,
 and
-.Tn MobileIP
+.Tn Mobile IP
 are enabled with the following
 .Xr sysctl 3
 variables respectively in
@@ -61,7 +61,7 @@ This variable depends on
 .Va gre.allow
 being set.
 .It Va net.inet.mobileip.allow
-Allow MobileIP packets in and out of the system.
+Allow Mobile IP packets in and out of the system.
 .El
 .Pp
 A
@@ -88,7 +88,7 @@ interfaces.
 Datagrams are encapsulated into IP, but with a much smaller
 encapsulation header.
 This protocol only supports IP in IP encapsulation, and is intended
-for use with mobile IP.
+for use with Mobile IP.
 .El
 .Pp
 The network interfaces are named
diff --git a/usr.sbin/dhcpd/dhcp-options.5 b/usr.sbin/dhcpd/dhcp-options.5
index 2e44138f1f7..a1ac5794115 100644
--- a/usr.sbin/dhcpd/dhcp-options.5
+++ b/usr.sbin/dhcpd/dhcp-options.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcp-options.5,v 1.20 2014/01/21 07:52:14 jmc Exp $
+.\"	$OpenBSD: dhcp-options.5,v 1.21 2015/06/02 16:02:45 sobrado Exp $
 .\"
 .\" Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: January 21 2014 $
+.Dd $Mdocdate: June 2 2015 $
 .Dt DHCP-OPTIONS 5
 .Os
 .Sh NAME
@@ -349,7 +349,7 @@ the
 .Tn NVT ASCII
 character set.
 .It Ic option mobile-ip-home-agent Ar ip-address Oo , Ar ip-address ... Oc ;
-This option specifies a list of IP addresses indicating mobile IP
+This option specifies a list of IP addresses indicating Mobile IP
 home agents available to the client.
 Agents should be listed in order of preference, although normally there
 will be only one such agent.
diff --git a/usr.sbin/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8
index 8ea99e2973b..c693ad97d8d 100644
--- a/usr.sbin/rtadvd/rtadvd.8
+++ b/usr.sbin/rtadvd/rtadvd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtadvd.8,v 1.30 2014/12/03 20:15:37 florian Exp $
+.\"	$OpenBSD: rtadvd.8,v 1.31 2015/06/02 16:02:45 sobrado Exp $
 .\"	$KAME: rtadvd.8,v 1.18 2002/04/28 10:43:02 jinmei 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 3 2014 $
+.Dd $Mdocdate: June 2 2015 $
 .Dt RTADVD 8
 .Os
 .Sh NAME
@@ -111,7 +111,7 @@ This option has meaning only with the
 .Fl R
 option, which enables routing renumbering protocol support.
 .\".It Fl m
-.\"Enables mobile IPv6 support.
+.\"Enables Mobile IPv6 support.
 .\"This changes the content of router advertisement option, as well as
 .\"permitted configuration directives.
 .It Fl R
-- 
2.20.1