Convert Quagga templates to use val_help:

45 files changed, 105 insertions, 127 deletions

diff --git a/templates/protocols/ospf/access-list/node.tag/export/node.def b/templates/protocols/ospf/access-list/node.tag/export/node.def
index ef7c6027..2cd5b177 100644
--- a/templates/protocols/ospf/access-list/node.tag/export/node.def
+++ b/templates/protocols/ospf/access-list/node.tag/export/node.def
@@ -2,15 +2,18 @@ multi:
 type: txt
 help: Set filter for outgoing routing updates [REQUIRED]
 syntax:expression: $VAR(@) in "bgp", "connected", "kernel", "rip", "static"; "Must be (bgp, connected, kernel, rip, or static)"
+
+val_help: bgp                Filter bgp routes; 
+val_help: connected          Filter connected routes; 
+val_help: kernel             Filter kernel routes; 
+val_help: rip                Filter rip routes; 
+val_help: static             Filter static routes; 
+
 create: vtysh -c "configure terminal" \
             -c "router ospf"                                      \
             -c "distribute-list $VAR(../@) out $VAR(@)"; 
+
 delete: vtysh -c "configure terminal" \
             -c "router ospf"                                      \
             -c "no distribute-list $VAR(../@) out $VAR(@)";
-comp_help: possible completions:
-  bgp                Filter bgp routes
-  connected          Filter connected routes
-  kernel             Filter kernel routes
-  rip                Filter rip routes
-  static             Filter static routes
+
diff --git a/templates/protocols/ospf/area/node.def b/templates/protocols/ospf/area/node.def
index ef26aafb..0aaa7524 100644
--- a/templates/protocols/ospf/area/node.def
+++ b/templates/protocols/ospf/area/node.def
@@ -2,6 +2,5 @@ tag:
 type: txt
 help: Set OSPF Area
 syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $VAR(@)"
-comp_help: possible completions:
- <0-4294967295>     Set OSPF area in decimal notation
- <x.x.x.x>          Set OSPF area in dotted decimal notation
+val_help: u32; OSPF area in decimal notation
+val_help: ipv4; OSPF area in dotted decimal notation
diff --git a/templates/protocols/ospf/area/node.tag/area-type/node.def b/templates/protocols/ospf/area/node.tag/area-type/node.def
index 76724122..5f90efcc 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/node.def
@@ -1,5 +1,4 @@
 help: Set area type
-comp_help: possible completions:
- normal             Set normal area type
- nssa               Set not so stubby area type 
- stub               Set stub Area type 
+val_help: normal; Normal area type
+val_help: nssa; Not so stubby area type 
+val_help: stub; Stub Area type 
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
index ea03efdb..f6b5c409 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def
@@ -1,6 +1,7 @@
 type: u32
 help: Set the summary-default cost of nssa area
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
+val_help: u32:0-16777215; Summary default cost
 
 create: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
@@ -14,6 +15,3 @@ update: vtysh -c "configure terminal" \
 delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no area $VAR(../../../@) default-cost $VAR(@)";
-
-comp_help: possible completions:
-  <0-16777215>       Set summary default cost
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
index bb1269df..07d0607b 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def
@@ -3,7 +3,6 @@ help: Set nssa-abr
 default: "candidate"
 syntax:expression: $VAR(@) in "always", "candidate", "never"; "Must be (always, candidate, or never)"
 
-comp_help: possible completions:
- always             Configure NSSA-ABR to always translate
- candidate          Configure NSSA-ABR for translate election (default)
- never              Configure NSSA-ABR to never translate
+val_help: always; NSSA-ABR to always translate
+val_help: candidate; NSSA-ABR for translate election (default)
+val_help: never; NSSA-ABR to never translate
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
index 52b73d05..25320ad5 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def
@@ -1,6 +1,7 @@
 type: u32
 help: Set the summary-default cost of stub area
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215"
+val_help: u32:0-16777215; Summary default cost of stub area
 
 create: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
@@ -14,6 +15,3 @@ update: vtysh -c "configure terminal" \
 delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no area $VAR(../../../@) default-cost $VAR(@)";
-
-comp_help: possible completions:
- <0-16777215>       Set summary default cost of stub area
diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def
index 3c87b9db..9616e27c 100644
--- a/templates/protocols/ospf/area/node.tag/authentication/node.def
+++ b/templates/protocols/ospf/area/node.tag/authentication/node.def
@@ -1,7 +1,10 @@
 type: txt
 help: Set OSPF area authentication type
+allowed: echo "plaintext-password md5"
 syntax:expression: $VAR(@) in "plaintext-password", "md5"; \
        "Must be either plaintext-password or md5"
+val_help: plaintext-password; Use plain-text authentication
+val_help: md5; Use md5 authentication
 
 update:expression: "\
         if [ x$VAR(@) == xplaintext-password ]; then               \
@@ -21,7 +24,3 @@ update:expression: "\
 delete:expression: "vtysh -c \"configure terminal\" \
             -c \"router ospf \"                                                 \
             -c \"no area $VAR(../@) authentication \" "
-
-comp_help: possible completions:
- plaintex-password    Use plain-text authentication
- md5                  Use md5 authentication
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
index 22665949..cbdd1aa7 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
@@ -1,6 +1,4 @@
 type: u32
 help: Set metric for this range
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Metric must be between 0-16777215"
-
-comp_help: possible completions:
-  <0-16777215>       Set metric for this range
+val_help: u32: 0-16777215; Metric for this range
diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def
index 85b7df93..6749ac11 100644
--- a/templates/protocols/ospf/area/node.tag/shortcut/node.def
+++ b/templates/protocols/ospf/area/node.tag/shortcut/node.def
@@ -1,13 +1,15 @@
 type: txt
 help: Set area's shortcut mode
+allowed: echo "default disable enable"
 syntax:expression: $VAR(@) in "default", "disable", "enable"; "Must be (default, disable, enable)"
+val_help: default; Set default; 
+val_help: disable; Disable shortcutting mode; 
+val_help: enable; Enable  shortcutting mode; 
+
 update:expression: "vtysh -c \"configure terminal\" \
           -c \"router ospf\" \
           -c \"area $VAR(../@) shortcut $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
           -c \"router ospf\" \
           -c \"no area $VAR(../@) shortcut $VAR(@)\"; "
-comp_help: possible completions:
- default            Set default
- disable            Disable shortcutting mode
- enable             Enable  shortcutting mode
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
index f906e58f..da1451a4 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def
@@ -2,8 +2,12 @@ tag:
 type: u32
 help: Set MD5 key id
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
+val_help: u32:1-255; MD5 key id
+
 commit:expression: $VAR(md5-key/) != ""; "Must add the md5-key for key-id $VAR(@)"
+
 delete:expression: "touch /tmp/ospf-md5.$PPID"
+
 end:expression: "\
       if [ -f \"/tmp/ospf-md5.$PPID\" ]; then                          \
          vtysh -c \"configure terminal\"   \
@@ -17,5 +21,3 @@ end:expression: "\
            -c \"area $VAR(../../../../@) virtual-link $VAR(../../../@) \
            message-digest-key $VAR(@) md5 $VAR(md5-key/@)\";           \
       fi; "
-comp_help: possible completions:
- <1-255>            Set the key id
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def
index c985099d..29200bd1 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def
@@ -1,9 +1,9 @@
 type: txt
 help: Set MD5 key
+val_help: MD5 Key (16 characters or less)
+
 syntax:expression: exec "                              \
         if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then  \
           echo MD5 key must be 16 characters or less ; \
           exit 1 ;                                     \
         fi ; "
-comp_help: possible completions:
- <text>             MD5 Key (16 characters or less)
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
index 9a7292eb..16d2fde0 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
@@ -1,5 +1,7 @@
 type: txt
 help: Set plain text password
+val_help: Plain text password (8 characters or less)
+
 syntax:expression: exec "                              \
         if [ `echo -n '$VAR(@)' | wc -c` -gt 8 ]; then   \
           echo Password must be 8 characters or less ; \
@@ -15,6 +17,3 @@ update: vtysh -c "configure terminal" -c "router ospf"         \
 delete: vtysh  -c "configure terminal" -c "router ospf"           \
           -c "no area $VAR(../../../@) virtual-link $VAR(../../@) \
             authentication authentication-key";
-
-comp_help: possible completions:
-  <text>             Plain text password (8 characters or less)
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
index 8ce008a3..1b8d0ea1 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def
@@ -1,11 +1,13 @@
 type: u32
 help: Set interval after which a neighbor is declared dead
+val_help: u32:1-65535; Neighbor dead interval (seconds)
+
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+
 update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) virtual-link $VAR(../@) dead-interval $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) virtual-link $VAR(../@) dead-interval \"; "
-comp_help: possible completions:
- <1-65535>           Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
index 2d378bd7..8fed1181 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def
@@ -1,11 +1,13 @@
 type: u32
 help: Set interval between hello packets
+val_help: u32:1-65535; Hello interval (seconds)
+
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+
 update:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"area $VAR(../../@) virtual-link $VAR(../@) hello-interval $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"no area $VAR(../../@) virtual-link $VAR(../@) hello-interval \"; "
-comp_help: possible completions:
- <1-65535>          Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
index faa4ba8d..62f02f2c 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def
@@ -1,13 +1,15 @@
 type: u32
 help: Set interval between retransmitting lost link state advertisements
+val_help: u32:1-65535; Retransmit interval (seconds)
+
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+
 update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"area $VAR(../../@) virtual-link $VAR(../@) \
        retransmit-interval $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no area $VAR(../../@) virtual-link $VAR(../@) \
        retransmit-interval \"; "
-comp_help: possible completions:
- <1-65535>          Seconds
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
index 13a58564..9c2f9e10 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def
@@ -1,11 +1,13 @@
 type: u32
 help: Set link state transmit delay
+val_help: u32:1-65535; Link state transmit delay (seconds)
+
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+
 update:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"area $VAR(../../@) virtual-link $VAR(../@) transmit-delay $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
       -c \"router ospf\" \
       -c \"no area $VAR(../../@) virtual-link $VAR(../@) transmit-delay \"; "
-comp_help: possible completions:
- <1-65535>          Seconds
diff --git a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
index 0bcafe6d..b0405e4c 100644
--- a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
+++ b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
@@ -3,6 +3,7 @@ help: Set to use reference bandwidth method to assign OSPF cost
 default: 100
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967; \
        "Must be between 1-4294967"
+val_help: u32:1-4294967; Reference bandwidth cost in Mbits/sec (default 100)
 
 update:expression: "vtysh --noerror \
        -c \"configure terminal\"                       \
@@ -17,6 +18,3 @@ delete:expression: "vtysh --noerror \
        -c \"no auto-cost reference-bandwidth \";       \
        echo 'OSPF: Reference bandwidth is changed.';   \
        echo '      Please ensure reference bandwidth is consistent across all routers'; "
-
-comp_help: possible completions:
- <1-4294967>        Set reference bandwidth cost in Mbits/sec (default 100)
diff --git a/templates/protocols/ospf/default-information/originate/metric-type/node.def b/templates/protocols/ospf/default-information/originate/metric-type/node.def
index 9878782f..84973f8b 100644
--- a/templates/protocols/ospf/default-information/originate/metric-type/node.def
+++ b/templates/protocols/ospf/default-information/originate/metric-type/node.def
@@ -2,5 +2,4 @@ type: u32
 help: Set OSPF metric type for default routes
 default: 2
 syntax:expression: $VAR(@) in 1, 2 ; "metric must be either 1 or 2"
-comp_help: possible completions:
- <1-2>              Set metric type for default routes (default 2)
+val_help: u32:1-2; Metric type for default routes (default 2)
diff --git a/templates/protocols/ospf/default-information/originate/metric/node.def b/templates/protocols/ospf/default-information/originate/metric/node.def
index 54ee5653..86ecbfa1 100644
--- a/templates/protocols/ospf/default-information/originate/metric/node.def
+++ b/templates/protocols/ospf/default-information/originate/metric/node.def
@@ -1,5 +1,4 @@
 type: u32
 help: Set OSPF default metric
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "must be between 0-16777214"
-comp_help: possible completions:
- <0-16777214>       Set default metric
+val_help: u32:0-16777214; Default metric
diff --git a/templates/protocols/ospf/default-metric/node.def b/templates/protocols/ospf/default-metric/node.def
index e6f0dd3a..db5c9422 100644
--- a/templates/protocols/ospf/default-metric/node.def
+++ b/templates/protocols/ospf/default-metric/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Set metric of redistributed routes
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "Must be between 0-16777214"
+val_help: u32:0-16777214; Metric of redistributed routes
+
 update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"default-metric $VAR(@) \"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no default-metric $VAR(@) \"; "
-comp_help: possible completions:
- <0-16777214>       Set metric of redistributed routes
diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def
index 31025a39..a4c743c0 100644
--- a/templates/protocols/ospf/distance/global/node.def
+++ b/templates/protocols/ospf/distance/global/node.def
@@ -1,11 +1,13 @@
 type: u32
 help: Set OSPF administrative distance
+val_help: u32:1-255; Administrative distance"
+
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
+
 update:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"distance $VAR(@) \"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
        -c \"router ospf\" \
        -c \"no distance $VAR(@) \"; "
-comp_help: possible completions:
- <1-255>            Set administrative distance"
diff --git a/templates/protocols/ospf/distance/ospf/external/node.def b/templates/protocols/ospf/distance/ospf/external/node.def
index e99bfa07..e9619b1e 100644
--- a/templates/protocols/ospf/distance/ospf/external/node.def
+++ b/templates/protocols/ospf/distance/ospf/external/node.def
@@ -1,5 +1,4 @@
 type: u32
 help: Set a distance for external routes
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
-comp_help: possible completions:
- <1-255>            Set distance for external routes
+val_help: u32: 1-255; Distance for external routes
diff --git a/templates/protocols/ospf/distance/ospf/inter-area/node.def b/templates/protocols/ospf/distance/ospf/inter-area/node.def
index a6bcf23a..dcec0673 100644
--- a/templates/protocols/ospf/distance/ospf/inter-area/node.def
+++ b/templates/protocols/ospf/distance/ospf/inter-area/node.def
@@ -1,5 +1,4 @@
 type: u32
 help: Set a distance for inter-area routes
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
-comp_help: possible completions:
- <1-255>            Set distance for inter-area routes
+val_help: u32:1-255; Distance for inter-area routes
diff --git a/templates/protocols/ospf/distance/ospf/intra-area/node.def b/templates/protocols/ospf/distance/ospf/intra-area/node.def
index b03b0470..964a032d 100644
--- a/templates/protocols/ospf/distance/ospf/intra-area/node.def
+++ b/templates/protocols/ospf/distance/ospf/intra-area/node.def
@@ -1,5 +1,4 @@
 type: u32
 help: Set a distance for intra-area routes
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
-comp_help: possible completions:
- <1-255>            Set distance for intra-area routes
+val_help: u32:1-255; Distance for intra-area routes
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
index 2369b7be..1d51784e 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Set to advertise stub-router prior to full shutdown of OSPF
 syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
+val_help: u32:5-86400; Time (seconds) to advertise self as stub-router
+
 update:expression: "vtysh -c \"configure terminal\" \
         -c \"router ospf\" \
         -c \"max-metric router-lsa on-shutdown $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
         -c \"router ospf\" \
         -c \"no max-metric router-lsa on-shutdown \"; "
-comp_help: possible completions:
- <5-86400>          Time (seconds) to advertise self as stub-router
diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
index e859f0fd..e0045614 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Set to automatically advertise stub Router-LSA on startup of OSPF
 syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
+val_help: u32:5-86400; Time (seconds) to advertise self as stub-router
+
 update:expression: "vtysh -c \"configure terminal\" \
         -c \"router ospf\" \
         -c \"max-metric router-lsa on-startup $VAR(@)\"; "
+
 delete:expression: "vtysh -c \"configure terminal\" \
         -c \"router ospf\" \
         -c \"no max-metric router-lsa on-startup \"; "
-comp_help: possible completions:
- <5-86400>          Time (seconds) to advertise self as stub-router
diff --git a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
index b5e39099..ec0a9a9d 100644
--- a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
@@ -1,12 +1,14 @@
 type: u32
 help: Set dead neighbor polling interval
 default: 60
+val_help: u32:1-65535; Seconds between dead neighbor polling interval (default 60)
+
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535 seconds"
+
 update: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "neighbor $VAR(../@) poll-interval $VAR(@)";
+
 delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "neighbor $VAR(../@) poll-interval 60";
-comp_help: possible completions:
- <1-65535>          Seconds between dead neighbor polling interval (default 60)
diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
index 6772e988..ab235b5f 100644
--- a/templates/protocols/ospf/neighbor/node.tag/priority/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
@@ -2,11 +2,12 @@ type: u32
 help: Set neighbor priority in seconds
 default: 0
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Priority must be between 0-255"
+val_help: u32:0-255; Neighbor priority (default 0)
+
 update: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "neighbor $VAR(../@) priority $VAR(@)"; 
+
 delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "neighbor $VAR(../@) priority 0";
-comp_help: possible completions:
- <0-255>            Set neighbor priority (default 0)
diff --git a/templates/protocols/ospf/parameters/abr-type/node.def b/templates/protocols/ospf/parameters/abr-type/node.def
index cb1b588c..1af93c67 100644
--- a/templates/protocols/ospf/parameters/abr-type/node.def
+++ b/templates/protocols/ospf/parameters/abr-type/node.def
@@ -2,14 +2,16 @@ type: txt
 help: Set OSPF ABR type
 default: "cisco"
 syntax:expression: $VAR(@) in "cisco", "ibm", "shortcut", "standard"; "Must be (cisco, ibm, shortcut, standard)"
+val_help: cisco; Cisco ABR type (default)
+val_help: ibm; Ibm ABR type
+val_help: shortcut; Shortcut ABR type
+val_help: standard; Standard ABR type
+
 update: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "ospf abr-type $VAR(@)";
+
 delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "ospf abr-type cisco"; 
-comp_help: possible completions:
-  cisco              Set cisco ABR type (default)
-  ibm                Set ibm ABR type
-  shortcut           Set shortcut ABR type
-  standard           Set standard ABR type
+
diff --git a/templates/protocols/ospf/passive-interface-exclude/node.def b/templates/protocols/ospf/passive-interface-exclude/node.def
index b69cc8b0..fb1b91ca 100644
--- a/templates/protocols/ospf/passive-interface-exclude/node.def
+++ b/templates/protocols/ospf/passive-interface-exclude/node.def
@@ -1,6 +1,7 @@
 multi:
 type: txt
 help: Set interface to exclude when using 'passive-interface default'
+val_help:<interface>; Interface to exclude from 'passive-interface default'
 
 allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all 
 
@@ -19,6 +20,3 @@ create: if [ -z $VAR(@) ] ; then
 
 delete: vtysh -c "configure terminal" -c "router ospf" \
           -c "passive-interface $VAR(@)";
-
-comp_help: possible completions:
-  <interface>     Set an interface to exclude from 'passive-interface default'
diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def
index bd66993e..95794e51 100644
--- a/templates/protocols/ospf/passive-interface/node.def
+++ b/templates/protocols/ospf/passive-interface/node.def
@@ -1,10 +1,9 @@
 multi:
 type: txt
 help: Set to suppress routing updates on an interface
-
 allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default
-
-
+val_help:<interface>; Interface to be passive (i.e. suppress routing updates)
+val_help:default; Default to suppress routing updates on all interfaces
 
 create: sudo /opt/vyatta/sbin/vyatta_quagga_utils.pl \
            --check-ospf-passive="$VAR(@)"
@@ -39,7 +38,3 @@ delete: if [ -z $VAR(@) ]
                  -c "router ospf"        \
                  -c "no passive-interface $VAR(@)"
  	fi
-
-comp_help: possible completions:
-  <interface>     Set an interface to be passive (i.e. suppress routing updates)
-  default         Set default to suppress routing updates on all interfaces
diff --git a/templates/protocols/ospf/redistribute/bgp/metric-type/node.def b/templates/protocols/ospf/redistribute/bgp/metric-type/node.def
index 07f1e577..55ed97cc 100644
--- a/templates/protocols/ospf/redistribute/bgp/metric-type/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/metric-type/node.def
@@ -1,8 +1,5 @@
 type: u32
 help: Set OSPF metric type
 default: 2
-
 syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2"
-
-comp_help: possible completions:
- <1-2>              Set metric type (default 2)
+val_help: u32:1-2; Metric type (default 2)
diff --git a/templates/protocols/ospf/redistribute/bgp/metric/node.def b/templates/protocols/ospf/redistribute/bgp/metric/node.def
index e70579c6..9d71b46a 100644
--- a/templates/protocols/ospf/redistribute/bgp/metric/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/metric/node.def
@@ -1,5 +1,4 @@
 type: u32
 help: Set metric for redistributed routes
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
-comp_help: possible completions:
- <1-16>             Set metric for redistributed routes
+val_help: u32:1-16; Metric for redistributed routes
diff --git a/templates/protocols/ospf/redistribute/connected/metric-type/node.def b/templates/protocols/ospf/redistribute/connected/metric-type/node.def
index 07f1e577..55ed97cc 100644
--- a/templates/protocols/ospf/redistribute/connected/metric-type/node.def
+++ b/templates/protocols/ospf/redistribute/connected/metric-type/node.def
@@ -1,8 +1,5 @@
 type: u32
 help: Set OSPF metric type
 default: 2
-
 syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2"
-
-comp_help: possible completions:
- <1-2>              Set metric type (default 2)
+val_help: u32:1-2; Metric type (default 2)
diff --git a/templates/protocols/ospf/redistribute/connected/metric/node.def b/templates/protocols/ospf/redistribute/connected/metric/node.def
index e70579c6..9d71b46a 100644
--- a/templates/protocols/ospf/redistribute/connected/metric/node.def
+++ b/templates/protocols/ospf/redistribute/connected/metric/node.def
@@ -1,5 +1,4 @@
 type: u32
 help: Set metric for redistributed routes
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
-comp_help: possible completions:
- <1-16>             Set metric for redistributed routes
+val_help: u32:1-16; Metric for redistributed routes
diff --git a/templates/protocols/ospf/redistribute/kernel/metric-type/node.def b/templates/protocols/ospf/redistribute/kernel/metric-type/node.def
index 07f1e577..55ed97cc 100644
--- a/templates/protocols/ospf/redistribute/kernel/metric-type/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/metric-type/node.def
@@ -1,8 +1,5 @@
 type: u32
 help: Set OSPF metric type
 default: 2
-
 syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2"
-
-comp_help: possible completions:
- <1-2>              Set metric type (default 2)
+val_help: u32:1-2; Metric type (default 2)
diff --git a/templates/protocols/ospf/redistribute/kernel/metric/node.def b/templates/protocols/ospf/redistribute/kernel/metric/node.def
index e70579c6..9d71b46a 100644
--- a/templates/protocols/ospf/redistribute/kernel/metric/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/metric/node.def
@@ -1,5 +1,4 @@
 type: u32
 help: Set metric for redistributed routes
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
-comp_help: possible completions:
- <1-16>             Set metric for redistributed routes
+val_help: u32:1-16; Metric for redistributed routes
diff --git a/templates/protocols/ospf/redistribute/rip/metric-type/node.def b/templates/protocols/ospf/redistribute/rip/metric-type/node.def
index 07f1e577..55ed97cc 100644
--- a/templates/protocols/ospf/redistribute/rip/metric-type/node.def
+++ b/templates/protocols/ospf/redistribute/rip/metric-type/node.def
@@ -1,8 +1,5 @@
 type: u32
 help: Set OSPF metric type
 default: 2
-
 syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2"
-
-comp_help: possible completions:
- <1-2>              Set metric type (default 2)
+val_help: u32:1-2; Metric type (default 2)
diff --git a/templates/protocols/ospf/redistribute/rip/metric/node.def b/templates/protocols/ospf/redistribute/rip/metric/node.def
index e70579c6..9d71b46a 100644
--- a/templates/protocols/ospf/redistribute/rip/metric/node.def
+++ b/templates/protocols/ospf/redistribute/rip/metric/node.def
@@ -1,5 +1,4 @@
 type: u32
 help: Set metric for redistributed routes
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
-comp_help: possible completions:
- <1-16>             Set metric for redistributed routes
+val_help: u32:1-16; Metric for redistributed routes
diff --git a/templates/protocols/ospf/redistribute/static/metric-type/node.def b/templates/protocols/ospf/redistribute/static/metric-type/node.def
index 07f1e577..55ed97cc 100644
--- a/templates/protocols/ospf/redistribute/static/metric-type/node.def
+++ b/templates/protocols/ospf/redistribute/static/metric-type/node.def
@@ -1,8 +1,5 @@
 type: u32
 help: Set OSPF metric type
 default: 2
-
 syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2"
-
-comp_help: possible completions:
- <1-2>              Set metric type (default 2)
+val_help: u32:1-2; Metric type (default 2)
diff --git a/templates/protocols/ospf/redistribute/static/metric/node.def b/templates/protocols/ospf/redistribute/static/metric/node.def
index e70579c6..9d71b46a 100644
--- a/templates/protocols/ospf/redistribute/static/metric/node.def
+++ b/templates/protocols/ospf/redistribute/static/metric/node.def
@@ -1,5 +1,4 @@
 type: u32
 help: Set metric for redistributed routes
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
-comp_help: possible completions:
- <1-16>             Set metric for redistributed routes
+val_help: u32:1-16; Metric for redistributed routes
diff --git a/templates/protocols/ospf/refresh/timers/node.def b/templates/protocols/ospf/refresh/timers/node.def
index 055d9f26..e6002cc0 100644
--- a/templates/protocols/ospf/refresh/timers/node.def
+++ b/templates/protocols/ospf/refresh/timers/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Set refresh timer
 syntax:expression: $VAR(@) >= 10 && $VAR(@) <= 1800; "must be between 10-1800"
+val_help: u32:10-1800; Timer value in seconds
+
 update: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no refresh timer" -c "refresh timer $VAR(@)"; 
+
 delete: vtysh -c "configure terminal" \
           -c "router ospf"                                        \
           -c "no refresh timer $VAR(@)";
-comp_help: possible completions:
-  <10-1800>          Timer value in seconds
diff --git a/templates/protocols/ospf/timers/throttle/spf/delay/node.def b/templates/protocols/ospf/timers/throttle/spf/delay/node.def
index 85d69c75..cd4c2a25 100644
--- a/templates/protocols/ospf/timers/throttle/spf/delay/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/delay/node.def
@@ -2,5 +2,4 @@ type: u32
 help: Set delay (msec) from first change received till SPF calculation
 default: 200
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000"
-comp_help: possible competions:
- <0-600000>         Set delay in msec (default 200)
+val_help: u32:0-600000; Delay in msec (default 200)
diff --git a/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def b/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def
index ad5a297b..65dfb1a6 100644
--- a/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def
@@ -2,5 +2,4 @@ type: u32
 help: Set initial hold time(msec) between consecutive SPF calculations
 default: 1000
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000"
-comp_help: possible completions:
- <0-600000>         Initial hold time in msec (default 1000)
+val_help: u32:0-600000; Initial hold time in msec (default 1000)
diff --git a/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def b/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def
index 1cfa29b0..2c188c45 100644
--- a/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def
@@ -2,5 +2,4 @@ type: u32
 help: Set maximum hold time (msec)
 default: 10000
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000"
-comp_help: possible completions:
- <0-600000>         Max hold time in msec (default 10000)
+val_help: u32:0-600000; Max hold time in msec (default 10000)