Use val_help: features to format better

Previous change did not format val-help tag correctly

39 files changed, 83 insertions, 75 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
diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def
index 5208faf8..699554e2 100644
--- a/templates/interfaces/bridge/node.tag/address/node.def
+++ b/templates/interfaces/bridge/node.tag/address/node.def
@@ -17,6 +17,6 @@ delete:
       sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@)
   fi
 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/bridge/node.tag/aging/node.def b/templates/interfaces/bridge/node.tag/aging/node.def
index 925734a3..c2d9b12f 100644
--- a/templates/interfaces/bridge/node.tag/aging/node.def
+++ b/templates/interfaces/bridge/node.tag/aging/node.def
@@ -2,7 +2,7 @@ type: u32
 help: Interval addresses are retained
 default: 300
 syntax:expression:$VAR(@) <= 60; "Bridge aging time must be between 0 and 60"
-val_help:<0-60>; Address aging time for bridge (seconds)
+val_help: u32:0-60; Address aging time for bridge (seconds)
 
 update: /usr/sbin/brctl setageing $VAR(../@) $VAR(@)
 delete: /usr/sbin/brctl setageing $VAR(../@) 300
diff --git a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
index b1e244f4..ae9d8390 100644
--- a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
+++ b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
@@ -1,5 +1,5 @@
 type: u32
 help: Forwarding delay
 syntax:expression:$VAR(@) <= 60; "Forwarding delay must be between 0 and 60"
-val_help:<0-60>; Spanning Tree Protocol forwarding delay in seconds (default 15)
+val_help: u32:0-60; Spanning Tree Protocol forwarding delay in seconds (default 15)
 update: /usr/sbin/brctl setfd $VAR(../@) $VAR(@)
diff --git a/templates/interfaces/bridge/node.tag/hello-time/node.def b/templates/interfaces/bridge/node.tag/hello-time/node.def
index 6dfb3493..beb6e385 100644
--- a/templates/interfaces/bridge/node.tag/hello-time/node.def
+++ b/templates/interfaces/bridge/node.tag/hello-time/node.def
@@ -2,6 +2,6 @@ type: u32
 default: 2
 help: Hello packet advertisment interval
 syntax:expression:$VAR(@) <= 30; "Bridge Hello interval must be between 0 and 30 seconds"
-val_help:<0-30>:Spanning Tree Protocol hello advertisement interval (default 2)
+val_help: u32:0-30; Spanning Tree Protocol hello advertisement interval (default 2)
 update: /usr/sbin/brctl sethello $VAR(../@) $VAR(@)
 delete: /usr/sbin/brctl sethello $VAR(../@) 2
diff --git a/templates/interfaces/bridge/node.tag/max-age/node.def b/templates/interfaces/bridge/node.tag/max-age/node.def
index b05ac934..72b3b902 100644
--- a/templates/interfaces/bridge/node.tag/max-age/node.def
+++ b/templates/interfaces/bridge/node.tag/max-age/node.def
@@ -2,7 +2,7 @@ type: u32
 help: Interval at which neighbor bridges are removed
 default: 20
 syntax:expression:$VAR(@) <= 60; "Bridge max aging value must be between 0 and 60"
-val_help:<0-60>:Bridge maximum aging time value (default 20)
+val_help: u32:0-60; Bridge maximum aging time value (default 20)
 update: /usr/sbin/brctl setmaxage $VAR(../@) $VAR(@)
 delete: /usr/sbin/brctl setmaxage $VAR(../@) 20
 
diff --git a/templates/interfaces/bridge/node.tag/priority/node.def b/templates/interfaces/bridge/node.tag/priority/node.def
index 8fc0a683..d487ef84 100644
--- a/templates/interfaces/bridge/node.tag/priority/node.def
+++ b/templates/interfaces/bridge/node.tag/priority/node.def
@@ -2,7 +2,7 @@ type: u32
 help: Priority for this bridge
 default: 0
 syntax:expression:$VAR(@) < 65536 ; "Bridge priority must be between 0 and 65535"
-val_help:<0-65535>; Bridge priority (default 0)
+val_help: u32:0-65535; Bridge priority (default 0)
 
 update: /usr/sbin/brctl setbridgeprio $VAR(../@) $VAR(@)
 delete: /usr/sbin/brctl setbridgeprio $VAR(../@) 0
diff --git a/templates/interfaces/bridge/node.tag/stp/node.def b/templates/interfaces/bridge/node.tag/stp/node.def
index 5a660574..d24a3261 100644
--- a/templates/interfaces/bridge/node.tag/stp/node.def
+++ b/templates/interfaces/bridge/node.tag/stp/node.def
@@ -1,8 +1,8 @@
 type: bool
 default: false
 help: Enable spanning tree protocol
-val_help:true:Enable  Spanning Tree Protocol
-val_help:false:Disable Spanning Tree Protocol (default false)
+val_help: true; Enable Spanning Tree Protocol
+val_help: false; Disable Spanning Tree Protocol (default)
 
 update: if [ "$VAR(@)" == "true" ]; then
 	  if [ -z "$VAR(../../forwarding-delay)" ]; then
diff --git a/templates/interfaces/ethernet/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/address/node.def
index f2bff386..8cdd27db 100644
--- a/templates/interfaces/ethernet/node.tag/address/node.def
+++ b/templates/interfaces/ethernet/node.tag/address/node.def
@@ -48,7 +48,7 @@ delete:
 
 allowed: echo "dhcp dhcpv6 <>"
 
-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:dhcpv6; Dynamic Host Configuration Protocol for IPv6
+val_help: ipv4; IP address and prefix length
+val_help: ipv6; IPv6 address and prefix length
+val_help: dhcp; Dynamic Host Configuration Protocol
+val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
index 2b1e6243..22bac5a2 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Bridge port cost
 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/ethernet/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
index 35bd1a3f..41cf303f 100644
--- a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Bridge port priority
 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/ethernet/node.tag/duplex/node.def b/templates/interfaces/ethernet/node.tag/duplex/node.def
index a032266d..8fbe1594 100644
--- a/templates/interfaces/ethernet/node.tag/duplex/node.def
+++ b/templates/interfaces/ethernet/node.tag/duplex/node.def
@@ -2,12 +2,13 @@ type: txt
 help: Duplex mode
 default: "auto"
 syntax:expression: $VAR(@) in "auto", "half", "full"; "duplex must be auto, half or full"
-val_help:auto:Auto negotiation (default)
-val_help:half:Half duplex
-val_help:full:Full duplex
 
 commit:expression: ( $VAR(@) == "auto" && $VAR(../speed/@) == "auto" ) || \
 		   ( $VAR(@) != "auto" && $VAR(../speed/@) != "auto" ) ; \
 	"if duplex is hardcoded, speed must also be hardcoded"
 update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \
 	--speed-duplex $VAR(../speed/@) $VAR(@)
+
+val_help: auto; Auto negotiation (default)
+val_help: half; Half duplex
+val_help: full; Full duplex
diff --git a/templates/interfaces/ethernet/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/mtu/node.def
index bb8d3ea4..dcd73b7c 100644
--- a/templates/interfaces/ethernet/node.tag/mtu/node.def
+++ b/templates/interfaces/ethernet/node.tag/mtu/node.def
@@ -1,7 +1,8 @@
 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 (MTU)
+val_help: u32:68-9000; Maximum Transmission Unit (MTU)
+
 update: if ! ip link set $VAR(../@) mtu $VAR(@)
         then echo "Error setting MTU on dev $VAR(../@)"; exit 1
         fi
diff --git a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
index b1c33b6b..a6498f88 100644
--- a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
+++ b/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
@@ -15,8 +15,8 @@ type: txt
 
 help: CPU interrupt affinity mask
 
-val_help:<hex number>:Bitmask representing CPUs that this NIC will interrupt
-val_help:auto:affinity automatically (default)
+val_help: <hex>; Bitmask representing CPUs that this NIC will interrupt
+val_help: auto; Automatic CPU affinity (default)
 
 default: "auto"
 
diff --git a/templates/interfaces/ethernet/node.tag/speed/node.def b/templates/interfaces/ethernet/node.tag/speed/node.def
index 5d68f524..d9be6f6d 100644
--- a/templates/interfaces/ethernet/node.tag/speed/node.def
+++ b/templates/interfaces/ethernet/node.tag/speed/node.def
@@ -2,15 +2,17 @@ type: txt
 help: Link speed
 default: "auto"
 syntax:expression: $VAR(@) in "auto", "10", "100", "1000", "2500", "10000"; "Speed must be auto, 10, 100, 1000, 2500, or 10000"
-val_help:auto:Auto negotiation (default)
-val_help:10:10 Mbit/sec
-val_help:100:100 Mbit/sec
-val_help:1000:1 Gbit/sec
-val_help:2500:2.5 Gbit/sec
-val_help:10000:10 Gbit/sec
 
 commit:expression: ( $VAR(@) == "auto" && $VAR(../duplex/@) == "auto" ) || \
 		   ( $VAR(@) != "auto" && $VAR(../duplex/@) != "auto" ) ; \
               "if speed is hardcoded, duplex must also be hardcoded"
 update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \
 	--speed-duplex $VAR(@) $VAR(../duplex/@)
+
+val_help: auto; Auto negotiation (default)
+val_help: 10; 10 Mbit/sec
+val_help: 100; 100 Mbit/sec
+val_help: 1000; 1 Gbit/sec
+val_help: 2500; 2.5 Gbit/sec
+val_help: 10000; 10 Gbit/sec
+
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
index 0076668e..388ad332 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.def
@@ -3,7 +3,7 @@ priority: 319
 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: if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
 	then echo "Error creating VLAN device $VAR(../@).$VAR(@)"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
index b3f360b6..7e1833c3 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
@@ -21,6 +21,6 @@ delete:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --de
 
 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/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
index f25a36ac..243747b9 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/ethernet/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/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
index 38c11131..abda5971 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/ethernet/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
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
index 1c6ea9af..46ae1b69 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
@@ -6,7 +6,8 @@ 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/tunnel/node.tag/bridge-group/cost/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
index f25a36ac..243747b9 100644
--- a/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/tunnel/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/tunnel/node.tag/bridge-group/priority/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
index 38c11131..abda5971 100644
--- a/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/tunnel/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/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
index 79c57310..edbc3ae1 100644
--- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def
+++ b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
@@ -7,8 +7,8 @@ create:expression: "true"
 update:expression: "false" ; \
                "Encapsulation can only be set at tunnel creation for $VAR(../@)"
 
-val_help:gre:Generic Routing Encapsulation
-val_help:gre-bridge:Generic Routing Encapsulation bridge interface
-val_help:ipip:IP in IP encapsulation
-val_help:sit:Simple Internet Transition encapsulation
+val_help: gre; Generic Routing Encapsulation
+val_help: gre-bridge; Generic Routing Encapsulation bridge interface
+val_help: ipip; IP in IP encapsulation
+val_help: sit; Simple Internet Transition encapsulation
 
diff --git a/templates/interfaces/tunnel/node.tag/key/node.def b/templates/interfaces/tunnel/node.tag/key/node.def
index e873765f..3f4cea4e 100644
--- a/templates/interfaces/tunnel/node.tag/key/node.def
+++ b/templates/interfaces/tunnel/node.tag/key/node.def
@@ -2,6 +2,8 @@ type: u32
 help: Tunnel key
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 999999; \
                    "Must be between 0-999999 for $VAR(../@)"
+val_help: u32:0-999999; Tunnel key
+
 syntax:expression: exec "                                                                  \
         if [ -n \"`ip tunnel show $VAR(../@) | grep $VAR(../@) `\" ]; then            \
               echo Key can only be set at tunnel creation for $VAR(../@);                  \
@@ -14,5 +16,3 @@ commit:expression: $VAR(../encapsulation/@) in "gre" ; \
 create:expression: "true"
 update:expression: "false" ; \
                    "Key can only be set at tunnel creation for $VAR(../@)"
-
-val_help:<0-999999>:Tunnel key
diff --git a/templates/interfaces/tunnel/node.tag/mtu/node.def b/templates/interfaces/tunnel/node.tag/mtu/node.def
index 1fcd3467..67594bc3 100644
--- a/templates/interfaces/tunnel/node.tag/mtu/node.def
+++ b/templates/interfaces/tunnel/node.tag/mtu/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: Maximum Transmission Unit (MTU)
 syntax:expression: $VAR(@) >= 64 && $VAR(@) <= 8024; "Must be between 64-8024"
-val_help:<64-8024>:Maximum Transmission Unit (MTU)
+val_help: u32:64-8024; Maximum Transmission Unit (MTU)
 
 update: ip link set $VAR(../@) mtu $VAR(@)
 delete: ip link set $VAR(../@) mtu 1476
diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def
index 8fd45da6..911a4e88 100644
--- a/templates/interfaces/tunnel/node.tag/multicast/node.def
+++ b/templates/interfaces/tunnel/node.tag/multicast/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Multicast operation over tunnel
 default: "disable"
-val_help:enable:Enable Multicast
-val_help:disable:Disable Multicast (default)
+val_help: enable; Enable Multicast
+val_help: disable; Disable Multicast (default)
 
 syntax:expression: $VAR(@) in "enable", "disable"; \
                    "Must be 'disable' or 'enable'"
diff --git a/templates/interfaces/tunnel/node.tag/tos/node.def b/templates/interfaces/tunnel/node.tag/tos/node.def
index 8a78875c..7a7817fc 100644
--- a/templates/interfaces/tunnel/node.tag/tos/node.def
+++ b/templates/interfaces/tunnel/node.tag/tos/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: Type of Service (TOS)
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 99; "Must be between 0-99"
-val_help:<0-99>:Type Of Service (TOS)
+val_help: u32:0-99; Type Of Service (TOS)
 
 update: ip tunnel change $VAR(../@) tos $VAR(@)
 delete: ip tunnel change $VAR(../@) tos inherit
diff --git a/templates/interfaces/tunnel/node.tag/ttl/node.def b/templates/interfaces/tunnel/node.tag/ttl/node.def
index bad9e027..fba20795 100644
--- a/templates/interfaces/tunnel/node.tag/ttl/node.def
+++ b/templates/interfaces/tunnel/node.tag/ttl/node.def
@@ -1,7 +1,7 @@
 type: u32
 default: 255
 help: Time to live field
-val_help:<0-255>:Time to live (default 255)
+val_help: u32:0-255; Time to live (default 255)
 
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
 update:if [ "$VAR(../encapsulation/@)" != "gre-bridge" ]; then sudo ip tunnel change $VAR(../@) ttl $VAR(@); fi;
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.def
index d30d5afb..d4670e39 100644
--- a/templates/system/login/user/node.tag/authentication/public-keys/node.def
+++ b/templates/system/login/user/node.tag/authentication/public-keys/node.def
@@ -1,7 +1,7 @@
 tag:
 type: txt
 help: Remote access public keys
-val_help:<txt>; key identifier used by ssh-keygen (usually of form user@host)
+val_help: key identifier used by ssh-keygen (usually of form user@host)
 
 commit:expression: $VAR(./type/) != "" ; \
 		   "Must configure public key type for $VAR(@)"
diff --git a/templates/system/login/user/node.tag/group/node.def b/templates/system/login/user/node.tag/group/node.def
index 2dc0abc9..f706521a 100644
--- a/templates/system/login/user/node.tag/group/node.def
+++ b/templates/system/login/user/node.tag/group/node.def
@@ -1,6 +1,9 @@
 multi:
 type: txt
 help: Additional group membership
+val_help: <groupname>; Group name
+val_help: u32:0-65535; Group ID
+
 syntax:expression: pattern $VAR(@) "^[a-zA-Z_][a-zA-Z0-9_-]*\\$?$"
    ; "Invalid group name $VAR(@)"
 syntax:expression: ! $VAR(@) in \
@@ -10,4 +13,3 @@ allowed: awk -F: '
     $1 == "quaggavty" || $1 == "vyattacfg" || $1 == "vyattaop" || \
     $1 == "sudo" || $1 == "adm" || $1 == "operator" { next; }
     		{printf "%s ", $1}' </etc/group
-comp_help: Enter group name or numerical group id
diff --git a/templates/system/login/user/node.tag/level/node.def b/templates/system/login/user/node.tag/level/node.def
index 2596bd7a..54891031 100644
--- a/templates/system/login/user/node.tag/level/node.def
+++ b/templates/system/login/user/node.tag/level/node.def
@@ -2,6 +2,6 @@ type: txt
 help: User privilege level
 default: "admin"
 syntax:expression: $VAR(@) in "admin", "operator"; "Allowed levels are \"admin\" and \"operator\""
-comp_help:Possible completions:
-  admin         Administrators
-  operator      Operators
+
+val_help: admin; Administrators
+val_help: operator; Operators