Use val_help: features to format better

Previous change did not format val-help tag correctly

9 files changed, 21 insertions, 20 deletions

diff --git a/templates/interfaces/bonding/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/address/node.def
index 1c6ea9af..8701d134 100644
--- a/templates/interfaces/bonding/node.tag/address/node.def
+++ b/templates/interfaces/bonding/node.tag/address/node.def
@@ -6,7 +6,7 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR
 create:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@)
 delete:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@)
 allowed: echo "dhcp <>"
-val_help:<x.x.x.x/x>; IP address and prefix length
-val_help:<h:h:h:h:h:h:h:h/x>; IPv6 address and prefix length
-val_help:dhcp; Dynamic Host Configuration Protocol
+val_help: ipv4; IP address and prefix length
+val_help: ipv6; IPv6 address and prefix length
+val_help: dhcp; Dynamic Host Configuration Protocol
 
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def
index f25a36ac..243747b9 100644
--- a/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Path cost for this port
 syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
-val_help:<1-65535>; Path cost value for Spanning Tree Protocol
+val_help: u32:1-65535; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def
index 38c11131..abda5971 100644
--- a/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Port priority for this port
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
-val_help:<1-255>; Bridge port priority
+val_help: u32:1-255; Bridge port priority
diff --git a/templates/interfaces/bonding/node.tag/mode/node.def b/templates/interfaces/bonding/node.tag/mode/node.def
index f76282a0..a21d2961 100644
--- a/templates/interfaces/bonding/node.tag/mode/node.def
+++ b/templates/interfaces/bonding/node.tag/mode/node.def
@@ -10,10 +10,10 @@ transmit-load-balance, adaptive-load-balance, or xor"
 help: Bonding mode
 update: sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$VAR(../@) --mode=$VAR(@)
 
-val_help:802.3ad:IEEE 802.3ad Dynamic link aggregation (Default)
-val_help:active-backup:Fault tolerant: only one slave in the bond is active
-val_help:broadcast:Fault tolerant: transmits everything on all slave interfaces
-val_help:round-robin:Load balance: transmit packets in sequential order
-val_help:transmit-load-balance:Load balance: adapts based on transmit load and speed
-val_help:adaptive-load-balance:Load balance: adapts based on transmit and receive plus ARP
-val_help:xor-hash:Load balance: distribute based on MAC address
+val_help: 802.3ad; IEEE 802.3ad Dynamic link aggregation (Default)
+val_help: active-backup; Fault tolerant: only one slave in the bond is active
+val_help: broadcast; Fault tolerant: transmits everything on all slave interfaces
+val_help: round-robin; Load balance: transmit packets in sequential order
+val_help: transmit-load-balance; Load balance: adapts based on transmit load and speed
+val_help: adaptive-load-balance; Load balance: adapts based on transmit and receive plus ARP
+val_help: xor-hash; Load balance: distribute based on MAC address
diff --git a/templates/interfaces/bonding/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/mtu/node.def
index 4439a4f1..09e5adb7 100644
--- a/templates/interfaces/bonding/node.tag/mtu/node.def
+++ b/templates/interfaces/bonding/node.tag/mtu/node.def
@@ -1,6 +1,6 @@
 type: u32
 help: Maximum Transmission Unit (MTU)
 syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
-val_help:<68-9000>: Maximum Transmission Unit
+val_help: u32:68-9000; Maximum Transmission Unit
 update: ip link set $VAR(../@) mtu $VAR(@)
 delete: ip link set $VAR(../@) mtu 1500
diff --git a/templates/interfaces/bonding/node.tag/vif/node.def b/templates/interfaces/bonding/node.tag/vif/node.def
index b9b544a2..5d6a5478 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.def
@@ -3,7 +3,7 @@ priority: 320
 type: u32
 help: Virtual Local Area Network (VLAN) ID
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
-val_help:<0-4094>:VLAN ID
+val_help: u32:0-4094; VLAN ID
 
 create: read -a SLAVES </sys/class/net/$VAR(../@)/bonding/slaves
 	if [ ${#SLAVES[*]} -eq 0 ]; then
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def
index 84bd9e3b..99f55aad 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def
@@ -3,9 +3,10 @@ type: txt
 help: IP address
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../../@).$VAR(../@) "\
     ; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../../@).$VAR(../@)"
+allowed: echo "dhcp <>"
+val_help: ipv4; IP address and prefix length
+val_help: ipv6; IPv6 address and prefix length
+val_help: dhcp; Dynamic Host Configuration Protocol
+
 create:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../../@).$VAR(../@)
 delete:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../../@).$VAR(../@)
-allowed: echo "dhcp <>"
-val_help:<x.x.x.x/x>; IP address and prefix length
-val_help:<h:h:h:h:h:h:h:h/x>; IPv6 address and prefix length
-val_help:dhcp; Dynamic Host Configuration Protocol
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def
index f25a36ac..243747b9 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Path cost for this port
 syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
-val_help:<1-65535>; Path cost value for Spanning Tree Protocol
+val_help: u32:1-65535; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def
index 38c11131..abda5971 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Port priority for this port
 syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
-val_help:<1-255>; Bridge port priority
+val_help: u32:1-255; Bridge port priority