update help text to use val_help

6 files changed, 52 insertions, 57 deletions

diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/address/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/address/node.def
index 1adbe8d..4953885 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/address/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/address/node.def
@@ -2,13 +2,12 @@ type: txt
 
 help: Destination IPv6 address, prefix or range
 
-comp_help: Possible completions:
-  <x:x:x:x:x:x:x:x>             IPv6 address to match
-  <x:x:x:x:x:x:x:x>/<n>         IPv6 prefix to match
-  <x:x:x:x:x:x>-<x:x:x:x:x:x>   Range of IPv6 addresses
-  !<x:x:x:x:x:x:x:x>            Everything except IPv6 address
-  !<x:x:x:x:x:x:x:x>/<n>        Everything except IPv6 prefix
-  !<x:x:x:x:x:x>-<x:x:x:x:x:x>  Everything except range
+val_help: ipv6; IPv6 address to match
+val_help: ipv6net; IPv6 prefix to match
+val_help: ipv6range; IPv6 range to match
+val_help: !ipv6; Match everything except the specified address
+val_help: !ipv6net; Match everything except the specified prefix
+val_help: !ipv6range; Match everything except the specified range
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv6_addr_param $VAR(@)"
 
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/port/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/port/node.def
index 760c0e8..2b2d8c7 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/port/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/port/node.def
@@ -2,9 +2,9 @@ type: txt
 
 help: Destination port
 
-comp_help: Destination port(s) can be specified as a comma-separated list of:
-  <port name>           Named port (any name in /etc/services, e.g., http)
-  <1-65535>             Numbered port
-  <start>-<end>         Numbered port range (e.g., 1001-1005)
+val_help: <port name>; Named port (any name in /etc/services, e.g., http)
+val_help: u32:1-65535; Numbered port
+val_help: range; Numbered port range (e.g., 1001-1005)
+comp_help: Multiple destination ports can be specified as a comma-separated list.
 The whole list can also be "negated" using '!'. For example:
   '!22,telnet,http,123,1001-1005'
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/type/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/type/node.def
index a066647..d11da4e 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/type/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/type/node.def
@@ -2,32 +2,31 @@ type: txt
 
 help: ICMPv6 type/code
 
-comp_help: Possible completions:
-  destination-unreachable       ICMPv6 type/code name
-   no-route                     ICMPv6 type/code name
-   communication-prohibited     ICMPv6 type/code name
-   address-unreachable          ICMPv6 type/code name
-   port-unreachable             ICMPv6 type/code name
-  packet-too-big                ICMPv6 type/code name
-  time-exceeded                 ICMPv6 type/code name
-   ttl-zero-during-transit      ICMPv6 type/code name
-   ttl-zero-during-reassembly   ICMPv6 type/code name
-  parameter-problem             ICMPv6 type/code name
-   bad-header                   ICMPv6 type/code name
-   unknown-header-type          ICMPv6 type/code name
-   unknown-option               ICMPv6 type/code name
-  echo-request                  ICMPv6 type/code name
-  ping                          ICMPv6 type/code name
-  echo-reply                    ICMPv6 type/code name
-  pong                          ICMPv6 type/code name
-  router-solicitation           ICMPv6 type/code name
-  router-advertisement          ICMPv6 type/code name
-  neighbour-solicitation        ICMPv6 type/code name
-  neighbor-solicitation         ICMPv6 type/code name
-  neighbour-advertisement       ICMPv6 type/code name
-  neighbor-advertisement        ICMPv6 type/code name
-  <0 - 255>                     ICMPv6 type number
-  <0 - 255>/<0 - 255>           ICMPv6 type and code numbers
+val_help:  destination-unreachable; ICMPv6 type/code name
+val_help:  _ no-route; ICMPv6 type/code name
+val_help:  _ communication-prohibited; ICMPv6 type/code name
+val_help:  _ address-unreachable; ICMPv6 type/code name
+val_help:  _ port-unreachable; ICMPv6 type/code name
+val_help:  packet-too-big; ICMPv6 type/code name
+val_help:  time-exceeded; ICMPv6 type/code name
+val_help:  _ ttl-zero-during-transit; ICMPv6 type/code name
+val_help:  _ ttl-zero-during-reassembly; ICMPv6 type/code name
+val_help:  parameter-problem; ICMPv6 type/code name
+val_help:  _ bad-header; ICMPv6 type/code name
+val_help:  _ unknown-header-type; ICMPv6 type/code name
+val_help:  _ unknown-option; ICMPv6 type/code name
+val_help:  echo-request; ICMPv6 type/code name
+val_help:  ping; ICMPv6 type/code name
+val_help:  echo-reply; ICMPv6 type/code name
+val_help:  pong; ICMPv6 type/code name
+val_help:  router-solicitation; ICMPv6 type/code name
+val_help:  router-advertisement; ICMPv6 type/code name
+val_help:  neighbour-solicitation; ICMPv6 type/code name
+val_help:  neighbor-solicitation; ICMPv6 type/code name
+val_help:  neighbour-advertisement; ICMPv6 type/code name
+val_help:  neighbor-advertisement; ICMPv6 type/code name
+val_help:  u32:0-255; ICMPv6 type number
+val_help:  <0-255>/<0-255>; ICMPv6 type and code numbers
 
 allowed:
         array=(
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/protocol/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/protocol/node.def
index 0ea2382..ee3110f 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/protocol/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/protocol/node.def
@@ -21,10 +21,8 @@ allowed:
 	protos="all icmpv6 $protos tcp_udp"
 	echo -n $protos
 
-comp_help:Possible completions:
-  <text>        An IPv6 protocol name (e.g. "tcp" or "udp")
-  <1-255>       An IPv6 protocol number
-  tcp_udp       Both TCP and UDP
-  all           All IPv6 protocols
-  !<text>       All IPv6 protocols except for the specified name
-  !<1-255>      All IPv6 protocols except for the specified number
+val_help: txt; IPv6 protocol name from /etc/protocols (e.g. "tcp" or "udp")
+val_help: u32:0-255; IPv6 protocol number
+val_help: tcp_udp; Both TCP and UDP
+val_help: all; All IPv6 protocols
+val_help: !<protocol>; All IPv6 protocols except for the specified name or number
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/address/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/address/node.def
index 01a7b99..397c686 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/address/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/address/node.def
@@ -3,12 +3,11 @@ type: txt
 
 help: Source IPv6 address, prefix or range
 
-comp_help: Possible completions:
-  <x:x:x:x:x:x:x:x>             IPv6 address to match
-  <x:x:x:x:x:x:x:x>/<n>         IPv6 prefix to match
-  <x:x:x:x:x:x>-<x:x:x:x:x:x>   Range of IPv6 addresses
-  !<x:x:x:x:x:x:x:x>            Everything except IPv6 address
-  !<x:x:x:x:x:x:x:x>/<n>        Everything except IPv6 prefix
-  !<x:x:x:x:x:x>-<x:x:x:x:x:x>  Everything except range
-
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv6_addr_param $VAR(@)"
\ No newline at end of file
+val_help: ipv6; IPv6 address to match
+val_help: ipv6net; IPv6 prefix to match
+val_help: ipv6range; IPv6 range to match
+val_help: !ipv6; Match everything except the specified address
+val_help: !ipv6net; Match everything except the specified prefix
+val_help: !ipv6range; Match everything except the specified range
+
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl ipv6_addr_param $VAR(@)"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/port/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/port/node.def
index 4cec3cf..adfae7a 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/port/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/port/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Source port
-comp_help: Source port(s) can be specified as a comma-separated list of:
-  <port name>           Named port (any name in /etc/services, e.g., http)
-  <1-65535>             Numbered port
-  <start>-<end>         Numbered port range (e.g., 1001-1005)
+val_help: <port name>; Named port (any name in /etc/services, e.g., http)
+val_help: u32:1-65535; Numbered port
+val_help: range; Numbered port range (e.g., 1001-1005)
+comp_help: Multiple source ports can be specified as a comma-separated list.
 The whole list can also be "negated" using '!'. For example:
   '!22,telnet,http,123,1001-1005'