summaryrefslogtreecommitdiff
path: root/templates/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'templates/protocols')
-rw-r--r--templates/protocols/bgp/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/aggregate-address/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/aggregate-address/node.tag/as-set/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/aggregate-address/node.tag/summary-only/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/description/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/local-as/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/no-prepend/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/timers/connect/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/timers/holdtime/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/timers/keepalive/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/network/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def4
-rw-r--r--templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/as-path/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/med/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/bestpath/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/cluster-id/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/confederation/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/half-life/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/max-suppress-time/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/re-use/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/dampening/start-suppress-time/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/default/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/graceful-restart/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/router-id/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/parameters/scan-time/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/connected/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/connected/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/kernel/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/kernel/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/ospf/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/ospf/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/rip/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/rip/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/static/metric/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/static/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/timers/holdtime/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/timers/keepalive/node.def2
-rw-r--r--templates/protocols/bgp/node.tag/timers/node.def2
-rw-r--r--templates/protocols/node.def2
-rw-r--r--templates/protocols/ospf/access-list/node.def2
-rw-r--r--templates/protocols/ospf/access-list/node.tag/export/node.def2
-rw-r--r--templates/protocols/ospf/area/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/normal/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/nssa/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/nssa/translate/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/area-type/stub/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/authentication/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/network/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/shortcut/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/dead-interval/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/hello-interval/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/retransmit-interval/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/virtual-link/node.tag/transmit-delay/node.def2
-rw-r--r--templates/protocols/ospf/auto-cost/node.def2
-rw-r--r--templates/protocols/ospf/auto-cost/reference-bandwidth/node.def2
-rw-r--r--templates/protocols/ospf/default-information/node.def2
-rw-r--r--templates/protocols/ospf/default-information/originate/always/node.def2
-rw-r--r--templates/protocols/ospf/default-information/originate/metric-type/node.def2
-rw-r--r--templates/protocols/ospf/default-information/originate/metric/node.def2
-rw-r--r--templates/protocols/ospf/default-information/originate/node.def2
-rw-r--r--templates/protocols/ospf/default-information/originate/route-map/node.def2
-rw-r--r--templates/protocols/ospf/distance/global/node.def2
-rw-r--r--templates/protocols/ospf/distance/node.def2
-rw-r--r--templates/protocols/ospf/distance/ospf/external/node.def2
-rw-r--r--templates/protocols/ospf/distance/ospf/inter-area/node.def2
-rw-r--r--templates/protocols/ospf/distance/ospf/intra-area/node.def2
-rw-r--r--templates/protocols/ospf/distance/ospf/node.def2
-rw-r--r--templates/protocols/ospf/log-adjacency-changes/detail/node.def2
-rw-r--r--templates/protocols/ospf/log-adjacency-changes/node.def2
-rw-r--r--templates/protocols/ospf/max-metric/node.def2
-rw-r--r--templates/protocols/ospf/max-metric/router-lsa/administrative/node.def2
-rw-r--r--templates/protocols/ospf/max-metric/router-lsa/node.def2
-rw-r--r--templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def2
-rw-r--r--templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def2
-rw-r--r--templates/protocols/ospf/mpls-te/enable/node.def2
-rw-r--r--templates/protocols/ospf/mpls-te/node.def2
-rw-r--r--templates/protocols/ospf/mpls-te/router-address/node.def2
-rw-r--r--templates/protocols/ospf/neighbor/node.def2
-rw-r--r--templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def2
-rw-r--r--templates/protocols/ospf/neighbor/node.tag/priority/node.def2
-rw-r--r--templates/protocols/ospf/node.def2
-rw-r--r--templates/protocols/ospf/parameters/node.def2
-rw-r--r--templates/protocols/ospf/parameters/router-id/node.def2
-rw-r--r--templates/protocols/ospf/passive-interface/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/bgp/metric/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/bgp/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/bgp/route-map/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/connected/metric/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/connected/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/connected/route-map/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/kernel/metric/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/kernel/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/kernel/route-map/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/rip/metric/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/rip/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/rip/route-map/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/static/metric/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/static/node.def2
-rw-r--r--templates/protocols/ospf/redistribute/static/route-map/node.def2
-rw-r--r--templates/protocols/ospf/refresh/node.def2
-rw-r--r--templates/protocols/ospf/timers/node.def2
-rw-r--r--templates/protocols/ospf/timers/throttle/node.def2
-rw-r--r--templates/protocols/ospf/timers/throttle/spf/delay/node.def2
-rw-r--r--templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def2
-rw-r--r--templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def2
-rw-r--r--templates/protocols/ospf/timers/throttle/spf/node.def2
-rw-r--r--templates/protocols/rip/default-distance/node.def2
-rw-r--r--templates/protocols/rip/default-information/node.def2
-rw-r--r--templates/protocols/rip/default-information/originate/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/access-list/in/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/access-list/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/access-list/out/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/prefix-list/in/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/prefix-list/node.def2
-rw-r--r--templates/protocols/rip/distribute-list/prefix-list/out/node.def2
-rw-r--r--templates/protocols/rip/interface/node.def2
-rw-r--r--templates/protocols/rip/neighbor/node.def2
-rw-r--r--templates/protocols/rip/network-distance/node.def2
-rw-r--r--templates/protocols/rip/network-distance/node.tag/access-list/node.def2
-rw-r--r--templates/protocols/rip/network-distance/node.tag/distance/node.def2
-rw-r--r--templates/protocols/rip/network/node.def2
-rw-r--r--templates/protocols/rip/node.def2
-rw-r--r--templates/protocols/rip/passive-interface/node.def2
-rw-r--r--templates/protocols/rip/redistribute/bgp/metric/node.def2
-rw-r--r--templates/protocols/rip/redistribute/bgp/node.def2
-rw-r--r--templates/protocols/rip/redistribute/bgp/route-map/node.def2
-rw-r--r--templates/protocols/rip/redistribute/connected/metric/node.def2
-rw-r--r--templates/protocols/rip/redistribute/connected/node.def2
-rw-r--r--templates/protocols/rip/redistribute/connected/route-map/node.def2
-rw-r--r--templates/protocols/rip/redistribute/kernel/metric/node.def2
-rw-r--r--templates/protocols/rip/redistribute/kernel/node.def2
-rw-r--r--templates/protocols/rip/redistribute/kernel/route-map/node.def2
-rw-r--r--templates/protocols/rip/redistribute/node.def2
-rw-r--r--templates/protocols/rip/redistribute/ospf/metric/node.def2
-rw-r--r--templates/protocols/rip/redistribute/ospf/node.def2
-rw-r--r--templates/protocols/rip/redistribute/ospf/route-map/node.def2
-rw-r--r--templates/protocols/rip/redistribute/static/metric/node.def2
-rw-r--r--templates/protocols/rip/redistribute/static/node.def2
-rw-r--r--templates/protocols/rip/redistribute/static/route-map/node.def2
-rw-r--r--templates/protocols/rip/route/node.def2
-rw-r--r--templates/protocols/rip/timers/garbage-collection/node.def2
-rw-r--r--templates/protocols/rip/timers/timeout/node.def2
-rw-r--r--templates/protocols/rip/timers/update/node.def2
-rw-r--r--templates/protocols/static/interface-route/node.def2
-rw-r--r--templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def2
-rw-r--r--templates/protocols/static/interface-route/node.tag/blackhole/node.def2
-rw-r--r--templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def2
-rw-r--r--templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def2
-rw-r--r--templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/node.def2
-rw-r--r--templates/protocols/static/interface-route/node.tag/node.def2
-rw-r--r--templates/protocols/static/node.def2
-rw-r--r--templates/protocols/static/route/node.def2
-rw-r--r--templates/protocols/static/route/node.tag/blackhole/distance/node.def2
-rw-r--r--templates/protocols/static/route/node.tag/blackhole/node.def2
-rw-r--r--templates/protocols/static/route/node.tag/next-hop/node.def2
-rw-r--r--templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def2
-rw-r--r--templates/protocols/static/route/node.tag/next-hop/node.tag/node.def2
-rw-r--r--templates/protocols/static/route/node.tag/node.def2
262 files changed, 263 insertions, 263 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def
index c656ab50..9d640b1e 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -1,6 +1,6 @@
tag:
type: u32
-help: Configure BGP protocol
+help: Configure Border Gateway Protocol (BGP) parameters
comp_help: \1 <1-4294967294>\tAS number
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "AS number must be between 1 and 4294967294"
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.def b/templates/protocols/bgp/node.tag/aggregate-address/node.def
index e7b214fb..6e2ba210 100644
--- a/templates/protocols/bgp/node.tag/aggregate-address/node.def
+++ b/templates/protocols/bgp/node.tag/aggregate-address/node.def
@@ -1,6 +1,6 @@
tag:
type: ipv4net
-help: configure a BGP aggregate network
+help: Set a BGP aggregate network
comp_help: \1 <x.x.x.x/x>\taggregate network
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
delete: touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID
diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.tag/as-set/node.def b/templates/protocols/bgp/node.tag/aggregate-address/node.tag/as-set/node.def
index ef6214f2..78572519 100644
--- a/templates/protocols/bgp/node.tag/aggregate-address/node.tag/as-set/node.def
+++ b/templates/protocols/bgp/node.tag/aggregate-address/node.tag/as-set/node.def
@@ -1 +1 @@
-help: generate AS-set path information for this aggregate
+help: Set to generate AS-set path information for this aggregate address
diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.tag/summary-only/node.def b/templates/protocols/bgp/node.tag/aggregate-address/node.tag/summary-only/node.def
index f2e04595..7aaf0620 100644
--- a/templates/protocols/bgp/node.tag/aggregate-address/node.tag/summary-only/node.def
+++ b/templates/protocols/bgp/node.tag/aggregate-address/node.tag/summary-only/node.def
@@ -1 +1 @@
-help: announce the aggregate summary network only
+help: Set to announce the aggregate summary network only
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def
index 6630aaf4..20679a41 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: configure a BGP neighbor
+help: Set a BGP neighbor
comp_help: \1 <x.x.x.x>\tBGP neighbor IP address
syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-peer-name $VAR(@)"
update: if [ -n "`echo $VAR(@) | sed 's/[0-9]\{1,3\}.[0-9]\{1,3\}.[0-9]\{1,3\}.[0-9]\{1,3\}//'`" ]; then
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
index 05f7f199..104a4954 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/advertisement-interval/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set the minimum interval for sending routing updates
+help: Set the minimum interval for sending routing updates
comp_help: \1 <0-600>\tadvertisement interval in seconds
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600; "must be between 0 and 600"
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
index aca87d6a..47739dee 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/node.def
@@ -1,4 +1,4 @@
-help: accept a route that contains the local-AS in the as-path
+help: Set to accept a route that contains the local-AS in the as-path
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
delete: touch /tmp/bgp-neighbor-$VAR(../@)-allowas-in.$PPID
end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "router bgp $VAR(../../@)" \
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def
index 30b3922a..59bbf053 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/allowas-in/number/node.def
@@ -1,5 +1,5 @@
type: u32
-help: number of occurrences of AS number
+help: Set number of occurrences of AS number
comp_help: \1 <1-10>\tnumber of times AS is allowed in path
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10; "allowas-in number must be between 1 and 10"
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def
index 2967aec6..02bc0751 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/as-path/node.def
@@ -1 +1 @@
-help: send AS path unchanged
+help: Set to send AS path unchanged
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def
index 28997ace..93154a64 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/med/node.def
@@ -1 +1 @@
-help: send multi-exit discriminator unchanged
+help: Set to send multi-exit discriminator unchanged
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def
index 3d2429bc..f8b1ca86 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/next-hop/node.def
@@ -1 +1 @@
-help: send nexthop unchanged
+help: Set to send nexthop unchanged
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
index c45b57f0..9e6db64e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def
@@ -1,4 +1,4 @@
-help: set whether BGP attributes are sent unchanged
+help: Set whether BGP attributes are sent unchanged
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set attribute-unchanged for a neighbor in a peer-group"
delete: touch /tmp/bgp-neighbor-$VAR(../@)-attribute-unchanged.$PPID
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
index d5dbb16f..2fd214b9 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/dynamic/node.def
@@ -1,4 +1,4 @@
-help: advertise dynamic capability to this neighbor
+help: Set to advertise dynamic capability to this neighbor
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
update: if [ -n "$VAR(../../remote-as/@)" ]; then
peer="remote-as $VAR(../../remote-as/@)";
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
index 3d0947e6..f83cac18 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/node.def
@@ -1 +1 @@
-help: advertise capabilities to this neighbor
+help: Set to advertise capabilities to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/node.def
index 9ddbf8e7..a0058566 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/node.def
@@ -1 +1 @@
-help: advertise ORF capability to this neighbor
+help: Set to advertise ORF capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/node.def
index 257b2bc1..cb911c75 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/node.def
@@ -1 +1 @@
-help: Advertise prefix-list ORF capability to this neighbor
+help: Set to advertise prefix-list ORF capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def
index f384b6a5..3d8ebb02 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/receive/node.def
@@ -1,4 +1,4 @@
-help: configure the capability to receive the ORF
+help: Set capability to receive the ORF
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../../../@) --neighbor $VAR(../../../../@)"
commit:expression: $VAR(../../../../peer-group/) == ""; "You can't set orf capability receive for neighbor $VAR(../../../../@) in peer-group $VAR(../../../../peer-group/@)"
update: if [ -n "$VAR(../../../../remote-as/@)" ]; then
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def
index 91b9dbf7..8ffc380b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/orf/prefix-list/send/node.def
@@ -1,4 +1,4 @@
-help: configure the capability to send the ORF
+help: Set capability to send the ORF
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../../../@) --neighbor $VAR(../../../../@)"
commit:expression: $VAR(../../../../peer-group/) == ""; "You can't set capability orf send for neighbor $VAR(../../../../@) in peer-group $VAR(../../../../peer-group/@)"
update:expression: "if [ -n \"$VAR(../../../../remote-as/@)\" ]; then \
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
index 99398a94..b340a4ee 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/node.def
@@ -1,4 +1,4 @@
-help: send default route to this neighbor
+help: Set to send default route to this neighbor
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocold bgp $VAR(../../@) neighbor $VAR(../@): you can't set default-originate for a neighbor in a peer-group"
delete: touch /tmp/bgp-neighbor-$VAR(../@)-default-originate.$PPID
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def
index 0379b4e4..9753b7a5 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def
@@ -1,4 +1,4 @@
type: txt
-help: set the route-map to specify criteria of the default
+help: Set the route-map to specify criteria of the default
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" " ; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@) default-originate: route-map $VAR(@) doesn't exist"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set default-originate for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/description/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/description/node.def
index 6ad2f3a0..9b8fe210 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/description/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/description/node.def
@@ -1,2 +1,2 @@
type: txt
-help: set a description for this neighbor
+help: Set a description for this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
index 37c1892e..894b0a12 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-capability-negotiation/node.def
@@ -1,4 +1,4 @@
-help: do not perform capability negotiation with this neighbor
+help: Set to not perform capability negotiation with this neighbor
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
update: if [ -n "$VAR(../remote-as/@)" ]; then
peer="remote-as $VAR(../remote-as/@)";
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
index 3afa5bff..86ecbe85 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-connected-check/node.def
@@ -1,4 +1,4 @@
-help: disable check to see if EBGP peer's address is a connected route
+help: Disable check to see if EBGP peer's address is a connected route
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
update: if [ -n "$VAR(../remote-as/@)" ]; then
peer="remote-as $VAR(../remote-as/@)";
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
index c960d316..ad46a9ba 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/extended/node.def
@@ -1,4 +1,4 @@
-help: do not send extended community attributes to this neighbor
+help: Se to not send extended community attributes to this neighbor
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set disable-send-community for a neighbor in a peer-group"
update: if [ -n "$VAR(../../remote-as/@)" ]; then
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def
index 5fb559c0..c760705e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/node.def
@@ -1,2 +1,2 @@
-help: do not send community attributes to this neighbor
+help: Set to not send community attributes to this neighbor
commit:expression: ($VAR(./extended/) != "") || ($VAR(./standard/) != ""); "protocols bgp $(../../@) neighbor $(../@): you must specify the type of community"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
index 7b9219b4..13e28d5a 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/disable-send-community/standard/node.def
@@ -1,4 +1,4 @@
-help: do not send standard community attributes to this neighbor
+help: Set to not send standard community attributes to this neighbor
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set disable-send-community for a neighbor in a peer-group"
update: if [ -n "$VAR(../../remote-as/@)" ]; then
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
index a85ca3f1..3ed5ac6d 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/export/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set an access-list to filter outgoing route updates to this neighbor
+help: Set an access-list to filter outgoing route updates to this neighbor
comp_help: \1 <1-65535>\taccess-list number
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set a distribute-list for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
index dcd5c569..9a6e6b80 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/import/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set an access-list to filter incoming route updates from this neighbor
+help: Set an access-list to filter incoming route updates from this neighbor
comp_help: \1 <1-65535>\taccess-list number
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set a distribute-list for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def
index fbc92e31..4013725c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/distribute-list/node.def
@@ -1 +1 @@
-help: configure an access-list to filter route updates to/from this neighbor
+help: Set an access-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
index 9b7497b8..0bc04757 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ebgp-multihop/node.def
@@ -1,5 +1,5 @@
type: u32
-help: allow this EBGP neighbor to not be on a directly connected network
+help: Allow this EBGP neighbor to not be on a directly connected network
comp_help: \1 <1-255>\tnumber of hops
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
syntax:expression: $VAR(@) >=1 && $VAR(@) <= 255; "ebgp-multihop must be between 1 and 255"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
index 776c9fe5..bf0e2d33 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/export/node.def
@@ -1,5 +1,5 @@
type: txt
-help: set an as-path-list to filter outgoing route updates to this neighbor
+help: Set an as-path-list to filter outgoing route updates to this neighbor
comp_help: \1 <txt>\t\tas-path-list name
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set a filter-list for a neighbor in peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
index b0575a87..a06da057 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/import/node.def
@@ -1,5 +1,5 @@
type: txt
-help: set an as-path-list to filter incoming route updates from this neighbor
+help: Set an as-path-list to filter incoming route updates from this neighbor
comp_help: \1 <txt>\t\tas-path-list name
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set a filter-list for a neighbor in peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def
index 100d58fb..191c561b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/filter-list/node.def
@@ -1 +1 @@
-help: configure an as-path-list to filter route updates to/from this neighbor
+help: Set an as-path-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/local-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/local-as/node.def
index 6a7a1f87..c70dba65 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/local-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/local-as/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set the local AS number
+help: Set the local AS number
comp_help: \1 <1-4294967294>\tlocal AS number
syntax:expression: $VAR(@) >=1 && $VAR(@) <= 4294967294; "local-as must be between 1 and 4294967294"
syntax:expression: $VAR(@) != $VAR(../../../@); "Cannot have local-as same as BGP AS number"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/no-prepend/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/no-prepend/node.def
index 8f03c17b..299e92e9 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/no-prepend/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/no-prepend/node.def
@@ -1 +1 @@
-help: do not prepend local-as to updates from EBGP peers
+help: Set to not prepend local-as to updates from EBGP peers
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
index 86ca9f5b..3f3ee011 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.def
@@ -1,4 +1,4 @@
-help: set a different AS number to use with this neighbor
+help: Set a different AS number to use with this neighbor
syntax:expression: $VAR(./local-as/@) >= 1 && $VAR(./local-as/@) <= 4294967294; "AS number must be between 1 and 4294967294"
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(./local-as/@) != $VAR(../../@); "protocols bgp $VAR(../../@) neighbor $VAR(../@) local-as: you can't set a different local-as for iBGP neighbors"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
index 78815923..8ec44aab 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/maximum-prefix/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set the maximum number of prefixes to accept from this neighbor
+help: Set the maximum number of prefixes to accept from this neighbor
comp_help: \1 <1-4294967295>\tprefix limit
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
update: if [ -n "$VAR(../remote-as/@)" ]; then
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
index df0aa6c2..9374186f 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/nexthop-self/node.def
@@ -1,4 +1,4 @@
-help: set nexthop for routes sent to this neighbor to be the local router
+help: Set nexthop for routes sent to this neighbor to be the local router
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@) next-hop-self: you can't set next-hop-self for a neighbor in a peer-group"
update: if [ -n "$VAR(../remote-as/@)" ]; then
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
index 82668b8a..821fefdc 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/override-capability/node.def
@@ -1,4 +1,4 @@
-help: ignore capability negotiation with this neighbor
+help: Set to ignore capability negotiation with specified neighbor
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../strict-capability/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@) override-capability: you can't set both strict-capability and override-capability"
update: if [ -n "$VAR(../remote-as/@)" ]; then
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
index 46d787a8..ad15bb5e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/passive/node.def
@@ -1,4 +1,4 @@
-help: don't try to initiate a session with this neighbor
+help: Set to not try initiating a session with this neighbor
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
update: if [ -n "$VAR(../remote-as/@)" ]; then
peer="remote-as $VAR(../remote-as/@)";
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
index 5bedc010..4001027c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
@@ -1,5 +1,5 @@
type: txt
-help: add this neighbor to a peer-group
+help: Set to add this neighbor to a peer-group
comp_help: \1 <txt>\tpeer-group name
syntax:expression: exec "if [ -n \"`echo $VAR(../@) | sed 's/[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}.[0-9]\\{1,3\\}//'`\" ]; then \
exit 1; \
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
index a738b3d4..d6f20b81 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/port/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set the neighbor's BGP port
+help: Set the neighbor's BGP port
comp_help: \1 <1-65535>\tport number
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; \
"port must be between 1 and 65535"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
index e74140f1..02699c7b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/export/node.def
@@ -1,5 +1,5 @@
type: txt
-help: set a prefix-list to filter outgoing route updates to this neighbor
+help: Set a prefix-list to filter outgoing route updates to this neighbor
comp_help: \1 <txt>\t\tprefix-list name
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set a prefix-list for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
index dc6231b9..8c3f1b0a 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/import/node.def
@@ -1,5 +1,5 @@
type: txt
-help: set a prefix-list to filter incoming route updates from this neighbor
+help: Set a prefix-list to filter incoming route updates from this neighbor
comp_help: \1 <txt>\t\tprefix-list name
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set a prefix-list for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def
index c5e93f61..1a6187c9 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/prefix-list/node.def
@@ -1 +1 @@
-help: configure a prefix-list to filter route updates to/from this neighbor
+help: Set a prefix-list to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
index e668c22b..75b0f3a7 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set neighbor BGP AS number
+help: Set neighbor BGP AS number
comp_help: \1 <1-4294967294>\tAS number
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "remote-as must be between 1 and 4294967294"
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
index 81956352..2fe11e46 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remove-private-as/node.def
@@ -1,4 +1,4 @@
-help: remove private AS numbers from AS path in outbound route updates
+help: Set to remove private AS numbers from AS path in outbound route updates
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../../@): you can't set remove-private-as for a neighbor in a peer-group"
update: if [ -n "$VAR(../remote-as/@)" ]; then
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
index 7286f430..0f68abd3 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/export/node.def
@@ -1,5 +1,5 @@
type: txt
-help: set a route-map to filter outgoing route updates to this neighbor
+help: Set a route-map to filter outgoing route updates to this neighbor
comp_help: \1 <txt>\t\troute-map name
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set a route-map for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
index d3e7d9f9..10513cf8 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/import/node.def
@@ -1,5 +1,5 @@
type: txt
-help: set a route-map to filter incoming route updates from this neighbor
+help: Set a route-map to filter incoming route updates from this neighbor
comp_help: \1 <txt>\t\troute-map name
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)"
commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set a route-map for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def
index 3cfbe71f..7d581eb7 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-map/node.def
@@ -1 +1 @@
-help: configure a route-map to filter route updates to/from this neighbor
+help: Set a route-map to filter route updates to/from this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
index adf849ff..88e8e48b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-reflector-client/node.def
@@ -1,4 +1,4 @@
-help: configure neighbor as a route reflector client
+help: Set neighbor as a route reflector client
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set route-reflector-client for a neighbor in a peer-group"
commit:expression: $VAR(../../@) == $VAR(../remote-as/@); "protocols bgp $VAR(../../@) neighbor $VAR(../@) route-reflector-client: remote-as must equal local-as"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
index 43c90168..97eaf838 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/route-server-client/node.def
@@ -1,4 +1,4 @@
-help: configure neighbor as route server client
+help: Set neighbor as route server client
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set route-server-client for a neighbor in a peer-group"
update: if [ -n "$VAR(../remote-as/@)" ]; then
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
index fa35aede..0d90f0d1 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/shutdown/node.def
@@ -1,4 +1,4 @@
-help: administratively shut down neighbor
+help: Set to administratively shut down neighbor
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
update: if [ -n "$VAR(../remote-as/@)" ]; then
peer="remote-as $VAR(../remote-as/@)";
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def
index 2bbd6954..493073d3 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def
@@ -1,4 +1,4 @@
-help: configure inbound soft reconfiguration for this neighbor
+help: Set inbound soft reconfiguration for this neighbor
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
update: if [ -n "$VAR(../../remote-as/@)" ]; then
peer="remote-as $VAR(../../remote-as/@)";
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def
index ae8fd30e..4c7f5706 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/node.def
@@ -1,2 +1,2 @@
-help: configure soft reconfiguration for neighbor
+help: Set soft reconfiguration for neighbor
commit:expression: $VAR(./inbound/) != ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@) soft-reconfiguration: you must specify the type of soft-reconfiguration"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
index bd0a211e..1603de51 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/strict-capability-match/node.def
@@ -1,4 +1,4 @@
-help: enable strict capability negotiation
+help: Enable strict capability negotiation
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../override-capability/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@) strict-capability-match: you can't set both strict-capability and override-capability"
update: if [ -n "$VAR(../remote-as/@)" ]; then
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/connect/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/connect/node.def
index 3ccfdd4c..3e00ec99 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/connect/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/connect/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set the BGP connect timer for this neighbor
+help: Set the BGP connect timer for this neighbor
comp_help: \1 <1-65535>\tconnect timer in seconds
0\t\tdisable connect timer
syntax:expression: $VAR(@) >=0 && $VAR(@) <= 65535; "BGP connect timer must be between 0 and 65535"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/holdtime/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/holdtime/node.def
index 07c921af..3fcce7e2 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/holdtime/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/holdtime/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set the BGP hold timer for this neighbor
+help: Set the BGP hold timer for this neighbor
comp_help: \1 <1-65535>\thold timer in seconds
0\t\tdisable hold timer
syntax:expression: $VAR(@) == 0 || ($VAR(@) >= 4 && $VAR(@) <= 65535); "Holdtime interval must be 0 or between 4 and 65535"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/keepalive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/keepalive/node.def
index 33314049..cb47e1ce 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/keepalive/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/keepalive/node.def
@@ -1,4 +1,4 @@
type: u32
-help: set the BGP keepalive interval for this neighbor
+help: Set the BGP keepalive interval for this neighbor
comp_help: \1 <1-65535>\tkeepalive interval in seconds
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Keepalive interval must be between 1 and 65535"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
index c9fbdca8..71a74730 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/timers/node.def
@@ -1,4 +1,4 @@
-help: configure neighbor timers
+help: Set neighbor timers
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set timers for a neighbor in a peer-group"
delete: touch /tmp/bgp-neighbor-$VAR(../@)-timers.$PPID
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
index 0c70489f..81936f0c 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/unsuppress-map/node.def
@@ -1,5 +1,5 @@
type: txt
-help: set a route-map to selectively unsuppress suppressed routes
+help: Set a route-map to selectively unsuppress suppressed routes
comp_help: \1 <txt>\t\troute-map name
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set unsuppress-map for a neighbor in a peer-group"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
index d4476531..249429ce 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/update-source/node.def
@@ -1,5 +1,5 @@
type: ipv4
-help: set the source IP of routing updates
+help: Set the source IP of routing updates
comp_help: \1 <x.x.x.x>\tIP address of route source
syntax:expression: exec " \
if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def
index 1d42b0c1..3671473e 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/weight/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set default weight for routes from this neighbor
+help: Set default weight for routes from this neighbor
comp_help: \1 <1-65535>\tweight for routes from this neighbor
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "weight must be between 1 and 65535"
commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../@) --neighbor $VAR(../@)"
diff --git a/templates/protocols/bgp/node.tag/network/node.def b/templates/protocols/bgp/node.tag/network/node.def
index 6b8a810d..ad39bbe3 100644
--- a/templates/protocols/bgp/node.tag/network/node.def
+++ b/templates/protocols/bgp/node.tag/network/node.def
@@ -1,6 +1,6 @@
tag:
type: ipv4net
-help: configure a BGP network
+help: Set a BGP network
comp_help: \1 <x.x.x.x/x>\tnetwork
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)";
"Prefix doesn't fall on a natural boundry"
diff --git a/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def b/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def
index 5d4b5731..327ff689 100644
--- a/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def
+++ b/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def
@@ -1 +1 @@
-help: set this network as a backdoor route
+help: Set this network as a backdoor route
diff --git a/templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def
index 16c2adc6..97091ab3 100644
--- a/templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/network/node.tag/route-map/node.def
@@ -1,4 +1,4 @@
type: txt
-help: set a route-map to modify route attributes
-comp_help: \1 <txt>\t\troute-map name
+help: Set a route-map to modify route attributes
+comp_help: \1 <text>\t\troute-map name
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../@) network $VAR(../@): route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def b/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
index e397dc9c..6acaa730 100644
--- a/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/always-compare-med/node.def
@@ -1,4 +1,4 @@
-help: compare MEDs from different neighbors
+help: Set to compare MEDs from different neighbors
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp always-compare-med"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
index 84dfe043..94d0947b 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/confed/node.def
@@ -1,4 +1,4 @@
-help: compare as-path lengths including confederation sets & sequences
+help: Set to compare AS-path lengths including confederation sets & sequences
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "bgp bestpath as-path confed"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
index 69ada7a2..02ae5d3b 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/ignore/node.def
@@ -1,4 +1,4 @@
-help: ignore as-path length in selecting a route
+help: Set to ignore AS-path length in selecting a route
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "bgp bestpath as-path ignore"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/node.def
index 2e84b475..4e34efc7 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/node.def
@@ -1 +1 @@
-help: set AS-path attribute comparison parameters
+help: Set AS-path attribute comparison parameters
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
index ed50d705..bdee3425 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/compare-routerid/node.def
@@ -1,4 +1,4 @@
-help: compare the router-id for identical EBGP paths
+help: Set to compare the router-id for identical EBGP paths
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "bgp bestpath compare-routerid"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
index 509ee095..2fe47d22 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/med/confed/node.def
@@ -1,4 +1,4 @@
-help: compare MEDs among confederation paths
+help: Set to compare MEDs among confederation paths
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "bgp bestpath med confed"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
index 9ff63ae8..48b9f4c5 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/med/missing-as-worst/node.def
@@ -1,4 +1,4 @@
-help: treat a route missing a MED as the least preferred one
+help: Set to treat a route missing a MED as the least preferred one
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
-c "bgp bestpath med missing-as-worst"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/med/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/med/node.def
index 5784f034..fe5c00b6 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/med/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/med/node.def
@@ -1 +1 @@
-help: set MED attribute comparison parameters
+help: Set MED attribute comparison parameters
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/node.def
index 10e215df..fb34af31 100644
--- a/templates/protocols/bgp/node.tag/parameters/bestpath/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/node.def
@@ -1 +1 @@
-help: change the default bestpath selection mechanism
+help: Set to change the default bestpath selection mechanism
diff --git a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def b/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
index 319107d1..e898e349 100644
--- a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def
@@ -1,5 +1,5 @@
type: ipv4
-help: configure the route-reflector cluster-id
+help: Set the route-reflector cluster-id
comp_help: \1 <x.x.x.x>\tcluster-id IP
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp cluster-id $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
index 7798df99..23ee9cea 100644
--- a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set confederation AS identifier
+help: Set confederation AS identifier
comp_help: \1 <1-4294967294>\tconfederation AS id
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294"
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/node.def
index 529569cf..e6507eff 100644
--- a/templates/protocols/bgp/node.tag/parameters/confederation/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/confederation/node.def
@@ -1 +1 @@
-help: configure AS confederation parameters
+help: Set AS confederation parameters
diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
index c07a346d..849f2934 100644
--- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
@@ -1,6 +1,6 @@
multi:
type: u32
-help: set the peer ASs in the BGP confederation
+help: Set the peer ASs in the BGP confederation
comp_help: \1 <1-4294967294>\tpeer AS number numbers (ex: "435 234")
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294"
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/half-life/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/half-life/node.def
index 92143567..a852d0d0 100644
--- a/templates/protocols/bgp/node.tag/parameters/dampening/half-life/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/dampening/half-life/node.def
@@ -1,4 +1,4 @@
type: u32
-help: set half-life time for dampening
+help: Set half-life time for dampening
comp_help: \1 <1-45>\thalf-life penalty in seconds
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 45; "Half-life penalty must be between 1 and 45"
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/max-suppress-time/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/max-suppress-time/node.def
index a26a6369..60438745 100644
--- a/templates/protocols/bgp/node.tag/parameters/dampening/max-suppress-time/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/dampening/max-suppress-time/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set the maximum duration to suppress a stable route
+help: Set the maximum duration to suppress a stable route
comp_help: \1 <1-255>\tmaximum suppress duration in seconds
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Max-suppress-time must be between 1 and 255"
commit:expression: $VAR(../re-use/) != ""; "protocols bgp $VAR(../../../@) parameters dampening max-suppress-time: you must set a re-use time"
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/node.def
index ed61e381..a86cbe79 100644
--- a/templates/protocols/bgp/node.tag/parameters/dampening/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/dampening/node.def
@@ -1,4 +1,4 @@
-help: enable route-flap dampening
+help: Enable route-flap dampening
delete:expression: "touch /tmp/bgp-dampening.$PPID"
end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp dampening" ;
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/re-use/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/re-use/node.def
index 0dd9c1b2..1eb3d6b3 100644
--- a/templates/protocols/bgp/node.tag/parameters/dampening/re-use/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/dampening/re-use/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set time to start reusing a route
+help: Set time to start reusing a route
comp_help: \1 <1-20000>\tre-use time in seconds
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 20000; "Re-use value must be between 1 and 20000"
commit:expression: $VAR(../start-suppress-time/) != ""; "protocols bgp $VAR(../../../@) parameters dampening re-use: you must set start-suppress-time"
diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/start-suppress-time/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/start-suppress-time/node.def
index 83e6ba76..a1f55596 100644
--- a/templates/protocols/bgp/node.tag/parameters/dampening/start-suppress-time/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/dampening/start-suppress-time/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set when to start suppressing a route
+help: Set when to start suppressing a route
comp_help: \1 <1-20000>\t\tstart-suppress-time
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 20000; "Start-suppress-time must be between 1 and 20000"
commit:expression: $VAR(../re-use/) != ""; "protocols bgp $VAR(../../../@) parameters dampening max-suppress-time: you must set re-use"
diff --git a/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def b/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
index 1956bc1f..4651cd68 100644
--- a/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/default/local-pref/node.def
@@ -1,5 +1,5 @@
type: u32
-help: configure the default local preference (higher=more preferred)
+help: Set the default local preference (higher=more preferred)
comp_help: \1 <0-4294967295>\tlocal preference
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "bgp default local-preference $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def b/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
index ff91d1ad..5747cdfa 100644
--- a/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/default/no-ipv4-unicast/node.def
@@ -1,4 +1,4 @@
-help: deactivate IPv4 unicast for a peer by default
+help: Set to deactivate IPv4 unicast for a peer by default
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \
-c "no bgp default ipv4-unicast"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/default/node.def b/templates/protocols/bgp/node.tag/parameters/default/node.def
index 6aaafd5c..03806ac0 100644
--- a/templates/protocols/bgp/node.tag/parameters/default/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/default/node.def
@@ -1 +1 @@
-help: configure BGP defaults
+help: Set BGP defaults
diff --git a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def b/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
index 2f9722fa..f6a23e70 100644
--- a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def
@@ -1,4 +1,4 @@
-help: compare MEDs between different peers in the same AS
+help: Set to compare MEDs between different peers in the same AS
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp deterministic-med"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def b/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
index 3a13f76c..85bfee9a 100644
--- a/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/disable-network-import-check/node.def
@@ -1,4 +1,4 @@
-help: disable IGP route check for network statements
+help: Set to disable IGP route check for network statements
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp network import-check"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def b/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
index 7922bdf3..8ec9c0de 100644
--- a/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
@@ -1,4 +1,4 @@
-help: require first AS in the path to match peer's AS
+help: Set to require first AS in the path to match peer's AS
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp enforce-first-as "
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/graceful-restart/node.def b/templates/protocols/bgp/node.tag/parameters/graceful-restart/node.def
index 4586be73..85b6b73d 100644
--- a/templates/protocols/bgp/node.tag/parameters/graceful-restart/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/graceful-restart/node.def
@@ -1 +1 @@
-help: configure graceful restart capability parameters
+help: Set graceful restart capability parameters
diff --git a/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def b/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
index 103941f1..91491cbd 100644
--- a/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/graceful-restart/stalepath-time/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set the maximum time to hold onto restarting peer's stale paths
+help: Set the maximum time to hold onto restarting peer's stale paths
comp_help: \1 <1-3600>\thold time in seconds
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 3600; "stalepath-time must be between 1 and 3600"
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def b/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
index d81d0653..11429c19 100644
--- a/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/log-neighbor-changes/node.def
@@ -1,4 +1,4 @@
-help: log neighbor up/down changes and reset reason
+help: Set to log neighbor up/down changes and reset reason
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp log-neighbor-changes"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def b/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
index 1fa64426..2d774537 100644
--- a/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/no-client-to-client-reflection/node.def
@@ -1,4 +1,4 @@
-help: disable client to client route reflection
+help: Set to disable client to client route reflection
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp client-to-client reflection"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def b/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
index 4a221e60..23440864 100644
--- a/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/no-fast-external-failover/node.def
@@ -1,4 +1,4 @@
-help: disable immediate sesison reset if peer's connected link goes down
+help: Set to disable immediate sesison reset if peer's connected link goes down
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no bgp fast-external-failover"
delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
diff --git a/templates/protocols/bgp/node.tag/parameters/node.def b/templates/protocols/bgp/node.tag/parameters/node.def
index 513f8ebd..6bb752b5 100644
--- a/templates/protocols/bgp/node.tag/parameters/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/node.def
@@ -1 +1 @@
-help: configure BGP parameters
+help: Set BGP parameters
diff --git a/templates/protocols/bgp/node.tag/parameters/router-id/node.def b/templates/protocols/bgp/node.tag/parameters/router-id/node.def
index 26b96b5e..477f900a 100644
--- a/templates/protocols/bgp/node.tag/parameters/router-id/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/router-id/node.def
@@ -1,5 +1,5 @@
type: ipv4
-help: set BGP router id
+help: Set BGP router id
comp_help: \1 <x.x.x.x>\tBGP router-id IP
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "bgp router-id $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
index 66a1eae1..8619b163 100644
--- a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set BGP route scanner interval
+help: Set BGP route scanner interval
comp_help: \1 <5-60>\tscan interval in seconds
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 60; "scan-time must be between 5 and 60 seconds"
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/metric/node.def b/templates/protocols/bgp/node.tag/redistribute/connected/metric/node.def
index 740fbde8..8ac30200 100644
--- a/templates/protocols/bgp/node.tag/redistribute/connected/metric/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/connected/metric/node.def
@@ -1,3 +1,3 @@
type: u32
-help: set the metric for redistributed routes
+help: Set the metric for redistributed routes
comp_help: \1 <0-4294967295>\tmetric
diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/redistribute/connected/node.def
index f7d15bfb..6c44113c 100644
--- a/templates/protocols/bgp/node.tag/redistribute/connected/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/connected/node.def
@@ -1,4 +1,4 @@
-help: redistribute connected routes into BGP
+help: Set to redistribute connected routes into BGP
delete: touch /tmp/bgp-redist-connected.$PPID
end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no redistribute connected";
diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def b/templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def
index 17cb0c67..026de05a 100644
--- a/templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/connected/route-map/node.def
@@ -1,4 +1,4 @@
type: txt
-help: configure a route map to filter redistributed routes
+help: Set a route map to filter redistributed routes
comp_help: \1 <txt>\t\troute-map name
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) redistribute connected: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/metric/node.def b/templates/protocols/bgp/node.tag/redistribute/kernel/metric/node.def
index 740fbde8..8ac30200 100644
--- a/templates/protocols/bgp/node.tag/redistribute/kernel/metric/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/kernel/metric/node.def
@@ -1,3 +1,3 @@
type: u32
-help: set the metric for redistributed routes
+help: Set the metric for redistributed routes
comp_help: \1 <0-4294967295>\tmetric
diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
index 20708ed1..0b7f0d04 100644
--- a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def
@@ -1,4 +1,4 @@
-help: redistribute kernel routes into BGP
+help: Set to redistribute kernel routes into BGP
delete: touch /tmp/bgp-redist-kernel.$PPID
end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no redistribute kernel ";
diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def b/templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def
index d7d0ff49..e513130e 100644
--- a/templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/kernel/route-map/node.def
@@ -1,4 +1,4 @@
type: txt
-help: configure a route map to filter redistributed routes
+help: Set a route map to filter redistributed routes
comp_help: \1 <txt>\t\troute-map name
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) redistribute kernel: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/redistribute/node.def b/templates/protocols/bgp/node.tag/redistribute/node.def
index 6fe54125..105e22db 100644
--- a/templates/protocols/bgp/node.tag/redistribute/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/node.def
@@ -1 +1 @@
-help: configure redistribution of routes from other protocols into BGP
+help: Set redistribution of routes from other protocols into BGP
diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/metric/node.def b/templates/protocols/bgp/node.tag/redistribute/ospf/metric/node.def
index 740fbde8..8ac30200 100644
--- a/templates/protocols/bgp/node.tag/redistribute/ospf/metric/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/ospf/metric/node.def
@@ -1,3 +1,3 @@
type: u32
-help: set the metric for redistributed routes
+help: Set the metric for redistributed routes
comp_help: \1 <0-4294967295>\tmetric
diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
index 76b27d9c..3eb7a3c5 100644
--- a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def
@@ -1,4 +1,4 @@
-help: redistribute OSPF routes into BGP
+help: Set to redistribute OSPF routes into BGP
delete: touch /tmp/bgp-redist-ospf.$PPID
end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no redistribute ospf";
diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def b/templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def
index cbad8dc3..e2b5c019 100644
--- a/templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/ospf/route-map/node.def
@@ -1,4 +1,4 @@
type: txt
-help: configure a route map to filter redistributed routes
+help: Set a route map to filter redistributed routes
comp_help: \1 <txt>\t\troute-map name
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) redistribute ospf: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/metric/node.def b/templates/protocols/bgp/node.tag/redistribute/rip/metric/node.def
index 740fbde8..8ac30200 100644
--- a/templates/protocols/bgp/node.tag/redistribute/rip/metric/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/rip/metric/node.def
@@ -1,3 +1,3 @@
type: u32
-help: set the metric for redistributed routes
+help: Set the metric for redistributed routes
comp_help: \1 <0-4294967295>\tmetric
diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/node.def b/templates/protocols/bgp/node.tag/redistribute/rip/node.def
index 2b0886e8..f66f5d74 100644
--- a/templates/protocols/bgp/node.tag/redistribute/rip/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/rip/node.def
@@ -1,4 +1,4 @@
-help: redistribute RIP routes into BGP
+help: Set to redistribute RIP routes into BGP
delete: touch /tmp/bgp-redist-rip.$PPID
end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no redistribute rip ";
diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def b/templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def
index 1665507b..b8461b4c 100644
--- a/templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/rip/route-map/node.def
@@ -1,4 +1,4 @@
type: txt
-help: configure a route map to filter redistributed routes
+help: Set a route map to filter redistributed routes
comp_help: \1 <txt>\t\troute-map name
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) redistribute rip: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/redistribute/static/metric/node.def b/templates/protocols/bgp/node.tag/redistribute/static/metric/node.def
index 740fbde8..8ac30200 100644
--- a/templates/protocols/bgp/node.tag/redistribute/static/metric/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/static/metric/node.def
@@ -1,3 +1,3 @@
type: u32
-help: set the metric for redistributed routes
+help: Set the metric for redistributed routes
comp_help: \1 <0-4294967295>\tmetric
diff --git a/templates/protocols/bgp/node.tag/redistribute/static/node.def b/templates/protocols/bgp/node.tag/redistribute/static/node.def
index 3dc1adaf..ec107483 100644
--- a/templates/protocols/bgp/node.tag/redistribute/static/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/static/node.def
@@ -1,4 +1,4 @@
-help: redistribute static routes into BGP
+help: Set to redistribute static routes into BGP
delete: touch /tmp/bgp-redist-static.$PPID
end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \
-c "no redistribute static";
diff --git a/templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def b/templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def
index cda1e460..61352932 100644
--- a/templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def
+++ b/templates/protocols/bgp/node.tag/redistribute/static/route-map/node.def
@@ -1,4 +1,4 @@
type: txt
-help: configure a route map to filter redistributed routes
+help: Set a route map to filter redistributed routes
comp_help: \1 <txt>\t\troute-map name
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"protocols bgp $VAR(../../../@) redistribute static: route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/timers/holdtime/node.def b/templates/protocols/bgp/node.tag/timers/holdtime/node.def
index 8ba97b62..6c07dd55 100644
--- a/templates/protocols/bgp/node.tag/timers/holdtime/node.def
+++ b/templates/protocols/bgp/node.tag/timers/holdtime/node.def
@@ -1,5 +1,5 @@
type: u32
-help: set the BGP holdtime interval
+help: Set the BGP holdtime interval
comp_help: \1 <4-65535>\thold-time in seconds (default 180)
0\t\tdon't hold routes
default: 180
diff --git a/templates/protocols/bgp/node.tag/timers/keepalive/node.def b/templates/protocols/bgp/node.tag/timers/keepalive/node.def
index 4315f3ba..ad158910 100644
--- a/templates/protocols/bgp/node.tag/timers/keepalive/node.def
+++ b/templates/protocols/bgp/node.tag/timers/keepalive/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Keepalive interval
+help: Set keepalive interval
comp_help: \1 <1-65535>\tkeep-alive time in seconds (default 60)
default: 60
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; \
diff --git a/templates/protocols/bgp/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/timers/node.def
index cb62fe06..ad23965b 100644
--- a/templates/protocols/bgp/node.tag/timers/node.def
+++ b/templates/protocols/bgp/node.tag/timers/node.def
@@ -1,4 +1,4 @@
-help: configure BGP protocol timers
+help: Set BGP protocol timers
commit:expression: $VAR(./keepalive/) != ""; "protocols bgp $VAR(../@) timers: you must set a keepalive interval"
commit:expression: $VAR(./holdtime/) != ""; "protocols bgp $VAR(../@) timers: you must set a holdtime interval"
delete: touch /tmp/bgp-timers.$PPID
diff --git a/templates/protocols/node.def b/templates/protocols/node.def
index cdc0b969..04e1666a 100644
--- a/templates/protocols/node.def
+++ b/templates/protocols/node.def
@@ -1 +1 @@
-help: Routing protocol configuration
+help: Configure routing protocol parameters
diff --git a/templates/protocols/ospf/access-list/node.def b/templates/protocols/ospf/access-list/node.def
index e806f106..9186918a 100644
--- a/templates/protocols/ospf/access-list/node.def
+++ b/templates/protocols/ospf/access-list/node.def
@@ -1,4 +1,4 @@
tag:
type: u32
commit:expression: $VAR(./export/) != ""; "must add protocol to filter"
-help: Access-list to filter networks in routing updates
+help: Set access-list to filter networks in routing updates
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 b553053c..15855424 100644
--- a/templates/protocols/ospf/access-list/node.tag/export/node.def
+++ b/templates/protocols/ospf/access-list/node.tag/export/node.def
@@ -1,6 +1,6 @@
multi:
type: txt
-help: Filter outgoing routing updates
+help: Set filter for outgoing routing updates
syntax:expression: $VAR(@) in "bgp", "connected", "kernel", "rip", "static"; "Must be (bgp, connected, kernel, rip, or static)"
create: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
-c "router ospf" \
diff --git a/templates/protocols/ospf/area/node.def b/templates/protocols/ospf/area/node.def
index 53fc6067..cf97094a 100644
--- a/templates/protocols/ospf/area/node.def
+++ b/templates/protocols/ospf/area/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: OSPF Area
+help: Set OSPF Area
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $VAR(@)"; "Invalid OSFP area \"$VAR(@)\" "
comp_help: possible completions:
<0-4294967295> Set OSPF area in 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 fba5775d..76724122 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/node.def
@@ -1,4 +1,4 @@
-help: Area type
+help: Set area type
comp_help: possible completions:
normal Set normal area type
nssa Set not so stubby area type
diff --git a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
index 8bf65c54..1061ace6 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def
@@ -1,4 +1,4 @@
-help: Normal OSPF area
+help: Set normal OSPF area
syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first"
syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first"
create:expression: " \
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
index 4999ff7a..b82abfc0 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/no-summary/node.def
@@ -1 +1 @@
-help: Do not inject inter-area routes into stub
+help: Set to not inject inter-area routes into stub
diff --git a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
index b27f0b3a..fc58564f 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/node.def
@@ -1,4 +1,4 @@
-help: nssa OSPF area
+help: Set nssa OSPF area
syntax:expression: ! $VAR(../../@) in "0", "0.0.0.0"; "Backbone can't be NSSA"
syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first"
syntax:expression: $VAR(../stub/) == "" ; "Must delete stub area type first"
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 9b6db051..bb1269df 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
@@ -1,5 +1,5 @@
type: txt
-help: Configure NSSA-ABR
+help: Set nssa-abr
default: "candidate"
syntax:expression: $VAR(@) in "always", "candidate", "never"; "Must be (always, candidate, or never)"
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
index 5420dba5..48353482 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/no-summary/node.def
@@ -1,4 +1,4 @@
-help: Do not inject inter-area routes into stub
+help: Set to not inject inter-area routes into stub
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
-c \"area $VAR(../../../@) stub no-summary \"; "
diff --git a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
index cfaa9b87..af9fe88e 100644
--- a/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
+++ b/templates/protocols/ospf/area/node.tag/area-type/stub/node.def
@@ -1,4 +1,4 @@
-help: Stub OSPF area
+help: Set stub OSPF area
syntax:expression: ! $VAR(../../@) in "0", "0.0.0.0"; "Backbone can't be stub"
syntax:expression: $VAR(../nssa/) == "" ; "Must delete nssa area type first"
syntax:expression: $VAR(../normal/) == "" ; "Must delete normal area type first"
diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def
index 66bd28d3..068e8892 100644
--- a/templates/protocols/ospf/area/node.tag/authentication/node.def
+++ b/templates/protocols/ospf/area/node.tag/authentication/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Configure OSPF area authentication type
+help: Set OSPF area authentication type
syntax:expression: $VAR(@) in "plaintext-password", "md5"; \
"Must be either plaintext-password or md5"
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def
index 6b743ede..3929d1e7 100644
--- a/templates/protocols/ospf/area/node.tag/network/node.def
+++ b/templates/protocols/ospf/area/node.tag/network/node.def
@@ -1,6 +1,6 @@
multi:
type: ipv4net
-help: OSPF network
+help: Set OSPF network
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/area/node.tag/node.def b/templates/protocols/ospf/area/node.tag/node.def
index 2652108b..7d080287 100644
--- a/templates/protocols/ospf/area/node.tag/node.def
+++ b/templates/protocols/ospf/area/node.tag/node.def
@@ -1,3 +1,3 @@
-help: IPv4 network
+help: Set IPv4 network
diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def
index 63147ac6..e3c21eea 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.def
@@ -1,6 +1,6 @@
tag:
type: ipv4net
-help: Summarize routes matching prefix (border routers only)
+help: Set to summarize routes matching prefix (border routers only)
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
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 11b744db..7ee65934 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,5 +1,5 @@
type: u32
-help: Metric for this range
+help: Set metric for this range
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Metric must be between 0-16777215"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
index 22a10e0c..9e14d588 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
@@ -1,4 +1,4 @@
-help: Do NOT advertise this range
+help: Set to not advertise this range
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
-c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; "
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
index dba70a07..6dbc7be6 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
@@ -1,5 +1,5 @@
type: ipv4net
-help: Announce area range as another prefix
+help: Set to announce area range as another prefix
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def
index ed6fd7de..d7641261 100644
--- a/templates/protocols/ospf/area/node.tag/shortcut/node.def
+++ b/templates/protocols/ospf/area/node.tag/shortcut/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Configure area's shortcutting mode
+help: Set area's shortcut mode
syntax:expression: $VAR(@) in "default", "disable", "enable"; "Must be (default, disable, enable)"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
index 572e161b..6bd48896 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.def
@@ -1,6 +1,6 @@
tag:
type: ipv4
-help: Configure a virtual link
+help: Set a virtual link
syntax:expression: ! $VAR(../@) in "0", "0.0.0.0"; "Can't configure VL over area $VAR(../@)"
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
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 1710e6d2..fe064f55 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
@@ -1,6 +1,6 @@
tag:
type: u32
-help: Configure MD5 key id
+help: Set MD5 key id
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
commit:expression: $VAR(md5-key/) != ""; "Must add the md5-key for key-id $VAR(@)"
delete:expression: "touch /tmp/ospf-md5.$PPID"
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 7cbcad83..ef35f7da 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,5 +1,5 @@
type: txt
-help: Configure md5 key
+help: Set MD5 key
syntax:expression: exec " \
if [ `echo -n $VAR(@) | wc -c` -gt 16 ]; then \
echo MD5 key must be 16 characters or less ; \
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/node.def
index c90f5cf9..3d83feec 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/node.def
@@ -1 +1 @@
-help: Configure md5 key
+help: Set MD5 key
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
index c2af0dd3..65f6d60b 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
@@ -1,4 +1,4 @@
-help: Configure MD5 key id
+help: Set MD5 key id
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \
-c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def
index 0e0aad62..2712c790 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/node.def
@@ -1 +1 @@
-help: Configure authentication
+help: Set authentication
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 ab268f98..14539e12 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,5 @@
type: txt
-help: Configure plain text password
+help: Set plain text password
syntax:expression: exec " \
if [ `echo -n $VAR(@) | wc -c` -gt 8 ]; then \
echo Password must be 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 4a765bf1..4bb5e97d 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,5 +1,5 @@
type: u32
-help: Interval after which a neighbor is declared dead
+help: Set interval after which a neighbor is declared dead
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
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 0cab5c07..368add50 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,5 +1,5 @@
type: u32
-help: Interval between HELLO packets
+help: Set interval between hello packets
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/node.def
index dd576aa7..6eb2820b 100644
--- a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/node.def
+++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/node.def
@@ -1 +1 @@
-help: virtual link
+help: Set virtual link
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 014a44ba..45c54431 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,5 +1,5 @@
type: u32
-help: Interval between retransmitting lost link state advertisements
+help: Set interval between retransmitting lost link state advertisements
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
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 e2cf5896..7ff0cf05 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,5 +1,5 @@
type: u32
-help: Link state transmit delay
+help: Set link state transmit delay
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/auto-cost/node.def b/templates/protocols/ospf/auto-cost/node.def
index 5ea6ce6f..f7f8dc23 100644
--- a/templates/protocols/ospf/auto-cost/node.def
+++ b/templates/protocols/ospf/auto-cost/node.def
@@ -1 +1 @@
-help: Calculate OSPF interface cost according to bandwidth
+help: Set to calculate OSPF interface cost according to bandwidth
diff --git a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
index 9896730d..24413a11 100644
--- a/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
+++ b/templates/protocols/ospf/auto-cost/reference-bandwidth/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Use reference bandwidth method to assign OSPF cost
+help: Set to use reference bandwidth method to assign OSPF cost
default: 100
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967; \
"Must be between 1-4294967"
diff --git a/templates/protocols/ospf/default-information/node.def b/templates/protocols/ospf/default-information/node.def
index 7cd4ddbc..1c2edbe4 100644
--- a/templates/protocols/ospf/default-information/node.def
+++ b/templates/protocols/ospf/default-information/node.def
@@ -1 +1 @@
-help: Control distribution of default information
+help: Set to control distribution of default information
diff --git a/templates/protocols/ospf/default-information/originate/always/node.def b/templates/protocols/ospf/default-information/originate/always/node.def
index 31ce00db..7e238873 100644
--- a/templates/protocols/ospf/default-information/originate/always/node.def
+++ b/templates/protocols/ospf/default-information/originate/always/node.def
@@ -1 +1 @@
-help: Always advertise default route
+help: Set to always advertise default route
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 5b6b6531..9878782f 100644
--- a/templates/protocols/ospf/default-information/originate/metric-type/node.def
+++ b/templates/protocols/ospf/default-information/originate/metric-type/node.def
@@ -1,5 +1,5 @@
type: u32
-help: OSPF metric type for default routes
+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:
diff --git a/templates/protocols/ospf/default-information/originate/metric/node.def b/templates/protocols/ospf/default-information/originate/metric/node.def
index 80609683..54ee5653 100644
--- a/templates/protocols/ospf/default-information/originate/metric/node.def
+++ b/templates/protocols/ospf/default-information/originate/metric/node.def
@@ -1,5 +1,5 @@
type: u32
-help: OSPF default metric
+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
diff --git a/templates/protocols/ospf/default-information/originate/node.def b/templates/protocols/ospf/default-information/originate/node.def
index 084d529e..73a8912e 100644
--- a/templates/protocols/ospf/default-information/originate/node.def
+++ b/templates/protocols/ospf/default-information/originate/node.def
@@ -1,4 +1,4 @@
-help: Distribute a default route
+help: Set to distribute a default route
delete: touch /tmp/ospf-default-info.$PPID
end: if [ -f "/tmp/ospf-default-info.$PPID" ]; then
${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
diff --git a/templates/protocols/ospf/default-information/originate/route-map/node.def b/templates/protocols/ospf/default-information/originate/route-map/node.def
index c7943078..f5811b9d 100644
--- a/templates/protocols/ospf/default-information/originate/route-map/node.def
+++ b/templates/protocols/ospf/default-information/originate/route-map/node.def
@@ -1,2 +1,2 @@
type: txt
-help: Route map reference
+help: Set route map reference
diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def
index 7b8a45b9..6b30fcf0 100644
--- a/templates/protocols/ospf/distance/global/node.def
+++ b/templates/protocols/ospf/distance/global/node.def
@@ -1,5 +1,5 @@
type: u32
-help: OSPF administrative distance
+help: Set OSPF administrative distance
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/distance/node.def b/templates/protocols/ospf/distance/node.def
index f86a74d1..cb26cb98 100644
--- a/templates/protocols/ospf/distance/node.def
+++ b/templates/protocols/ospf/distance/node.def
@@ -1 +1 @@
-help: Define an administrative distance
+help: Set an administrative distance
diff --git a/templates/protocols/ospf/distance/ospf/external/node.def b/templates/protocols/ospf/distance/ospf/external/node.def
index 2b827181..e99bfa07 100644
--- a/templates/protocols/ospf/distance/ospf/external/node.def
+++ b/templates/protocols/ospf/distance/ospf/external/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Define a distance for external routes
+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
diff --git a/templates/protocols/ospf/distance/ospf/inter-area/node.def b/templates/protocols/ospf/distance/ospf/inter-area/node.def
index 0ac254e6..a6bcf23a 100644
--- a/templates/protocols/ospf/distance/ospf/inter-area/node.def
+++ b/templates/protocols/ospf/distance/ospf/inter-area/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Define a distance for inter-area routes
+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
diff --git a/templates/protocols/ospf/distance/ospf/intra-area/node.def b/templates/protocols/ospf/distance/ospf/intra-area/node.def
index 665bf139..b03b0470 100644
--- a/templates/protocols/ospf/distance/ospf/intra-area/node.def
+++ b/templates/protocols/ospf/distance/ospf/intra-area/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Define a distance for intra-area routes
+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
diff --git a/templates/protocols/ospf/distance/ospf/node.def b/templates/protocols/ospf/distance/ospf/node.def
index f1a7884c..b326c90f 100644
--- a/templates/protocols/ospf/distance/ospf/node.def
+++ b/templates/protocols/ospf/distance/ospf/node.def
@@ -1,4 +1,4 @@
-help: OSPF administrative distance
+help: Set OSPF administrative distance
delete:expression: "touch /tmp/ospf-distance.$PPID"
end:expression: "\
if [ -f \"/tmp/ospf-distance.$PPID\" ]; then \
diff --git a/templates/protocols/ospf/log-adjacency-changes/detail/node.def b/templates/protocols/ospf/log-adjacency-changes/detail/node.def
index 89c2bb75..d9745af1 100644
--- a/templates/protocols/ospf/log-adjacency-changes/detail/node.def
+++ b/templates/protocols/ospf/log-adjacency-changes/detail/node.def
@@ -1,4 +1,4 @@
-help: Log all state changes
+help: Set to log all state changes
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
-c \"log-adjacency-changes detail\"; "
delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router ospf\" \
diff --git a/templates/protocols/ospf/log-adjacency-changes/node.def b/templates/protocols/ospf/log-adjacency-changes/node.def
index 3bf908f2..b3c78e12 100644
--- a/templates/protocols/ospf/log-adjacency-changes/node.def
+++ b/templates/protocols/ospf/log-adjacency-changes/node.def
@@ -1,4 +1,4 @@
-help: Log changes in adjacency state
+help: Set to log changes in adjacency state
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
-c \"log-adjacency-changes\"; "
diff --git a/templates/protocols/ospf/max-metric/node.def b/templates/protocols/ospf/max-metric/node.def
index 812172f8..d40ccc2a 100644
--- a/templates/protocols/ospf/max-metric/node.def
+++ b/templates/protocols/ospf/max-metric/node.def
@@ -1 +1 @@
-help: OSPF maximum / infinite-distance metric
+help: Set OSPF maximum/infinite-distance metric
diff --git a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
index 5d1cfcaf..e4f8db14 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/administrative/node.def
@@ -1,4 +1,4 @@
-help: Administratively applied, for an indefinite period
+help: Set to administratively apply, for an indefinite period
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
-c \"max-metric router-lsa administrative\"; "
diff --git a/templates/protocols/ospf/max-metric/router-lsa/node.def b/templates/protocols/ospf/max-metric/router-lsa/node.def
index 7371f9a9..8f4248c2 100644
--- a/templates/protocols/ospf/max-metric/router-lsa/node.def
+++ b/templates/protocols/ospf/max-metric/router-lsa/node.def
@@ -1 +1 @@
-help: Advertise own Router-LSA with infinite distance (stub router)
+help: Set to advertise own Router-LSA with infinite distance (stub router)
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 da7c0da1..e068e184 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,5 +1,5 @@
type: u32
-help: Advertise stub-router prior to full shutdown of OSPF
+help: Set to advertise stub-router prior to full shutdown of OSPF
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
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 99480c03..3b6d2352 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,5 +1,5 @@
type: u32
-help: Automatically advertise stub Router-LSA on startup of OSPF
+help: Set to automatically advertise stub Router-LSA on startup of OSPF
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/mpls-te/enable/node.def b/templates/protocols/ospf/mpls-te/enable/node.def
index 2ab09a62..4ea46008 100644
--- a/templates/protocols/ospf/mpls-te/enable/node.def
+++ b/templates/protocols/ospf/mpls-te/enable/node.def
@@ -1,4 +1,4 @@
-help: Enable the MPLS-TE functionality
+help: Enable MPLS-TE functionality
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
-c \"mpls-te on\"; "
diff --git a/templates/protocols/ospf/mpls-te/node.def b/templates/protocols/ospf/mpls-te/node.def
index 691c56d6..e138a407 100644
--- a/templates/protocols/ospf/mpls-te/node.def
+++ b/templates/protocols/ospf/mpls-te/node.def
@@ -1 +1 @@
-help: Configure MPLS-TE parameters
+help: Set MultiProtocol Label Switching-Traffic Engineering (MPLS-TE) parameters
diff --git a/templates/protocols/ospf/mpls-te/router-address/node.def b/templates/protocols/ospf/mpls-te/router-address/node.def
index 9c70bd29..a082f3f7 100644
--- a/templates/protocols/ospf/mpls-te/router-address/node.def
+++ b/templates/protocols/ospf/mpls-te/router-address/node.def
@@ -1,5 +1,5 @@
type: ipv4
-help: Stable IP address of the advertising router
+help: Set stable IP address of the advertising router
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
-c \"mpls-te router-address $VAR(@)\"; "
diff --git a/templates/protocols/ospf/neighbor/node.def b/templates/protocols/ospf/neighbor/node.def
index 2d690ce7..0c10b1a5 100644
--- a/templates/protocols/ospf/neighbor/node.def
+++ b/templates/protocols/ospf/neighbor/node.def
@@ -1,6 +1,6 @@
tag:
type: ipv4
-help: Neighbor IP address
+help: Set neighbor IP address
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
-c \"neighbor $VAR(@)\"; "
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 7c234d10..5be48c7e 100644
--- a/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/poll-interval/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Dead neighbor polling interval
+help: Set dead neighbor polling interval
default: 60
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535 seconds"
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
index 16af4dc3..f3c00a89 100644
--- a/templates/protocols/ospf/neighbor/node.tag/priority/node.def
+++ b/templates/protocols/ospf/neighbor/node.tag/priority/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Neighbor priority in seconds
+help: Set neighbor priority in seconds
default: 0
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Priority must be between 0-255"
update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
index def04c81..fd462730 100644
--- a/templates/protocols/ospf/node.def
+++ b/templates/protocols/ospf/node.def
@@ -1,4 +1,4 @@
-help: Configure OSPF for IPv4
+help: Configure Open Shortest Path First protocol (OSPF) parameters
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" "
delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
diff --git a/templates/protocols/ospf/parameters/node.def b/templates/protocols/ospf/parameters/node.def
index 050f78ae..a1fdfa27 100644
--- a/templates/protocols/ospf/parameters/node.def
+++ b/templates/protocols/ospf/parameters/node.def
@@ -1 +1 @@
-help: OSPF specific commands
+help: Set OSPF specific parameters
diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def
index a2036004..d25b0941 100644
--- a/templates/protocols/ospf/parameters/router-id/node.def
+++ b/templates/protocols/ospf/parameters/router-id/node.def
@@ -1,5 +1,5 @@
type: ipv4
-help: Override the default router identifier
+help: Set to override the default router identifier
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
-c \"ospf router-id $VAR(@)\" "
diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def
index 5b9cf721..bfdf6b51 100644
--- a/templates/protocols/ospf/passive-interface/node.def
+++ b/templates/protocols/ospf/passive-interface/node.def
@@ -1,6 +1,6 @@
multi:
type: txt
-help: Suppress routing updates on an interface
+help: Set to suppress routing updates on an interface
syntax:expression: exec " \
if [ -z \"`ip addr | grep $VAR(@) `\" ] && [ x$VAR(@) != xdefault ]; then \
echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
diff --git a/templates/protocols/ospf/redistribute/bgp/metric/node.def b/templates/protocols/ospf/redistribute/bgp/metric/node.def
index 114173dc..e70579c6 100644
--- a/templates/protocols/ospf/redistribute/bgp/metric/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/metric/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Metric for redistributed routes
+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
diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def
index 6f377318..a3564af4 100644
--- a/templates/protocols/ospf/redistribute/bgp/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/node.def
@@ -1,4 +1,4 @@
-help: Redistribute BGP routes
+help: Set to redistribute BGP routes
delete:expression: "touch /tmp/ospf-redist-bgp.$PPID"
end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/redistribute/bgp/route-map/node.def b/templates/protocols/ospf/redistribute/bgp/route-map/node.def
index a56f5668..cf70580f 100644
--- a/templates/protocols/ospf/redistribute/bgp/route-map/node.def
+++ b/templates/protocols/ospf/redistribute/bgp/route-map/node.def
@@ -1,4 +1,4 @@
type: txt
-help: Route map reference
+help: Set route map reference
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/ospf/redistribute/connected/metric/node.def b/templates/protocols/ospf/redistribute/connected/metric/node.def
index 114173dc..e70579c6 100644
--- a/templates/protocols/ospf/redistribute/connected/metric/node.def
+++ b/templates/protocols/ospf/redistribute/connected/metric/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Metric for redistributed routes
+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
diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def
index 892aab54..6e40db83 100644
--- a/templates/protocols/ospf/redistribute/connected/node.def
+++ b/templates/protocols/ospf/redistribute/connected/node.def
@@ -1,4 +1,4 @@
-help: Redistribute connected routes
+help: Set to redistribute connected routes
delete:expression: "touch /tmp/ospf-redist-connected.$PPID"
end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/redistribute/connected/route-map/node.def b/templates/protocols/ospf/redistribute/connected/route-map/node.def
index f2c6f7c2..3f570311 100644
--- a/templates/protocols/ospf/redistribute/connected/route-map/node.def
+++ b/templates/protocols/ospf/redistribute/connected/route-map/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Route map reference
+help: Set route map reference
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/ospf/redistribute/kernel/metric/node.def b/templates/protocols/ospf/redistribute/kernel/metric/node.def
index 114173dc..e70579c6 100644
--- a/templates/protocols/ospf/redistribute/kernel/metric/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/metric/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Metric for redistributed routes
+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
diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def
index fc47efc6..af19cff1 100644
--- a/templates/protocols/ospf/redistribute/kernel/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/node.def
@@ -1,4 +1,4 @@
-help: Redistribute kernel routes
+help: Set to redistribute kernel routes
delete:expression: "touch /tmp/ospf-redist-kernel.$PPID"
end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/redistribute/kernel/route-map/node.def b/templates/protocols/ospf/redistribute/kernel/route-map/node.def
index f2c6f7c2..3f570311 100644
--- a/templates/protocols/ospf/redistribute/kernel/route-map/node.def
+++ b/templates/protocols/ospf/redistribute/kernel/route-map/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Route map reference
+help: Set route map reference
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/ospf/redistribute/node.def b/templates/protocols/ospf/redistribute/node.def
index 00eefa88..0f60ac58 100644
--- a/templates/protocols/ospf/redistribute/node.def
+++ b/templates/protocols/ospf/redistribute/node.def
@@ -1 +1 @@
-help: Redistribute information from another routing protocol
+help: Set to redistribute information from another routing protocol
diff --git a/templates/protocols/ospf/redistribute/rip/metric/node.def b/templates/protocols/ospf/redistribute/rip/metric/node.def
index 114173dc..e70579c6 100644
--- a/templates/protocols/ospf/redistribute/rip/metric/node.def
+++ b/templates/protocols/ospf/redistribute/rip/metric/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Metric for redistributed routes
+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
diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def
index 0f090921..58bd8338 100644
--- a/templates/protocols/ospf/redistribute/rip/node.def
+++ b/templates/protocols/ospf/redistribute/rip/node.def
@@ -1,4 +1,4 @@
-help: Redistribute RIP routes
+help: Set to redistribute RIP routes
delete:expression: "touch /tmp/ospf-redist-rip.$PPID"
end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/redistribute/rip/route-map/node.def b/templates/protocols/ospf/redistribute/rip/route-map/node.def
index f2c6f7c2..3f570311 100644
--- a/templates/protocols/ospf/redistribute/rip/route-map/node.def
+++ b/templates/protocols/ospf/redistribute/rip/route-map/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Route map reference
+help: Set route map reference
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/ospf/redistribute/static/metric/node.def b/templates/protocols/ospf/redistribute/static/metric/node.def
index 114173dc..e70579c6 100644
--- a/templates/protocols/ospf/redistribute/static/metric/node.def
+++ b/templates/protocols/ospf/redistribute/static/metric/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Metric for redistributed routes
+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
diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def
index 81117107..57a227c0 100644
--- a/templates/protocols/ospf/redistribute/static/node.def
+++ b/templates/protocols/ospf/redistribute/static/node.def
@@ -1,4 +1,4 @@
-help: Redistribute static routes
+help: Set to redistribute static routes
delete:expression: "touch /tmp/ospf-redist-static.$PPID"
end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-c \"router ospf\" \
diff --git a/templates/protocols/ospf/redistribute/static/route-map/node.def b/templates/protocols/ospf/redistribute/static/route-map/node.def
index f2c6f7c2..3f570311 100644
--- a/templates/protocols/ospf/redistribute/static/route-map/node.def
+++ b/templates/protocols/ospf/redistribute/static/route-map/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Route map reference
+help: Set route map reference
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/ospf/refresh/node.def b/templates/protocols/ospf/refresh/node.def
index bfa1dca4..7ade431b 100644
--- a/templates/protocols/ospf/refresh/node.def
+++ b/templates/protocols/ospf/refresh/node.def
@@ -1 +1 @@
-help: Adjust refresh parameters
+help: Set to adjust refresh parameters
diff --git a/templates/protocols/ospf/timers/node.def b/templates/protocols/ospf/timers/node.def
index 8c4873b2..499649fb 100644
--- a/templates/protocols/ospf/timers/node.def
+++ b/templates/protocols/ospf/timers/node.def
@@ -1 +1 @@
-help: Adjust routing timers
+help: Set to adjust routing timers
diff --git a/templates/protocols/ospf/timers/throttle/node.def b/templates/protocols/ospf/timers/throttle/node.def
index 0854aae8..6389a9c3 100644
--- a/templates/protocols/ospf/timers/throttle/node.def
+++ b/templates/protocols/ospf/timers/throttle/node.def
@@ -1 +1 @@
-help: Throttling adaptive timers
+help: Set throttling adaptive timers
diff --git a/templates/protocols/ospf/timers/throttle/spf/delay/node.def b/templates/protocols/ospf/timers/throttle/spf/delay/node.def
index 68bb270f..85d69c75 100644
--- a/templates/protocols/ospf/timers/throttle/spf/delay/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/delay/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Delay (msec) from first change received till SPF calculation
+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:
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 5054c9bd..ad5a297b 100644
--- a/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Initial hold time(msec) between consecutive SPF calculations
+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:
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 b9eb7748..1cfa29b0 100644
--- a/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Maximum hold time (msec)
+help: Set maximum hold time (msec)
default: 10000
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000"
comp_help: possible completions:
diff --git a/templates/protocols/ospf/timers/throttle/spf/node.def b/templates/protocols/ospf/timers/throttle/spf/node.def
index 9f68167c..5707ec4f 100644
--- a/templates/protocols/ospf/timers/throttle/spf/node.def
+++ b/templates/protocols/ospf/timers/throttle/spf/node.def
@@ -1,4 +1,4 @@
-help: OSPF SPF timers
+help: Set OSPF SPF timers
delete: touch /tmp/ospf-timer.$PPID
end: if [ -f "/tmp/ospf-timer.$PPID" ]; then
${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" \
diff --git a/templates/protocols/rip/default-distance/node.def b/templates/protocols/rip/default-distance/node.def
index 5ad7b7b9..4ef5cd58 100644
--- a/templates/protocols/rip/default-distance/node.def
+++ b/templates/protocols/rip/default-distance/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Administrative distance
+help: Set administrative distance
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"distance $VAR(@) \" "
diff --git a/templates/protocols/rip/default-information/node.def b/templates/protocols/rip/default-information/node.def
index 7d35a646..47215862 100644
--- a/templates/protocols/rip/default-information/node.def
+++ b/templates/protocols/rip/default-information/node.def
@@ -1 +1 @@
-help: Control distribution of default route
+help: Set to control distribution of default route
diff --git a/templates/protocols/rip/default-information/originate/node.def b/templates/protocols/rip/default-information/originate/node.def
index bfd93a81..c7035d9e 100644
--- a/templates/protocols/rip/default-information/originate/node.def
+++ b/templates/protocols/rip/default-information/originate/node.def
@@ -1,4 +1,4 @@
-help: Distribute a default route
+help: Set to distribute a default route
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"default-information originate\" "
delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
diff --git a/templates/protocols/rip/distribute-list/access-list/in/node.def b/templates/protocols/rip/distribute-list/access-list/in/node.def
index 87eddf90..09392942 100644
--- a/templates/protocols/rip/distribute-list/access-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/in/node.def
@@ -1,5 +1,5 @@
type: u32
-help: access-list to apply to input packets
+help: Set access-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list $VAR(@) in\" "
diff --git a/templates/protocols/rip/distribute-list/access-list/node.def b/templates/protocols/rip/distribute-list/access-list/node.def
index dd7917a7..d7baa021 100644
--- a/templates/protocols/rip/distribute-list/access-list/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/node.def
@@ -1 +1 @@
-help: Access-list
+help: Set access-list
diff --git a/templates/protocols/rip/distribute-list/access-list/out/node.def b/templates/protocols/rip/distribute-list/access-list/out/node.def
index 4b7f6b85..ba9809e5 100644
--- a/templates/protocols/rip/distribute-list/access-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/access-list/out/node.def
@@ -1,5 +1,5 @@
type: u32
-help: access-list to apply to output packets
+help: Set access-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list $VAR(@) out\" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.def b/templates/protocols/rip/distribute-list/interface/node.def
index 70009e14..46fe743d 100644
--- a/templates/protocols/rip/distribute-list/interface/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Apply filtering to an interface
+help: Set to apply filtering to an interface
syntax:expression: exec "if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \
echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
exit 1 ; \
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
index 4b2bad82..1c024368 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/in/node.def
@@ -1,5 +1,5 @@
type: u32
-help: access-list to apply to input packets
+help: Set access-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list $VAR(@) in $VAR(../../@)\" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
index dd7917a7..d7baa021 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/node.def
@@ -1 +1 @@
-help: Access-list
+help: Set access-list
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
index 5362c410..a17c97e4 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/access-list/out/node.def
@@ -1,5 +1,5 @@
type: u32
-help: access-list to apply to output packets
+help: Set access-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list $VAR(@) out $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
index 2c02beba..6af54e82 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/in/node.def
@@ -1,5 +1,5 @@
type: txt
-help: prefix-list to apply to input packets
+help: Set prefix-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list prefix $VAR(@) in $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
index 2aa289c3..30eb3f3f 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/node.def
@@ -1 +1 @@
-help: Prefix-list
+help: Set prefix-list
diff --git a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
index bd441e02..d231622e 100644
--- a/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/interface/node.tag/prefix-list/out/node.def
@@ -1,5 +1,5 @@
type: txt
-help: prefix-list to apply to output packets
+help: Set prefix-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list prefix $VAR(@) out $VAR(../../@) \" "
diff --git a/templates/protocols/rip/distribute-list/node.def b/templates/protocols/rip/distribute-list/node.def
index 34c3cd35..f7255a70 100644
--- a/templates/protocols/rip/distribute-list/node.def
+++ b/templates/protocols/rip/distribute-list/node.def
@@ -1,2 +1,2 @@
-help: Filter networks in routing updates
+help: Set to filter networks in routing updates
diff --git a/templates/protocols/rip/distribute-list/prefix-list/in/node.def b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
index c4966d6f..7b45524d 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/in/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/in/node.def
@@ -1,5 +1,5 @@
type: txt
-help: prefix-list to apply to input packets
+help: Set prefix-list to apply to input packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list prefix $VAR(@) in\" "
diff --git a/templates/protocols/rip/distribute-list/prefix-list/node.def b/templates/protocols/rip/distribute-list/prefix-list/node.def
index 2aa289c3..30eb3f3f 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/node.def
@@ -1 +1 @@
-help: Prefix-list
+help: Set prefix-list
diff --git a/templates/protocols/rip/distribute-list/prefix-list/out/node.def b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
index b488ffdb..129d62e2 100644
--- a/templates/protocols/rip/distribute-list/prefix-list/out/node.def
+++ b/templates/protocols/rip/distribute-list/prefix-list/out/node.def
@@ -1,5 +1,5 @@
type: txt
-help: prefix-list to apply to output packets
+help: Set prefix-list to apply to output packets
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" ";"prefix-list $VAR(@) doesn't exist"
update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"distribute-list prefix $VAR(@) out\" "
diff --git a/templates/protocols/rip/interface/node.def b/templates/protocols/rip/interface/node.def
index c5c730c2..57a649ce 100644
--- a/templates/protocols/rip/interface/node.def
+++ b/templates/protocols/rip/interface/node.def
@@ -1,6 +1,6 @@
multi:
type: txt
-help: Interface name
+help: Set interface name
syntax:expression: exec " \
if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \
echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
diff --git a/templates/protocols/rip/neighbor/node.def b/templates/protocols/rip/neighbor/node.def
index 1b694564..bc2b2709 100644
--- a/templates/protocols/rip/neighbor/node.def
+++ b/templates/protocols/rip/neighbor/node.def
@@ -1,6 +1,6 @@
multi:
type: ipv4
-help: Specify a neighbor router
+help: Set a neighbor router
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"neighbor $VAR(@)\"; "
delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
diff --git a/templates/protocols/rip/network-distance/node.def b/templates/protocols/rip/network-distance/node.def
index 1caa6b04..e0e64003 100644
--- a/templates/protocols/rip/network-distance/node.def
+++ b/templates/protocols/rip/network-distance/node.def
@@ -1,6 +1,6 @@
tag:
type: ipv4net
-help: Source network
+help: Set source network
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
commit:expression: $VAR(./distance/) != ""; "Must specify distance for network $VAR(@)"
delete:expression: "touch /tmp/rip-dist.$PPID"
diff --git a/templates/protocols/rip/network-distance/node.tag/access-list/node.def b/templates/protocols/rip/network-distance/node.tag/access-list/node.def
index 3003e718..a7bc9a6f 100644
--- a/templates/protocols/rip/network-distance/node.tag/access-list/node.def
+++ b/templates/protocols/rip/network-distance/node.tag/access-list/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Access list
+help: Set access list
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/network-distance/node.tag/distance/node.def b/templates/protocols/rip/network-distance/node.tag/distance/node.def
index 96d3042e..9b05a496 100644
--- a/templates/protocols/rip/network-distance/node.tag/distance/node.def
+++ b/templates/protocols/rip/network-distance/node.tag/distance/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Administrative distance for network
+help: Set administrative distance for network
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255"
delete:expression: "echo $VAR(@) > /tmp/rip-network-distance.$PPID"
comp_help: Enter a distance valude between 1-255
diff --git a/templates/protocols/rip/network/node.def b/templates/protocols/rip/network/node.def
index e01ee3fe..07c36d73 100644
--- a/templates/protocols/rip/network/node.def
+++ b/templates/protocols/rip/network/node.def
@@ -1,6 +1,6 @@
multi:
type: ipv4net
-help: RIP network
+help: Set RIP network
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"network $VAR(@)\"; "
diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def
index c5442b5c..8ddc56cc 100644
--- a/templates/protocols/rip/node.def
+++ b/templates/protocols/rip/node.def
@@ -1,4 +1,4 @@
-help: RIP options
+help: Configure Routing Information Protocol (RIP) parameters
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" "
delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no router rip\" "
diff --git a/templates/protocols/rip/passive-interface/node.def b/templates/protocols/rip/passive-interface/node.def
index 5a4001b5..135911b7 100644
--- a/templates/protocols/rip/passive-interface/node.def
+++ b/templates/protocols/rip/passive-interface/node.def
@@ -1,6 +1,6 @@
multi:
type: txt
-help: Suppress routing updates on an interface
+help: Set to suppress routing updates on an interface
syntax:expression: exec " \
if [ -z \"`ip addr | grep $VAR(@) `\" ] && [ x$VAR(@) != xdefault ]; then \
echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
diff --git a/templates/protocols/rip/redistribute/bgp/metric/node.def b/templates/protocols/rip/redistribute/bgp/metric/node.def
index 549cfdf1..ad569327 100644
--- a/templates/protocols/rip/redistribute/bgp/metric/node.def
+++ b/templates/protocols/rip/redistribute/bgp/metric/node.def
@@ -1,3 +1,3 @@
type: u32
-help: Metric for redistributed routes
+help: Set metric for redistributed routes
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/bgp/node.def b/templates/protocols/rip/redistribute/bgp/node.def
index 84317dcd..92493e34 100644
--- a/templates/protocols/rip/redistribute/bgp/node.def
+++ b/templates/protocols/rip/redistribute/bgp/node.def
@@ -1,4 +1,4 @@
-help: Redistribute BGP routes
+help: Set to redistribute BGP routes
delete:expression: "touch /tmp/rip-redist-bgp.$PPID"
end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"no redistribute bgp \"; \
diff --git a/templates/protocols/rip/redistribute/bgp/route-map/node.def b/templates/protocols/rip/redistribute/bgp/route-map/node.def
index a56f5668..cf70580f 100644
--- a/templates/protocols/rip/redistribute/bgp/route-map/node.def
+++ b/templates/protocols/rip/redistribute/bgp/route-map/node.def
@@ -1,4 +1,4 @@
type: txt
-help: Route map reference
+help: Set route map reference
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/redistribute/connected/metric/node.def b/templates/protocols/rip/redistribute/connected/metric/node.def
index 8234167e..101e24f9 100644
--- a/templates/protocols/rip/redistribute/connected/metric/node.def
+++ b/templates/protocols/rip/redistribute/connected/metric/node.def
@@ -1,5 +1,5 @@
type: u32
-help: Metric for redistributed routes
+help: Set metric for redistributed routes
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/connected/node.def b/templates/protocols/rip/redistribute/connected/node.def
index a7157811..0374875a 100644
--- a/templates/protocols/rip/redistribute/connected/node.def
+++ b/templates/protocols/rip/redistribute/connected/node.def
@@ -1,4 +1,4 @@
-help: Redistribute connected routes
+help: Set to redistribute connected routes
delete:expression: "touch /tmp/rip-redist-connected.$PPID"
end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"no redistribute connected \"; \
diff --git a/templates/protocols/rip/redistribute/connected/route-map/node.def b/templates/protocols/rip/redistribute/connected/route-map/node.def
index f2c6f7c2..3f570311 100644
--- a/templates/protocols/rip/redistribute/connected/route-map/node.def
+++ b/templates/protocols/rip/redistribute/connected/route-map/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Route map reference
+help: Set route map reference
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/redistribute/kernel/metric/node.def b/templates/protocols/rip/redistribute/kernel/metric/node.def
index 549cfdf1..ad569327 100644
--- a/templates/protocols/rip/redistribute/kernel/metric/node.def
+++ b/templates/protocols/rip/redistribute/kernel/metric/node.def
@@ -1,3 +1,3 @@
type: u32
-help: Metric for redistributed routes
+help: Set metric for redistributed routes
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/kernel/node.def b/templates/protocols/rip/redistribute/kernel/node.def
index ca9a4412..82e39688 100644
--- a/templates/protocols/rip/redistribute/kernel/node.def
+++ b/templates/protocols/rip/redistribute/kernel/node.def
@@ -1,4 +1,4 @@
-help: Redistribute kernel routes
+help: Set to redistribute kernel routes
delete:expression: "touch /tmp/rip-redist-kernel.$PPID"
end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"no redistribute kernel \"; \
diff --git a/templates/protocols/rip/redistribute/kernel/route-map/node.def b/templates/protocols/rip/redistribute/kernel/route-map/node.def
index f2c6f7c2..3f570311 100644
--- a/templates/protocols/rip/redistribute/kernel/route-map/node.def
+++ b/templates/protocols/rip/redistribute/kernel/route-map/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Route map reference
+help: Set route map reference
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/redistribute/node.def b/templates/protocols/rip/redistribute/node.def
index 00eefa88..0f60ac58 100644
--- a/templates/protocols/rip/redistribute/node.def
+++ b/templates/protocols/rip/redistribute/node.def
@@ -1 +1 @@
-help: Redistribute information from another routing protocol
+help: Set to redistribute information from another routing protocol
diff --git a/templates/protocols/rip/redistribute/ospf/metric/node.def b/templates/protocols/rip/redistribute/ospf/metric/node.def
index 80d13b5e..6ed582ad 100644
--- a/templates/protocols/rip/redistribute/ospf/metric/node.def
+++ b/templates/protocols/rip/redistribute/ospf/metric/node.def
@@ -1,4 +1,4 @@
type: u32
-help: Metric for redistributed routes
+help: Set metric for redistributed routes
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/ospf/node.def b/templates/protocols/rip/redistribute/ospf/node.def
index 04c43c83..9fc3a646 100644
--- a/templates/protocols/rip/redistribute/ospf/node.def
+++ b/templates/protocols/rip/redistribute/ospf/node.def
@@ -1,4 +1,4 @@
-help: Redistribute OSPF routes
+help: Set to redistribute OSPF routes
delete:expression: "touch /tmp/rip-redist-ospf.$PPID"
end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"no redistribute ospf \"; \
diff --git a/templates/protocols/rip/redistribute/ospf/route-map/node.def b/templates/protocols/rip/redistribute/ospf/route-map/node.def
index f2c6f7c2..3f570311 100644
--- a/templates/protocols/rip/redistribute/ospf/route-map/node.def
+++ b/templates/protocols/rip/redistribute/ospf/route-map/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Route map reference
+help: Set route map reference
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/redistribute/static/metric/node.def b/templates/protocols/rip/redistribute/static/metric/node.def
index 549cfdf1..ad569327 100644
--- a/templates/protocols/rip/redistribute/static/metric/node.def
+++ b/templates/protocols/rip/redistribute/static/metric/node.def
@@ -1,3 +1,3 @@
type: u32
-help: Metric for redistributed routes
+help: Set metric for redistributed routes
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16"
diff --git a/templates/protocols/rip/redistribute/static/node.def b/templates/protocols/rip/redistribute/static/node.def
index ab170994..7c20d4c0 100644
--- a/templates/protocols/rip/redistribute/static/node.def
+++ b/templates/protocols/rip/redistribute/static/node.def
@@ -1,4 +1,4 @@
-help: Redistribute static routes
+help: Set to redistribute static routes
delete:expression: "touch /tmp/rip-redist-static.$PPID"
end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"no redistribute static \"; \
diff --git a/templates/protocols/rip/redistribute/static/route-map/node.def b/templates/protocols/rip/redistribute/static/route-map/node.def
index f2c6f7c2..3f570311 100644
--- a/templates/protocols/rip/redistribute/static/route-map/node.def
+++ b/templates/protocols/rip/redistribute/static/route-map/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Route map reference
+help: Set route map reference
commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" ";"route-map $VAR(@) doesn't exist"
diff --git a/templates/protocols/rip/route/node.def b/templates/protocols/rip/route/node.def
index bb2be03f..58b6c206 100644
--- a/templates/protocols/rip/route/node.def
+++ b/templates/protocols/rip/route/node.def
@@ -1,6 +1,6 @@
multi:
type: ipv4net
-help: RIP static route configuration
+help: Set RIP static route
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router rip\" \
-c \"route $VAR(@)\" "
diff --git a/templates/protocols/rip/timers/garbage-collection/node.def b/templates/protocols/rip/timers/garbage-collection/node.def
index 2a7b2bc9..276efb19 100644
--- a/templates/protocols/rip/timers/garbage-collection/node.def
+++ b/templates/protocols/rip/timers/garbage-collection/node.def
@@ -1,6 +1,6 @@
type: u32
default: 120
-help: Garbage collection timer
+help: Set garbage collection timer
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \
"Garbage collection timer must be between 5 and 2147483647"
comp_help: possible completions:
diff --git a/templates/protocols/rip/timers/timeout/node.def b/templates/protocols/rip/timers/timeout/node.def
index 907662f0..adc9946a 100644
--- a/templates/protocols/rip/timers/timeout/node.def
+++ b/templates/protocols/rip/timers/timeout/node.def
@@ -1,6 +1,6 @@
type: u32
default: 180
-help: Routing information timeout timer
+help: Set routing information timeout timer
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \
"Timeout timer must be between 5 and 2147483647"
comp_help: possible completions:
diff --git a/templates/protocols/rip/timers/update/node.def b/templates/protocols/rip/timers/update/node.def
index 6a48225f..6c574ede 100644
--- a/templates/protocols/rip/timers/update/node.def
+++ b/templates/protocols/rip/timers/update/node.def
@@ -1,6 +1,6 @@
type: u32
default: 30
-help: Routing table update timer
+help: Set routing table update timer
syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \
"Update timer must be between 5 and 2147483647"
comp_help: possible completions:
diff --git a/templates/protocols/static/interface-route/node.def b/templates/protocols/static/interface-route/node.def
index 56992140..0e732ea9 100644
--- a/templates/protocols/static/interface-route/node.def
+++ b/templates/protocols/static/interface-route/node.def
@@ -1,4 +1,4 @@
tag:
type: ipv4net
-help: Configure an interface-based static route
+help: Set an interface-based static route
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
diff --git a/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def b/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
index ac8083af..08a06ad8 100644
--- a/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
+++ b/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
@@ -1,4 +1,4 @@
type: u32
-help: Distance value for this route
+help: Set distance value for this route
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
comp_help: <1-255> Distance for this route
diff --git a/templates/protocols/static/interface-route/node.tag/blackhole/node.def b/templates/protocols/static/interface-route/node.tag/blackhole/node.def
index d8e65ef4..aaeab5b6 100644
--- a/templates/protocols/static/interface-route/node.tag/blackhole/node.def
+++ b/templates/protocols/static/interface-route/node.tag/blackhole/node.def
@@ -1,4 +1,4 @@
-help: Silently discard pkts when matched
+help: Set to silently discard pkts when matched
delete:expression: "touch /tmp/static.$PPID"
end:expression: "if [ -f \"/tmp/static.$PPID\" ]; then \
${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $VAR(../@) null0\" ; \
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
index 6f3b606a..bf6aa5b9 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
@@ -1,6 +1,6 @@
tag:
type: txt
-help: Configure the next-hop interface
+help: Set the next-hop interface
syntax:expression: exec " \
if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \
echo ethernet interface $VAR(@) doesn\\'t exist on this system ; \
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def
index ac8083af..08a06ad8 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def
@@ -1,4 +1,4 @@
type: u32
-help: Distance value for this route
+help: Set distance value for this route
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
comp_help: <1-255> Distance for this route
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/node.def
index 0422e89c..5bd7d7c7 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/node.def
@@ -1 +1 @@
-help: Enter next-hop interface
+help: Set next-hop interface
diff --git a/templates/protocols/static/interface-route/node.tag/node.def b/templates/protocols/static/interface-route/node.tag/node.def
index e6893719..21624367 100644
--- a/templates/protocols/static/interface-route/node.tag/node.def
+++ b/templates/protocols/static/interface-route/node.tag/node.def
@@ -1,2 +1,2 @@
-help: IP network
+help: Set IP network
commit:expression: $VAR(./next-hop-interface/) != "" || $VAR(./blackhole/) != ""; "Must add either a next-hop-interface or blackhole for route $VAR(@)"
diff --git a/templates/protocols/static/node.def b/templates/protocols/static/node.def
index 0cb6cd0c..37216e4a 100644
--- a/templates/protocols/static/node.def
+++ b/templates/protocols/static/node.def
@@ -1,3 +1,3 @@
-help: Static route configuration
+help: Configure static route parameters
diff --git a/templates/protocols/static/route/node.def b/templates/protocols/static/route/node.def
index be26c621..78ead81d 100644
--- a/templates/protocols/static/route/node.def
+++ b/templates/protocols/static/route/node.def
@@ -1,4 +1,4 @@
tag:
type: ipv4net
-help: Configure a static route
+help: Set a static route
syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
diff --git a/templates/protocols/static/route/node.tag/blackhole/distance/node.def b/templates/protocols/static/route/node.tag/blackhole/distance/node.def
index ac8083af..08a06ad8 100644
--- a/templates/protocols/static/route/node.tag/blackhole/distance/node.def
+++ b/templates/protocols/static/route/node.tag/blackhole/distance/node.def
@@ -1,4 +1,4 @@
type: u32
-help: Distance value for this route
+help: Set distance value for this route
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
comp_help: <1-255> Distance for this route
diff --git a/templates/protocols/static/route/node.tag/blackhole/node.def b/templates/protocols/static/route/node.tag/blackhole/node.def
index d8e65ef4..aaeab5b6 100644
--- a/templates/protocols/static/route/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route/node.tag/blackhole/node.def
@@ -1,4 +1,4 @@
-help: Silently discard pkts when matched
+help: Set to silently discard pkts when matched
delete:expression: "touch /tmp/static.$PPID"
end:expression: "if [ -f \"/tmp/static.$PPID\" ]; then \
${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $VAR(../@) null0\" ; \
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.def b/templates/protocols/static/route/node.tag/next-hop/node.def
index 1540a0b4..cfd4b923 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.def
@@ -1,6 +1,6 @@
tag:
type: ipv4
-help: Configure the next-hop router
+help: Set the next-hop router
delete:expression: "touch /tmp/static.$PPID"
end:expression: "if [ -f \"/tmp/static.$PPID\" ]; then \
${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"no ip route $VAR(../@) $VAR(@)\" ; \
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def b/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def
index ac8083af..08a06ad8 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def
@@ -1,4 +1,4 @@
type: u32
-help: Distance value for this route
+help: Set distance value for this route
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)"
comp_help: <1-255> Distance for this route
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.tag/node.def b/templates/protocols/static/route/node.tag/next-hop/node.tag/node.def
index 7a5e624b..08dff1a9 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.tag/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.tag/node.def
@@ -1,2 +1,2 @@
-help: Enter next-hop router
+help: Set next-hop router
diff --git a/templates/protocols/static/route/node.tag/node.def b/templates/protocols/static/route/node.tag/node.def
index ce1324d8..7e15c498 100644
--- a/templates/protocols/static/route/node.tag/node.def
+++ b/templates/protocols/static/route/node.tag/node.def
@@ -1,3 +1,3 @@
-help: IP network
+help: Set IP network
commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; "Must add either a next-hop or blackhole for route $VAR(@)"