Cleanup usage of val_help:

Add spaces and use u32: format

15 files changed, 67 insertions, 59 deletions

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