Convert Quagga templates to use val_help:

9 files changed, 17 insertions, 13 deletions

diff --git a/templates/policy/access-list/node.def b/templates/policy/access-list/node.def
index 83216365..4a3ee522 100644
--- a/templates/policy/access-list/node.def
+++ b/templates/policy/access-list/node.def
@@ -7,8 +7,10 @@ syntax:expression: ($VAR(@) >= 1 && $VAR(@) <= 199) || ($VAR(@) >= 1300 && $VAR(
   <100-199>\tIP extended access list
   <1300-1999>\tIP standard access list (expanded range)
   <2000-2699>\tIP extended access list (expanded range)"
-comp_help: \1  <1-99>\tIP standard access list
-  <100-199>\tIP extended access list
-  <1300-1999>\tIP standard access list (expanded range)
-  <2000-2699>\tIP extended access list (expanded range)
+
+val_help: u32:1-99; IP standard access list
+val_help: u32:100-199; IP extended access list
+val_help: u32:1300-1999; IP standard access list (expanded range)
+val_help: u32:2000-2699; IP extended access list (expanded range)
+
 end: /opt/vyatta/sbin/vyatta-policy.pl --update-access-list $VAR(@)
diff --git a/templates/policy/access-list/node.tag/rule/node.def b/templates/policy/access-list/node.tag/rule/node.def
index 747614b7..77233931 100644
--- a/templates/policy/access-list/node.tag/rule/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.def
@@ -1,5 +1,5 @@
 tag:
 type: u32
 help: Set a rule for this access-list
-comp_help: \1  <1-65535>\taccess-list rule number
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "rule number must be between 1 and 65535"
+val_help: u32:1-65535>; Access-list rule number
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/action/node.def b/templates/policy/access-list/node.tag/rule/node.tag/action/node.def
index 9861a18c..9567d02d 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/action/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/action/node.def
@@ -1,5 +1,5 @@
 type: txt
 help: Set action to take on networks matching this rule [REQUIRED]
-comp_help: \1  permit\tpermit matching networks
-  deny\t\tdeny matching networks
 syntax:expression: $VAR(@) in "permit", "deny"; "action must be permit or deny"
+val_help: permit; Permit matching networks
+val_help: deny; Deny matching networks
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def
index ab9bc4da..814e64c2 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 help: Set a single host IP address to match
-comp_help: \1  <x.x.x.x>\thost address to match
+val_help: Host address to match
 commit:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); "\
 policy access-list $VAR(../../../@) rule $VAR(../../@) destination: access-list number must be <100-199> or <2000-2699> to set destination matches"
 commit:expression: ($VAR(../any/) == "") && ($VAR(../network/) == ""); "\
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def
index 6966a613..25e9fb9b 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 help: Set a network/netmask to match (requires network be defined)
-comp_help: \1  <x.x.x.x>\tinverse-mask to match
+val_help: Inverse-mask to match
 commit:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); "\
 policy access-list $VAR(../../../@) rule $VAR(../../@) destination: access-list number must be <100-199> or <2000-2699> to set destination matches"
 commit:expression: ($VAR(../any/) == "") && ($VAR(../host/) == ""); "policy access-list $VAR(../../../@) rule $VAR(../../@) destination: you may only define one filter type. (host|network|any)"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def
index 4df7afa6..5cb86d84 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def
@@ -1,6 +1,6 @@
 type: ipv4
 help: Set a network/netmask to match (requires inverse-mask be defined)
-comp_help: \1  <x.x.x.x>\tnetwork to match
+val_help: Network to match
 commit:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); "\
 policy access-list $VAR(../../../@) rule $VAR(../../@) destination: access-list number must be <100-199> or <2000-2699> to set destination matches"
 commit:expression: ($VAR(../host/) == "") && ($VAR(../any/) == ""); "policy access-list $VAR(../../../@) rule $VAR(../../@) destination: you may only define one filter type. (host|network|any)"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def
index 47177ac8..25e8bb80 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def
@@ -1,5 +1,5 @@
 type: ipv4
 help: Set a single host IP address to match
-comp_help: \1  <x.x.x.x>\thost address to match
+val_help: Host address to match
 commit:expression: ($VAR(../any/) == "") && ($VAR(../network/) == ""); "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you may only define one filter type. (host|network|any)"
 commit:expression: $VAR(../../action/) != ""; "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you must specify an action"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def
index 64c0fb44..0f5c235b 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def
@@ -1,6 +1,7 @@
 type: ipv4
 help: Set a network/netmask to match (requires network be defined)
-comp_help: \1  <x.x.x.x>\tinverse-mask to match
+val_help: Inverse-mast to match
+
 commit:expression: ($VAR(../any/) == "") && ($VAR(../host/) == ""); "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you may only define one filter type. (host|network|any)"
 commit:expression: $VAR(../network/) != ""; "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you must specify a network if you configure an inverse-mask"
 commit:expression: $VAR(../../action/) != ""; "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you must specify an action"
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def
index c58b4a2c..c2ad6458 100644
--- a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def
+++ b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def
@@ -1,6 +1,7 @@
 type: ipv4
 help: Set a network/netmask to match (requires inverse-mask be defined)
-comp_help: \1  <x.x.x.x>\tnetwork to match
+val_help: Network to match
+
 commit:expression: ($VAR(../host/) == "") && ($VAR(../any/) == ""); "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you may only define one filter type.  (host|network|any)"
 commit:expression: $VAR(../inverse-mask/) != ""; "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you must specify an inverse-mask if you configure a network"
 commit:expression: $VAR(../../action/) != ""; "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you must specify an action"