[src/netbsd-8]: src/share/man/man4 Pull up following revision(s) (requested b...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/de4821309672
branches:  netbsd-8
changeset: 851386:de4821309672
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Feb 19 18:52:13 2018 +0000

description:
Pull up following revision(s) (requested by pgoyette in ticket #560):
        share/man/man4/gif.4: 1.31
Add 'tunnel mode ipip' to the cisco configuration as requested in
PR kern/53037

diffstat:

 share/man/man4/gif.4 |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r ef597f4cc42e -r de4821309672 share/man/man4/gif.4
--- a/share/man/man4/gif.4      Mon Feb 19 18:50:35 2018 +0000
+++ b/share/man/man4/gif.4      Mon Feb 19 18:52:13 2018 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: gif.4,v 1.30 2010/01/15 19:23:38 joerg Exp $
+.\"    $NetBSD: gif.4,v 1.30.40.1 2018/02/19 18:52:13 snj Exp $
 .\"    $KAME: gif.4,v 1.24 2001/02/20 12:54:01 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 January 15, 2009
+.Dd February 19, 2018
 .Dt GIF 4
 .Os
 .Sh NAME
@@ -185,6 +185,7 @@
     ip unnumbered D   ! e.g. address from Ethernet interface
     tunnel source D   ! e.g. address from Ethernet interface
     tunnel destination A
+    tunnel mode ipip
    ip route C <some interface and mask>
    ip route A mask C
    ip route X mask tunnelX