Cleanup usage of val_help:

Add spaces and use u32: format

73 files changed, 253 insertions, 238 deletions

diff --git a/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def b/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def
index fc57c1c..0932bd7 100644
--- a/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def
+++ b/templates/traffic-policy/drop-tail/node.tag/queue-limit/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Maximum queue size (packets)
 syntax:expression: $VAR(@) > 0 ; "queue limit must be greater than zero"
-val_help:<1-4294967295>; Queue size in bytes
+val_help: u32:1-4294967295; Queue size in bytes
diff --git a/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def b/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def
index 5d1a02a..1d1d8eb 100644
--- a/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def
+++ b/templates/traffic-policy/fair-queue/node.tag/queue-limit/node.def
@@ -2,4 +2,4 @@ type: u32
 help: Maximum queue size (packets)
 syntax:expression: $VAR(@) > 1 && $VAR(@) < 128;\
     "Queue limit must greater than 1 and less than 128"
-val_help:<1-127>; Queue size in bytes
+val_help: u32:1-127; Queue size in bytes
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.def b/templates/traffic-policy/limiter/node.tag/class/node.def
index 3cf3191..26d5ad6 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.def
@@ -2,4 +2,4 @@ tag:
 type: u32
 help: Class ID
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4090; "Class identifier must be between 1 and 4090"
-val_help:<1-4090>; Class Identifier
+val_help: u32:1-4090; Class Identifier
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/bandwidth/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/bandwidth/node.def
index 153c1fc..1e1f95b 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/bandwidth/node.def
@@ -1,5 +1,6 @@
 type: txt
 help: Traffic-limit used for this class [REQUIRED]
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
-val_help:<number>; Rate in k (1000) bytes per second 
-val_help:<number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
+
+val_help: <number>; Rate in k (1000) bytes per second 
+val_help: <number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def
index 4e0efa1..8e50ba5 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/burst/node.def
@@ -2,5 +2,5 @@ type: txt
 help: Burst size for this class (default: 15kb)
 default: "15k"
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
-val_help:<number>; Bytes
-val_help:<number><suffix>; Bytes with scaling suffix (kb, mb, gb)
+val_help: <number>; Bytes
+val_help: <number><suffix>; Bytes with scaling suffix (kb, mb, gb)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
index 4b221ba..f320ea4 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
@@ -1,5 +1,5 @@
 type: txt
 help: IP destination port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
index 27d880b..c55127c 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
@@ -4,15 +4,16 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help:u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help:default; match DSCP (000000)
-val_help:reliability; match; DSCP (000001)
-val_help:throughput; match; DSCP (000010)
-val_help:lowdelay; match; DSCP (000100)
-val_help:priority; match; DSCP (001000)
-val_help:immediate; match; DSCP (010000)
-val_help:flash; match DSCP (011000)
-val_help:flash-override; match DSCP (100000)
-val_help:critical; match DSCP (101000)
-val_help:internet; match; DSCP (110000)
-val_help:network; match; DSCP (111000)
+
+val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
+val_help: default; match DSCP (000000)
+val_help: reliability; match; DSCP (000001)
+val_help: throughput; match; DSCP (000010)
+val_help: lowdelay; match; DSCP (000100)
+val_help: priority; match; DSCP (001000)
+val_help: immediate; match; DSCP (010000)
+val_help: flash; match DSCP (011000)
+val_help: flash-override; match DSCP (100000)
+val_help: critical; match DSCP (101000)
+val_help: internet; match; DSCP (110000)
+val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
index 1451175..355c6a6 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
@@ -4,13 +4,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
-val_help:<0-255>; IP protocol value
-val_help:icmp; Internet Control Message Protocol
-val_help:igmp; Internet Group Management Protocol
-val_help:ggp; Gateway-Gateway protocol
-val_help:tcp; Transmission Control Protocol
-val_help:egp; Exterior Gateway Protocol
-val_help:udp; User Datagram Protocol
-val_help:gre; General Routing Encapsulation
-val_help:ospf; Open Shortest Path First IGP
-val_help:sctp; Stream Control Transmission Protocol
+val_help: u32:0-255; IP protocol value
+val_help: icmp; Internet Control Message Protocol
+val_help: igmp; Internet Group Management Protocol
+val_help: ggp; Gateway-Gateway protocol
+val_help: tcp; Transmission Control Protocol
+val_help: egp; Exterior Gateway Protocol
+val_help: udp; User Datagram Protocol
+val_help: gre; General Routing Encapsulation
+val_help: ospf; Open Shortest Path First IGP
+val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
index ad5e485..130bea6 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: IP source port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
 
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
index 4dd11ae..f358023 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
@@ -4,15 +4,16 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help:<0-63>; Differentiated Services Codepoint (DSCP) value
-val_help:default; match DSCP (000000)
-val_help:reliability; match DSCP (000001)
-val_help:throughput; match DSCP (000010)
-val_help:lowdelay; match DSCP (000100)
-val_help:priority; match DSCP (001000)
-val_help:immediate; match DSCP (010000)
-val_help:flash; match DSCP (011000)
-val_help:flash; -override 	match DSCP (100000)
-val_help:critical; match DSCP (101000)
-val_help:internet; match DSCP (110000)
-val_help:network; match DSCP (111000)
+
+val_help: u32:0-63; Differentiated Services Codepoint (DSCP) value
+val_help: default; match DSCP (000000)
+val_help: reliability; match DSCP (000001)
+val_help: throughput; match DSCP (000010)
+val_help: lowdelay; match DSCP (000100)
+val_help: priority; match DSCP (001000)
+val_help: immediate; match DSCP (010000)
+val_help: flash; match DSCP (011000)
+val_help: flash; -override 	match DSCP (100000)
+val_help: critical; match DSCP (101000)
+val_help: internet; match DSCP (110000)
+val_help: network; match DSCP (111000)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
index 1451175..66451c8 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
@@ -4,13 +4,14 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
-val_help:<0-255>; IP protocol value
-val_help:icmp; Internet Control Message Protocol
-val_help:igmp; Internet Group Management Protocol
-val_help:ggp; Gateway-Gateway protocol
-val_help:tcp; Transmission Control Protocol
-val_help:egp; Exterior Gateway Protocol
-val_help:udp; User Datagram Protocol
-val_help:gre; General Routing Encapsulation
-val_help:ospf; Open Shortest Path First IGP
-val_help:sctp; Stream Control Transmission Protocol
+
+val_help: u32:0-255; IP protocol value
+val_help: icmp; Internet Control Message Protocol
+val_help: igmp; Internet Group Management Protocol
+val_help: ggp; Gateway-Gateway protocol
+val_help: tcp; Transmission Control Protocol
+val_help: egp; Exterior Gateway Protocol
+val_help: udp; User Datagram Protocol
+val_help: gre; General Routing Encapsulation
+val_help: ospf; Open Shortest Path First IGP
+val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
index f305799..7fee35e 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: IPv6 source port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
 
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
index e3621c4..be93225 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
@@ -1,4 +1,5 @@
 type: u32
 help: Virtual Local Area Network (VLAN) ID for this match
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; "VLAN ID must be between 0 and 4095"
-val_help:<0-4095>; Virtual Local Area Network (VLAN) tag 
+
+val_help: u32:0-4095; Virtual Local Area Network (VLAN) tag 
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
index 8f4fa87..24f3b8b 100644
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
@@ -3,4 +3,4 @@ help: Ordering for rule evaluation
 default: 20
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255 ; \
 		   "precedence must be between 0 and 255"
-val_help:<0-255>; Rule evaluation order
+val_help: u32:0-255; Rule evaluation order
diff --git a/templates/traffic-policy/limiter/node.tag/default/bandwidth/node.def b/templates/traffic-policy/limiter/node.tag/default/bandwidth/node.def
index 4fdd8f9..59cb0f1 100644
--- a/templates/traffic-policy/limiter/node.tag/default/bandwidth/node.def
+++ b/templates/traffic-policy/limiter/node.tag/default/bandwidth/node.def
@@ -1,5 +1,6 @@
 type: txt
 help: Traffic-limit used for this class
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
-val_help:<number>; Rate in k (1000) bytes per second 
-val_help:<number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
+
+val_help: <number>; Rate in k (1000) bytes per second 
+val_help: <number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
diff --git a/templates/traffic-policy/limiter/node.tag/default/burst/node.def b/templates/traffic-policy/limiter/node.tag/default/burst/node.def
index 4e0efa1..1420cec 100644
--- a/templates/traffic-policy/limiter/node.tag/default/burst/node.def
+++ b/templates/traffic-policy/limiter/node.tag/default/burst/node.def
@@ -2,5 +2,6 @@ type: txt
 help: Burst size for this class (default: 15kb)
 default: "15k"
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
-val_help:<number>; Bytes
-val_help:<number><suffix>; Bytes with scaling suffix (kb, mb, gb)
+
+val_help: <number>; Bytes
+val_help: <number><suffix>; Bytes with scaling suffix (kb, mb, gb)
diff --git a/templates/traffic-policy/limiter/node.tag/default/priority/node.def b/templates/traffic-policy/limiter/node.tag/default/priority/node.def
index b088129..916a3c7 100644
--- a/templates/traffic-policy/limiter/node.tag/default/priority/node.def
+++ b/templates/traffic-policy/limiter/node.tag/default/priority/node.def
@@ -4,4 +4,5 @@ default: 20
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 20 ; \
 		   "priority must be between 0 and 20"
 help: Priority for rule evaluation
-val_help:<0-20>; Rule evaluation order
+
+val_help: u32:0-20; Rule evaluation order
diff --git a/templates/traffic-policy/network-emulator/node.tag/bandwidth/node.def b/templates/traffic-policy/network-emulator/node.tag/bandwidth/node.def
index 22b4e23..7f08b01 100644
--- a/templates/traffic-policy/network-emulator/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/bandwidth/node.def
@@ -1,5 +1,6 @@
 type: txt
 help: Bandwidth limit
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
-val_help:<number>; Rate in k (1000) bytes per second 
-val_help:<number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
+
+val_help: <number>; Rate in k (1000) bytes per second 
+val_help: <number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
diff --git a/templates/traffic-policy/network-emulator/node.tag/burst/node.def b/templates/traffic-policy/network-emulator/node.tag/burst/node.def
index 493e0fc..0889449 100644
--- a/templates/traffic-policy/network-emulator/node.tag/burst/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/burst/node.def
@@ -2,5 +2,6 @@ type: txt
 help: Burst size
 default: "15k"
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
-val_help:<number>; Bytes
-val_help:<number><suffix>; Bytes with scaling suffix (kb, mb, gb)
+
+val_help: <number>; Bytes
+val_help: <number><suffix>; Bytes with scaling suffix (kb, mb, gb)
diff --git a/templates/traffic-policy/network-emulator/node.tag/network-delay/node.def b/templates/traffic-policy/network-emulator/node.tag/network-delay/node.def
index 7455a38..1e6d9a1 100644
--- a/templates/traffic-policy/network-emulator/node.tag/network-delay/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/network-delay/node.def
@@ -1,5 +1,6 @@
 type: txt
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)"
 help: Additional network delay
-val_help:<number>; Time in milliseconds
-val_help:<number><suffix>; Time with suffix (secs, ms, us)
+
+val_help: <number>; Time in milliseconds
+val_help: <number><suffix>; Time with suffix (secs, ms, us)
diff --git a/templates/traffic-policy/network-emulator/node.tag/packet-corruption/node.def b/templates/traffic-policy/network-emulator/node.tag/packet-corruption/node.def
index c875ad5..7679492 100644
--- a/templates/traffic-policy/network-emulator/node.tag/packet-corruption/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/packet-corruption/node.def
@@ -1,5 +1,6 @@
 type: txt
 help: Emulated packet data corruption rate
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent $VAR(@)"
-val_help:<number>%%; Percentage of packets affected
+
+val_help: <number>%%; Percentage of packets affected
 
diff --git a/templates/traffic-policy/network-emulator/node.tag/packet-loss/node.def b/templates/traffic-policy/network-emulator/node.tag/packet-loss/node.def
index 4765fd5..e94096a 100644
--- a/templates/traffic-policy/network-emulator/node.tag/packet-loss/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/packet-loss/node.def
@@ -1,5 +1,6 @@
 type: txt
 help: Emulated packet loss rate
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent $VAR(@)"
-val_help:<number>%%; Percentage of packets affected
+
+val_help: <number>%%; Percentage of packets affected
 
diff --git a/templates/traffic-policy/network-emulator/node.tag/packet-reordering/node.def b/templates/traffic-policy/network-emulator/node.tag/packet-reordering/node.def
index 654bec3..4b4a1ad 100644
--- a/templates/traffic-policy/network-emulator/node.tag/packet-reordering/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/packet-reordering/node.def
@@ -3,5 +3,5 @@ help: Emulated packet reordering percentage
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent $VAR(@)"
 commit:expression: $VAR(../network-delay) != "" ; \
        "Must specify network-delay for packet reordering"
-val_help:<number>%%; Percentage of packets affected
+val_help: <number>%%; Percentage of packets affected
 
diff --git a/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def b/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def
index a1fb213..dd70472 100644
--- a/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def
+++ b/templates/traffic-policy/network-emulator/node.tag/queue-limit/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Maximum queue size (packets)
 syntax:expression: $VAR(@) > 0; "Queue limit must be greater than zero"
-val_help:<1-4294967295>; Queue size in bytes
+val_help: u32:1-4294967295; Queue size in bytes
diff --git a/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def b/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def
index d7ac169..88ac488 100644
--- a/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def
@@ -3,6 +3,6 @@ help: Available bandwidth for this policy
 default: "auto"
 syntax:expression: $VAR(@) == "auto" || \
 		   exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
-val_help:auto; Rate based on interface speed (default)
-val_help:<number>; Rate in k (1000) bytes per second 
-val_help:<number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
+val_help: auto; Rate based on interface speed (default)
+val_help: <number>; Rate in k (1000) bytes per second 
+val_help: <number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.def
index 2b6171f..a74647b 100644
--- a/templates/traffic-policy/random-detect/node.tag/precedence/node.def
+++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.def
@@ -3,4 +3,4 @@ type: u32
 help: IP precedence
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 7; \
 	           "IP precedence value must be between 0 and 7"
-val_help:<0-7>; IP precedence value
+val_help: u32:0-7; IP precedence value
diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def
index e625ed7..6ca1ec9 100644
--- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def
+++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def
@@ -2,4 +2,4 @@ type: u32
 help: Average packet size (bytes)
 default: 1024
 syntax:expression: $VAR(@) >= 16 && $VAR(@) <= 10240 ; "Average packet size must be between 16 and 10240"
-val_help:<16-10240>; Average packet size in bytes
+val_help: u32:16-10240; Average packet size in bytes
diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def
index 5a7df82..92dccb1 100644
--- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def
+++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Mark probability for this precedence
 syntax:expression: $VAR(@) > 0 ; "Mark probability must be greater than 0"
-val_help:<number>; Numeric value ( 1 / N )
+val_help: <number>; Numeric value ( 1 / N )
diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def
index 3f42375..93c246d 100644
--- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def
+++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def
@@ -2,4 +2,4 @@ type: u32
 help: Maximum threshold for random detection
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4096;\
                    "Threshold must be between 0 and 4096"
-val_help:<0-4096>; Maximum Threshold in packets
+val_help: u32:0-4096; Maximum Threshold in packets
diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def
index 6875bc1..90df922 100644
--- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def
+++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def
@@ -2,4 +2,4 @@ type: u32
 help: Minimum threshold for random detection
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4096; \
                    "Threshold must be between 0 and 4096"
-val_help:<0-4096>; Minimum Threshold in packets
+val_help: u32:0-4096; Minimum Threshold in packets
diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def
index b9f0651..b1dd909 100644
--- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def
+++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Maximum queue size (packets)
 syntax:expression: $VAR(@) > 0 ; "Queue limit must greater than zero"
-val_help:<1-4294967295>; Queue size in bytes
+val_help: u32:1-4294967295; Queue size in bytes
diff --git a/templates/traffic-policy/rate-control/node.tag/bandwidth/node.def b/templates/traffic-policy/rate-control/node.tag/bandwidth/node.def
index 22b4e23..7f08b01 100644
--- a/templates/traffic-policy/rate-control/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/rate-control/node.tag/bandwidth/node.def
@@ -1,5 +1,6 @@
 type: txt
 help: Bandwidth limit
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
-val_help:<number>; Rate in k (1000) bytes per second 
-val_help:<number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
+
+val_help: <number>; Rate in k (1000) bytes per second 
+val_help: <number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
diff --git a/templates/traffic-policy/rate-control/node.tag/burst/node.def b/templates/traffic-policy/rate-control/node.tag/burst/node.def
index b9f3aa0..0889449 100644
--- a/templates/traffic-policy/rate-control/node.tag/burst/node.def
+++ b/templates/traffic-policy/rate-control/node.tag/burst/node.def
@@ -3,5 +3,5 @@ help: Burst size
 default: "15k"
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
 
-val_help:<number>; Bytes
-val_help:<number><suffix>; Bytes with scaling suffix (kb, mb, gb)
+val_help: <number>; Bytes
+val_help: <number><suffix>; Bytes with scaling suffix (kb, mb, gb)
diff --git a/templates/traffic-policy/rate-control/node.tag/latency/node.def b/templates/traffic-policy/rate-control/node.tag/latency/node.def
index 89196dd..e8d958d 100644
--- a/templates/traffic-policy/rate-control/node.tag/latency/node.def
+++ b/templates/traffic-policy/rate-control/node.tag/latency/node.def
@@ -2,5 +2,6 @@ type: txt
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)"
 default: "50ms"
 help: Maximum latency
-val_help:<number>; Time in milliseconds
-val_help:<number><suffix>; Time with suffix (secs, ms, us)
+
+val_help: <number>; Time in milliseconds
+val_help: <number><suffix>; Time with suffix (secs, ms, us)
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.def
index 171d0a4..928453f 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.def
@@ -3,4 +3,4 @@ type: u32
 help: Class handle
 syntax:expression: $VAR(@) > 1 && $VAR(@) <= 4095; \
                   "Class identifier must be between 3 and 4095"
-val_help:<1-4095>; Class identifier
+val_help: u32:1-4095; Class identifier
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
index 4b221ba..f320ea4 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
@@ -1,5 +1,5 @@
 type: txt
 help: IP destination port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
index 1451175..355c6a6 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
@@ -4,13 +4,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
-val_help:<0-255>; IP protocol value
-val_help:icmp; Internet Control Message Protocol
-val_help:igmp; Internet Group Management Protocol
-val_help:ggp; Gateway-Gateway protocol
-val_help:tcp; Transmission Control Protocol
-val_help:egp; Exterior Gateway Protocol
-val_help:udp; User Datagram Protocol
-val_help:gre; General Routing Encapsulation
-val_help:ospf; Open Shortest Path First IGP
-val_help:sctp; Stream Control Transmission Protocol
+val_help: u32:0-255; IP protocol value
+val_help: icmp; Internet Control Message Protocol
+val_help: igmp; Internet Group Management Protocol
+val_help: ggp; Gateway-Gateway protocol
+val_help: tcp; Transmission Control Protocol
+val_help: egp; Exterior Gateway Protocol
+val_help: udp; User Datagram Protocol
+val_help: gre; General Routing Encapsulation
+val_help: ospf; Open Shortest Path First IGP
+val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
index ad5e485..130bea6 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: IP source port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
 
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
index 6fb393e..05498ef 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
@@ -1,5 +1,5 @@
 type: txt
 help: IPv6 destination port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
index 27d880b..224b002 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
@@ -4,15 +4,15 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help:u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help:default; match DSCP (000000)
-val_help:reliability; match; DSCP (000001)
-val_help:throughput; match; DSCP (000010)
-val_help:lowdelay; match; DSCP (000100)
-val_help:priority; match; DSCP (001000)
-val_help:immediate; match; DSCP (010000)
-val_help:flash; match DSCP (011000)
-val_help:flash-override; match DSCP (100000)
-val_help:critical; match DSCP (101000)
-val_help:internet; match; DSCP (110000)
-val_help:network; match; DSCP (111000)
+val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
+val_help: default; match DSCP (000000)
+val_help: reliability; match; DSCP (000001)
+val_help: throughput; match; DSCP (000010)
+val_help: lowdelay; match; DSCP (000100)
+val_help: priority; match; DSCP (001000)
+val_help: immediate; match; DSCP (010000)
+val_help: flash; match DSCP (011000)
+val_help: flash-override; match DSCP (100000)
+val_help: critical; match DSCP (101000)
+val_help: internet; match; DSCP (110000)
+val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
index 1451175..355c6a6 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
@@ -4,13 +4,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
-val_help:<0-255>; IP protocol value
-val_help:icmp; Internet Control Message Protocol
-val_help:igmp; Internet Group Management Protocol
-val_help:ggp; Gateway-Gateway protocol
-val_help:tcp; Transmission Control Protocol
-val_help:egp; Exterior Gateway Protocol
-val_help:udp; User Datagram Protocol
-val_help:gre; General Routing Encapsulation
-val_help:ospf; Open Shortest Path First IGP
-val_help:sctp; Stream Control Transmission Protocol
+val_help: u32:0-255; IP protocol value
+val_help: icmp; Internet Control Message Protocol
+val_help: igmp; Internet Group Management Protocol
+val_help: ggp; Gateway-Gateway protocol
+val_help: tcp; Transmission Control Protocol
+val_help: egp; Exterior Gateway Protocol
+val_help: udp; User Datagram Protocol
+val_help: gre; General Routing Encapsulation
+val_help: ospf; Open Shortest Path First IGP
+val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
index f305799..7fee35e 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: IPv6 source port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
 
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def
index 65f05a5..6d9f82f 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def
@@ -2,4 +2,4 @@ type: u32
 help: Virtual Local Area Network (VLAN) ID for this match
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; \
                    "VLAN ID must be between 0 and 4095"
-val_help:<0-4095>; Virtual Local Area Network (VLAN) tag 
+val_help: u32:0-4095; Virtual Local Area Network (VLAN) tag 
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def
index 5d1a02a..1d1d8eb 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def
@@ -2,4 +2,4 @@ type: u32
 help: Maximum queue size (packets)
 syntax:expression: $VAR(@) > 1 && $VAR(@) < 128;\
     "Queue limit must greater than 1 and less than 128"
-val_help:<1-127>; Queue size in bytes
+val_help: u32:1-127; Queue size in bytes
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def
index 7832d71..5768fdd 100644
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def
@@ -3,6 +3,6 @@ default: "drop-tail"
 syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; \
                    "Unknown queue-type"
 help: Queue type for this class
-val_help:fair-queue; Stochastic Fair Queue (SFQ)
-val_help:drop-tail; First-In-First-Out (FIFO)
-val_help:priority; Priority queueing based on DSCP
+val_help: fair-queue; Stochastic Fair Queue (SFQ)
+val_help: drop-tail; First-In-First-Out (FIFO)
+val_help: priority; Priority queueing based on DSCP
diff --git a/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def b/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def
index b9f0651..b1dd909 100644
--- a/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Maximum queue size (packets)
 syntax:expression: $VAR(@) > 0 ; "Queue limit must greater than zero"
-val_help:<1-4294967295>; Queue size in bytes
+val_help: u32:1-4294967295; Queue size in bytes
diff --git a/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def b/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def
index 2785543..ec3d4a2 100644
--- a/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def
@@ -3,7 +3,7 @@ default: "fair-queue"
 syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail";\
                    "Unknown queue-type"
 help: Queue type for this class
-val_help:fair-queue; Stochastic Fair Queue (SFQ)
-val_help:drop-tail; First-In-First-Out (FIFO)
-val_help:priority; Priority queueing based on DSCP
+val_help: fair-queue; Stochastic Fair Queue (SFQ)
+val_help: drop-tail; First-In-First-Out (FIFO)
+val_help: priority; Priority queueing based on DSCP
 
diff --git a/templates/traffic-policy/round-robin/node.tag/quantum/node.def b/templates/traffic-policy/round-robin/node.tag/quantum/node.def
index a2b41df..7763166 100644
--- a/templates/traffic-policy/round-robin/node.tag/quantum/node.def
+++ b/templates/traffic-policy/round-robin/node.tag/quantum/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Packet scheduling quantum
 syntax:expression: $VAR(@) > 0 ; "Quantum must be greater than zero"
-val_help:<1-4294967295>; Packet scheduling quantum (bytes)
+val_help: u32:1-4294967295; Packet scheduling quantum (bytes)
diff --git a/templates/traffic-policy/shaper/node.tag/bandwidth/node.def b/templates/traffic-policy/shaper/node.tag/bandwidth/node.def
index f865a59..08384f6 100644
--- a/templates/traffic-policy/shaper/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/shaper/node.tag/bandwidth/node.def
@@ -4,6 +4,6 @@ default: "auto"
 syntax:expression: $VAR(@) == "auto" || \
 		   exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)"
 
-val_help:auto; Rate matches interface speed (default)
-val_help:<number>; Rate in k (1000) bytes per second 
-val_help:<number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
+val_help: auto; Rate matches interface speed (default)
+val_help: <number>; Rate in k (1000) bytes per second 
+val_help: <number><suffix>;  Rate with scaling suffix (mbit, mbps, ...)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.def b/templates/traffic-policy/shaper/node.tag/class/node.def
index 1662f26..1857c5b 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.def
@@ -3,4 +3,4 @@ type: u32
 help: Class handle
 syntax:expression: $VAR(@) > 1 && $VAR(@) <= 4095; \
                   "Class identifier must be between 2 and 4095"
-val_help:<1-4095>; Class identifier
+val_help: u32:1-4095; Class identifier
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/bandwidth/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/bandwidth/node.def
index 3df631d..1bc24c5 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/bandwidth/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/bandwidth/node.def
@@ -2,6 +2,6 @@ type: txt
 default: "100%"
 help: Bandwidth used for this class
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
-val_help:<number>; Bandwidth in Kbps
-val_help:<number>%%; Percentage of overall rate (default 100%%)
-val_help:<number><suffix>;  Value with scaling suffix (kbit, kbps, ...)
+val_help: <number>; Bandwidth in Kbps
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number><suffix>;  Value with scaling suffix (kbit, kbps, ...)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/burst/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/burst/node.def
index 4e0efa1..8e50ba5 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/burst/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/burst/node.def
@@ -2,5 +2,5 @@ type: txt
 help: Burst size for this class (default: 15kb)
 default: "15k"
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
-val_help:<number>; Bytes
-val_help:<number><suffix>; Bytes with scaling suffix (kb, mb, gb)
+val_help: <number>; Bytes
+val_help: <number><suffix>; Bytes with scaling suffix (kb, mb, gb)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/ceiling/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/ceiling/node.def
index f186eba..bd3c588 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/ceiling/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/ceiling/node.def
@@ -2,6 +2,6 @@ type: txt
 help: Bandwidth limit for this class
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
 
-val_help:<number>; Bandwidth in Kbps
-val_help:<number>%%; Percentage of overall rate (default 100%%)
-val_help:<number><suffix>;  Value with scaling suffix (kbit, kbps, ...)
+val_help: <number>; Bandwidth in Kbps
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number><suffix>;  Value with scaling suffix (kbit, kbps, ...)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
index 4b221ba..f320ea4 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
@@ -1,5 +1,5 @@
 type: txt
 help: IP destination port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
index 27d880b..224b002 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
@@ -4,15 +4,15 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help:u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help:default; match DSCP (000000)
-val_help:reliability; match; DSCP (000001)
-val_help:throughput; match; DSCP (000010)
-val_help:lowdelay; match; DSCP (000100)
-val_help:priority; match; DSCP (001000)
-val_help:immediate; match; DSCP (010000)
-val_help:flash; match DSCP (011000)
-val_help:flash-override; match DSCP (100000)
-val_help:critical; match DSCP (101000)
-val_help:internet; match; DSCP (110000)
-val_help:network; match; DSCP (111000)
+val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
+val_help: default; match DSCP (000000)
+val_help: reliability; match; DSCP (000001)
+val_help: throughput; match; DSCP (000010)
+val_help: lowdelay; match; DSCP (000100)
+val_help: priority; match; DSCP (001000)
+val_help: immediate; match; DSCP (010000)
+val_help: flash; match DSCP (011000)
+val_help: flash-override; match DSCP (100000)
+val_help: critical; match DSCP (101000)
+val_help: internet; match; DSCP (110000)
+val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
index 7c9e022..b0ef59f 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
@@ -4,13 +4,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { if($1 != "ip") printf "%s ", $1 }' </etc/protocols
-val_help:<0-255>; IP protocol value
-val_help:icmp; Internet Control Message Protocol
-val_help:igmp; Internet Group Management Protocol
-val_help:ggp; Gateway-Gateway protocol
-val_help:tcp; Transmission Control Protocol
-val_help:egp; Exterior Gateway Protocol
-val_help:udp; User Datagram Protocol
-val_help:gre; General Routing Encapsulation
-val_help:ospf; Open Shortest Path First IGP
-val_help:sctp; Stream Control Transmission Protocol
+val_help: u32:0-255; IP protocol value
+val_help: icmp; Internet Control Message Protocol
+val_help: igmp; Internet Group Management Protocol
+val_help: ggp; Gateway-Gateway protocol
+val_help: tcp; Transmission Control Protocol
+val_help: egp; Exterior Gateway Protocol
+val_help: udp; User Datagram Protocol
+val_help: gre; General Routing Encapsulation
+val_help: ospf; Open Shortest Path First IGP
+val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
index ad5e485..130bea6 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: IP source port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
 
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
index 6fb393e..05498ef 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
@@ -1,5 +1,5 @@
 type: txt
 help: IPv6 destination port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
index 27d880b..224b002 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
@@ -4,15 +4,15 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help:u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help:default; match DSCP (000000)
-val_help:reliability; match; DSCP (000001)
-val_help:throughput; match; DSCP (000010)
-val_help:lowdelay; match; DSCP (000100)
-val_help:priority; match; DSCP (001000)
-val_help:immediate; match; DSCP (010000)
-val_help:flash; match DSCP (011000)
-val_help:flash-override; match DSCP (100000)
-val_help:critical; match DSCP (101000)
-val_help:internet; match; DSCP (110000)
-val_help:network; match; DSCP (111000)
+val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
+val_help: default; match DSCP (000000)
+val_help: reliability; match; DSCP (000001)
+val_help: throughput; match; DSCP (000010)
+val_help: lowdelay; match; DSCP (000100)
+val_help: priority; match; DSCP (001000)
+val_help: immediate; match; DSCP (010000)
+val_help: flash; match DSCP (011000)
+val_help: flash-override; match DSCP (100000)
+val_help: critical; match DSCP (101000)
+val_help: internet; match; DSCP (110000)
+val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
index 1451175..355c6a6 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
@@ -4,13 +4,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $1 }' </etc/protocols
-val_help:<0-255>; IP protocol value
-val_help:icmp; Internet Control Message Protocol
-val_help:igmp; Internet Group Management Protocol
-val_help:ggp; Gateway-Gateway protocol
-val_help:tcp; Transmission Control Protocol
-val_help:egp; Exterior Gateway Protocol
-val_help:udp; User Datagram Protocol
-val_help:gre; General Routing Encapsulation
-val_help:ospf; Open Shortest Path First IGP
-val_help:sctp; Stream Control Transmission Protocol
+val_help: u32:0-255; IP protocol value
+val_help: icmp; Internet Control Message Protocol
+val_help: igmp; Internet Group Management Protocol
+val_help: ggp; Gateway-Gateway protocol
+val_help: tcp; Transmission Control Protocol
+val_help: egp; Exterior Gateway Protocol
+val_help: udp; User Datagram Protocol
+val_help: gre; General Routing Encapsulation
+val_help: ospf; Open Shortest Path First IGP
+val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
index f305799..7fee35e 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: IPv6 source port for this match
 
-val_help: u32:1-65535>; Numeric IP port
+val_help: u32:1-65535; Numeric IP port
 val_help: txt; Assigned IP port name
 
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def
index e0e11aa..d975074 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def
@@ -2,4 +2,4 @@ type: u32
 help: Virtual Local Area Network (VLAN) ID for this match
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; \
                   "VLAN ID must be between 0 and 4095"
-val_help:<0-4095>; Virtual Local Area Network (VLAN) tag 
+val_help: u32:0-4095; Virtual Local Area Network (VLAN) tag 
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/priority/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/priority/node.def
index a3edd88..6cacb22 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/priority/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/priority/node.def
@@ -2,4 +2,4 @@ type: u32
 help: Priority for usage of excess bandwidth
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 7 ;\
                    "priority must be between 0 than 7"
-val_help:<0-7>; Priority order for bandwidth pool
+val_help: u32:0-7; Priority order for bandwidth pool
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def
index 5d1a02a..1d1d8eb 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-limit/node.def
@@ -2,4 +2,4 @@ type: u32
 help: Maximum queue size (packets)
 syntax:expression: $VAR(@) > 1 && $VAR(@) < 128;\
     "Queue limit must greater than 1 and less than 128"
-val_help:<1-127>; Queue size in bytes
+val_help: u32:1-127; Queue size in bytes
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def
index 3db969a..6b44648 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/queue-type/node.def
@@ -4,8 +4,8 @@ syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-det
                    "Unknown queue-type"
 help: Queue type for this class
 
-val_help:fair-queue; Stochastic Fair Queue (SFQ)
-val_help:drop-tail; First-In-First-Out (FIFO)
-val_help:priority; Priority queueing based on DSCP
-val_help:random-detect; Random Early Detection (RED)
+val_help: fair-queue; Stochastic Fair Queue (SFQ)
+val_help: drop-tail; First-In-First-Out (FIFO)
+val_help: priority; Priority queueing based on DSCP
+val_help: random-detect; Random Early Detection (RED)
 
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/set-dscp/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/set-dscp/node.def
index 26106d6..eb29d56 100644
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/set-dscp/node.def
+++ b/templates/traffic-policy/shaper/node.tag/class/node.tag/set-dscp/node.def
@@ -4,15 +4,15 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help:u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help:default; match DSCP (000000)
-val_help:reliability; match; DSCP (000001)
-val_help:throughput; match; DSCP (000010)
-val_help:lowdelay; match; DSCP (000100)
-val_help:priority; match; DSCP (001000)
-val_help:immediate; match; DSCP (010000)
-val_help:flash; match DSCP (011000)
-val_help:flash-override; match DSCP (100000)
-val_help:critical; match DSCP (101000)
-val_help:internet; match; DSCP (110000)
-val_help:network; match; DSCP (111000)
+val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
+val_help: default; match DSCP (000000)
+val_help: reliability; match; DSCP (000001)
+val_help: throughput; match; DSCP (000010)
+val_help: lowdelay; match; DSCP (000100)
+val_help: priority; match; DSCP (001000)
+val_help: immediate; match; DSCP (010000)
+val_help: flash; match DSCP (011000)
+val_help: flash-override; match DSCP (100000)
+val_help: critical; match DSCP (101000)
+val_help: internet; match; DSCP (110000)
+val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/shaper/node.tag/default/bandwidth/node.def b/templates/traffic-policy/shaper/node.tag/default/bandwidth/node.def
index 512e447..e44dd92 100644
--- a/templates/traffic-policy/shaper/node.tag/default/bandwidth/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/bandwidth/node.def
@@ -2,6 +2,6 @@ type: txt
 help: Bandwidth used for default traffic [REQUIRED]
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \$VAR(@)"
 
-val_help:<number>; Bandwidth in Kbps
-val_help:<number>%%; Percentage of overall rate (default 100%%)
-val_help:<number><suffix>;  Value with scaling suffix (kbit, kbps, ...)
+val_help: <number>; Bandwidth in Kbps
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number><suffix>;  Value with scaling suffix (kbit, kbps, ...)
diff --git a/templates/traffic-policy/shaper/node.tag/default/burst/node.def b/templates/traffic-policy/shaper/node.tag/default/burst/node.def
index e7e89ec..c3a04ab 100644
--- a/templates/traffic-policy/shaper/node.tag/default/burst/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/burst/node.def
@@ -3,5 +3,5 @@ help: Burst size for default traffic
 default: "15k"
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)"
 
-val_help:<number>; Bytes
-val_help:<number><suffix>; Bytes with scaling suffix (kb, mb, gb)
+val_help: <number>; Bytes
+val_help: <number><suffix>; Bytes with scaling suffix (kb, mb, gb)
diff --git a/templates/traffic-policy/shaper/node.tag/default/ceiling/node.def b/templates/traffic-policy/shaper/node.tag/default/ceiling/node.def
index 922cb73..b4d9caf 100644
--- a/templates/traffic-policy/shaper/node.tag/default/ceiling/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/ceiling/node.def
@@ -2,6 +2,6 @@ type: txt
 help: Bandwidth limit for default traffic
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate $VAR(@)"
 
-val_help:<number>; Bandwidth in Kbps
-val_help:<number>%%; Percentage of overall rate (default 100%%)
-val_help:<number><suffix>;  Value with scaling suffix (kbit, kbps, ...)
+val_help: <number>; Bandwidth in Kbps
+val_help: <number>%%; Percentage of overall rate (default 100%%)
+val_help: <number><suffix>;  Value with scaling suffix (kbit, kbps, ...)
diff --git a/templates/traffic-policy/shaper/node.tag/default/priority/node.def b/templates/traffic-policy/shaper/node.tag/default/priority/node.def
index 11fcfd9..44772bb 100644
--- a/templates/traffic-policy/shaper/node.tag/default/priority/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/priority/node.def
@@ -2,4 +2,4 @@ type: u32
 help: Priority for usage of extra bandwidth
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 7 ;\
                    "priority must be between 0 than 7"
-val_help:<0-7>; Priority order for bandwidth pool
+val_help: u32:0-7; Priority order for bandwidth pool
diff --git a/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def b/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def
index 63c3206..4d79afb 100644
--- a/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/queue-limit/node.def
@@ -1,4 +1,4 @@
 type: u32
 help: Maximum queue size (packets)
 syntax:expression: $VAR(@) > 0;  "Queue limit must be greater than zero"
-val_help:<1-4294967295>; Queue size in bytes
+val_help: u32:1-4294967295; Queue size in bytes
diff --git a/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def b/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
index f4bf0d4..caf6818 100644
--- a/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/queue-type/node.def
@@ -3,7 +3,7 @@ default: "fair-queue"
 syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect";\
                    "Unknown queue-type"
 help: Queue type for default traffic
-val_help:fair-queue; Stochastic Fair Queue (SFQ)
-val_help:drop-tail; First-In-First-Out (FIFO)
-val_help:priority; Priority queueing based on DSCP
-val_help:random-detect; Random Early Detection (RED)
+val_help: fair-queue; Stochastic Fair Queue (SFQ)
+val_help: drop-tail; First-In-First-Out (FIFO)
+val_help: priority; Priority queueing based on DSCP
+val_help: random-detect; Random Early Detection (RED)
diff --git a/templates/traffic-policy/shaper/node.tag/default/set-dscp/node.def b/templates/traffic-policy/shaper/node.tag/default/set-dscp/node.def
index 9161e2f..fc3f3fa 100644
--- a/templates/traffic-policy/shaper/node.tag/default/set-dscp/node.def
+++ b/templates/traffic-policy/shaper/node.tag/default/set-dscp/node.def
@@ -4,15 +4,15 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
 allowed: awk '
 	/^#/ { next }
 	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help:u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help:default; match DSCP (000000)
-val_help:reliability; match; DSCP (000001)
-val_help:throughput; match; DSCP (000010)
-val_help:lowdelay; match; DSCP (000100)
-val_help:priority; match; DSCP (001000)
-val_help:immediate; match; DSCP (010000)
-val_help:flash; match DSCP (011000)
-val_help:flash-override; match DSCP (100000)
-val_help:critical; match DSCP (101000)
-val_help:internet; match; DSCP (110000)
-val_help:network; match; DSCP (111000)
+val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
+val_help: default; match DSCP (000000)
+val_help: reliability; match; DSCP (000001)
+val_help: throughput; match; DSCP (000010)
+val_help: lowdelay; match; DSCP (000100)
+val_help: priority; match; DSCP (001000)
+val_help: immediate; match; DSCP (010000)
+val_help: flash; match DSCP (011000)
+val_help: flash-override; match DSCP (100000)
+val_help: critical; match DSCP (101000)
+val_help: internet; match; DSCP (110000)
+val_help: network; match; DSCP (111000)