From: Nicolas Dichtel Date: Thu, 13 Dec 2012 03:42:52 +0000 (+0000) Subject: ip: update man pages for 'ip link' X-Git-Tag: v4.13.0~1124^2~44 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=77987911e5c3beab9b3a20c13ba63b5c441e16f5;p=mirror_iproute2.git ip: update man pages for 'ip link' Now 'ip link' supports ipip, sit and ip6tnl. Signed-off-by: Nicolas Dichtel --- diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index 43c4ac6b..8d2a6f99 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -1,4 +1,4 @@ -.TH IP\-LINK 8 "20 Dec 2011" "iproute2" "Linux" +.TH IP\-LINK 8 "13 Dec 2012" "iproute2" "Linux" .SH "NAME" ip-link \- network device configuration .SH "SYNOPSIS" @@ -59,7 +59,10 @@ ip-link \- network device configuration .BR vcan " | " .BR veth " | " .BR vlan " | " -.BR vxlan " ]" +.BR vxlan " |" +.BR ip6tnl " |" +.BR ipip " |" +.BR sit " ]" .ti -8 .BI "ip link delete " DEVICE @@ -174,6 +177,15 @@ Link types: .sp .BR vxlan - Virtual eXtended LAN +.sp +.BR ip6tnl +- Virtual tunnel interface IPv4|IPv6 over IPv6 +.sp +.BR ipip +- Virtual tunnel interface IPv4 over IPv4 +.sp +.BR sit +- Virtual tunnel interface IPv6 over IPv4 .in -8 .TP