diff options
| author | Michael Biebl <biebl@debian.org> | 2015-11-24 00:06:46 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-11-24 00:06:46 +0100 |
| commit | 5916ab88146d04273e6a1895ba3eed7322f2625f (patch) | |
| tree | 54479065ceda124ef5ff84890de64c52717a5645 /libnm/nm-ifcfg-rh-docs.xml | |
| parent | 3f830f75cf071873c36e1365f80c31e2422e1f7c (diff) | |
| parent | a6ece1a2aa19a6268335c87d4fdef20123dd04a5 (diff) | |
Merge tag 'upstream/1.0.8'
Upstream version 1.0.8
Diffstat (limited to 'libnm/nm-ifcfg-rh-docs.xml')
| -rw-r--r-- | libnm/nm-ifcfg-rh-docs.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm/nm-ifcfg-rh-docs.xml b/libnm/nm-ifcfg-rh-docs.xml index 1ea38141..2cea2cb2 100644 --- a/libnm/nm-ifcfg-rh-docs.xml +++ b/libnm/nm-ifcfg-rh-docs.xml @@ -194,8 +194,8 @@ IPV6_PRIVACY_PREFER_PUBLIC_IP: yes, no" default="no" example="IPV6_PRIVACY=rfc30 <property name="parent" variable="DEVICE or PHYSDEV" format="" values="" default="" example="" description="Parent interface of the VLAN."/> <property name="id" variable="VLAN_ID or DEVICE" format="" values="" default="" example="" description="VLAN identifier."/> <property name="flags" variable="VLAN_FLAGS, REORDER_HDR" format="" values=""GVRP", "LOOSE_BINDING" for VLAN_FLAGS; 0 or 1 for REORDER_HDR" default="" example="" description="VLAN flags."/> -<property name="ingress-property-map" variable="VLAN_INGRESS_PRIORITY_MAP" format="" values="" default="" example="VLAN_INGRESS_PRIORITY_MAP=4:2,3:5" description="Ingress priority mapping."/> -<property name="egress-property-map" variable="VLAN_EGRESS_PRIORITY_MAP" format="" values="" default="" example="VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7" description="Egress priority mapping."/> +<property name="ingress-priority-map" variable="VLAN_INGRESS_PRIORITY_MAP" format="" values="" default="" example="VLAN_INGRESS_PRIORITY_MAP=4:2,3:5" description="Ingress priority mapping."/> +<property name="egress-priority-map" variable="VLAN_EGRESS_PRIORITY_MAP" format="" values="" default="" example="VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7" description="Egress priority mapping."/> <property name="interface-name" variable="PHYSDEV and VLAN_ID, or DEVICE" format="" values="" default="" example="PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12" description="VLAN interface name. If all variables are set, parent device from PHYSDEV takes precedence over DEVICE, but VLAN id from DEVICE takes precedence over VLAN_ID."/> |