From f1a6f4e9850103e9b012f9eeda003893ede9b262 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 25 Oct 2012 09:01:29 -0700 Subject: [PATCH] iplink: add vxlan to man page Also sort link types for clarity --- man/man8/ip-link.8.in | 46 +++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index c03a8d64..43c4ac6b 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -50,7 +50,16 @@ ip-link \- network device configuration .ti -8 .IR TYPE " := [ " -.BR vlan " | " veth " | " vcan " | " dummy " | " ifb " | " macvlan " | " can " | " bridge " | "ipoib" ]" +.BR bridge " | " +.BR can " | " +.BR dummy " | " +.BR ifb " | " +.BR ipoib " |" +.BR macvlan " | " +.BR vcan " | " +.BR veth " | " +.BR vlan " | " +.BR vxlan " ]" .ti -8 .BI "ip link delete " DEVICE @@ -136,14 +145,11 @@ specifies the type of the new device. Link types: .in +8 -.B vlan -- 802.1q tagged virtual LAN interface +.B bridge +- Ethernet Bridge device .sp -.B veth -- Virtual ethernet interface -.sp -.B vcan -- Virtual Local CAN interface +.B can +- Controller Area Network interface .sp .B dummy - Dummy network interface @@ -151,17 +157,23 @@ Link types: .B ifb - Intermediate Functional Block device .sp -.B macvlan -- virtual interface base on link layer address (MAC) -.sp -.B can -- Controller Area Network interface -.sp -.B bridge -- Ethernet Bridge device -.sp .B ipoib - IP over Infiniband device +.sp +.B macvlan +- Virtual interface base on link layer address (MAC) +.sp +.B vcan +- Virtual Local CAN interface +.sp +.B veth +- Virtual ethernet interface +.sp +.BR vlan +- 802.1q tagged virtual LAN interface +.sp +.BR vxlan +- Virtual eXtended LAN .in -8 .TP