Index: ifconfig.8
===================================================================
RCS file: /cvs/src/sbin/ifconfig/ifconfig.8,v
retrieving revision 1.282
diff -u -p -r1.282 ifconfig.8
--- ifconfig.8	12 May 2017 15:11:02 -0000	1.282
+++ ifconfig.8	6 Jun 2017 01:54:10 -0000
@@ -415,6 +415,14 @@ and 0's for the host part.
 The mask should contain at least the standard network portion,
 and the subnet field should be contiguous with the network
 portion.
+.It Cm parent Ar parent-interface
+Associate with interface
+.Ar parent-interface .
+Packets transmitted through the interface will be encapsulated and
+diverted to the specified parent interface
+.It Cm -parent
+Disassociate from the parent interface.
+This breaks the link between the interface and its parent.
 .It Cm prefixlen Ar n
 (inet and inet6 only)
 Effect is similar to
@@ -461,6 +469,20 @@ This may be used to enable an interface 
 It happens automatically when setting the first address on an interface.
 If the interface was reset when previously marked down,
 the hardware will be re-initialized.
+.It Cm vnetid Ar network-id Ns | Ns Cm any
+Set the virtual network identifier.
+This is a number which is used by encapsulation interfaces such as
+.Xr vlan 4
+or
+.Xr vxlan 4
+to identify packets with a virtual network.
+If supported by the interface,
+the value can also be set to
+.Ar any
+to accept packets with arbitrary network identifiers (for example for
+multipoint-to-multipoint modes).
+.It Cm -vnetid
+Clear the virtual network identifier.
 .It Cm wol
 Enable Wake on LAN (WoL).
 When enabled, reception of a WoL frame will cause the network card to
@@ -1531,7 +1553,6 @@ for a complete list of the available pro
 .Op Oo Fl Oc Ns Cm keepalive Ar period count
 .Op Cm tunnel Ar src_address dest_address
 .Op Cm tunneldomain Ar tableid
-.Op Oo Fl Oc Ns Cm vnetid Ar network-id
 .Ek
 .nr nS 0
 .Pp
@@ -1583,21 +1604,6 @@ can be set to any valid routing table ID
 the corresponding routing domain is derived from this table.
 .It Cm tunnelttl Ar ttl
 Set the IP or multicast TTL of the tunnel packets.
-.It Cm vnetid Ar network-id
-Set the virtual network identifier.
-This is a number which is used by tunnel protocols such as
-.Xr vxlan 4
-to identify packets with a virtual network.
-The accepted size of the number depends on the individual tunnel protocol;
-it is a 24-bit number for
-.Xr vxlan 4 .
-If supported by the tunnel protocol,
-the value can also be set to
-.Ar any
-to accept packets with arbitrary network identifiers (for example for
-multipoint-to-multipoint modes).
-.It Cm -vnetid
-Clear the virtual network identifier.
 .El
 .Sh UMB
 .nr nS 1
@@ -1660,52 +1666,6 @@ Disable data roaming.
 As soon as the interface is marked as "up", the
 .Xr umb 4
 device will try to establish a data connection with the service provider.
-.El
-.Sh VLAN
-.nr nS 1
-.Bk -words
-.Nm ifconfig
-.Ar vlan-interface
-.Op Cm vlan Ar vlan-tag
-.Op Oo Fl Oc Ns Cm vlandev Ar parent-interface
-.Ek
-.nr nS 0
-.Pp
-The following options are available for a
-.Xr vlan 4
-interface:
-.Bl -tag -width Ds
-.It Cm vlan Ar vlan-tag
-Set the vlan tag value
-to
-.Ar vlan-tag .
-This value is a 12-bit number which is used to create an 802.1Q
-vlan header for packets sent from the vlan interface.
-This value cannot be changed once it is set for an interface.
-.It Cm vlandev Ar parent-interface
-Associate with interface
-.Ar parent-interface .
-Packets transmitted through the vlan interface will be
-diverted to the specified interface
-.Ar parent-interface
-with 802.1Q vlan tagging.
-Packets with 802.1Q tagging received
-by the parent interface with the correct vlan tag will be diverted to
-the associated vlan pseudo-device.
-The vlan interface is assigned a
-copy of the parent interface's flags and the parent's Ethernet address.
-If
-.Cm vlandev
-and
-.Cm vlan
-are not set at the same time, the vlan tag will be inferred from
-the interface name, for instance
-.Cm vlan5
-will be assigned 802.1Q tag 5.
-.It Cm -vlandev
-Disassociate from the parent interface.
-This breaks the link between the vlan interface and its parent,
-clears its vlan tag, flags, and link address, and shuts the interface down.
 .El
 .Sh EXAMPLES
 Assign the