diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-21 12:09:45 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-21 12:09:45 -0700 |
| commit | e7652a229a81de89f754783287a7293c30457970 (patch) | |
| tree | c0ebf145e57bbbfc69e9dcca2e58f2f3e2acff9c /templates | |
| parent | baa0d50c299c06ad5027f730d7a63e8eec6bef43 (diff) | |
| download | vyatta-cfg-quagga-e7652a229a81de89f754783287a7293c30457970.tar.gz vyatta-cfg-quagga-e7652a229a81de89f754783287a7293c30457970.zip | |
Remove verbs from help strings
Diffstat (limited to 'templates')
607 files changed, 607 insertions, 607 deletions
diff --git a/templates/policy/access-list/node.def b/templates/policy/access-list/node.def index 4a3ee522..92323da0 100644 --- a/templates/policy/access-list/node.def +++ b/templates/policy/access-list/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Set IP access-list filter +help: IP access-list filter syntax:expression: ($VAR(@) >= 1 && $VAR(@) <= 199) || ($VAR(@) >= 1300 && $VAR(@) <= 2699); \ "Access list number must be <1-99>\tIP standard access list diff --git a/templates/policy/access-list/node.tag/description/node.def b/templates/policy/access-list/node.tag/description/node.def index 040ef5c1..9a10af5a 100644 --- a/templates/policy/access-list/node.tag/description/node.def +++ b/templates/policy/access-list/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this access-list +help: Description for this access-list diff --git a/templates/policy/access-list/node.tag/rule/node.def b/templates/policy/access-list/node.tag/rule/node.def index 77233931..e25c85b1 100644 --- a/templates/policy/access-list/node.tag/rule/node.def +++ b/templates/policy/access-list/node.tag/rule/node.def @@ -1,5 +1,5 @@ tag: type: u32 -help: Set a rule for this access-list +help: Rule for this access-list syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "rule number must be between 1 and 65535" val_help: u32:1-65535>; Access-list rule number diff --git a/templates/policy/access-list/node.tag/rule/node.tag/action/node.def b/templates/policy/access-list/node.tag/rule/node.tag/action/node.def index 9567d02d..c09d3d39 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/action/node.def @@ -1,5 +1,5 @@ type: txt -help: Set action to take on networks matching this rule [REQUIRED] +help: Action to take on networks matching this rule [REQUIRED] syntax:expression: $VAR(@) in "permit", "deny"; "action must be permit or deny" val_help: permit; Permit matching networks val_help: deny; Deny matching networks diff --git a/templates/policy/access-list/node.tag/rule/node.tag/description/node.def b/templates/policy/access-list/node.tag/rule/node.tag/description/node.def index 8b6dc54a..b8e3095b 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/description/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this rule +help: Description for this rule diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def index 34b31199..16f9d58b 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def @@ -1,4 +1,4 @@ -help: Set any IP address to match +help: Any IP address to match commit:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); "\ policy access-list $VAR(../../../@) rule $VAR(../../@) destination: access-list number must be <100-199> or <2000-2699> to set destination matches" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def index 814e64c2..ec8410b8 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set a single host IP address to match +help: Single host IP address to match val_help: Host address to match commit:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); "\ policy access-list $VAR(../../../@) rule $VAR(../../@) destination: access-list number must be <100-199> or <2000-2699> to set destination matches" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def index 25e9fb9b..2f35bde4 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set a network/netmask to match (requires network be defined) +help: Network/netmask to match (requires network be defined) val_help: Inverse-mask to match commit:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); "\ policy access-list $VAR(../../../@) rule $VAR(../../@) destination: access-list number must be <100-199> or <2000-2699> to set destination matches" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def index 5cb86d84..85b71ad8 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set a network/netmask to match (requires inverse-mask be defined) +help: Network/netmask to match (requires inverse-mask be defined) val_help: Network to match commit:expression: ($VAR(../../../@) >= 100 && $VAR(../../../@) <= 199) || ($VAR(../../../@) >= 2000 && $VAR(../../../@) <= 2699); "\ policy access-list $VAR(../../../@) rule $VAR(../../@) destination: access-list number must be <100-199> or <2000-2699> to set destination matches" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/node.def index 11c34319..2720ac27 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/node.def @@ -1 +1 @@ -help: Set destination network or address +help: Destination network or address diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def index efdcd2bb..777ac99a 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def @@ -1,3 +1,3 @@ -help: Set any IP address to match +help: Any IP address to match commit:expression: ($VAR(../host/) == "") && ($VAR(../network/) == ""); "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you may only define one filter type. (host|network|any)" commit:expression: $VAR(../../action/) != ""; "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you must specify an action" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def index 25e8bb80..aeaa5521 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set a single host IP address to match +help: Single host IP address to match val_help: Host address to match commit:expression: ($VAR(../any/) == "") && ($VAR(../network/) == ""); "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you may only define one filter type. (host|network|any)" commit:expression: $VAR(../../action/) != ""; "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you must specify an action" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def index 0f5c235b..60b8143e 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set a network/netmask to match (requires network be defined) +help: Network/netmask to match (requires network be defined) val_help: Inverse-mast to match commit:expression: ($VAR(../any/) == "") && ($VAR(../host/) == ""); "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you may only define one filter type. (host|network|any)" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def index c2ad6458..24e191b3 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set a network/netmask to match (requires inverse-mask be defined) +help: Network/netmask to match (requires inverse-mask be defined) val_help: Network to match commit:expression: ($VAR(../host/) == "") && ($VAR(../any/) == ""); "policy access-list $VAR(../../../@) rule $VAR(../../@) source: you may only define one filter type. (host|network|any)" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/node.def index 6f8eda55..827dd64a 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/node.def @@ -1 +1 @@ -help: Set source network or address to match +help: Source network or address to match diff --git a/templates/policy/access-list6/node.def b/templates/policy/access-list6/node.def index 72f7f9e5..7ddb65ac 100644 --- a/templates/policy/access-list6/node.def +++ b/templates/policy/access-list6/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set IPv6 access-list filter +help: IPv6 access-list filter val_help: Name of IPv6 access-list syntax:expression: pattern $VAR(@) "^[[:graph:]]{1,64}$" ; \ diff --git a/templates/policy/access-list6/node.tag/description/node.def b/templates/policy/access-list6/node.tag/description/node.def index 2ed57fe5..d0c2b494 100644 --- a/templates/policy/access-list6/node.tag/description/node.def +++ b/templates/policy/access-list6/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this IPv6 access-list +help: Description for this IPv6 access-list diff --git a/templates/policy/access-list6/node.tag/rule/node.def b/templates/policy/access-list6/node.tag/rule/node.def index 736e1e49..84fd1d87 100644 --- a/templates/policy/access-list6/node.tag/rule/node.def +++ b/templates/policy/access-list6/node.tag/rule/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Set a rule for this access-list6 +help: Rule for this access-list6 val_help: u32:1-65535; Access-list6 rule number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; \ diff --git a/templates/policy/access-list6/node.tag/rule/node.tag/action/node.def b/templates/policy/access-list6/node.tag/rule/node.tag/action/node.def index c6b30231..40818893 100644 --- a/templates/policy/access-list6/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/access-list6/node.tag/rule/node.tag/action/node.def @@ -1,5 +1,5 @@ type: txt -help: Set action to take on networks matching this rule [REQUIRED] +help: Action to take on networks matching this rule [REQUIRED] val_help: permit; Permit matching networks val_help: deny; Deny matching networks diff --git a/templates/policy/access-list6/node.tag/rule/node.tag/description/node.def b/templates/policy/access-list6/node.tag/rule/node.tag/description/node.def index 9fbe0f6c..bd44c7b1 100644 --- a/templates/policy/access-list6/node.tag/rule/node.tag/description/node.def +++ b/templates/policy/access-list6/node.tag/rule/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this IPv6 access-list rule +help: Description for this IPv6 access-list rule diff --git a/templates/policy/access-list6/node.tag/rule/node.tag/source/any/node.def b/templates/policy/access-list6/node.tag/rule/node.tag/source/any/node.def index 94dac8f3..f08dd0dd 100644 --- a/templates/policy/access-list6/node.tag/rule/node.tag/source/any/node.def +++ b/templates/policy/access-list6/node.tag/rule/node.tag/source/any/node.def @@ -1,4 +1,4 @@ -help: Set any IPv6 address to match +help: Any IPv6 address to match commit:expression: ($VAR(../network/) == ""); "policy access-list6 $VAR(../../../@) rule $VAR(../../@) source: you may only define one filter type. (network|any)" diff --git a/templates/policy/access-list6/node.tag/rule/node.tag/source/network/node.def b/templates/policy/access-list6/node.tag/rule/node.tag/source/network/node.def index b6758c87..ad10ba4d 100644 --- a/templates/policy/access-list6/node.tag/rule/node.tag/source/network/node.def +++ b/templates/policy/access-list6/node.tag/rule/node.tag/source/network/node.def @@ -1,5 +1,5 @@ type: ipv6net -help: Set a network/netmask to match (requires inverse-mask be defined) +help: Network/netmask to match (requires inverse-mask be defined) val_help: IPv6 address and prefix length commit:expression: ($VAR(../any/) == ""); "policy access-list6 $VAR(../../../@) rule $VAR(../../@) source: you may only define one filter type. (network|any)" diff --git a/templates/policy/access-list6/node.tag/rule/node.tag/source/node.def b/templates/policy/access-list6/node.tag/rule/node.tag/source/node.def index 37277c3d..af2dc123 100644 --- a/templates/policy/access-list6/node.tag/rule/node.tag/source/node.def +++ b/templates/policy/access-list6/node.tag/rule/node.tag/source/node.def @@ -1 +1 @@ -help: Set source IPv6 network to match +help: Source IPv6 network to match diff --git a/templates/policy/as-path-list/node.def b/templates/policy/as-path-list/node.def index a2713bf1..96a616a6 100644 --- a/templates/policy/as-path-list/node.def +++ b/templates/policy/as-path-list/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set Border Gateway Protocol (BGP) autonomous system path filter +help: Border Gateway Protocol (BGP) autonomous system path filter val_help: AS path list name syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]+$" ; "as-path-list name must be alpha-numeric" diff --git a/templates/policy/as-path-list/node.tag/description/node.def b/templates/policy/as-path-list/node.tag/description/node.def index 27f20f3c..8302f6ac 100644 --- a/templates/policy/as-path-list/node.tag/description/node.def +++ b/templates/policy/as-path-list/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this as-path-list +help: Description for this as-path-list diff --git a/templates/policy/as-path-list/node.tag/rule/node.def b/templates/policy/as-path-list/node.tag/rule/node.def index afd67fe4..e99fba26 100644 --- a/templates/policy/as-path-list/node.tag/rule/node.def +++ b/templates/policy/as-path-list/node.tag/rule/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Set a rule for this as-path-list +help: Rule for this as-path-list val_help: u32:1-65535; AS path list rule number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "rule number must be between 1 and 65535" diff --git a/templates/policy/as-path-list/node.tag/rule/node.tag/action/node.def b/templates/policy/as-path-list/node.tag/rule/node.tag/action/node.def index ed0a4329..ee429f5d 100644 --- a/templates/policy/as-path-list/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/as-path-list/node.tag/rule/node.tag/action/node.def @@ -1,5 +1,5 @@ type: txt -help: Set action to take on AS paths matching this rule [REQUIRED] +help: Action to take on AS paths matching this rule [REQUIRED] val_help: permit; Permit matching as-paths val_help: deny; Deny matching as-paths diff --git a/templates/policy/as-path-list/node.tag/rule/node.tag/description/node.def b/templates/policy/as-path-list/node.tag/rule/node.tag/description/node.def index 8b6dc54a..b8e3095b 100644 --- a/templates/policy/as-path-list/node.tag/rule/node.tag/description/node.def +++ b/templates/policy/as-path-list/node.tag/rule/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this rule +help: Description for this rule diff --git a/templates/policy/as-path-list/node.tag/rule/node.tag/regex/node.def b/templates/policy/as-path-list/node.tag/rule/node.tag/regex/node.def index 372c6b9b..e42d30d8 100644 --- a/templates/policy/as-path-list/node.tag/rule/node.tag/regex/node.def +++ b/templates/policy/as-path-list/node.tag/rule/node.tag/regex/node.def @@ -1,5 +1,5 @@ type: txt -help: Set regular expression to match against an AS path +help: Regular expression to match against an AS path val_help: <aa:nn>; AS path regular expression (ex: "50:1 6553:1201") # TODO: check regex syntax; \ # "invalid chars in regex syntax" diff --git a/templates/policy/community-list/node.def b/templates/policy/community-list/node.def index df10f694..bf41b6a1 100644 --- a/templates/policy/community-list/node.def +++ b/templates/policy/community-list/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Set Border Gateway Protocol (BGP) community-list filter +help: Border Gateway Protocol (BGP) community-list filter syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 500; " community-list must be diff --git a/templates/policy/community-list/node.tag/description/node.def b/templates/policy/community-list/node.tag/description/node.def index 400d6f9a..7a660be4 100644 --- a/templates/policy/community-list/node.tag/description/node.def +++ b/templates/policy/community-list/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this community list +help: Description for this community list diff --git a/templates/policy/community-list/node.tag/rule/node.tag/action/node.def b/templates/policy/community-list/node.tag/rule/node.tag/action/node.def index 3fd50c8b..521d972f 100644 --- a/templates/policy/community-list/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/community-list/node.tag/rule/node.tag/action/node.def @@ -1,5 +1,5 @@ type: txt -help: Set action to take on communities matching this rule [REQUIRED] +help: Action to take on communities matching this rule [REQUIRED] val_help: permit; Permit matching communities val_help: deny; Deny matching communities diff --git a/templates/policy/community-list/node.tag/rule/node.tag/description/node.def b/templates/policy/community-list/node.tag/rule/node.tag/description/node.def index 8b6dc54a..b8e3095b 100644 --- a/templates/policy/community-list/node.tag/rule/node.tag/description/node.def +++ b/templates/policy/community-list/node.tag/rule/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this rule +help: Description for this rule diff --git a/templates/policy/community-list/node.tag/rule/node.tag/regex/node.def b/templates/policy/community-list/node.tag/rule/node.tag/regex/node.def index e8406d6e..49825567 100644 --- a/templates/policy/community-list/node.tag/rule/node.tag/regex/node.def +++ b/templates/policy/community-list/node.tag/rule/node.tag/regex/node.def @@ -1,5 +1,5 @@ type: txt -help: Set regular expression to match against a community list +help: Regular expression to match against a community list val_help: Community list regular expression syntax:expression: exec " \ diff --git a/templates/policy/node.def b/templates/policy/node.def index 8b3a96d8..837ff6be 100644 --- a/templates/policy/node.def +++ b/templates/policy/node.def @@ -1,2 +1,2 @@ priority: 470 -help: Configure routing policy +help: Routing policy diff --git a/templates/policy/prefix-list/node.def b/templates/policy/prefix-list/node.def index cb741618..3b1f2a20 100644 --- a/templates/policy/prefix-list/node.def +++ b/templates/policy/prefix-list/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set IP prefix-list filter +help: IP prefix-list filter val_help: Prefix list name syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]+$" ; "prefix-list name must be alpha-numeric" diff --git a/templates/policy/prefix-list/node.tag/description/node.def b/templates/policy/prefix-list/node.tag/description/node.def index 6eb531f1..1994f9cf 100644 --- a/templates/policy/prefix-list/node.tag/description/node.def +++ b/templates/policy/prefix-list/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this prefix-list +help: Description for this prefix-list diff --git a/templates/policy/prefix-list/node.tag/rule/node.def b/templates/policy/prefix-list/node.tag/rule/node.def index e0d8e866..8245f766 100644 --- a/templates/policy/prefix-list/node.tag/rule/node.def +++ b/templates/policy/prefix-list/node.tag/rule/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Set a rule for this prefix-list +help: Rule for this prefix-list val_help: u32:1-65535; Prefix-list rule number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "rule number must be between 1 and 65535" diff --git a/templates/policy/prefix-list/node.tag/rule/node.tag/action/node.def b/templates/policy/prefix-list/node.tag/rule/node.tag/action/node.def index 1d5d05dc..4ee48f41 100644 --- a/templates/policy/prefix-list/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/prefix-list/node.tag/rule/node.tag/action/node.def @@ -1,5 +1,5 @@ type: txt -help: Set action to take on prefixes matching this rule [REQUIRED] +help: Action to take on prefixes matching this rule [REQUIRED] val_help: permit; Permit matching prefixes val_help: deny; Deny matching prefixes diff --git a/templates/policy/prefix-list/node.tag/rule/node.tag/description/node.def b/templates/policy/prefix-list/node.tag/rule/node.tag/description/node.def index 8b6dc54a..b8e3095b 100644 --- a/templates/policy/prefix-list/node.tag/rule/node.tag/description/node.def +++ b/templates/policy/prefix-list/node.tag/rule/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this rule +help: Description for this rule diff --git a/templates/policy/prefix-list/node.tag/rule/node.tag/ge/node.def b/templates/policy/prefix-list/node.tag/rule/node.tag/ge/node.def index a89204f8..f69113c2 100644 --- a/templates/policy/prefix-list/node.tag/rule/node.tag/ge/node.def +++ b/templates/policy/prefix-list/node.tag/rule/node.tag/ge/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set prefix length to match a netmask greater than or equal to it +help: Prefix length to match a netmask greater than or equal to it val_help: u32:0-32; Netmask greater than length syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 32; "ge must be between 0 and 32" diff --git a/templates/policy/prefix-list/node.tag/rule/node.tag/le/node.def b/templates/policy/prefix-list/node.tag/rule/node.tag/le/node.def index 5a91bc53..46640f6c 100644 --- a/templates/policy/prefix-list/node.tag/rule/node.tag/le/node.def +++ b/templates/policy/prefix-list/node.tag/rule/node.tag/le/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set prefix length to match a netmask less than or equal to it +help: Prefix length to match a netmask less than or equal to it val_help: u32:0-32; Netmask less than length syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 32; "le must be between 0 and 32" diff --git a/templates/policy/prefix-list/node.tag/rule/node.tag/prefix/node.def b/templates/policy/prefix-list/node.tag/rule/node.tag/prefix/node.def index f7e7ef39..89e8e805 100644 --- a/templates/policy/prefix-list/node.tag/rule/node.tag/prefix/node.def +++ b/templates/policy/prefix-list/node.tag/rule/node.tag/prefix/node.def @@ -1,3 +1,3 @@ type: ipv4net -help: Set a prefix to match +help: Prefix to match val_help: Prefix to match against diff --git a/templates/policy/prefix-list6/node.def b/templates/policy/prefix-list6/node.def index 728107a8..0dd244ca 100644 --- a/templates/policy/prefix-list6/node.def +++ b/templates/policy/prefix-list6/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set IPv6 prefix-list filter +help: IPv6 prefix-list filter val_help: Prefix list name syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]+$" ; "prefix-list6 name must be alpha-numeric" diff --git a/templates/policy/prefix-list6/node.tag/description/node.def b/templates/policy/prefix-list6/node.tag/description/node.def index 7617ee52..43f336bd 100644 --- a/templates/policy/prefix-list6/node.tag/description/node.def +++ b/templates/policy/prefix-list6/node.tag/description/node.def @@ -1,3 +1,3 @@ type: txt -help: Set a description for this prefix-list6 +help: Description for this prefix-list6 diff --git a/templates/policy/prefix-list6/node.tag/rule/node.def b/templates/policy/prefix-list6/node.tag/rule/node.def index e5ea49a3..2af0eb88 100644 --- a/templates/policy/prefix-list6/node.tag/rule/node.def +++ b/templates/policy/prefix-list6/node.tag/rule/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Set a rule for this prefix-list6 +help: Rule for this prefix-list6 val_help: u32:1-65535; Prefix list rule number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "rule number must be between 1 and 65535" diff --git a/templates/policy/prefix-list6/node.tag/rule/node.tag/action/node.def b/templates/policy/prefix-list6/node.tag/rule/node.tag/action/node.def index 1da5e2d4..ecdc0993 100644 --- a/templates/policy/prefix-list6/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/prefix-list6/node.tag/rule/node.tag/action/node.def @@ -1,5 +1,5 @@ type: txt -help: Set action to take on prefixes matching this rule +help: Action to take on prefixes matching this rule val_help: permit; Permit matching prefixes val_help: deny; Deny matching prefixes diff --git a/templates/policy/prefix-list6/node.tag/rule/node.tag/description/node.def b/templates/policy/prefix-list6/node.tag/rule/node.tag/description/node.def index 8b6dc54a..b8e3095b 100644 --- a/templates/policy/prefix-list6/node.tag/rule/node.tag/description/node.def +++ b/templates/policy/prefix-list6/node.tag/rule/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this rule +help: Description for this rule diff --git a/templates/policy/prefix-list6/node.tag/rule/node.tag/ge/node.def b/templates/policy/prefix-list6/node.tag/rule/node.tag/ge/node.def index 135e1da9..f0d086ae 100644 --- a/templates/policy/prefix-list6/node.tag/rule/node.tag/ge/node.def +++ b/templates/policy/prefix-list6/node.tag/rule/node.tag/ge/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set prefix length to match a netmask greater than or equal to it +help: Prefix length to match a netmask greater than or equal to it val_help: u32:0-128; Netmask greater than length syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 128; "ge must be between 0 and 128" diff --git a/templates/policy/prefix-list6/node.tag/rule/node.tag/le/node.def b/templates/policy/prefix-list6/node.tag/rule/node.tag/le/node.def index 15c674d3..337a17aa 100644 --- a/templates/policy/prefix-list6/node.tag/rule/node.tag/le/node.def +++ b/templates/policy/prefix-list6/node.tag/rule/node.tag/le/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set prefix length to match a netmask less than or equal to it +help: Prefix length to match a netmask less than or equal to it val_help: u32:0-128; Netmask less than length syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 128; "le must be between 0 and 128" diff --git a/templates/policy/prefix-list6/node.tag/rule/node.tag/prefix/node.def b/templates/policy/prefix-list6/node.tag/rule/node.tag/prefix/node.def index a478035d..8a4dd060 100644 --- a/templates/policy/prefix-list6/node.tag/rule/node.tag/prefix/node.def +++ b/templates/policy/prefix-list6/node.tag/rule/node.tag/prefix/node.def @@ -1,3 +1,3 @@ type: ipv6net -help: Set a prefix to match +help: Prefix to match val_help: IPv5 prefix diff --git a/templates/policy/route-map/node.def b/templates/policy/route-map/node.def index 7d712c1f..b2fa6b8c 100644 --- a/templates/policy/route-map/node.def +++ b/templates/policy/route-map/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set IP route-map +help: IP route-map val_help: Route map name syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9.]+$" ; "route-map $VAR(@): name must be alpha-numeric" diff --git a/templates/policy/route-map/node.tag/description/node.def b/templates/policy/route-map/node.tag/description/node.def index 27f1ce01..0929e1dc 100644 --- a/templates/policy/route-map/node.tag/description/node.def +++ b/templates/policy/route-map/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this route-map +help: Description for this route-map diff --git a/templates/policy/route-map/node.tag/rule/node.def b/templates/policy/route-map/node.tag/rule/node.def index 35c7be15..d1bee7e5 100644 --- a/templates/policy/route-map/node.tag/rule/node.def +++ b/templates/policy/route-map/node.tag/rule/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Set a rule for this route-map +help: Rule for this route-map val_help: u32:1-65535; Route-map rule number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "rule number must be between 1 and 65535" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/action/node.def b/templates/policy/route-map/node.tag/rule/node.tag/action/node.def index 64f5b852..a2d7c96f 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/action/node.def @@ -1,5 +1,5 @@ type: txt -help: Set action to take on prefixes matching this rule [REQUIRED] +help: Action to take on prefixes matching this rule [REQUIRED] val_help: permit; Permit matching prefixes val_help: deny; Deny matching prefixes diff --git a/templates/policy/route-map/node.tag/rule/node.tag/call/node.def b/templates/policy/route-map/node.tag/rule/node.tag/call/node.def index 46a41c0f..bbd278e3 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/call/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/call/node.def @@ -1,5 +1,5 @@ type: txt -help: Set to call another route-map on match +help: Call another route-map on match val_help: Route map name commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy route-map $VAR(@)\" "; "policy route-map $VAR(../../@) rule $VAR(../@) call: called route-map $VAR(@) doesn't exist" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def b/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def index 2e34ed6c..9982c50a 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set to jump to a different rule in this route-map on a match +help: Jump to a different rule in this route-map on a match val_help: u32:1-65535; Rule number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "continue must be between 1 and 65535" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/description/node.def b/templates/policy/route-map/node.tag/rule/node.tag/description/node.def index 8b6dc54a..b8e3095b 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/description/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this rule +help: Description for this rule diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def index fe249ff1..73a013ba 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/as-path/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a BGP as-path-list to match +help: BGP as-path-list to match val_help: AS path list name commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): You must specify an action" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/community/community-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/community/community-list/node.def index bf58724a..5566808b 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/community/community-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/community/community-list/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set a BGP community-list to match +help: BGP community-list to match val_help: u32:1-99; BGP community list (standard) val_help: u32:100-500; BGP community list (expanded) diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/community/exact-match/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/community/exact-match/node.def index 35031a0b..62f1124d 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/community/exact-match/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/community/exact-match/node.def @@ -1 +1 @@ -help: Set the community-list to exactly match +help: Community-list to exactly match diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def index 357ee2c8..d3e6ef72 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/community/node.def @@ -1,4 +1,4 @@ -help: Set a BGP community-list to match +help: BGP community-list to match delete: echo route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@) >> /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match-community.$PPID end: if [ -f /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match-community.$PPID ]; then routemap=`cat /tmp/delete-policy-route-map-$VAR(../../../@)-$VAR(../../@)-match-community.$PPID` diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def index 4e322633..5c1034c3 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/interface/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the first hop interface of a route to match +help: First hop interface of a route to match val_help: Interface name commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): You must specify an action" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def index 7d15a49f..1a8b8eb2 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set an IP access-list to match +help: IP access-list to match val_help: u32:1-99; IP standard access list number val_help: u32:100-199; IP extended access list number val_help: u32:1300-1999; IP standard access list number (expanded range) diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/node.def index c40fdb8e..5aa52207 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/node.def @@ -1 +1 @@ -help: Set IP address of route to match +help: IP address of route to match diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def index 6f143bec..66dafac6 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an IP prefix-list to match +help: IP prefix-list to match val_help: Prefix list name allowed: local -a params diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def index 568d5ca3..90e2fc30 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set an IP access-list to match +help: IP access-list to match val_help: u32:1-99; IP standard access list number val_help: u32:100-199; IP extended access list number val_help: u32:1300-1999; IP standard access list number (expanded range) diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/node.def index aeba3cb4..31b6bd93 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/node.def @@ -1 +1 @@ -help: Set IP next-hop of route to match +help: IP next-hop of route to match diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def index 832ab55f..bb59ecfe 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an IP prefix-list to match +help: IP prefix-list to match val_help: Prefix list name commit:expression: $VAR(../access-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip nexthop prefix-list: you can only specify a prefix-list or access-list" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/node.def index 88d2097d..dbf30df8 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/node.def @@ -1 +1 @@ -help: Set IP prefix parameters to match +help: IP prefix parameters to match diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def index c353c0db..4182eafb 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set an IP access-list to match +help: IP access-list to match val_help: u32:1-99; IP standard access list number val_help: u32:100-199; IP extended access list number val_help: u32:1300-1999; IP standard access list number (expanded range) diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/node.def index 8d906f8b..cbbb4a02 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/node.def @@ -1 +1 @@ -help: Set IP route-source to match +help: IP route-source to match diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def index adc64356..8c58d92a 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an IP prefix-list to match +help: IP prefix-list to match val_help: Prefix list name commit:expression: $VAR(../access-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ip route-source prefix-list: you can only specify a prefix-list or access-list" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def index 18157e09..5d99ddaa 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an IPv6 access-list6 to match +help: IPv6 access-list6 to match val_help: IPV6 access list name allowed: local -a params diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/node.def index 0b32b653..364bbfc1 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/node.def @@ -1 +1 @@ -help: Set IPv6 address of route to match +help: IPv6 address of route to match diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def index a3aee610..c2f75c45 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an IPv6 prefix-list to match +help: IPv6 prefix-list to match val_help: IPv6 prefix list name allowed: local -a params diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def index f24a8fa7..eb75c329 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an IPv6 access-list6 to match +help: IPv6 access-list6 to match val_help: IPv6 access list commit:expression: $VAR(../prefix-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ipv6 nexthop access-list: you may only specify a prefix-list or access-list" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def index aeba3cb4..31b6bd93 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def @@ -1 +1 @@ -help: Set IP next-hop of route to match +help: IP next-hop of route to match diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def index 189cd3cd..8acefeb0 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an IPv6 prefix-list to match +help: IPv6 prefix-list to match val_help: IPv6 prefix list name commit:expression: $VAR(../access-list/) == ""; "policy route-map $VAR(../../../../../@) rule $VAR(../../../../@) match ipv6 nexthop prefix-list: you can only specify a prefix-list or access-list" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/node.def index 2281146d..b50ca30b 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/node.def @@ -1 +1 @@ -help: Set IPv6 prefix parameters to match +help: IPv6 prefix parameters to match diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def index 799e3876..26190202 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric of route to match +help: Metric of route to match val_help: u32:1-65535; Rrute metric syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "metric must be between 1 and 65535" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/node.def index 247316ff..22e73f59 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/node.def @@ -1 +1 @@ -help: Set route parameters to match +help: Route parameters to match diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def index 66c5762e..591fa8ca 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/origin/node.def @@ -1,5 +1,5 @@ type: txt -help: Set Border Gateway Protocol (BGP) origin code to match +help: Border Gateway Protocol (BGP) origin code to match val_help: egp; Exterior gateway protocol origin val_help: igp; Interior gateway protocol origin val_help: incomplete; Incomplete origin diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def index 178085fc..e0f7ffc0 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/peer/node.def @@ -1,5 +1,5 @@ type: txt -help: Set peer address to match +help: Peer address to match val_help: ipv4; Peer IP address val_help: local: Static or redistributed routes diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def index 21a2c802..2ee87f7b 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set route tag to match +help: Route tag to match val_help: u32:1-65535; Route tag syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "tag must be between 1 and 65535" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def index eaef24fb..212a8e69 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set rule number to goto on match +help: Rule number to goto on match val_help: u32:1-65535; Rule number syntax:expression: $VAR(../next/) == ""; "you may set only goto or next" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def index 6e5aa703..647a8c0e 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def @@ -1,4 +1,4 @@ -help: Set next sequence number to goto on match +help: Next sequence number to goto on match syntax:expression: $VAR(../goto/) == ""; "you may set only goto or next" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" update: vtysh -c "configure terminal" \ diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/node.def index 37f46798..718fe124 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/node.def @@ -1 +1 @@ -help: Set the exit policy on matches +help: Exit policy on matches diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/as/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/as/node.def index 9f63f0d3..b42b4972 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/as/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/as/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the AS number of an aggregation +help: AS number of an aggregation val_help: u32:1-65535; BGP AS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "BGP AS number must be between 1 and 4294967294" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/ip/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/ip/node.def index bfae6d5e..5973140c 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/ip/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/ip/node.def @@ -1,3 +1,3 @@ type: ipv4 -help: Set the IP address of an aggregation +help: IP address of an aggregation val_help: IP address diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def index eddcf92f..15cfe854 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/aggregator/node.def @@ -1,4 +1,4 @@ -help: Set the Border Gateway Protocol (BGP) aggregator attribute +help: Border Gateway Protocol (BGP) aggregator attribute commit:expression: $VAR(./as/) != "" && $VAR(./ip/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@) set aggregator: you must configure both as and ip" commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must configure an action" delete: echo $VAR(./as/@) $VAR(./ip/@) > /tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-aggregator.$PPID diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def index 39da12bf..1bc6709c 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def @@ -1,5 +1,5 @@ type: txt -help: Set prepend string for a Border Gateway Protocol (BGP) AS-path attribute +help: Prepend string for a Border Gateway Protocol (BGP) AS-path attribute val_help: BGP AS path prepend string (ex: "456 64500 45001") syntax:expression: exec "/opt/vyatta/sbin/vyatta-check-as-prepend.pl \"$VAR(@)\" "; "invalid AS path string" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def index 5a892483..f844c1ef 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/atomic-aggregate/node.def @@ -1,4 +1,4 @@ -help: Set Border Gateway Protocol (BGP) atomic aggregate attribute +help: Border Gateway Protocol (BGP) atomic aggregate attribute commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" update: vtysh -c "configure terminal" \ -c "route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)" \ diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/comm-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/comm-list/node.def index 5a969077..31a321bd 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/comm-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/comm-list/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set BGP communities with a community-list +help: BGP communities with a community-list val_help: u32:1-99; BGP community list (standard) val_help: u32:100-500; BGP community list (expanded) diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def index 3ccd9a42..518023ca 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/comm-list/node.def @@ -1,4 +1,4 @@ -help: Set or delete Border Gateway Protocol (BGP) communities matching a community-list +help: Border Gateway Protocol (BGP) communities matching a community-list delete: touch /tmp/policy-route-map-$VAR(../../../@)-$VAR(../../action/@)-$VAR(../../@)-set-comm-list.$PPID end: if [ -z "$VAR(./comm-list/)" ]; then echo policy route-map $VAR(../../../@) rule $VAR(../../@) set comm-list: You must configure a comm-list ; diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def index 685b23d8..cd3c8ed5 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/community/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the Border Gateway Protocl (BGP) community attribute +help: Border Gateway Protocl (BGP) community attribute val_help: <AA:NN>; Community in 4 octet AS:value format val_help: local-AS; Advertise communities in local AS only (NO_EXPORT_SUBCONFED) val_help: no-advertise; Don't advertise this route to any peer (NO_ADVERTISE) diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def index 1f2b8fcb..2faf7c6c 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/ip-next-hop/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set nexthop IP address +help: Nexthop IP address val_help: IP address # TODO: can also set to peer for BGP diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def index 3a9bee60..7dfda530 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/local-preference/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set Border Gateway Protocol (BGP) local preference attribute +help: Border Gateway Protocol (BGP) local preference attribute val_help: Local preference value commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def index ffade540..92c776d0 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def @@ -1,5 +1,5 @@ type: txt -help: Set Open Shortest Path First (OSPF) external metric-type +help: Open Shortest Path First (OSPF) external metric-type val_help: type-1; OSPF external type 1 metric val_help: type-2; OSPF external type 2 metric diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def index bd5e0d3c..6f71fd12 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/metric/node.def @@ -1,5 +1,5 @@ type: txt -help: Set destination routing protocol metric +help: Destination routing protocol metric val_help: <+/-metric>; Add or subtract metric val_help: u32:0-4294967295; Metric value diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/node.def index 7ba76cdc..47aeeb76 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/node.def @@ -1 +1 @@ -help: Set route parameters +help: Route parameters diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def index aa5c0e5c..887b1ef9 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/origin/node.def @@ -1,5 +1,5 @@ type: txt -help: Set Border Gateway Protocl (BGP) origin code +help: Border Gateway Protocl (BGP) origin code val_help: igp; Interior gateway protocol origin val_help: egp; Exterior gateway protocol origin val_help: incomplete; Incomplete origin diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def index c1807d16..db2d90d2 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/originator-id/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set Border Gateway Protocol (BGP) originator ID attribute +help: Border Gateway Protocol (BGP) originator ID attribute val_help: Orignator IP address commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def index f6e5ad5d..94497a37 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/tag/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set tag value for routing protocol +help: Tag value for routing protocol val_help: u32:1-65535; Tag value syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "tag must be between 1 and 65535" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def index 3fe1fe56..ee11e704 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/weight/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set Border Gateway Protocol (BGP) weight attribute +help: Border Gateway Protocol (BGP) weight attribute val_help: BGP weight commit:expression: $VAR(../../action/) != ""; "policy route-map $VAR(../../../@) rule $VAR(../../@): you must specify an action" diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index e6d3a49b..3e9e6b51 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -1,7 +1,7 @@ tag:1 priority: 730 type: u32 -help: Configure Border Gateway Protocol (BGP) parameters +help: Border Gateway Protocol (BGP) parameters val_help: u32:1-4294967294; AS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \ diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def index 8210b9fd..a17bfe81 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def @@ -1,5 +1,5 @@ tag: type: ipv6net -help: Set a BGP IPv6 aggregate network +help: BGP IPv6 aggregate network val_help: IPv6 aggregate network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.tag/summary-only/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.tag/summary-only/node.def index 7aaf0620..e68ae9b6 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.tag/summary-only/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.tag/summary-only/node.def @@ -1 +1 @@ -help: Set to announce the aggregate summary network only +help: Announce the aggregate summary network only diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def index 7da29853..ad75e82b 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def @@ -1,5 +1,5 @@ tag: type: ipv6net -help: Set a BGP IPv6 network +help: BGP IPv6 network val_help: IPv6 network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/path-limit/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/path-limit/node.def index 0d475547..71a74e21 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/path-limit/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/path-limit/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set an AS-path hopcount limit +help: AS-path hopcount limit val_help: u32:0-255; AS path hop count limit commit:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "protocols bgp $VAR(../../../../@) address-family ipv6-unicast network $VAR(../@) path-limit: path-limit must be between 0-255." diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/route-map/node.def index d6f0a064..5a40830e 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/route-map/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.tag/route-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route-map to modify route attributes +help: Route-map to modify route attributes val_help: Route map name allowed: local -a params diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def index 1a8f732e..ef8520d4 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/node.def @@ -1 +1 @@ -help: Set a BGP IPv6 settings +help: BGP IPv6 settings diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/metric/node.def index 53b9a18e..43d42f8d 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/metric/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/metric/node.def @@ -1,3 +1,3 @@ type: u32 -help: Set the metric for redistributed routes +help: Metric for redistributed routes val_help: Metric for redistributed routes diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/node.def index acdef3a3..0b095c32 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/node.def @@ -1 +1 @@ -help: Set to redistribute connected routes into BGP +help: Redistribute connected routes into BGP diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def index 7c951191..d059ca5e 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/connected/route-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route map to filter redistributed routes +help: Route map to filter redistributed routes val_help: Route map name allowed: local -a params diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/metric/node.def index 797801ed..43f1ffff 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/metric/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/metric/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set the metric for redistributed routes +help: Metric for redistributed routes diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/node.def index 5f0bfb51..3160951b 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/node.def @@ -1,2 +1,2 @@ -help: Set to redistribute kernel routes into BGP +help: Redistribute kernel routes into BGP diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def index 8a83768d..6aa45eef 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/kernel/route-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route map to filter redistributed routes +help: Route map to filter redistributed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/node.def index 105e22db..d8312d74 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/node.def @@ -1 +1 @@ -help: Set redistribution of routes from other protocols into BGP +help: Redistribute routes from other protocols into BGP diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/metric/node.def index 797801ed..43f1ffff 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/metric/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/metric/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set the metric for redistributed routes +help: Metric for redistributed routes diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/node.def index 76cf1808..0181f155 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/node.def @@ -1 +1 @@ -help: Set to redistribute OSPFv3 routes into BGP +help: Redistribute OSPFv3 routes into BGP diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def index a9a27a92..59076002 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ospfv3/route-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route map to filter redistributed routes +help: Route map to filter redistributed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/metric/node.def index 797801ed..43f1ffff 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/metric/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/metric/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set the metric for redistributed routes +help: Metric for redistributed routes diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/node.def index 55ac8b58..1631b384 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/node.def @@ -1 +1 @@ -help: Set to redistribute RIPng routes into BGP +help: Redistribute RIPng routes into BGP diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def index 1efdad87..a61dd54a 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/ripng/route-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route map to filter redistributed routes +help: Route map to filter redistributed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/metric/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/metric/node.def index 797801ed..43f1ffff 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/metric/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/metric/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set the metric for redistributed routes +help: Metric for redistributed routes diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/node.def index c196a54b..b7f8b390 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/node.def @@ -1 +1 @@ -help: Set to redistribute static routes into BGP +help: Redistribute static routes into BGP diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def index ced83747..4901077c 100644 --- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def +++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/redistribute/static/route-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route map to filter redistributed routes +help: Route map to filter redistributed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/address-family/node.def b/templates/protocols/bgp/node.tag/address-family/node.def index 1b67a4a0..36628c3f 100644 --- a/templates/protocols/bgp/node.tag/address-family/node.def +++ b/templates/protocols/bgp/node.tag/address-family/node.def @@ -1 +1 @@ -help: Set BGP address-family parameters +help: BGP address-family parameters diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.def b/templates/protocols/bgp/node.tag/aggregate-address/node.def index 2a250e54..e03339ca 100644 --- a/templates/protocols/bgp/node.tag/aggregate-address/node.def +++ b/templates/protocols/bgp/node.tag/aggregate-address/node.def @@ -1,4 +1,4 @@ tag: type: ipv4net -help: Set a BGP aggregate network +help: BGP aggregate network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" 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 78572519..3de1c8ec 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: Set to generate AS-set path information for this aggregate address +help: 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 7aaf0620..e68ae9b6 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: Set to announce the aggregate summary network only +help: 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 0433acdc..122f2f17 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: Set a BGP neighbor +help: BGP neighbor val_help: ipv4; BGP neighbor IP address val_help: ipv6; BGP neighbor IPv6 address diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/node.def index b6747e41..e0699608 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/node.def @@ -1 +1 @@ -help: Set to accept a route that contains the local-AS in the as-path +help: Accept a route that contains the local-AS in the as-path diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def index 74e16e3c..857b7b98 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set number of occurrences of AS number +help: Number of occurrences of AS number val_help: u32:1-10; Number of times AS is allowed in path syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10; "allowas-in number must be between 1 and 10" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def index 02bc0751..b2a2a898 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def @@ -1 +1 @@ -help: Set to send AS path unchanged +help: Send AS path unchanged diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def index 93154a64..c70212cb 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def @@ -1 +1 @@ -help: Set to send multi-exit discriminator unchanged +help: Send multi-exit discriminator unchanged diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def index f8b1ca86..a67c9fec 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def @@ -1 +1 @@ -help: Set to send nexthop unchanged +help: Send nexthop unchanged diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def index 547a1c0b..8df7fae8 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def @@ -1,2 +1,2 @@ -help: Set whether BGP attributes are sent unchanged +help: Send BGP attributes unchanged commit:expression: $VAR(../../../../peer-group/) == ""; "protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@): you can't set attribute-unchanged for a neighbor in a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def index a03cc588..bcf94c95 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def @@ -1 +1 @@ -help: Set to advertise dynamic capability to this neighbor +help: Advertise dynamic capability to this neighbor diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/node.def index f83cac18..1a9583b2 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/node.def @@ -1 +1 @@ -help: Set to advertise capabilities to this neighbor +help: Advertise capabilities to this neighbor diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/node.def index a0058566..b4b10172 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/node.def @@ -1 +1 @@ -help: Set to advertise ORF capability to this neighbor +help: Advertise ORF capability to this neighbor diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def index cb911c75..257b2bc1 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def @@ -1 +1 @@ -help: Set to advertise prefix-list ORF capability to this neighbor +help: Advertise prefix-list ORF capability to this neighbor diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def index 2019178e..5682b6f7 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def @@ -1,3 +1,3 @@ -help: Set capability to receive the ORF +help: Capability to receive the ORF commit:expression: $VAR(../../../../../../peer-group/) == ""; "protocols bgp $VAR(../../../../../../../@) neighbor $VAR(../../../../../../@): you can't set capability orf prefix-list send for a neighbor in a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def index c50c2834..0ee17795 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def @@ -1,2 +1,2 @@ -help: Set capability to send the ORF +help: Capability to send the ORF commit:expression: $VAR(../../../../../../peer-group/) == ""; "protocols bgp $VAR(../../../../../../../@) neighbor $VAR(../../../../../../@): you can't set capability orf prefix-list send for a neighbor in a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/node.def index ca2c59d9..6bbaf6c9 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/node.def @@ -1,2 +1,2 @@ -help: Set to send default route to this neighbor +help: Send default route to this neighbor 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/address-family/ipv6-unicast/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def index 51f71b1a..0a8d7cf7 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the route-map to specify criteria of the default +help: Route-map to specify criteria of the default allowed: local -a params params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def index 19496fb9..976b9745 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def @@ -1,2 +1,2 @@ -help: Set to not send extended community attributes to this neighbor +help: Disable sending extended community attributes to this neighbor commit:expression: $VAR(../../../../peer-group/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@): you can't set disable-send-community extended for a neighbor in a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/node.def index 1af3f9c5..5ea63fe7 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/node.def @@ -1,2 +1,2 @@ -help: Set to not send community attributes to this neighbor +help: Disable sending community attributes to this neighbor commit:expression: ($VAR(./extended/) != "") || ($VAR(./standard/) != ""); "protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@): you must specify the type of community" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def index ee0fa5b6..ab52d4e3 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def @@ -1,2 +1,2 @@ -help: Set to not send standard community attributes to this neighbor +help: Disable sending standard community attributes to this neighbor commit:expression: $VAR(../../../../peer-group/) == ""; "protocols bgp $VAR(../../../../../@) neighbor $VAR(../../../../@): you can't set disable-send-community standard for a neighbor in a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def index d4904340..d5691878 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an access-list to filter outgoing route updates to this neighbor +help: Access-list to filter outgoing route updates to this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def index 0ffe5986..074f4af8 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an access-list to filter incoming route updates from this neighbor +help: Access-list to filter incoming route updates from this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/node.def index 4013725c..28cf509a 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/distribute-list/node.def @@ -1 +1 @@ -help: Set an access-list to filter route updates to/from this neighbor +help: Access-list to filter route updates to/from this neighbor diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def index 9d9df1c1..1c7c4ced 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/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: As-path-list to filter outgoing route updates to this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def index 576b38ee..fa3a4b5d 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/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: As-path-list to filter incoming route updates from this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/node.def index 191c561b..28294cb2 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/filter-list/node.def @@ -1 +1 @@ -help: Set an as-path-list to filter route updates to/from this neighbor +help: As-path-list to filter route updates to/from this neighbor diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def index 6b4d7ba8..781a8752 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the maximum number of prefixes to accept from this neighbor +help: Maximum number of prefixes to accept from this neighbor val_help: u32:1-4294967295; Prefix limit syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967295; "maximum-prefix must be between 1 and 4294967295" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/node.def index 6292882b..423a4ee5 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-local/node.def @@ -1 +1 @@ -help: Configure nexthop attributes +help: Nexthop attributes diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/node.def index 95262bf2..c62481d2 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/nexthop-self/node.def @@ -1,2 +1,2 @@ -help: Set nexthop for routes sent to this neighbor to be the local router +help: Nexthop for routes sent to this neighbor to be the local router commit:expression: $VAR(../../../peer-group/) == ""; "protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@): you can't set nexthop-self for a neighbor in a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def index 20c0a335..ecbe213b 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/node.def @@ -1 +1 @@ -help: Set BGP neighbor IPv6 parameters +help: BGP neighbor IPv6 parameters diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def index 17c3bb4a..863d708b 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/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: Prefix-list to filter outgoing route updates to this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 ) diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def index e8db34e8..1f1fac02 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/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: Prefix-list to filter incoming route updates from this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 ) diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/node.def index 1a6187c9..9ea11cad 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/prefix-list/node.def @@ -1 +1 @@ -help: Set a prefix-list to filter route updates to/from this neighbor +help: Prefix-list to filter route updates to/from this neighbor diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def index e2c13df6..ad6aaf59 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/remove-private-as/node.def @@ -1,4 +1,4 @@ -help: Set to remove private AS numbers from AS path in outbound route updates +help: Remove private AS numbers from AS path in outbound route updates commit:expression: $VAR(../../../peer-group/) == ""; "protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@): you can't set remove-private-as for a neighbor in a peer-group" commit:expression: $VAR(../../../remote-as/@) != $VAR(../../../../@); "protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@): you can't set remove-private-as for an iBGP peer" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def index 4116f57f..24ffde44 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/export/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/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: Route-map to filter outgoing route updates to this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def index 87d1e158..65d5e775 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/import/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/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: Route-map to filter incoming route updates from this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/node.def index 7d581eb7..d1439e74 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-map/node.def @@ -1 +1 @@ -help: Set a route-map to filter route updates to/from this neighbor +help: Route-map to filter route updates to/from this neighbor diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def index e916667e..7bca73d7 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def @@ -1,3 +1,3 @@ -help: Set neighbor as a route reflector client +help: Neighbor as a route reflector client commit:expression: $VAR(../../../../@) == $VAR(../../../remote-as/@); "protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@) route-reflector-client: remote-as must equal local-as" commit:expression: $VAR(../../../peer-group/) == ""; "protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@): you can't set route-reflector-client for a neighbor in a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-server-client/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-server-client/node.def index bc733823..7c7e9a9c 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-server-client/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/route-server-client/node.def @@ -1,2 +1,2 @@ -help: Set neighbor as route server client +help: Neighbor as route server client commit:expression: $VAR(../../../peer-group/) == ""; "protocols bgp $VAR(../../../../@) neighbor $VAR(../../../@): you can't set route-server-client for a neighbor in a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def index e3174775..f7310f26 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def @@ -1 +1 @@ -help: Set inbound soft reconfiguration for this neighbor [REQUIRED] +help: Inbound soft reconfiguration for this neighbor [REQUIRED] diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def index c17d82f9..02a8d509 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def @@ -1,2 +1,2 @@ -help: Set soft reconfiguration for neighbor +help: 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/address-family/ipv6-unicast/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def index 27c455f9..0a1e25db 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route-map to selectively unsuppress suppressed routes +help: Route-map to selectively unsuppress suppressed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.def index ed278b7f..d69173e1 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/node.def @@ -1 +1 @@ -help: Set parameters relating to IPv4 or IPv6 routes +help: Parameters relating to IPv4 or IPv6 routes 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 646274c6..208d54d9 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,4 +1,4 @@ type: u32 -help: Set the minimum interval for sending routing updates +help: Minimum interval for sending routing updates val_help: u32:0-600; Advertisement interval in seconds syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600; "must be between 0 and 600" 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 b6747e41..e0699608 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 +1 @@ -help: Set to accept a route that contains the local-AS in the as-path +help: Accept a route that contains the local-AS in the as-path 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 74e16e3c..857b7b98 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,4 +1,4 @@ type: u32 -help: Set number of occurrences of AS number +help: Number of occurrences of AS number val_help: u32:1-10; Number of times AS is allowed in path syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10; "allowas-in number must be between 1 and 10" 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 02bc0751..b2a2a898 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: Set to send AS path unchanged +help: 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 93154a64..c70212cb 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: Set to send multi-exit discriminator unchanged +help: 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 f8b1ca86..a67c9fec 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: Set to send nexthop unchanged +help: 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 15e7eaf5..4bc8d9e8 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,2 +1,2 @@ -help: Set whether BGP attributes are sent unchanged +help: BGP attributes are sent unchanged commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set attribute-unchanged for a neighbor in a peer-group" 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 a03cc588..bcf94c95 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 +1 @@ -help: Set to advertise dynamic capability to this neighbor +help: Advertise dynamic capability to this neighbor 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 f83cac18..1a9583b2 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: Set to advertise capabilities to this neighbor +help: 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 a0058566..b4b10172 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: Set to advertise ORF capability to this neighbor +help: 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 cb911c75..257b2bc1 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: Set to advertise prefix-list ORF capability to this neighbor +help: 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 4fcc6d3a..2f32bf58 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,2 +1,2 @@ -help: Set capability to receive the ORF +help: Capability to receive the ORF commit:expression: $VAR(../../../../peer-group/) == ""; "You can't set orf capability receive for neighbor $VAR(../../../../@) in peer-group $VAR(../../../../peer-group/@)" 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 27247e17..1f2a9133 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,2 +1,2 @@ -help: Set capability to send the ORF +help: Capability to send the ORF commit:expression: $VAR(../../../../peer-group/) == ""; "You can't set capability orf send for neighbor $VAR(../../../../@) in peer-group $VAR(../../../../peer-group/@)" 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 0680df95..b2a44f28 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,2 +1,2 @@ -help: Set to send default route to this neighbor +help: Send default route to this neighbor commit:expression: $VAR(../peer-group/) == ""; "protocold 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/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/default-originate/route-map/node.def index f9a7367e..2294e8e9 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,5 +1,5 @@ type: txt -help: Set the route-map to specify criteria of the default +help: Route-map to specify criteria of the default allowed: local -a params params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map) echo -n ${params[@]##*/} 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 9b8fe210..14c1b0b7 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: 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 04099bd2..eda82d36 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 +1 @@ -help: Set to not perform capability negotiation with this neighbor +help: Disable capability negotiation with this neighbor 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 53ed069a..852212d8 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,2 +1,2 @@ -help: Set to not send extended community attributes to this neighbor +help: Disable sending extended community attributes to this neighbor commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set disable-send-community for a neighbor in a peer-group" 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 b0b6bcca..bff2c868 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: Set to not send community attributes to this neighbor +help: Disable sending community attributes to this neighbor commit:expression: ($VAR(./extended/) != "") || ($VAR(./standard/) != ""); "protocols bgp $VAR(../../@) neighbor $VAR(../@): 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 555abb9b..3e3558dc 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,2 +1,2 @@ -help: Set to not send standard community attributes to this neighbor +help: Disable sending standard community attributes to this neighbor commit:expression: $VAR(../../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set disable-send-community for a neighbor in a peer-group" 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 bf26bd0c..5fec5882 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: txt -help: Set an access-list to filter outgoing route updates to this neighbor +help: Access-list to filter outgoing route updates to this neighbor val_help: u32:1-65535; Access list number allowed: local -a params 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 e16c4bdf..ba48fb02 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: txt -help: Set an access-list to filter incoming route updates from this neighbor +help: Access-list to filter incoming route updates from this neighbor val_help: u32:1-65535; Access-list number allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list ) 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 4013725c..28cf509a 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: Set an access-list to filter route updates to/from this neighbor +help: Access-list to filter route updates to/from this neighbor 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 dd8ccadf..24836412 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: As-path-list to filter outgoing route updates to this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list ) echo -n ${params[@]##*/} 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 3c259a75..27df8362 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: As-path-list to filter incoming route updates from this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list ) echo -n ${params[@]##*/} 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 191c561b..28294cb2 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: Set an as-path-list to filter route updates to/from this neighbor +help: As-path-list to filter route updates to/from this neighbor 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 c2948704..e2bfa76e 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,6 +1,6 @@ tag:1 type: u32 -help: Set the local AS number [REQUIRED] +help: Local AS number [REQUIRED] val_help: u32:1-4294967294; Local AS number syntax:expression: $VAR(@) >=1 && $VAR(@) <= 4294967294; "local-as must be between 1 and 4294967294" commit:expression: $VAR(@) != $VAR(../../@); "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set local-as the same as the router AS" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/node.def index 299e92e9..5270b67f 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/node.tag/no-prepend/node.def @@ -1 +1 @@ -help: Set to not prepend local-as to updates from EBGP peers +help: Do not prepend local-as to updates from EBGP peers 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 6b4d7ba8..781a8752 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,4 +1,4 @@ type: u32 -help: Set the maximum number of prefixes to accept from this neighbor +help: Maximum number of prefixes to accept from this neighbor val_help: u32:1-4294967295; Prefix limit syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967295; "maximum-prefix must be between 1 and 4294967295" 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 72a8ea1c..a448c4f2 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,2 +1,2 @@ -help: Set nexthop for routes sent to this neighbor to be the local router +help: Nexthop for routes sent to this neighbor to be the local router 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" 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 f86c2b4f..3b99bc65 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,2 +1,2 @@ -help: Set to ignore capability negotiation with specified neighbor +help: Ignore capability negotiation with specified neighbor commit:expression: $VAR(../strict-capability/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@) override-capability: you can't set both strict-capability and override-capability" 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 d73320bd..bdd812bb 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 +1 @@ -help: Set to not try initiating a session with this neighbor +help: Do not initiate a session with this neighbor diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def index 3a2f318d..2290b2ea 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Set BGP MD5 password +help: BGP MD5 password syntax:expression: exec " \ if [ `echo -n '$VAR(@)' | wc -c` -gt 80 ]; then \ echo Password must be 80 characters or less;\ 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 62d51de3..352c1ab7 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,2 +1,2 @@ type: txt -help: Set a peer group for this peer +help: Peer group for this peer 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 f2bf5a56..1e463a30 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: Neighbor's BGP port val_help: u32: 1-65535; Neighbor BGP port 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 440d0038..839eaf5f 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: Prefix-list to filter outgoing route updates to this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list ) echo -n ${params[@]##*/} 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 77062fa0..ca0a1aa9 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: Prefix-list to filter incoming route updates from this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list ) echo -n ${params[@]##*/} 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 1a6187c9..9ea11cad 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: Set a prefix-list to filter route updates to/from this neighbor +help: 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 dd13308f..5fbec1ae 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 [REQUIRED] +help: Neighbor BGP AS number [REQUIRED] val_help: u32: 1-4294967294; Neighbor AS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; \ "remote-as must be between 1 and 4294967294" 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 76fa7574..e868da71 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,3 +1,3 @@ -help: Set to remove private AS numbers from AS path in outbound route updates +help: Remove private AS numbers from AS path in outbound route updates commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set remove-private-as for a neighbor in a peer-group" commit:expression: $VAR(../remote-as/@) != $VAR(../../@); "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set remove-private-as for an iBGP peer" 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 8e0b2920..9287267a 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: Route-map to filter outgoing route updates to this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} 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 59812584..b3833328 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: Route-map to filter incoming route updates from this neighbor allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} 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 7d581eb7..d1439e74 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: Set a route-map to filter route updates to/from this neighbor +help: 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 954e3938..a0471c36 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,3 +1,3 @@ -help: Set neighbor as a route reflector client +help: Neighbor as a route reflector client 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 80041d4e..b9377a2b 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,2 +1,2 @@ -help: Set neighbor as route server client +help: Neighbor is route server client commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@): you can't set route-server-client for a neighbor in a peer-group" 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 e3d75ed4..e842f340 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 +1 @@ -help: Set to administratively shut down neighbor +help: Administratively shut down neighbor 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 e3174775..f7310f26 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 +1 @@ -help: Set inbound soft reconfiguration for this neighbor [REQUIRED] +help: Inbound soft reconfiguration for this neighbor [REQUIRED] 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 4c7f5706..7f4822d5 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: Set soft reconfiguration for neighbor +help: 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 0aa6af83..437d20cc 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,2 +1,2 @@ -help: Enable strict capability negotiation +help: Enable strict capability negotiation commit:expression: $VAR(../override-capability/) == ""; "protocols bgp $VAR(../../@) neighbor $VAR(../@) strict-capability-match: you can't set both strict-capability and override-capability" 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 c391cabc..c0ae078a 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: BGP connect timer for this neighbor val_help: u32:1-65535; Connect timer in seconds val_help: 0; Disable 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 e86ef075..ad02bfc8 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,6 +1,6 @@ type: u32 default: 180 -help: Set the BGP hold timer for this neighbor +help: BGP hold timer for this neighbor val_help: u32:1-65535; Hold timer in seconds val_help: 0; Disable 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 41425866..671bd52a 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,5 +1,5 @@ type: u32 default: 60 -help: Set the BGP keepalive interval for this neighbor +help: BGP keepalive interval for this neighbor val_help: u32:1-65535; Keepalive interval in seconds (default 60) 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 9e806ecf..15c2c662 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: Set neighbor timers +help: Neighbor timers # TODO: fix this. Can set connect &&|| (keepalive && holdtime) 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" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/hops/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/hops/node.def index 4e23d108..5a91ed3e 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/hops/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/hops/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set number of the maximum number of hops to the BGP peer +help: Number of the maximum number of hops to the BGP peer val_help: u32:1-254; Number of hops syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254; "ttl-security hops must be between 1 and 254" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def index 4ac20c35..cc142c95 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def @@ -1,2 +1,2 @@ -help: Set ttl security mechanism for this BGP peer +help: Ttl security mechanism for this BGP peer 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 0338f617..f11bf532 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: Route-map to selectively unsuppress suppressed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} 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 fe7993f1..cd555b5f 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: txt -help: Set the source IP of routing updates +help: Source IP of routing updates val_help: ipv4; IP address of route source val_help: <interface>; Interface as route source commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-source $VAR(@)" 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 2cc0406f..ec3595f5 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,4 +1,4 @@ type: u32 -help: Set default weight for routes from this neighbor +help: Default weight for routes from this neighbor val_help: u32: 1-65535; Weight for routes from this neighbor syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "weight must be between 1 and 65535" diff --git a/templates/protocols/bgp/node.tag/network/node.def b/templates/protocols/bgp/node.tag/network/node.def index cf79332f..7ca1d86f 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: Set a BGP network +help: BGP network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" commit:expression: !($VAR(./backdoor/) != "" && $VAR(./route-map/) != ""); "protocols bgp $VAR(../@) network $VAR(@): May specify route-map or backdoor but not both" 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 327ff689..a350af44 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: 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 b8e0897c..e869fdb3 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,5 +1,5 @@ type: txt -help: Set a route-map to modify route attributes +help: Route-map to modify route attributes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} 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 70c8284a..7c9df567 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 +1 @@ -help: Set to compare MEDs from different neighbors +help: Always compare MEDs from different neighbors 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 194741e6..f87e0cdb 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 +1 @@ -help: Set to compare AS-path lengths including confederation sets & sequences +help: Compare AS-path lengths including confederation sets & sequences 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 07aa6178..5ee32fbb 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 +1 @@ -help: Set to ignore AS-path length in selecting a route +help: Ignore AS-path length in selecting a route 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 4e34efc7..eeb9234c 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: 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 6781575e..884fcecf 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 +1 @@ -help: Set to compare the router-id for identical EBGP paths +help: Compare the router-id for identical EBGP paths 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 d65231d3..7ea833f6 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 +1 @@ -help: Set to compare MEDs among confederation paths +help: Compare MEDs among confederation paths 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 7c5e2b04..8b72d682 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 +1 @@ -help: Set to treat a route missing a MED as the least preferred one +help: Treat missing route as a MED as the least preferred one 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 fe5c00b6..44f97159 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: 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 fb34af31..3356898c 100644 --- a/templates/protocols/bgp/node.tag/parameters/bestpath/node.def +++ b/templates/protocols/bgp/node.tag/parameters/bestpath/node.def @@ -1 +1 @@ -help: Set to change the default bestpath selection mechanism +help: 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 d1136f82..72e09e04 100644 --- a/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def +++ b/templates/protocols/bgp/node.tag/parameters/cluster-id/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: Set the route-reflector cluster-id +help: Route-reflector cluster-id 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 8ad06ae5..c30ff542 100644 --- a/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def +++ b/templates/protocols/bgp/node.tag/parameters/confederation/identifier/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set confederation AS identifier [REQUIRED] +help: Confederation AS identifier [REQUIRED] val_help: u32:1-4294967294; Confederation AS id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294" diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/node.def index e6507eff..4933aeab 100644 --- a/templates/protocols/bgp/node.tag/parameters/confederation/node.def +++ b/templates/protocols/bgp/node.tag/parameters/confederation/node.def @@ -1 +1 @@ -help: Set AS confederation parameters +help: 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 dd81f9c2..71c6b0a8 100644 --- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def +++ b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def @@ -1,5 +1,5 @@ multi: type: u32 -help: Set the peer ASs in the BGP confederation +help: Peer ASs in the BGP confederation val_help: u32:1-4294967294; Peer AS number numbers (ex: "435 234") syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294" 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 8b33513b..9e30940c 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 [REQUIRED] +help: Half-life time for dampening [REQUIRED] val_help: u32:1-45; Half-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 89d4d59d..854beaf3 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 [REQUIRED] +help: Maximum duration to suppress a stable route [REQUIRED] val_help: u32:1-255; Maximum suppress duration in seconds syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Max-suppress-time must be between 1 and 255" 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 792a805f..99003040 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 [REQUIRED] +help: Time to start reusing a route [REQUIRED] val_help: u32:1-20000; Re-use time in seconds syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 20000; "Re-use value must be between 1 and 20000" 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 efb54286..0576c7e6 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 [REQUIRED] +help: When to start suppressing a route [REQUIRED] val_help: u32:1-20000; Start-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 97b86553..05b2ddfc 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,3 +1,3 @@ type: u32 -help: Set the default local preference (higher=more preferred) +help: Default local preference (higher=more preferred) val_help: u32:0-4294967295; Local preference 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 2f2019c2..3c3e6566 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 +1 @@ -help: Set to deactivate IPv4 unicast for a peer by default +help: Deactivate IPv4 unicast for a peer by default diff --git a/templates/protocols/bgp/node.tag/parameters/default/node.def b/templates/protocols/bgp/node.tag/parameters/default/node.def index 03806ac0..1b569e9d 100644 --- a/templates/protocols/bgp/node.tag/parameters/default/node.def +++ b/templates/protocols/bgp/node.tag/parameters/default/node.def @@ -1 +1 @@ -help: Set BGP defaults +help: 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 ba74d93a..a285fe43 100644 --- a/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def +++ b/templates/protocols/bgp/node.tag/parameters/deterministic-med/node.def @@ -1 +1 @@ -help: Set to compare MEDs between different peers in the same AS +help: Compare MEDs between different peers in the same AS 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 f4a670a3..30004e64 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 +1 @@ -help: Set to disable IGP route check for network statements +help: Disable IGP route check for network statements diff --git a/templates/protocols/bgp/node.tag/parameters/distance/global/external/node.def b/templates/protocols/bgp/node.tag/parameters/distance/global/external/node.def index 91ef1d22..db22f7e8 100644 --- a/templates/protocols/bgp/node.tag/parameters/distance/global/external/node.def +++ b/templates/protocols/bgp/node.tag/parameters/distance/global/external/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set an administrative distance for external BGP routes +help: Administrative distance for external BGP routes val_help: u32:1-255; Administrative distance for external BGP routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" diff --git a/templates/protocols/bgp/node.tag/parameters/distance/global/internal/node.def b/templates/protocols/bgp/node.tag/parameters/distance/global/internal/node.def index 5ea5ab2d..9689e103 100644 --- a/templates/protocols/bgp/node.tag/parameters/distance/global/internal/node.def +++ b/templates/protocols/bgp/node.tag/parameters/distance/global/internal/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set an administrative distance for internal BGP routes +help: Administrative distance for internal BGP routes val_help: u32:1-255; Administrative distance for internal BGP routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" diff --git a/templates/protocols/bgp/node.tag/parameters/distance/global/local/node.def b/templates/protocols/bgp/node.tag/parameters/distance/global/local/node.def index fd548d62..bc573238 100644 --- a/templates/protocols/bgp/node.tag/parameters/distance/global/local/node.def +++ b/templates/protocols/bgp/node.tag/parameters/distance/global/local/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set an administrative distance for local BGP routes +help: Administrative distance for local BGP routes val_help: u32:1-255; Administrative distance for local BGP routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" diff --git a/templates/protocols/bgp/node.tag/parameters/distance/global/node.def b/templates/protocols/bgp/node.tag/parameters/distance/global/node.def index ea7a99ef..02e08c2b 100644 --- a/templates/protocols/bgp/node.tag/parameters/distance/global/node.def +++ b/templates/protocols/bgp/node.tag/parameters/distance/global/node.def @@ -1,4 +1,4 @@ -help: Set global administratives distances for BGP routes +help: Global administratives distances for BGP routes commit:expression: $VAR(./external/) != ""; "protocols bgp $VAR(../../../@) parameters distance global: you must set an external route distance" commit:expression: $VAR(./internal/) != ""; "protocols bgp $VAR(../../../@) parameters distance global: you must set an internal route distance" commit:expression: $VAR(./local/) != ""; "protocols bgp $VAR(../../../@) parameters distance global: you must set a local route distance" diff --git a/templates/protocols/bgp/node.tag/parameters/distance/node.def b/templates/protocols/bgp/node.tag/parameters/distance/node.def index ef0704e2..72954529 100644 --- a/templates/protocols/bgp/node.tag/parameters/distance/node.def +++ b/templates/protocols/bgp/node.tag/parameters/distance/node.def @@ -1 +1 @@ -help: Set administratives distances for BGP routes +help: Administratives distances for BGP routes diff --git a/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def b/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def index a7627f69..eaf7d6d8 100644 --- a/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def +++ b/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def @@ -1,5 +1,5 @@ tag: type: ipv4net -help: Set an administrative distance for a specific BGP prefix +help: Administrative distance for a specific BGP prefix syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" commit:expression: $VAR(./distance/) != ""; "protocols bgp $VAR(../../../@) parameters distance prefix $VAR(@): you must set a route distance for this prefix" diff --git a/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.tag/distance/node.def b/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.tag/distance/node.def index b104035e..786cea36 100644 --- a/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.tag/distance/node.def +++ b/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.tag/distance/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set an administrative distance for prefix +help: Administrative distance for prefix val_help: u32:1-255; Administrative distance for external BGP routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" 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 c7f8814f..2263b31f 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 +1 @@ -help: Set to require first AS in the path to match peer's AS +help: Require first AS in the path to match peer's AS 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 85b6b73d..ef9d8f38 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: Set graceful restart capability parameters +help: 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 36a37d49..678deece 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,4 +1,4 @@ type: u32 -help: Set the maximum time to hold onto restarting peer's stale paths +help: Maximum time to hold onto restarting peer's stale paths val_help: u32:1-3600; Hold time in seconds syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 3600; "stalepath-time must be between 1 and 3600" 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 f231010f..528361ab 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 +1 @@ -help: Set to log neighbor up/down changes and reset reason +help: Log neighbor up/down changes and reset reason 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 30d2de78..37cf3d94 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 +1 @@ -help: Set to disable client to client route reflection +help: Disable client to client route reflection 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 37c4a0af..0302357a 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 +1 @@ -help: Set to disable immediate sesison reset if peer's connected link goes down +help: Disable immediate sesison reset if peer's connected link goes down diff --git a/templates/protocols/bgp/node.tag/parameters/node.def b/templates/protocols/bgp/node.tag/parameters/node.def index 6bb752b5..ac7c5a48 100644 --- a/templates/protocols/bgp/node.tag/parameters/node.def +++ b/templates/protocols/bgp/node.tag/parameters/node.def @@ -1 +1 @@ -help: Set BGP parameters +help: 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 9b4417c8..788aac57 100644 --- a/templates/protocols/bgp/node.tag/parameters/router-id/node.def +++ b/templates/protocols/bgp/node.tag/parameters/router-id/node.def @@ -1,2 +1,2 @@ type: ipv4 -help: Set BGP router id +help: BGP router id 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 08602afc..5a009f86 100644 --- a/templates/protocols/bgp/node.tag/parameters/scan-time/node.def +++ b/templates/protocols/bgp/node.tag/parameters/scan-time/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set BGP route scanner interval +help: BGP route scanner interval val_help: u32:5-60; Scan interval in seconds syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 60; "scan-time must be between 5 and 60 seconds" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/peer-group/node.def index 9a54b6db..47f4c2df 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set a BGP peer-group +help: BGP peer-group syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \ --check-peergroup-name $VAR(@)" delete:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \ diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/node.def index b6747e41..e0699608 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/node.def @@ -1 +1 @@ -help: Set to accept a route that contains the local-AS in the as-path +help: Accept a route that contains the local-AS in the as-path diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def index 74e16e3c..857b7b98 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/allowas-in/number/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set number of occurrences of AS number +help: Number of occurrences of AS number val_help: u32:1-10; Number of times AS is allowed in path syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10; "allowas-in number must be between 1 and 10" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def index 02bc0751..b2a2a898 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/as-path/node.def @@ -1 +1 @@ -help: Set to send AS path unchanged +help: Send AS path unchanged diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def index 93154a64..c70212cb 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/med/node.def @@ -1 +1 @@ -help: Set to send multi-exit discriminator unchanged +help: Send multi-exit discriminator unchanged diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def index f8b1ca86..a67c9fec 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/next-hop/node.def @@ -1 +1 @@ -help: Set to send nexthop unchanged +help: Send nexthop unchanged diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def index 719c0fd8..f637407e 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/attribute-unchanged/node.def @@ -1 +1 @@ -help: Set whether BGP attributes are sent unchanged +help: Send BGP attributes unchanged diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def index 653555ed..c8f64a26 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/dynamic/node.def @@ -1 +1 @@ -help: Set to advertise dynamic capability to this peer-group +help: Advertise dynamic capability to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/node.def index 2452fc2b..715932f2 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/node.def @@ -1 +1 @@ -help: Set to advertise capabilities to this peer-group +help: Advertise capabilities to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/node.def index ac420788..7ddab63b 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/node.def @@ -1 +1 @@ -help: Set to advertise ORF capability to this peer-group +help: Advertise ORF capability to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def index d335cd56..e57cf555 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/node.def @@ -1 +1 @@ -help: Set to advertise prefix-list ORF capability to this peer-group +help: Advertise prefix-list ORF capability to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def index c3850291..c79637f0 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/receive/node.def @@ -1 +1 @@ -help: Set capability to receive the ORF +help: Capability to receive the ORF diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def index 9e059106..bebf8e36 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/capability/orf/prefix-list/send/node.def @@ -1 +1 @@ -help: Set capability to send the ORF +help: Capability to send the ORF diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/node.def index 3335f496..bb7e2958 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/node.def @@ -1 +1 @@ -help: Set to send default route to this peer-group +help: Send default route to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def index aa81625d..7fec6bf8 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/default-originate/route-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the route-map to specify criteria of the default +help: Route-map to specify criteria of the default allowed: local -a params params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def index bae0ccb6..d9c17f81 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/extended/node.def @@ -1 +1 @@ -help: Set to not send extended community attributes to this peer-group +help: Disable sending extended community attributes to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/node.def index fc7dd194..1af8f176 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/node.def @@ -1,2 +1,2 @@ -help: Set to not send community attributes to this peer-group +help: Disable sending community attributes to this peer-group commit:expression: ($VAR(./extended/) != "") || ($VAR(./standard/) != ""); "protocols bgp $VAR(../../../../@) peer-group $VAR(../../../@): you must specify the type of community" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def index ee7b46bd..1f6d927e 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/disable-send-community/standard/node.def @@ -1 +1 @@ -help: Set to not send standard community attributes to this peer-group +help: Disable sending standard community attributes to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def index cdeb8b29..08165d9c 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/export/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an access-list to filter outgoing route updates to this peer-group +help: Access-list to filter outgoing route updates to this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def index b0b633c8..c30e425c 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/import/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an access-list to filter incoming route updates from this peer-group +help: Access-list to filter incoming route updates from this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list6 ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/node.def index 677b93af..ac125a22 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/distribute-list/node.def @@ -1 +1 @@ -help: Set an access-list to filter route updates to/from this peer-group +help: Access-list to filter route updates to/from this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def index d896b1bd..e9404865 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/export/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an as-path-list to filter outgoing route updates to this peer-group +help: As-path-list to filter outgoing route updates to this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def index 328a1133..d8406724 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/import/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an as-path-list to filter incoming route updates from this peer-group +help: As-path-list to filter incoming route updates from this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/node.def index 48d9267d..d7c3919b 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/filter-list/node.def @@ -1 +1 @@ -help: Set an as-path-list to filter route updates to/from this peer-group +help: As-path-list to filter route updates to/from this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def index a722d49c..b48b7b07 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/maximum-prefix/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set the maximum number of prefixes to accept from this peer-group +help: Maximum number of prefixes to accept from this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/node.def index 6292882b..423a4ee5 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-local/node.def @@ -1 +1 @@ -help: Configure nexthop attributes +help: Nexthop attributes diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/node.def index cec29d88..83c9fc96 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/nexthop-self/node.def @@ -1 +1 @@ -help: Set nexthop for routes sent to this peer-group to be the local router +help: Nexthop for routes sent to this peer-group to be the local router diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def index ac4d3626..44738872 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/node.def @@ -1 +1 @@ -help: Set BGP peer-group IPv6 parameters +help: BGP peer-group IPv6 parameters diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def index d66872ce..bfc6729a 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/export/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a prefix-list to filter outgoing route updates to this peer-group +help: Prefix-list to filter outgoing route updates to this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def index d8c7dcb6..3ced79fa 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/import/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a prefix-list to filter incoming route updates from this peer-group +help: Prefix-list to filter incoming route updates from this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list6 ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/node.def index 4d8960c2..65b0a4b8 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/prefix-list/node.def @@ -1 +1 @@ -help: Set a prefix-list to filter route updates to/from this peer-group +help: Prefix-list to filter route updates to/from this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/remove-private-as/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/remove-private-as/node.def index c045c88b..8d214005 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/remove-private-as/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/remove-private-as/node.def @@ -1 +1 @@ -help: Set to remove private AS numbers from AS path in outbound route updates +help: Remove private AS numbers from AS path in outbound route updates diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def index 7bc923f5..e187cb88 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/export/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route-map to filter outgoing route updates to this peer-group +help: Route-map to filter outgoing route updates to this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def index ffd401f4..73dc867b 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/import/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route-map to filter incoming route updates from this peer-group +help: Route-map to filter incoming route updates from this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/node.def index e444dc70..a9726b21 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-map/node.def @@ -1 +1 @@ -help: Set a route-map to filter route updates to/from this peer-group +help: Route-map to filter route updates to/from this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def index e6292566..7e0ffe30 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-reflector-client/node.def @@ -1,2 +1,2 @@ -help: Set peer-group as a route reflector client +help: Peer-group as a route reflector client commit:expression: $VAR(../../../../@) == $VAR(../../../remote-as/@); "protocols bgp $VAR(../../../../@) peer-group $VAR(../../../@) route-reflector-client: remote-as must equal local-as" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-server-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-server-client/node.def index 590ad079..c14e9686 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-server-client/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/route-server-client/node.def @@ -1 +1 @@ -help: Set peer-group as route server client +help: Peer-group as route server client diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def index f3a5369b..8a5f1880 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/inbound/node.def @@ -1 +1 @@ -help: Set inbound soft reconfiguration for this peer-group [REQUIRED] +help: Inbound soft reconfiguration for this peer-group [REQUIRED] diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def index 93440825..e52732f8 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/soft-reconfiguration/node.def @@ -1,2 +1,2 @@ -help: Set soft reconfiguration for peer-group +help: Soft reconfiguration for peer-group commit:expression: $VAR(./inbound/) != ""; "protocols bgp $VAR(../../../../@) peer-group $VAR(../../../@) soft-reconfiguration: you must specify the type of soft-reconfiguration" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def index 75514699..0bd073e5 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/ipv6-unicast/unsuppress-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route-map to selectively unsuppress suppressed routes +help: Route-map to selectively unsuppress suppressed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/node.def index 4c25aaf9..ef1e13c5 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/address-family/node.def @@ -1 +1 @@ -help: Set BGP peer-group address-family parameters +help: BGP peer-group address-family parameters diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/node.def index b6747e41..e0699608 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/node.def @@ -1 +1 @@ -help: Set to accept a route that contains the local-AS in the as-path +help: Accept a route that contains the local-AS in the as-path diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/number/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/number/node.def index 74e16e3c..857b7b98 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/number/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/allowas-in/number/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set number of occurrences of AS number +help: Number of occurrences of AS number val_help: u32:1-10; Number of times AS is allowed in path syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10; "allowas-in number must be between 1 and 10" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/as-path/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/as-path/node.def index 02bc0751..b2a2a898 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/as-path/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/as-path/node.def @@ -1 +1 @@ -help: Set to send AS path unchanged +help: Send AS path unchanged diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/med/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/med/node.def index 93154a64..c70212cb 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/med/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/med/node.def @@ -1 +1 @@ -help: Set to send multi-exit discriminator unchanged +help: Send multi-exit discriminator unchanged diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/next-hop/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/next-hop/node.def index f8b1ca86..a67c9fec 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/next-hop/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/next-hop/node.def @@ -1 +1 @@ -help: Set to send nexthop unchanged +help: Send nexthop unchanged diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def index 719c0fd8..d1135a3a 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/attribute-unchanged/node.def @@ -1 +1 @@ -help: Set whether BGP attributes are sent unchanged +help: BGP attributes are sent unchanged diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/dynamic/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/dynamic/node.def index 653555ed..c8f64a26 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/dynamic/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/dynamic/node.def @@ -1 +1 @@ -help: Set to advertise dynamic capability to this peer-group +help: Advertise dynamic capability to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/node.def index 2452fc2b..715932f2 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/node.def @@ -1 +1 @@ -help: Set to advertise capabilities to this peer-group +help: Advertise capabilities to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/node.def index ac420788..7ddab63b 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/node.def @@ -1 +1 @@ -help: Set to advertise ORF capability to this peer-group +help: Advertise ORF capability to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/node.def index d335cd56..e57cf555 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/node.def @@ -1 +1 @@ -help: Set to advertise prefix-list ORF capability to this peer-group +help: Advertise prefix-list ORF capability to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/receive/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/receive/node.def index c3850291..c79637f0 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/receive/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/receive/node.def @@ -1 +1 @@ -help: Set capability to receive the ORF +help: Capability to receive the ORF diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/send/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/send/node.def index 9e059106..bebf8e36 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/send/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/orf/prefix-list/send/node.def @@ -1 +1 @@ -help: Set capability to send the ORF +help: Capability to send the ORF diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/node.def index 3335f496..bb7e2958 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/node.def @@ -1 +1 @@ -help: Set to send default route to this peer-group +help: Send default route to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def index 403a0944..d327e542 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/default-originate/route-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the route-map to specify criteria of the default +help: Route-map to specify criteria of the default allowed: local -a params params=$(/opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/description/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/description/node.def index 3c817484..21008dee 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/description/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/description/node.def @@ -1,2 +1,2 @@ type: txt -help: Set a description for this peer-group +help: Description for this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-capability-negotiation/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-capability-negotiation/node.def index d237af93..29987278 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-capability-negotiation/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-capability-negotiation/node.def @@ -1 +1 @@ -help: Set to not perform capability negotiation with this peer-group +help: Disable capability negotiation with this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/extended/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/extended/node.def index bae0ccb6..d9c17f81 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/extended/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/extended/node.def @@ -1 +1 @@ -help: Set to not send extended community attributes to this peer-group +help: Disable sending extended community attributes to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/node.def index 8c75e619..c92cb4af 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/node.def @@ -1,2 +1,2 @@ -help: Set to not send community attributes to this peer-group +help: Disable sending community attributes to this peer-group commit:expression: ($VAR(./extended/) != "") || ($VAR(./standard/) != ""); "protocols bgp $VAR(../../@) peer-group $VAR(../@): you must specify the type of community" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/standard/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/standard/node.def index ee7b46bd..1f6d927e 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/standard/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/disable-send-community/standard/node.def @@ -1 +1 @@ -help: Set to not send standard community attributes to this peer-group +help: Disable sending standard community attributes to this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def index 1ca1c6da..78931f2d 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/export/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an access-list to filter outgoing route updates to this peer-group +help: Access-list to filter outgoing route updates to this peer-group val_help: u32:1-65535; Access list number allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy access-list ) diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def index fc719e6a..190e3bc8 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/import/node.def @@ -1,5 +1,5 @@ type: txt -help: Set an access-list to filter incoming route updates from this peer-group +help: Access-list to filter incoming route updates from this peer-group val_help: u32:1-65535; Access list number allowed: local -a params diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/node.def index 677b93af..ac125a22 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/distribute-list/node.def @@ -1 +1 @@ -help: Set an access-list to filter route updates to/from this peer-group +help: Access-list to filter route updates to/from this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/export/node.def index 568716ee..07dfcbb6 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/export/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/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 peer-group +help: As-path-list to filter outgoing route updates to this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/import/node.def index c4df16dd..0652e65f 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/import/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/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 peer-group +help: As-path-list to filter incoming route updates from this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy as-path-list ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/node.def index 48d9267d..d7c3919b 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/filter-list/node.def @@ -1 +1 @@ -help: Set an as-path-list to filter route updates to/from this peer-group +help: As-path-list to filter route updates to/from this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.def index 9dae8b74..55b1c3c2 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Set the local AS number [REQUIRED] +help: Local AS number [REQUIRED] val_help: u32: 1-4294967294; Local AS number syntax:expression: $VAR(@) >=1 && $VAR(@) <= 4294967294; "local-as must be between 1 and 4294967294" commit:expression: $VAR(@) != $VAR(../../@); "protocols bgp $VAR(../../@) peer-group $VAR(../@): you can't set local-as the same as the router AS" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.tag/no-prepend/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.tag/no-prepend/node.def index 299e92e9..c805c4bf 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.tag/no-prepend/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/local-as/node.tag/no-prepend/node.def @@ -1 +1 @@ -help: Set to not prepend local-as to updates from EBGP peers +help: Disable prepending local-as to updates from EBGP peers diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/maximum-prefix/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/maximum-prefix/node.def index bed266bf..aed2bd6d 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/maximum-prefix/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/maximum-prefix/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set the maximum number of prefixes to accept from this peer-group +help: Maximum number of prefixes to accept from this peer-group val_help: 1-4294967295; Prefix limit syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967295; "maximum-prefix must be between 1 and 4294967295" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/nexthop-self/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/nexthop-self/node.def index cec29d88..83c9fc96 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/nexthop-self/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/nexthop-self/node.def @@ -1 +1 @@ -help: Set nexthop for routes sent to this peer-group to be the local router +help: Nexthop for routes sent to this peer-group to be the local router diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/override-capability/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/override-capability/node.def index 5229901a..0223e7d7 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/override-capability/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/override-capability/node.def @@ -1,2 +1,2 @@ -help: Set to ignore capability negotiation with specified peer-group +help: Ignore capability negotiation with specified peer-group commit:expression: $VAR(../strict-capability/) == ""; "protocols bgp $VAR(../../@) peer-group $VAR(../@) override-capability: you can't set both strict-capability and override-capability" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/passive/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/passive/node.def index b14c84a8..24fedd17 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/passive/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/passive/node.def @@ -1 +1 @@ -help: Set to not try initiating a session with this peer-group +help: Don not intiate a session with this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/password/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/password/node.def index 7aa3b0a1..5b93648f 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/password/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/password/node.def @@ -1,5 +1,5 @@ type: txt -help: Set BGP MD5 password +help: BGP MD5 password syntax:expression: exec " \ if [ `echo -n '$VAR(@)' | wc -c` -gt 80 ]; then \ echo Password must be 80 characters or less;\ diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/export/node.def index 184eef5d..90629ca0 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/export/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/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 peer-group +help: Prefix-list to filter outgoing route updates to this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/import/node.def index d8997dd3..adec753f 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/import/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/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 peer-group +help: Prefix-list to filter incoming route updates from this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy prefix-list ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/node.def index 4d8960c2..65b0a4b8 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/prefix-list/node.def @@ -1 +1 @@ -help: Set a prefix-list to filter route updates to/from this peer-group +help: Prefix-list to filter route updates to/from this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def index 87315835..ab3913c7 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set peer-group BGP AS number [REQUIRED] +help: Peer-group BGP AS number [REQUIRED] val_help: u32:1-4294967294; AS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; \ "remote-as must be between 1 and 4294967294" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/remove-private-as/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/remove-private-as/node.def index c045c88b..8d214005 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/remove-private-as/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/remove-private-as/node.def @@ -1 +1 @@ -help: Set to remove private AS numbers from AS path in outbound route updates +help: Remove private AS numbers from AS path in outbound route updates diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/export/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/export/node.def index ce692921..4b1d3198 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/export/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/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 peer-group +help: Route-map to filter outgoing route updates to this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/import/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/import/node.def index 0d538a87..49158a55 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/import/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/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 peer-group +help: Route-map to filter incoming route updates from this peer-group allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/node.def index e444dc70..a9726b21 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-map/node.def @@ -1 +1 @@ -help: Set a route-map to filter route updates to/from this peer-group +help: Route-map to filter route updates to/from this peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-reflector-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-reflector-client/node.def index 201b31ff..9c773c60 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-reflector-client/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-reflector-client/node.def @@ -1,2 +1,2 @@ -help: Set peer-group as a route reflector client +help: Peer-group as a route reflector client commit:expression: $VAR(../../@) == $VAR(../remote-as/@); "protocols bgp $VAR(../../@) peer-group $VAR(../@) route-reflector-client: remote-as must equal local-as" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-server-client/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-server-client/node.def index 590ad079..c14e9686 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/route-server-client/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/route-server-client/node.def @@ -1 +1 @@ -help: Set peer-group as route server client +help: Peer-group as route server client diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/shutdown/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/shutdown/node.def index 1594cee8..f50d73a2 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/shutdown/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/shutdown/node.def @@ -1 +1 @@ -help: Set to administratively shut down peer-group +help: Administratively shut down peer-group diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def index f3a5369b..8a5f1880 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/inbound/node.def @@ -1 +1 @@ -help: Set inbound soft reconfiguration for this peer-group [REQUIRED] +help: Inbound soft reconfiguration for this peer-group [REQUIRED] diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/node.def index 4cf650b5..ae6ab330 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/soft-reconfiguration/node.def @@ -1,2 +1,2 @@ -help: Set soft reconfiguration for peer-group +help: Soft reconfiguration for peer-group commit:expression: $VAR(./inbound/) != ""; "protocols bgp $VAR(../../@) peer-group $VAR(../@) soft-reconfiguration: you must specify the type of soft-reconfiguration" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/holdtime/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/holdtime/node.def index 745af90c..d97fd47a 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/holdtime/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/holdtime/node.def @@ -1,6 +1,6 @@ type: u32 default: 180 -help: Set the BGP hold timer for this peer-group +help: BGP hold timer for this peer-group val_help: u32:1-65535; Hold timer in seconds val_help: 0; Disable hold timer diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/keepalive/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/keepalive/node.def index 72076ca2..5562c9f8 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/keepalive/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/keepalive/node.def @@ -1,5 +1,5 @@ type: u32 default: 60 -help: Set the BGP keepalive interval for this peer-group +help: BGP keepalive interval for this peer-group val_help: u32:1-65535; Keepalive 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/peer-group/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/node.def index 8950a4b2..942d081e 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/node.def @@ -1,4 +1,4 @@ -help: Set peer-group timers +help: Peer-group timers # TODO: fix this. Can set connect &&|| (keepalive && holdtime) 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" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def index a172a49d..c2756c6f 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/hops/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set number of the maximum number of hops to the BGP peer +help: Number of the maximum number of hops to the BGP peer val_help: u32:1-254; Number of hops syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254; "ttl-security hops must be between 1 and 254" diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def index 4ac20c35..31c4f4e3 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def @@ -1,2 +1,2 @@ -help: Set ttl security mechanism for this BGP peer +help: Ttl security mechanism diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def index 4d8cfd91..5d8fbce9 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/unsuppress-map/node.def @@ -1,5 +1,5 @@ type: txt -help: Set a route-map to selectively unsuppress suppressed routes +help: Route-map to selectively unsuppress suppressed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/update-source/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/update-source/node.def index bbb863d0..60931d4f 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/update-source/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/update-source/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the source IP of routing updates +help: Source IP of routing updates val_help: ipv4;IP address of route source val_help: <interface>; Interface as route source diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/weight/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/weight/node.def index 62204a24..45ebcd48 100644 --- a/templates/protocols/bgp/node.tag/peer-group/node.tag/weight/node.def +++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/weight/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set default weight for routes from this peer-group +help: Default weight for routes from this peer-group val_help: u32:1-65535; Weight for routes from this peer-group syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "weight must be between 1 and 65535" 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 797801ed..43f1ffff 100644 --- a/templates/protocols/bgp/node.tag/redistribute/connected/metric/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/connected/metric/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set the metric for redistributed routes +help: Metric for redistributed routes diff --git a/templates/protocols/bgp/node.tag/redistribute/connected/node.def b/templates/protocols/bgp/node.tag/redistribute/connected/node.def index acdef3a3..0b095c32 100644 --- a/templates/protocols/bgp/node.tag/redistribute/connected/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/connected/node.def @@ -1 +1 @@ -help: Set to redistribute connected routes into BGP +help: Redistribute connected routes into BGP 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 dbb12eca..4c6ac621 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,5 +1,5 @@ type: txt -help: Set a route map to filter redistributed routes +help: Route map to filter redistributed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} 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 797801ed..43f1ffff 100644 --- a/templates/protocols/bgp/node.tag/redistribute/kernel/metric/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/kernel/metric/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set the metric for redistributed routes +help: Metric for redistributed routes diff --git a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def index 45c82dda..2becf6c4 100644 --- a/templates/protocols/bgp/node.tag/redistribute/kernel/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/kernel/node.def @@ -1 +1 @@ -help: Set to redistribute kernel routes into BGP +help: Redistribute kernel routes into BGP 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 5793a945..c18a2d32 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,5 +1,5 @@ type: txt -help: Set a route map to filter redistributed routes +help: Route map to filter redistributed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/redistribute/node.def b/templates/protocols/bgp/node.tag/redistribute/node.def index 105e22db..d8312d74 100644 --- a/templates/protocols/bgp/node.tag/redistribute/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/node.def @@ -1 +1 @@ -help: Set redistribution of routes from other protocols into BGP +help: Redistribute 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 797801ed..43f1ffff 100644 --- a/templates/protocols/bgp/node.tag/redistribute/ospf/metric/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/ospf/metric/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set the metric for redistributed routes +help: Metric for redistributed routes diff --git a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def index f0f6e8de..7c92d26d 100644 --- a/templates/protocols/bgp/node.tag/redistribute/ospf/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/ospf/node.def @@ -1 +1 @@ -help: Set to redistribute OSPF routes into BGP +help: Redistribute OSPF routes into BGP 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 7ad5b916..c8850aa4 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,5 +1,5 @@ type: txt -help: Set a route map to filter redistributed routes +help: Route map to filter redistributed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} 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 797801ed..43f1ffff 100644 --- a/templates/protocols/bgp/node.tag/redistribute/rip/metric/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/rip/metric/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set the metric for redistributed routes +help: Metric for redistributed routes diff --git a/templates/protocols/bgp/node.tag/redistribute/rip/node.def b/templates/protocols/bgp/node.tag/redistribute/rip/node.def index 577b17e9..5b2e31b8 100644 --- a/templates/protocols/bgp/node.tag/redistribute/rip/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/rip/node.def @@ -1 +1 @@ -help: Set to redistribute RIP routes into BGP +help: Redistribute RIP routes into BGP 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 c80dbf27..735da89d 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,5 +1,5 @@ type: txt -help: Set a route map to filter redistributed routes +help: Route map to filter redistributed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} 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 797801ed..43f1ffff 100644 --- a/templates/protocols/bgp/node.tag/redistribute/static/metric/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/static/metric/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set the metric for redistributed routes +help: Metric for redistributed routes diff --git a/templates/protocols/bgp/node.tag/redistribute/static/node.def b/templates/protocols/bgp/node.tag/redistribute/static/node.def index c196a54b..b7f8b390 100644 --- a/templates/protocols/bgp/node.tag/redistribute/static/node.def +++ b/templates/protocols/bgp/node.tag/redistribute/static/node.def @@ -1 +1 @@ -help: Set to redistribute static routes into BGP +help: Redistribute static routes into BGP 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 6421a90e..0dc6db88 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,5 +1,5 @@ type: txt -help: Set a route map to filter redistributed routes +help: Route map to filter redistributed routes allowed: local -a params params=$( /opt/vyatta/sbin/vyatta-policy.pl --list-policy route-map ) echo -n ${params[@]##*/} diff --git a/templates/protocols/bgp/node.tag/timers/holdtime/node.def b/templates/protocols/bgp/node.tag/timers/holdtime/node.def index 19efe213..7573f2aa 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: BGP holdtime interval val_help: u32:4-65535; Hold-time in seconds (default 180) val_help: 0; Don't hold routes diff --git a/templates/protocols/bgp/node.tag/timers/keepalive/node.def b/templates/protocols/bgp/node.tag/timers/keepalive/node.def index 56dbda28..545d905e 100644 --- a/templates/protocols/bgp/node.tag/timers/keepalive/node.def +++ b/templates/protocols/bgp/node.tag/timers/keepalive/node.def @@ -1,6 +1,6 @@ type: u32 default: 60 -help: Set keepalive interval +help: Keepalive interval val_help: u32:1-65535; Keep-alive time in seconds (default 60) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; \ "Keepalive interval must be between 1 and 65535" diff --git a/templates/protocols/bgp/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/timers/node.def index f25de2a5..ffa19605 100644 --- a/templates/protocols/bgp/node.tag/timers/node.def +++ b/templates/protocols/bgp/node.tag/timers/node.def @@ -1,3 +1,3 @@ -help: Set BGP protocol timers +help: 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" diff --git a/templates/protocols/node.def b/templates/protocols/node.def index c6d7dda1..601ea951 100644 --- a/templates/protocols/node.def +++ b/templates/protocols/node.def @@ -1,2 +1,2 @@ priority: 900 -help: Configure routing protocol parameters +help: Routing protocol parameters diff --git a/templates/protocols/ospf/access-list/node.def b/templates/protocols/ospf/access-list/node.def index 9186918a..cbb773f3 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: Set access-list to filter networks in routing updates +help: 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 2cd5b177..50d2db49 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: Set filter for outgoing routing updates [REQUIRED] +help: Filter for outgoing routing updates [REQUIRED] syntax:expression: $VAR(@) in "bgp", "connected", "kernel", "rip", "static"; "Must be (bgp, connected, kernel, rip, or static)" val_help: bgp Filter bgp routes; diff --git a/templates/protocols/ospf/area/node.def b/templates/protocols/ospf/area/node.def index 0aaa7524..fc90826b 100644 --- a/templates/protocols/ospf/area/node.def +++ b/templates/protocols/ospf/area/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set OSPF Area +help: OSPF Area syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $VAR(@)" val_help: u32; OSPF area in decimal notation val_help: ipv4; OSPF area in dotted decimal notation diff --git a/templates/protocols/ospf/area/node.tag/area-type/node.def b/templates/protocols/ospf/area/node.tag/area-type/node.def index 5f90efcc..e3ab801c 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: Set area type +help: Area type val_help: normal; Normal area type val_help: nssa; Not so stubby area type val_help: stub; Stub Area type diff --git a/templates/protocols/ospf/area/node.tag/area-type/normal/node.def b/templates/protocols/ospf/area/node.tag/area-type/normal/node.def index 52d5c949..80639130 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: Set normal OSPF area +help: 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/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def index f6b5c409..a4745bce 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/nssa/default-cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the summary-default cost of nssa area +help: Summary-default cost of nssa area syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215" val_help: u32:0-16777215; Summary default cost 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 b82abfc0..4999ff7a 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: Set to not inject inter-area routes into stub +help: Do 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 14c9df74..9b886467 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: Set nssa OSPF area +help: 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 07d0607b..803f29ab 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: Set nssa-abr +help: 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/default-cost/node.def b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def index 25320ad5..3f192213 100644 --- a/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def +++ b/templates/protocols/ospf/area/node.tag/area-type/stub/default-cost/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set the summary-default cost of stub area +help: Summary-default cost of stub area syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Cost must be between 0-16777215" val_help: u32:0-16777215; Summary default cost of stub area 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 fdafe0db..d831fac5 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: Set to not inject inter-area routes into stub +help: Do not inject inter-area routes into stub create: vtysh -c "configure terminal" \ 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 5f5bef18..d4c2eb99 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: Set stub OSPF area +help: Stub OSPF area syntax:expression: ! $VAR(../../@) in "0", "0.0.0.0"; "Backbone can't be stub" diff --git a/templates/protocols/ospf/area/node.tag/authentication/node.def b/templates/protocols/ospf/area/node.tag/authentication/node.def index 9616e27c..5cb9839d 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: Set OSPF area authentication type +help: OSPF area authentication type allowed: echo "plaintext-password md5" 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 990070dd..9422f008 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: Set OSPF network [REQUIRED] +help: OSPF network [REQUIRED] syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" create:vtysh -c "configure terminal" \ -c "router ospf" -c "network $VAR(@) area $VAR(../@)" diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def index 72004a5e..94a90ed3 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: Set to summarize routes matching prefix (border routers only) +help: Summarize routes matching prefix (border routers only) syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" delete: touch /tmp/ospf-range.$PPID 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 cbdd1aa7..8bad1734 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,4 +1,4 @@ type: u32 -help: Set metric for this range +help: Metric for this range syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777215; "Metric must be between 0-16777215" val_help: u32: 0-16777215; Metric for this range 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 4728b0f3..dd6453ce 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: Set to not advertise this range +help: Do not advertise this range create:expression: "vtysh -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 ab3b85ba..f3a8e64d 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,3 +1,3 @@ type: ipv4net -help: Set to announce area range as another prefix +help: Announce area range as another prefix syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" diff --git a/templates/protocols/ospf/area/node.tag/shortcut/node.def b/templates/protocols/ospf/area/node.tag/shortcut/node.def index 6749ac11..2e42ddaa 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: Set area's shortcut mode +help: Area's shortcut mode allowed: echo "default disable enable" syntax:expression: $VAR(@) in "default", "disable", "enable"; "Must be (default, disable, enable)" val_help: default; Set default; 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 4f8e71f0..7843530f 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: Set a virtual link +help: Virtual link syntax:expression: ! $VAR(../@) in "0", "0.0.0.0"; "Can't configure VL over area $VAR(../@)" create:expression: "vtysh -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 da1451a4..3a5c98de 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: Set MD5 key id +help: MD5 key id syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)" val_help: u32:1-255; MD5 key id diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/key-id/node.tag/md5-key/node.def index 29200bd1..34572058 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: Set MD5 key +help: MD5 key val_help: MD5 Key (16 characters or less) syntax:expression: exec " \ 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 2fd13feb..312efb87 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: Set MD5 key id +help: MD5 key id commit:expression: $VAR(../plaintext-password/) == "" ; "plaintext-password already set" create: vtysh -c "configure terminal" \ 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 2712c790..180851c4 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: Set authentication +help: 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 16d2fde0..bf6d0051 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: Set plain text password +help: Plain text password val_help: Plain text password (8 characters or less) syntax:expression: exec " \ 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 1b8d0ea1..e4f67e87 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: Set interval after which a neighbor is declared dead +help: Interval after which a neighbor is declared dead val_help: u32:1-65535; Neighbor dead interval (seconds) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" 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 8fed1181..a9fc9be1 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: Set interval between hello packets +help: Interval between hello packets val_help: u32:1-65535; Hello interval (seconds) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" 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 62f02f2c..f3724090 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: Set interval between retransmitting lost link state advertisements +help: Interval between retransmitting lost link state advertisements val_help: u32:1-65535; Retransmit interval (seconds) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" 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 9c2f9e10..bf7b1440 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: Set link state transmit delay +help: Link state transmit delay val_help: u32:1-65535; Link state transmit delay (seconds) syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535" diff --git a/templates/protocols/ospf/auto-cost/node.def b/templates/protocols/ospf/auto-cost/node.def index f7f8dc23..5ea6ce6f 100644 --- a/templates/protocols/ospf/auto-cost/node.def +++ b/templates/protocols/ospf/auto-cost/node.def @@ -1 +1 @@ -help: Set to calculate OSPF interface cost according to bandwidth +help: 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 b0405e4c..110d3fc0 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: Set to use reference bandwidth method to assign OSPF cost +help: 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 1c2edbe4..7cd4ddbc 100644 --- a/templates/protocols/ospf/default-information/node.def +++ b/templates/protocols/ospf/default-information/node.def @@ -1 +1 @@ -help: Set to control distribution of default information +help: 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 7e238873..31ce00db 100644 --- a/templates/protocols/ospf/default-information/originate/always/node.def +++ b/templates/protocols/ospf/default-information/originate/always/node.def @@ -1 +1 @@ -help: Set to always advertise default route +help: 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 84973f8b..a5924566 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: Set OSPF metric type for default routes +help: OSPF metric type for default routes default: 2 syntax:expression: $VAR(@) in 1, 2 ; "metric must be either 1 or 2" val_help: u32:1-2; Metric type for default routes (default 2) diff --git a/templates/protocols/ospf/default-information/originate/metric/node.def b/templates/protocols/ospf/default-information/originate/metric/node.def index 86ecbfa1..99a755cb 100644 --- a/templates/protocols/ospf/default-information/originate/metric/node.def +++ b/templates/protocols/ospf/default-information/originate/metric/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set OSPF default metric +help: OSPF default metric syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "must be between 0-16777214" val_help: u32:0-16777214; Default metric diff --git a/templates/protocols/ospf/default-information/originate/node.def b/templates/protocols/ospf/default-information/originate/node.def index c1646b9d..f5d50e06 100644 --- a/templates/protocols/ospf/default-information/originate/node.def +++ b/templates/protocols/ospf/default-information/originate/node.def @@ -1,4 +1,4 @@ -help: Set to distribute a default route +help: Distribute a default route delete: touch /tmp/ospf-default-info.$PPID end: if [ -f "/tmp/ospf-default-info.$PPID" ]; then vtysh -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 f5811b9d..c7943078 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: Set route map reference +help: Route map reference diff --git a/templates/protocols/ospf/default-metric/node.def b/templates/protocols/ospf/default-metric/node.def index db5c9422..926fed1f 100644 --- a/templates/protocols/ospf/default-metric/node.def +++ b/templates/protocols/ospf/default-metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric of redistributed routes +help: Metric of redistributed routes syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777214; "Must be between 0-16777214" val_help: u32:0-16777214; Metric of redistributed routes diff --git a/templates/protocols/ospf/distance/global/node.def b/templates/protocols/ospf/distance/global/node.def index a4c743c0..9c6b62b2 100644 --- a/templates/protocols/ospf/distance/global/node.def +++ b/templates/protocols/ospf/distance/global/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set OSPF administrative distance +help: OSPF administrative distance val_help: u32:1-255; Administrative distance" syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" diff --git a/templates/protocols/ospf/distance/node.def b/templates/protocols/ospf/distance/node.def index cb26cb98..97a8c1c4 100644 --- a/templates/protocols/ospf/distance/node.def +++ b/templates/protocols/ospf/distance/node.def @@ -1 +1 @@ -help: Set an administrative distance +help: Administrative distance diff --git a/templates/protocols/ospf/distance/ospf/external/node.def b/templates/protocols/ospf/distance/ospf/external/node.def index e9619b1e..32ba607e 100644 --- a/templates/protocols/ospf/distance/ospf/external/node.def +++ b/templates/protocols/ospf/distance/ospf/external/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set a distance for external routes +help: Distance for external routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" val_help: u32: 1-255; Distance for external routes diff --git a/templates/protocols/ospf/distance/ospf/inter-area/node.def b/templates/protocols/ospf/distance/ospf/inter-area/node.def index dcec0673..496a4cf6 100644 --- a/templates/protocols/ospf/distance/ospf/inter-area/node.def +++ b/templates/protocols/ospf/distance/ospf/inter-area/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set a distance for inter-area routes +help: Distance for inter-area routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" val_help: u32:1-255; Distance for inter-area routes diff --git a/templates/protocols/ospf/distance/ospf/intra-area/node.def b/templates/protocols/ospf/distance/ospf/intra-area/node.def index 964a032d..7db14c3b 100644 --- a/templates/protocols/ospf/distance/ospf/intra-area/node.def +++ b/templates/protocols/ospf/distance/ospf/intra-area/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set a distance for intra-area routes +help: Distance for intra-area routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between 1-255" val_help: u32:1-255; Distance for intra-area routes diff --git a/templates/protocols/ospf/distance/ospf/node.def b/templates/protocols/ospf/distance/ospf/node.def index 85329600..b9527712 100644 --- a/templates/protocols/ospf/distance/ospf/node.def +++ b/templates/protocols/ospf/distance/ospf/node.def @@ -1,4 +1,4 @@ -help: Set OSPF administrative distance +help: 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 49c8c0de..e82c03ff 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: Set to log all state changes +help: Log all state changes create:expression: "vtysh -c \"configure terminal\" -c \"router ospf\" \ -c \"log-adjacency-changes detail\"; " delete:expression: "vtysh -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 d8789d98..e919f971 100644 --- a/templates/protocols/ospf/log-adjacency-changes/node.def +++ b/templates/protocols/ospf/log-adjacency-changes/node.def @@ -1,4 +1,4 @@ -help: Set to log changes in adjacency state +help: Log changes in adjacency state create:expression: "vtysh -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 d40ccc2a..aafed348 100644 --- a/templates/protocols/ospf/max-metric/node.def +++ b/templates/protocols/ospf/max-metric/node.def @@ -1 +1 @@ -help: Set OSPF maximum/infinite-distance metric +help: 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 96b17e75..d0ec588a 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: Set to administratively apply, for an indefinite period +help: Administratively apply, for an indefinite period create:expression: "vtysh -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 8f4248c2..7371f9a9 100644 --- a/templates/protocols/ospf/max-metric/router-lsa/node.def +++ b/templates/protocols/ospf/max-metric/router-lsa/node.def @@ -1 +1 @@ -help: Set to advertise own Router-LSA with infinite distance (stub router) +help: 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 1d51784e..b0f807de 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: Set to advertise stub-router prior to full shutdown of OSPF +help: Advertise stub-router prior to full shutdown of OSPF syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds" val_help: u32:5-86400; Time (seconds) to advertise self as stub-router 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 e0045614..d54d3012 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: Set to automatically advertise stub Router-LSA on startup of OSPF +help: Automatically advertise stub Router-LSA on startup of OSPF syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds" val_help: u32:5-86400; Time (seconds) to advertise self as stub-router diff --git a/templates/protocols/ospf/mpls-te/node.def b/templates/protocols/ospf/mpls-te/node.def index e138a407..19886f3b 100644 --- a/templates/protocols/ospf/mpls-te/node.def +++ b/templates/protocols/ospf/mpls-te/node.def @@ -1 +1 @@ -help: Set MultiProtocol Label Switching-Traffic Engineering (MPLS-TE) parameters +help: 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 e849f8b3..1e69402d 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: Set stable IP address of the advertising router +help: Stable IP address of the advertising router update:expression: "vtysh -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 84491993..7db35e22 100644 --- a/templates/protocols/ospf/neighbor/node.def +++ b/templates/protocols/ospf/neighbor/node.def @@ -1,6 +1,6 @@ tag: type: ipv4 -help: Set neighbor IP address +help: Neighbor IP address create:expression: "vtysh -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 ec0a9a9d..adabde15 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: Set dead neighbor polling interval +help: Dead neighbor polling interval default: 60 val_help: u32:1-65535; Seconds between dead neighbor polling interval (default 60) diff --git a/templates/protocols/ospf/neighbor/node.tag/priority/node.def b/templates/protocols/ospf/neighbor/node.tag/priority/node.def index ab235b5f..d9b61457 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: Set neighbor priority in seconds +help: Neighbor priority in seconds default: 0 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Priority must be between 0-255" val_help: u32:0-255; Neighbor priority (default 0) diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def index a2262b24..cf71ff05 100644 --- a/templates/protocols/ospf/node.def +++ b/templates/protocols/ospf/node.def @@ -1,4 +1,4 @@ priority: 620 -help: Configure Open Shortest Path First protocol (OSPF) parameters +help: Open Shortest Path First protocol (OSPF) parameters create: vtysh -c "configure terminal" -c "router ospf" delete: vtysh -c "configure terminal" -c "no router ospf" diff --git a/templates/protocols/ospf/parameters/abr-type/node.def b/templates/protocols/ospf/parameters/abr-type/node.def index 1af93c67..328574e5 100644 --- a/templates/protocols/ospf/parameters/abr-type/node.def +++ b/templates/protocols/ospf/parameters/abr-type/node.def @@ -1,5 +1,5 @@ type: txt -help: Set OSPF ABR type +help: OSPF ABR type default: "cisco" syntax:expression: $VAR(@) in "cisco", "ibm", "shortcut", "standard"; "Must be (cisco, ibm, shortcut, standard)" val_help: cisco; Cisco ABR type (default) diff --git a/templates/protocols/ospf/parameters/node.def b/templates/protocols/ospf/parameters/node.def index 7dde93d7..0864bb0b 100644 --- a/templates/protocols/ospf/parameters/node.def +++ b/templates/protocols/ospf/parameters/node.def @@ -1,2 +1,2 @@ priority: 610 -help: Set OSPF specific parameters +help: OSPF specific parameters diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def index abd4211d..e1b073fe 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: Set to override the default router identifier +help: Override the default router identifier update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"ospf router-id $VAR(@)\" " diff --git a/templates/protocols/ospf/passive-interface-exclude/node.def b/templates/protocols/ospf/passive-interface-exclude/node.def index fb1b91ca..e11b8143 100644 --- a/templates/protocols/ospf/passive-interface-exclude/node.def +++ b/templates/protocols/ospf/passive-interface-exclude/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set interface to exclude when using 'passive-interface default' +help: Interface to exclude when using 'passive-interface default' val_help:<interface>; Interface to exclude from 'passive-interface default' allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def index 95794e51..f73f9166 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: Set to suppress routing updates on an interface +help: Suppress routing updates on an interface allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default val_help:<interface>; Interface to be passive (i.e. suppress routing updates) val_help:default; Default to suppress routing updates on all interfaces diff --git a/templates/protocols/ospf/redistribute/bgp/metric-type/node.def b/templates/protocols/ospf/redistribute/bgp/metric-type/node.def index 55ed97cc..e49f528c 100644 --- a/templates/protocols/ospf/redistribute/bgp/metric-type/node.def +++ b/templates/protocols/ospf/redistribute/bgp/metric-type/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set OSPF metric type +help: OSPF metric type default: 2 syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2" val_help: u32:1-2; Metric type (default 2) diff --git a/templates/protocols/ospf/redistribute/bgp/metric/node.def b/templates/protocols/ospf/redistribute/bgp/metric/node.def index 9d71b46a..87ba8418 100644 --- a/templates/protocols/ospf/redistribute/bgp/metric/node.def +++ b/templates/protocols/ospf/redistribute/bgp/metric/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" val_help: u32:1-16; Metric for redistributed routes diff --git a/templates/protocols/ospf/redistribute/bgp/node.def b/templates/protocols/ospf/redistribute/bgp/node.def index 573b0e82..3630705c 100644 --- a/templates/protocols/ospf/redistribute/bgp/node.def +++ b/templates/protocols/ospf/redistribute/bgp/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute BGP routes +help: Redistribute BGP routes delete:expression: "touch /tmp/ospf-redist-bgp.$PPID" end: vtysh -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 cf70580f..a56f5668 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: Set route map reference +help: 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-type/node.def b/templates/protocols/ospf/redistribute/connected/metric-type/node.def index 55ed97cc..e49f528c 100644 --- a/templates/protocols/ospf/redistribute/connected/metric-type/node.def +++ b/templates/protocols/ospf/redistribute/connected/metric-type/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set OSPF metric type +help: OSPF metric type default: 2 syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2" val_help: u32:1-2; Metric type (default 2) diff --git a/templates/protocols/ospf/redistribute/connected/metric/node.def b/templates/protocols/ospf/redistribute/connected/metric/node.def index 9d71b46a..87ba8418 100644 --- a/templates/protocols/ospf/redistribute/connected/metric/node.def +++ b/templates/protocols/ospf/redistribute/connected/metric/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" val_help: u32:1-16; Metric for redistributed routes diff --git a/templates/protocols/ospf/redistribute/connected/node.def b/templates/protocols/ospf/redistribute/connected/node.def index 98b864fd..49944a71 100644 --- a/templates/protocols/ospf/redistribute/connected/node.def +++ b/templates/protocols/ospf/redistribute/connected/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute connected routes +help: Redistribute connected routes delete:expression: "touch /tmp/ospf-redist-connected.$PPID" end: vtysh -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 3f570311..f2c6f7c2 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: Set route map reference +help: 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-type/node.def b/templates/protocols/ospf/redistribute/kernel/metric-type/node.def index 55ed97cc..e49f528c 100644 --- a/templates/protocols/ospf/redistribute/kernel/metric-type/node.def +++ b/templates/protocols/ospf/redistribute/kernel/metric-type/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set OSPF metric type +help: OSPF metric type default: 2 syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2" val_help: u32:1-2; Metric type (default 2) diff --git a/templates/protocols/ospf/redistribute/kernel/metric/node.def b/templates/protocols/ospf/redistribute/kernel/metric/node.def index 9d71b46a..87ba8418 100644 --- a/templates/protocols/ospf/redistribute/kernel/metric/node.def +++ b/templates/protocols/ospf/redistribute/kernel/metric/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" val_help: u32:1-16; Metric for redistributed routes diff --git a/templates/protocols/ospf/redistribute/kernel/node.def b/templates/protocols/ospf/redistribute/kernel/node.def index 5e2fc586..0ad09cf5 100644 --- a/templates/protocols/ospf/redistribute/kernel/node.def +++ b/templates/protocols/ospf/redistribute/kernel/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute kernel routes +help: Redistribute kernel routes delete:expression: "touch /tmp/ospf-redist-kernel.$PPID" end: vtysh -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 3f570311..f2c6f7c2 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: Set route map reference +help: 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 0f60ac58..00eefa88 100644 --- a/templates/protocols/ospf/redistribute/node.def +++ b/templates/protocols/ospf/redistribute/node.def @@ -1 +1 @@ -help: Set to redistribute information from another routing protocol +help: Redistribute information from another routing protocol diff --git a/templates/protocols/ospf/redistribute/rip/metric-type/node.def b/templates/protocols/ospf/redistribute/rip/metric-type/node.def index 55ed97cc..e49f528c 100644 --- a/templates/protocols/ospf/redistribute/rip/metric-type/node.def +++ b/templates/protocols/ospf/redistribute/rip/metric-type/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set OSPF metric type +help: OSPF metric type default: 2 syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2" val_help: u32:1-2; Metric type (default 2) diff --git a/templates/protocols/ospf/redistribute/rip/metric/node.def b/templates/protocols/ospf/redistribute/rip/metric/node.def index 9d71b46a..87ba8418 100644 --- a/templates/protocols/ospf/redistribute/rip/metric/node.def +++ b/templates/protocols/ospf/redistribute/rip/metric/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" val_help: u32:1-16; Metric for redistributed routes diff --git a/templates/protocols/ospf/redistribute/rip/node.def b/templates/protocols/ospf/redistribute/rip/node.def index 48552329..0dee3c0b 100644 --- a/templates/protocols/ospf/redistribute/rip/node.def +++ b/templates/protocols/ospf/redistribute/rip/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute RIP routes +help: Redistribute RIP routes delete:expression: "touch /tmp/ospf-redist-rip.$PPID" end: vtysh -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 3f570311..f2c6f7c2 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: Set route map reference +help: 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-type/node.def b/templates/protocols/ospf/redistribute/static/metric-type/node.def index 55ed97cc..e49f528c 100644 --- a/templates/protocols/ospf/redistribute/static/metric-type/node.def +++ b/templates/protocols/ospf/redistribute/static/metric-type/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set OSPF metric type +help: OSPF metric type default: 2 syntax:expression: $VAR(@) in 1, 2 ; "metric-type must be either 1 or 2" val_help: u32:1-2; Metric type (default 2) diff --git a/templates/protocols/ospf/redistribute/static/metric/node.def b/templates/protocols/ospf/redistribute/static/metric/node.def index 9d71b46a..87ba8418 100644 --- a/templates/protocols/ospf/redistribute/static/metric/node.def +++ b/templates/protocols/ospf/redistribute/static/metric/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" val_help: u32:1-16; Metric for redistributed routes diff --git a/templates/protocols/ospf/redistribute/static/node.def b/templates/protocols/ospf/redistribute/static/node.def index a9fc42d1..4f1cfda6 100644 --- a/templates/protocols/ospf/redistribute/static/node.def +++ b/templates/protocols/ospf/redistribute/static/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute static routes +help: Redistribute static routes delete:expression: "touch /tmp/ospf-redist-static.$PPID" end: vtysh -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 3f570311..f2c6f7c2 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: Set route map reference +help: 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 7ade431b..bfa1dca4 100644 --- a/templates/protocols/ospf/refresh/node.def +++ b/templates/protocols/ospf/refresh/node.def @@ -1 +1 @@ -help: Set to adjust refresh parameters +help: Adjust refresh parameters diff --git a/templates/protocols/ospf/refresh/timers/node.def b/templates/protocols/ospf/refresh/timers/node.def index e6002cc0..3f094b4f 100644 --- a/templates/protocols/ospf/refresh/timers/node.def +++ b/templates/protocols/ospf/refresh/timers/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set refresh timer +help: Refresh timer syntax:expression: $VAR(@) >= 10 && $VAR(@) <= 1800; "must be between 10-1800" val_help: u32:10-1800; Timer value in seconds diff --git a/templates/protocols/ospf/timers/node.def b/templates/protocols/ospf/timers/node.def index 499649fb..8c4873b2 100644 --- a/templates/protocols/ospf/timers/node.def +++ b/templates/protocols/ospf/timers/node.def @@ -1 +1 @@ -help: Set to adjust routing timers +help: Adjust routing timers diff --git a/templates/protocols/ospf/timers/throttle/node.def b/templates/protocols/ospf/timers/throttle/node.def index 6389a9c3..0854aae8 100644 --- a/templates/protocols/ospf/timers/throttle/node.def +++ b/templates/protocols/ospf/timers/throttle/node.def @@ -1 +1 @@ -help: Set throttling adaptive timers +help: 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 cd4c2a25..14189c16 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: Set delay (msec) from first change received till SPF calculation +help: Delay (msec) from first change received till SPF calculation default: 200 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000" val_help: u32:0-600000; Delay in msec (default 200) diff --git a/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def b/templates/protocols/ospf/timers/throttle/spf/initial-holdtime/node.def index 65dfb1a6..1f095b95 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: Set initial hold time(msec) between consecutive SPF calculations +help: Initial hold time(msec) between consecutive SPF calculations default: 1000 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000" val_help: u32:0-600000; Initial hold time in msec (default 1000) diff --git a/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def b/templates/protocols/ospf/timers/throttle/spf/max-holdtime/node.def index 2c188c45..fd26a404 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: Set maximum hold time (msec) +help: Maximum hold time (msec) default: 10000 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 600000; "must be between 0-600000" val_help: u32:0-600000; Max hold time in msec (default 10000) diff --git a/templates/protocols/ospf/timers/throttle/spf/node.def b/templates/protocols/ospf/timers/throttle/spf/node.def index 1600d41c..a80e7bcc 100644 --- a/templates/protocols/ospf/timers/throttle/spf/node.def +++ b/templates/protocols/ospf/timers/throttle/spf/node.def @@ -1,4 +1,4 @@ -help: Set OSPF SPF timers +help: OSPF SPF timers delete: touch /tmp/ospf-timer.$PPID end: if [ -f "/tmp/ospf-timer.$PPID" ]; then vtysh -c "configure terminal" \ diff --git a/templates/protocols/ospfv3/area/node.def b/templates/protocols/ospfv3/area/node.def index 4a93fe93..73750abb 100644 --- a/templates/protocols/ospfv3/area/node.def +++ b/templates/protocols/ospfv3/area/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set OSPFv3 Area +help: OSPFv3 Area syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-ospf-area $VAR(@)"; "Invalid OSFPv3 area \"$VAR(@)\" " val_help: u32; OSPFv3 area in decimal notation val_help: ipv4; OSPFv3 area in dotted decimal notation diff --git a/templates/protocols/ospfv3/area/node.tag/export-list/node.def b/templates/protocols/ospfv3/area/node.tag/export-list/node.def index 756cd44e..a27ca264 100644 --- a/templates/protocols/ospfv3/area/node.tag/export-list/node.def +++ b/templates/protocols/ospfv3/area/node.tag/export-list/node.def @@ -1,5 +1,5 @@ type: txt -help: Set name of export-list +help: Name of export-list create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"area $VAR(../@) export-list $VAR(@) \"; " diff --git a/templates/protocols/ospfv3/area/node.tag/import-list/node.def b/templates/protocols/ospfv3/area/node.tag/import-list/node.def index 4a7cd641..cc689ab2 100644 --- a/templates/protocols/ospfv3/area/node.tag/import-list/node.def +++ b/templates/protocols/ospfv3/area/node.tag/import-list/node.def @@ -1,5 +1,5 @@ type: txt -help: Set name of import-list +help: Name of import-list create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"area $VAR(../@) import-list $VAR(@) \"; " diff --git a/templates/protocols/ospfv3/area/node.tag/interface/node.def b/templates/protocols/ospfv3/area/node.tag/interface/node.def index b7ce5d62..046b78d6 100644 --- a/templates/protocols/ospfv3/area/node.tag/interface/node.def +++ b/templates/protocols/ospfv3/area/node.tag/interface/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set OSPFv3 area interface +help: OSPFv3 area interface create: vtysh -c "configure terminal" -c "router ospf6" \ -c "interface $VAR(@) area $VAR(../@)" diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.def index 8b9cbc0c..4b594cd9 100644 --- a/templates/protocols/ospfv3/area/node.tag/range/node.def +++ b/templates/protocols/ospfv3/area/node.tag/range/node.def @@ -1,6 +1,6 @@ tag: type: ipv6net -help: Set to specify IPv6 prefix (border routers only) +help: Specify IPv6 prefix (border routers only) syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" delete: touch /tmp/ospf6-range.$PPID diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def index 8c781f13..81be1db0 100644 --- a/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def +++ b/templates/protocols/ospfv3/area/node.tag/range/node.tag/advertise/node.def @@ -1,4 +1,4 @@ -help: Set to advertise this range +help: Advertise this range create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6\" \ -c \"area $VAR(../../@) range $VAR(../@) advertise\"; " diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def index 09b35e71..d0a74ecd 100644 --- a/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def +++ b/templates/protocols/ospfv3/area/node.tag/range/node.tag/not-advertise/node.def @@ -1,4 +1,4 @@ -help: Set to not advertise this range +help: Do not advertise this range create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6\" \ -c \"area $VAR(../../@) range $VAR(../@) not-advertise\"; " diff --git a/templates/protocols/ospfv3/node.def b/templates/protocols/ospfv3/node.def index b79d63af..72e1886f 100644 --- a/templates/protocols/ospfv3/node.def +++ b/templates/protocols/ospfv3/node.def @@ -1,4 +1,4 @@ priority: 640 -help: Configure IPv6 Open Shortest Path First protocol (OSPFv3) parameters +help: IPv6 Open Shortest Path First protocol (OSPFv3) parameters create: vtysh -c "configure terminal" -c "router ospf6" delete: vtysh -c "configure terminal" -c "no router ospf6" diff --git a/templates/protocols/ospfv3/parameters/node.def b/templates/protocols/ospfv3/parameters/node.def index 0a5f888c..8f16d09d 100644 --- a/templates/protocols/ospfv3/parameters/node.def +++ b/templates/protocols/ospfv3/parameters/node.def @@ -1,2 +1,2 @@ priority: 630 -help: Set OSPFv3 specific parameters +help: OSPFv3 specific parameters diff --git a/templates/protocols/ospfv3/parameters/router-id/node.def b/templates/protocols/ospfv3/parameters/router-id/node.def index bccf295e..f0a02436 100644 --- a/templates/protocols/ospfv3/parameters/router-id/node.def +++ b/templates/protocols/ospfv3/parameters/router-id/node.def @@ -1,5 +1,5 @@ type: ipv4 -help: Set router identifier +help: Router identifier update:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6\" \ -c \"router-id $VAR(@)\" " diff --git a/templates/protocols/ospfv3/redistribute/bgp/node.def b/templates/protocols/ospfv3/redistribute/bgp/node.def index 72ea520e..3541a9a4 100644 --- a/templates/protocols/ospfv3/redistribute/bgp/node.def +++ b/templates/protocols/ospfv3/redistribute/bgp/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute bgp routes +help: Redistribute bgp routes end: vtysh -c "configure terminal" \ -c "router ospf6" \ diff --git a/templates/protocols/ospfv3/redistribute/bgp/route-map/node.def b/templates/protocols/ospfv3/redistribute/bgp/route-map/node.def index cf70580f..a56f5668 100644 --- a/templates/protocols/ospfv3/redistribute/bgp/route-map/node.def +++ b/templates/protocols/ospfv3/redistribute/bgp/route-map/node.def @@ -1,4 +1,4 @@ type: txt -help: Set route map reference +help: 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/ospfv3/redistribute/connected/node.def b/templates/protocols/ospfv3/redistribute/connected/node.def index ee7cd585..d9b43cb0 100644 --- a/templates/protocols/ospfv3/redistribute/connected/node.def +++ b/templates/protocols/ospfv3/redistribute/connected/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute connected routes +help: Redistribute connected routes end: vtysh -c "configure terminal" \ -c "router ospf6" \ diff --git a/templates/protocols/ospfv3/redistribute/connected/route-map/node.def b/templates/protocols/ospfv3/redistribute/connected/route-map/node.def index 3f570311..f2c6f7c2 100644 --- a/templates/protocols/ospfv3/redistribute/connected/route-map/node.def +++ b/templates/protocols/ospfv3/redistribute/connected/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: Set route map reference +help: 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/ospfv3/redistribute/kernel/node.def b/templates/protocols/ospfv3/redistribute/kernel/node.def index f61cb564..78fe7d36 100644 --- a/templates/protocols/ospfv3/redistribute/kernel/node.def +++ b/templates/protocols/ospfv3/redistribute/kernel/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute kernel routes +help: Redistribute kernel routes end: vtysh -c "configure terminal" \ -c "router ospf6" \ diff --git a/templates/protocols/ospfv3/redistribute/kernel/route-map/node.def b/templates/protocols/ospfv3/redistribute/kernel/route-map/node.def index 3f570311..f2c6f7c2 100644 --- a/templates/protocols/ospfv3/redistribute/kernel/route-map/node.def +++ b/templates/protocols/ospfv3/redistribute/kernel/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: Set route map reference +help: 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/ospfv3/redistribute/node.def b/templates/protocols/ospfv3/redistribute/node.def index 0f60ac58..00eefa88 100644 --- a/templates/protocols/ospfv3/redistribute/node.def +++ b/templates/protocols/ospfv3/redistribute/node.def @@ -1 +1 @@ -help: Set to redistribute information from another routing protocol +help: Redistribute information from another routing protocol diff --git a/templates/protocols/ospfv3/redistribute/ripng/node.def b/templates/protocols/ospfv3/redistribute/ripng/node.def index 6732c9da..f418999a 100644 --- a/templates/protocols/ospfv3/redistribute/ripng/node.def +++ b/templates/protocols/ospfv3/redistribute/ripng/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute RIPNG routes +help: Redistribute RIPNG routes end: vtysh -c "configure terminal" \ -c "router ospf6" \ diff --git a/templates/protocols/ospfv3/redistribute/ripng/route-map/node.def b/templates/protocols/ospfv3/redistribute/ripng/route-map/node.def index 3f570311..f2c6f7c2 100644 --- a/templates/protocols/ospfv3/redistribute/ripng/route-map/node.def +++ b/templates/protocols/ospfv3/redistribute/ripng/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: Set route map reference +help: 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/ospfv3/redistribute/static/node.def b/templates/protocols/ospfv3/redistribute/static/node.def index df31b1b1..d82d5f05 100644 --- a/templates/protocols/ospfv3/redistribute/static/node.def +++ b/templates/protocols/ospfv3/redistribute/static/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute static routes +help: Redistribute static routes end: vtysh -c "configure terminal" \ -c "router ospf6" \ diff --git a/templates/protocols/ospfv3/redistribute/static/route-map/node.def b/templates/protocols/ospfv3/redistribute/static/route-map/node.def index 3f570311..f2c6f7c2 100644 --- a/templates/protocols/ospfv3/redistribute/static/route-map/node.def +++ b/templates/protocols/ospfv3/redistribute/static/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: Set route map reference +help: 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/default-distance/node.def b/templates/protocols/rip/default-distance/node.def index 75cf3c33..6e56859e 100644 --- a/templates/protocols/rip/default-distance/node.def +++ b/templates/protocols/rip/default-distance/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set administrative distance +help: Administrative distance syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255" val_help: u32:1-255; Administrative distance diff --git a/templates/protocols/rip/default-information/node.def b/templates/protocols/rip/default-information/node.def index 47215862..7d35a646 100644 --- a/templates/protocols/rip/default-information/node.def +++ b/templates/protocols/rip/default-information/node.def @@ -1 +1 @@ -help: Set to control distribution of default route +help: 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 9ecbe683..8cae1f70 100644 --- a/templates/protocols/rip/default-information/originate/node.def +++ b/templates/protocols/rip/default-information/originate/node.def @@ -1,4 +1,4 @@ -help: Set to distribute a default route +help: Distribute a default route create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"default-information originate\" " delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ diff --git a/templates/protocols/rip/default-metric/node.def b/templates/protocols/rip/default-metric/node.def index 870860eb..e0da34b4 100644 --- a/templates/protocols/rip/default-metric/node.def +++ b/templates/protocols/rip/default-metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric of redistributed routes +help: Metric of redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16" val_help: u32:1-16; Redistributed routes metric 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 124705b2..0867f371 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: Set access-list to apply to input packets +help: 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: "vtysh -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 d7baa021..0cb37cd4 100644 --- a/templates/protocols/rip/distribute-list/access-list/node.def +++ b/templates/protocols/rip/distribute-list/access-list/node.def @@ -1 +1 @@ -help: Set access-list +help: 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 77810a46..09ede9c9 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: Set access-list to apply to output packets +help: 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: "vtysh -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 749e5fb5..1a725d47 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: Set to apply filtering to an interface +help: 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 ac16b25f..2e5a609d 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: Set access-list to apply to input packets +help: 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: "vtysh -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 d7baa021..0cb37cd4 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: Set access-list +help: 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 8f58be0f..d99db7ff 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: Set access-list to apply to output packets +help: 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: "vtysh -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 4dbe19c4..8395ca12 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: Set prefix-list to apply to input packets +help: 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: "vtysh -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 30eb3f3f..2aa289c3 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: Set prefix-list +help: 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 51707b0f..4fbcf8a9 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: Set prefix-list to apply to output packets +help: 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: "vtysh -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 f7255a70..34c3cd35 100644 --- a/templates/protocols/rip/distribute-list/node.def +++ b/templates/protocols/rip/distribute-list/node.def @@ -1,2 +1,2 @@ -help: Set to filter networks in routing updates +help: 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 89f95bcb..577ddc94 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: Set prefix-list to apply to input packets +help: 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: "vtysh -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 30eb3f3f..2aa289c3 100644 --- a/templates/protocols/rip/distribute-list/prefix-list/node.def +++ b/templates/protocols/rip/distribute-list/prefix-list/node.def @@ -1 +1 @@ -help: Set prefix-list +help: 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 598eeaa5..ee4a7067 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: Set prefix-list to apply to output packets +help: 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: "vtysh -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 2b4c75fe..be1db113 100644 --- a/templates/protocols/rip/interface/node.def +++ b/templates/protocols/rip/interface/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set interface name +help: Interface name commit:expression: exec " \ if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \ echo 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 f9359405..4037c759 100644 --- a/templates/protocols/rip/neighbor/node.def +++ b/templates/protocols/rip/neighbor/node.def @@ -1,6 +1,6 @@ multi: type: ipv4 -help: Set a neighbor router +help: Neighbor router create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"neighbor $VAR(@)\"; " delete:expression: "vtysh -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 74be87b8..5430f67e 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: Set source network +help: Source network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $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/distance/node.def b/templates/protocols/rip/network-distance/node.tag/distance/node.def index 56735bf6..3816ca3f 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: Set administrative distance for network +help: Administrative distance for network syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "must be between 1 and 255" val_help: u32:1-255; Administrative distance diff --git a/templates/protocols/rip/network/node.def b/templates/protocols/rip/network/node.def index 82ee17be..28f92307 100644 --- a/templates/protocols/rip/network/node.def +++ b/templates/protocols/rip/network/node.def @@ -1,6 +1,6 @@ multi: type: ipv4net -help: Set RIP network +help: RIP network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"network $VAR(@)\"; " diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def index c8224308..b5f02e5c 100644 --- a/templates/protocols/rip/node.def +++ b/templates/protocols/rip/node.def @@ -1,4 +1,4 @@ priority: 650 -help: Configure Routing Information Protocol (RIP) parameters +help: Routing Information Protocol (RIP) parameters create: vtysh -c "configure terminal" -c "router rip" delete: vtysh -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 a3a17f12..af95f815 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: Set to suppress routing updates on an interface +help: 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 e2c104a6..8446e404 100644 --- a/templates/protocols/rip/redistribute/bgp/metric/node.def +++ b/templates/protocols/rip/redistribute/bgp/metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes val_help: u32:1-16; Redistribute route metric 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 1ac42adb..b7108a73 100644 --- a/templates/protocols/rip/redistribute/bgp/node.def +++ b/templates/protocols/rip/redistribute/bgp/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute BGP routes +help: Redistribute BGP routes delete:expression: "touch /tmp/rip-redist-bgp.$PPID" end:expression: "vtysh -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 cf70580f..a56f5668 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: Set route map reference +help: 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 e2c104a6..8446e404 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: Set metric for redistributed routes +help: Metric for redistributed routes val_help: u32:1-16; Redistribute route metric 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 4bd5c8c3..a8b56646 100644 --- a/templates/protocols/rip/redistribute/connected/node.def +++ b/templates/protocols/rip/redistribute/connected/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute connected routes +help: Redistribute connected routes delete:expression: "touch /tmp/rip-redist-connected.$PPID" end:expression: "vtysh -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 3f570311..f2c6f7c2 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: Set route map reference +help: 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 e2c104a6..8446e404 100644 --- a/templates/protocols/rip/redistribute/kernel/metric/node.def +++ b/templates/protocols/rip/redistribute/kernel/metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes val_help: u32:1-16; Redistribute route metric 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 d7ef7420..33dd0e1a 100644 --- a/templates/protocols/rip/redistribute/kernel/node.def +++ b/templates/protocols/rip/redistribute/kernel/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute kernel routes +help: Redistribute kernel routes delete:expression: "touch /tmp/rip-redist-kernel.$PPID" end:expression: "vtysh -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 3f570311..f2c6f7c2 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: Set route map reference +help: 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 0f60ac58..00eefa88 100644 --- a/templates/protocols/rip/redistribute/node.def +++ b/templates/protocols/rip/redistribute/node.def @@ -1 +1 @@ -help: Set to redistribute information from another routing protocol +help: 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 8d752e7d..808090c7 100644 --- a/templates/protocols/rip/redistribute/ospf/metric/node.def +++ b/templates/protocols/rip/redistribute/ospf/metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes val_help: u32:1-16; Redistribute route metric 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 8c97dba9..c6a90534 100644 --- a/templates/protocols/rip/redistribute/ospf/node.def +++ b/templates/protocols/rip/redistribute/ospf/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute OSPF routes +help: Redistribute OSPF routes delete:expression: "touch /tmp/rip-redist-ospf.$PPID" end:expression: "vtysh -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 3f570311..f2c6f7c2 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: Set route map reference +help: 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 e2c104a6..8446e404 100644 --- a/templates/protocols/rip/redistribute/static/metric/node.def +++ b/templates/protocols/rip/redistribute/static/metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes val_help: u32:1-16; Redistribute route metric 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 728bf6f2..8ce4a0b0 100644 --- a/templates/protocols/rip/redistribute/static/node.def +++ b/templates/protocols/rip/redistribute/static/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute static routes +help: Redistribute static routes delete:expression: "touch /tmp/rip-redist-static.$PPID" end:expression: "vtysh -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 3f570311..f2c6f7c2 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: Set route map reference +help: 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 81638c9a..f92b933f 100644 --- a/templates/protocols/rip/route/node.def +++ b/templates/protocols/rip/route/node.def @@ -1,6 +1,6 @@ multi: type: ipv4net -help: Set RIP static route +help: RIP static route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \ -c \"route $VAR(@)\" " diff --git a/templates/protocols/rip/timers/node.def b/templates/protocols/rip/timers/node.def index 51b2cf17..c8132c64 100644 --- a/templates/protocols/rip/timers/node.def +++ b/templates/protocols/rip/timers/node.def @@ -1,4 +1,4 @@ -help: Set RIP timer values +help: RIP timer values delete: touch /tmp/rip-timers.$PPID diff --git a/templates/protocols/rip/timers/timeout/node.def b/templates/protocols/rip/timers/timeout/node.def index ce2e172a..391807a9 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: Set routing information timeout timer +help: Routing information timeout timer syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \ "Timeout timer must be between 5 and 2147483647" val_help: u32:5-2147483647; Routing information timeout timer (default 180) diff --git a/templates/protocols/rip/timers/update/node.def b/templates/protocols/rip/timers/update/node.def index 1b34c5ae..88795cc4 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: Set routing table update timer +help: Routing table update timer syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \ "Update timer must be between 5 and 2147483647" val_help: u32:5-2147483647; Routing table update timer in seconds (default 30) diff --git a/templates/protocols/ripng/aggregate-address/node.def b/templates/protocols/ripng/aggregate-address/node.def index 5532eb83..9b8c90d1 100644 --- a/templates/protocols/ripng/aggregate-address/node.def +++ b/templates/protocols/ripng/aggregate-address/node.def @@ -1,6 +1,6 @@ multi: type: ipv6net -help: Set aggregate RIPng route announcement +help: Aggregate RIPng route announcement syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" diff --git a/templates/protocols/ripng/default-information/node.def b/templates/protocols/ripng/default-information/node.def index 47215862..7d35a646 100644 --- a/templates/protocols/ripng/default-information/node.def +++ b/templates/protocols/ripng/default-information/node.def @@ -1 +1 @@ -help: Set to control distribution of default route +help: Control distribution of default route diff --git a/templates/protocols/ripng/default-information/originate/node.def b/templates/protocols/ripng/default-information/originate/node.def index eb392758..bad74c43 100644 --- a/templates/protocols/ripng/default-information/originate/node.def +++ b/templates/protocols/ripng/default-information/originate/node.def @@ -1,4 +1,4 @@ -help: Set to distribute a default route +help: Distribute a default route create: vtysh -c "configure terminal" \ -c "router ripng" \ diff --git a/templates/protocols/ripng/default-metric/node.def b/templates/protocols/ripng/default-metric/node.def index 380a3a30..dcbb7723 100644 --- a/templates/protocols/ripng/default-metric/node.def +++ b/templates/protocols/ripng/default-metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric of redistributed routes +help: Metric of redistributed routes syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "Must be between 1-16" val_help: u32:1-16; Default metric diff --git a/templates/protocols/ripng/distribute-list/access-list/in/node.def b/templates/protocols/ripng/distribute-list/access-list/in/node.def index f04150f0..08e86039 100644 --- a/templates/protocols/ripng/distribute-list/access-list/in/node.def +++ b/templates/protocols/ripng/distribute-list/access-list/in/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set access-list to apply to input packets +help: 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" diff --git a/templates/protocols/ripng/distribute-list/access-list/node.def b/templates/protocols/ripng/distribute-list/access-list/node.def index d7baa021..0cb37cd4 100644 --- a/templates/protocols/ripng/distribute-list/access-list/node.def +++ b/templates/protocols/ripng/distribute-list/access-list/node.def @@ -1 +1 @@ -help: Set access-list +help: Access list diff --git a/templates/protocols/ripng/distribute-list/access-list/out/node.def b/templates/protocols/ripng/distribute-list/access-list/out/node.def index 0c086528..484f6b55 100644 --- a/templates/protocols/ripng/distribute-list/access-list/out/node.def +++ b/templates/protocols/ripng/distribute-list/access-list/out/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set access-list to apply to output packets +help: 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" diff --git a/templates/protocols/ripng/distribute-list/interface/node.def b/templates/protocols/ripng/distribute-list/interface/node.def index 2c29dde8..b5e5bc16 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set to apply filtering to an interface +help: Apply filtering to an interface allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all syntax:expression: exec "\ if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \ diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def index a481d8ef..7b5fb546 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/in/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set access-list to apply to input packets +help: 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" diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/node.def index d7baa021..0cb37cd4 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/node.def @@ -1 +1 @@ -help: Set access-list +help: Access list diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def index fa0c54c4..201b4b53 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.tag/access-list/out/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set access-list to apply to output packets +help: 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" diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def index cd2e4aad..d0c950d0 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/in/node.def @@ -1,5 +1,5 @@ type: txt -help: Set prefix-list to apply to input packets +help: 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" diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/node.def index 30eb3f3f..2aa289c3 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/node.def @@ -1 +1 @@ -help: Set prefix-list +help: Prefix-list diff --git a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def index 2c847580..d0bee3d1 100644 --- a/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def +++ b/templates/protocols/ripng/distribute-list/interface/node.tag/prefix-list/out/node.def @@ -1,5 +1,5 @@ type: txt -help: Set prefix-list to apply to output packets +help: 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" diff --git a/templates/protocols/ripng/distribute-list/node.def b/templates/protocols/ripng/distribute-list/node.def index f7255a70..34c3cd35 100644 --- a/templates/protocols/ripng/distribute-list/node.def +++ b/templates/protocols/ripng/distribute-list/node.def @@ -1,2 +1,2 @@ -help: Set to filter networks in routing updates +help: Filter networks in routing updates diff --git a/templates/protocols/ripng/distribute-list/prefix-list/in/node.def b/templates/protocols/ripng/distribute-list/prefix-list/in/node.def index 3897a132..8dde8857 100644 --- a/templates/protocols/ripng/distribute-list/prefix-list/in/node.def +++ b/templates/protocols/ripng/distribute-list/prefix-list/in/node.def @@ -1,5 +1,5 @@ type: txt -help: Set prefix-list to apply to input packets +help: 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" diff --git a/templates/protocols/ripng/distribute-list/prefix-list/node.def b/templates/protocols/ripng/distribute-list/prefix-list/node.def index 30eb3f3f..2aa289c3 100644 --- a/templates/protocols/ripng/distribute-list/prefix-list/node.def +++ b/templates/protocols/ripng/distribute-list/prefix-list/node.def @@ -1 +1 @@ -help: Set prefix-list +help: Prefix-list diff --git a/templates/protocols/ripng/distribute-list/prefix-list/out/node.def b/templates/protocols/ripng/distribute-list/prefix-list/out/node.def index 49e38358..0db1bc3f 100644 --- a/templates/protocols/ripng/distribute-list/prefix-list/out/node.def +++ b/templates/protocols/ripng/distribute-list/prefix-list/out/node.def @@ -1,5 +1,5 @@ type: txt -help: Set prefix-list to apply to output packets +help: 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" diff --git a/templates/protocols/ripng/interface/node.def b/templates/protocols/ripng/interface/node.def index 3df2dd3e..0aee4971 100644 --- a/templates/protocols/ripng/interface/node.def +++ b/templates/protocols/ripng/interface/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set interface name +help: Interface name allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all commit:expression: exec " \ if [ -z \"`ip addr | grep $VAR(@) `\" ]; then \ diff --git a/templates/protocols/ripng/network/node.def b/templates/protocols/ripng/network/node.def index 163ba2cc..158fa54c 100644 --- a/templates/protocols/ripng/network/node.def +++ b/templates/protocols/ripng/network/node.def @@ -1,6 +1,6 @@ multi: type: ipv6net -help: Set RIPng network +help: RIPng network syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def index d679d6c2..d4f228b0 100644 --- a/templates/protocols/ripng/node.def +++ b/templates/protocols/ripng/node.def @@ -1,4 +1,4 @@ priority: 660 -help: Configure Routing Information Protocol (RIPng) parameters +help: Routing Information Protocol (RIPng) parameters create: vtysh -c "configure terminal" -c "router ripng" delete: vtysh -c "configure terminal" -c "no router ripng" diff --git a/templates/protocols/ripng/passive-interface/node.def b/templates/protocols/ripng/passive-interface/node.def index ecbcf546..0dd5ffc2 100644 --- a/templates/protocols/ripng/passive-interface/node.def +++ b/templates/protocols/ripng/passive-interface/node.def @@ -1,6 +1,6 @@ multi: type: txt -help: Set to suppress routing updates on an interface +help: Suppress routing updates on an interface allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all syntax:expression: exec " \ if [ -z \"`ip addr | grep $VAR(@) `\" ] && [ x$VAR(@) != xdefault ]; then \ diff --git a/templates/protocols/ripng/redistribute/bgp/metric/node.def b/templates/protocols/ripng/redistribute/bgp/metric/node.def index 4e2fee24..f3f58d49 100644 --- a/templates/protocols/ripng/redistribute/bgp/metric/node.def +++ b/templates/protocols/ripng/redistribute/bgp/metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes val_help: u32:1-16; Redistribute route metric syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; \ diff --git a/templates/protocols/ripng/redistribute/bgp/node.def b/templates/protocols/ripng/redistribute/bgp/node.def index 4c44cbf6..26494bd1 100644 --- a/templates/protocols/ripng/redistribute/bgp/node.def +++ b/templates/protocols/ripng/redistribute/bgp/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute BGP routes +help: Redistribute BGP routes delete: touch /tmp/rip-redist-bgp.$PPID diff --git a/templates/protocols/ripng/redistribute/bgp/route-map/node.def b/templates/protocols/ripng/redistribute/bgp/route-map/node.def index cf70580f..a56f5668 100644 --- a/templates/protocols/ripng/redistribute/bgp/route-map/node.def +++ b/templates/protocols/ripng/redistribute/bgp/route-map/node.def @@ -1,4 +1,4 @@ type: txt -help: Set route map reference +help: 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/ripng/redistribute/connected/metric/node.def b/templates/protocols/ripng/redistribute/connected/metric/node.def index e2c104a6..8446e404 100644 --- a/templates/protocols/ripng/redistribute/connected/metric/node.def +++ b/templates/protocols/ripng/redistribute/connected/metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes val_help: u32:1-16; Redistribute route metric syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/ripng/redistribute/connected/node.def b/templates/protocols/ripng/redistribute/connected/node.def index dfce0b34..075461f6 100644 --- a/templates/protocols/ripng/redistribute/connected/node.def +++ b/templates/protocols/ripng/redistribute/connected/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute connected routes +help: Redistribute connected routes delete: touch /tmp/rip-redist-connected.$PPID diff --git a/templates/protocols/ripng/redistribute/connected/route-map/node.def b/templates/protocols/ripng/redistribute/connected/route-map/node.def index 3f570311..f2c6f7c2 100644 --- a/templates/protocols/ripng/redistribute/connected/route-map/node.def +++ b/templates/protocols/ripng/redistribute/connected/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: Set route map reference +help: 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/ripng/redistribute/kernel/metric/node.def b/templates/protocols/ripng/redistribute/kernel/metric/node.def index e2c104a6..8446e404 100644 --- a/templates/protocols/ripng/redistribute/kernel/metric/node.def +++ b/templates/protocols/ripng/redistribute/kernel/metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes val_help: u32:1-16; Redistribute route metric syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/ripng/redistribute/kernel/node.def b/templates/protocols/ripng/redistribute/kernel/node.def index fa21a2fc..212fc168 100644 --- a/templates/protocols/ripng/redistribute/kernel/node.def +++ b/templates/protocols/ripng/redistribute/kernel/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute kernel routes +help: Redistribute kernel routes delete: touch /tmp/rip-redist-kernel.$PPID diff --git a/templates/protocols/ripng/redistribute/kernel/route-map/node.def b/templates/protocols/ripng/redistribute/kernel/route-map/node.def index 3f570311..f2c6f7c2 100644 --- a/templates/protocols/ripng/redistribute/kernel/route-map/node.def +++ b/templates/protocols/ripng/redistribute/kernel/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: Set route map reference +help: 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/ripng/redistribute/node.def b/templates/protocols/ripng/redistribute/node.def index 0f60ac58..00eefa88 100644 --- a/templates/protocols/ripng/redistribute/node.def +++ b/templates/protocols/ripng/redistribute/node.def @@ -1 +1 @@ -help: Set to redistribute information from another routing protocol +help: Redistribute information from another routing protocol diff --git a/templates/protocols/ripng/redistribute/ospfv3/metric/node.def b/templates/protocols/ripng/redistribute/ospfv3/metric/node.def index 8d752e7d..808090c7 100644 --- a/templates/protocols/ripng/redistribute/ospfv3/metric/node.def +++ b/templates/protocols/ripng/redistribute/ospfv3/metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes val_help: u32:1-16; Redistribute route metric syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/ripng/redistribute/ospfv3/node.def b/templates/protocols/ripng/redistribute/ospfv3/node.def index 1df11812..cc94d951 100644 --- a/templates/protocols/ripng/redistribute/ospfv3/node.def +++ b/templates/protocols/ripng/redistribute/ospfv3/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute OSPFv3 routes +help: Redistribute OSPFv3 routes delete: touch /tmp/rip-redist-ospf6.$PPID diff --git a/templates/protocols/ripng/redistribute/ospfv3/route-map/node.def b/templates/protocols/ripng/redistribute/ospfv3/route-map/node.def index 3f570311..f2c6f7c2 100644 --- a/templates/protocols/ripng/redistribute/ospfv3/route-map/node.def +++ b/templates/protocols/ripng/redistribute/ospfv3/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: Set route map reference +help: 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/ripng/redistribute/static/metric/node.def b/templates/protocols/ripng/redistribute/static/metric/node.def index e2c104a6..8446e404 100644 --- a/templates/protocols/ripng/redistribute/static/metric/node.def +++ b/templates/protocols/ripng/redistribute/static/metric/node.def @@ -1,5 +1,5 @@ type: u32 -help: Set metric for redistributed routes +help: Metric for redistributed routes val_help: u32:1-16; Redistribute route metric syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 16; "metric must be between 1 and 16" diff --git a/templates/protocols/ripng/redistribute/static/node.def b/templates/protocols/ripng/redistribute/static/node.def index a47d20a5..65fec6db 100644 --- a/templates/protocols/ripng/redistribute/static/node.def +++ b/templates/protocols/ripng/redistribute/static/node.def @@ -1,4 +1,4 @@ -help: Set to redistribute static routes +help: Redistribute static routes delete: touch /tmp/rip-redist-static.$PPID diff --git a/templates/protocols/ripng/redistribute/static/route-map/node.def b/templates/protocols/ripng/redistribute/static/route-map/node.def index 3f570311..f2c6f7c2 100644 --- a/templates/protocols/ripng/redistribute/static/route-map/node.def +++ b/templates/protocols/ripng/redistribute/static/route-map/node.def @@ -1,3 +1,3 @@ type: txt -help: Set route map reference +help: 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/ripng/route/node.def b/templates/protocols/ripng/route/node.def index e0e05796..5c12110f 100644 --- a/templates/protocols/ripng/route/node.def +++ b/templates/protocols/ripng/route/node.def @@ -1,6 +1,6 @@ multi: type: ipv6net -help: Set RIPng static route +help: RIPng static route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" diff --git a/templates/protocols/ripng/timers/garbage-collection/node.def b/templates/protocols/ripng/timers/garbage-collection/node.def index 090ea8f3..f5753a6b 100644 --- a/templates/protocols/ripng/timers/garbage-collection/node.def +++ b/templates/protocols/ripng/timers/garbage-collection/node.def @@ -1,6 +1,6 @@ type: u32 default: 120 -help: Set garbage collection timer +help: Garbage collection timer val_help: u32:0-65535; Garbage colletion time (default 120) syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; \ diff --git a/templates/protocols/ripng/timers/node.def b/templates/protocols/ripng/timers/node.def index b82d4c16..5802c520 100644 --- a/templates/protocols/ripng/timers/node.def +++ b/templates/protocols/ripng/timers/node.def @@ -1,4 +1,4 @@ -help: Set RIPng timer values +help: RIPng timer values delete: touch /tmp/ripng-timers.$PPID diff --git a/templates/protocols/ripng/timers/timeout/node.def b/templates/protocols/ripng/timers/timeout/node.def index 74b292d2..b272340a 100644 --- a/templates/protocols/ripng/timers/timeout/node.def +++ b/templates/protocols/ripng/timers/timeout/node.def @@ -1,6 +1,6 @@ type: u32 default: 180 -help: Set routing information timeout timer +help: Routing information timeout timer val_help: u32:0-65535; Routing information timeout timer (default 180) syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; \ diff --git a/templates/protocols/ripng/timers/update/node.def b/templates/protocols/ripng/timers/update/node.def index 16a0c62d..35a66cfe 100644 --- a/templates/protocols/ripng/timers/update/node.def +++ b/templates/protocols/ripng/timers/update/node.def @@ -1,6 +1,6 @@ type: u32 default: 30 -help: Set routing table update timer +help: Routing table update timer val_help: u32:0-65535; Routing table update timer in seconds (default 30) syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 65535; \ diff --git a/templates/protocols/static/arp/node.def b/templates/protocols/static/arp/node.def index 69b45a4f..395454ef 100644 --- a/templates/protocols/static/arp/node.def +++ b/templates/protocols/static/arp/node.def @@ -1,6 +1,6 @@ tag: type: ipv4 -help: Set a static ARP translation +help: Static ARP translation val_help: IPv4 destination address # diff --git a/templates/protocols/static/arp/node.tag/hwaddr/node.def b/templates/protocols/static/arp/node.tag/hwaddr/node.def index daa9a6a7..d3181160 100644 --- a/templates/protocols/static/arp/node.tag/hwaddr/node.def +++ b/templates/protocols/static/arp/node.tag/hwaddr/node.def @@ -1,5 +1,5 @@ type: macaddr -help: Set hardware protocol (e.g. MAC) address to translate to +help: Hardware protocol (e.g. MAC) address to translate to val_help: Hardware (MAC) address diff --git a/templates/protocols/static/interface-route/node.def b/templates/protocols/static/interface-route/node.def index 5b5f3efe..73dd97a3 100644 --- a/templates/protocols/static/interface-route/node.def +++ b/templates/protocols/static/interface-route/node.def @@ -1,6 +1,6 @@ tag: type: ipv4net -help: Set an interface-based static route +help: Interface based static route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" commit:expression: $VAR(./next-hop-interface/) != "" ; \ 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 7c0a0299..8c7f35fb 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: Set the next-hop interface [REQUIRED] +help: Next-hop interface [REQUIRED] # show all current interface # but syntax accepts any interface since it may exist later (ppp etc) allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all 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 9b72a0c7..61abcc65 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: Set distance value for this route +help: Distance value for this route syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" val_help: u32:1-255; Distance for this route diff --git a/templates/protocols/static/interface-route6/node.def b/templates/protocols/static/interface-route6/node.def index e00a8b3b..0015e601 100644 --- a/templates/protocols/static/interface-route6/node.def +++ b/templates/protocols/static/interface-route6/node.def @@ -1,6 +1,6 @@ tag: type: ipv6net -help: Set an interface-based IPv6 static route +help: Interface based IPv6 static route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" commit:expression: $VAR(./next-hop-interface/) != "" ; \ diff --git a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def index 666abca0..1a5e6709 100644 --- a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def +++ b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set the next-hop interface [REQUIRED] +help: Next-hop interface [REQUIRED] # show all current interface # but syntax accepts any interface since it may exist later (ppp etc) allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all diff --git a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.tag/distance/node.def b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.tag/distance/node.def index 9b72a0c7..61abcc65 100644 --- a/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.tag/distance/node.def +++ b/templates/protocols/static/interface-route6/node.tag/next-hop-interface/node.tag/distance/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set distance value for this route +help: Distance value for this route syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" val_help: u32:1-255; Distance for this route diff --git a/templates/protocols/static/node.def b/templates/protocols/static/node.def index 68e37840..8833f277 100644 --- a/templates/protocols/static/node.def +++ b/templates/protocols/static/node.def @@ -1,4 +1,4 @@ priority: 450 -help: Configure static route parameters +help: static route parameters diff --git a/templates/protocols/static/route/node.def b/templates/protocols/static/route/node.def index 88c91801..682ca944 100644 --- a/templates/protocols/static/route/node.def +++ b/templates/protocols/static/route/node.def @@ -1,6 +1,6 @@ tag: type: ipv4net -help: Set a static route +help: Static route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; \ 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 9b72a0c7..61abcc65 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: Set distance value for this route +help: Distance value for this route syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" val_help: u32: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 b2272e68..b6691ed4 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: Set to silently discard pkts when matched +help: Silently discard pkts when matched end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then vtysh -c "configure terminal" \ 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 e0cb6862..1c72e7f5 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: Set the next-hop router [REQUIRED] +help: Next-hop router [REQUIRED] end: if [[ -z "$VAR(./disable)" ]] then 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 9b72a0c7..61abcc65 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: Set distance value for this route +help: Distance value for this route syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" val_help: u32:1-255; Distance for this route diff --git a/templates/protocols/static/route6/node.def b/templates/protocols/static/route6/node.def index d33d73ea..de3f1cd8 100644 --- a/templates/protocols/static/route6/node.def +++ b/templates/protocols/static/route6/node.def @@ -1,6 +1,6 @@ tag: type: ipv6net -help: Set a static IPv6 route +help: Static IPv6 route syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)" commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; \ diff --git a/templates/protocols/static/route6/node.tag/blackhole/distance/node.def b/templates/protocols/static/route6/node.tag/blackhole/distance/node.def index 9b72a0c7..61abcc65 100644 --- a/templates/protocols/static/route6/node.tag/blackhole/distance/node.def +++ b/templates/protocols/static/route6/node.tag/blackhole/distance/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set distance value for this route +help: Distance value for this route syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" val_help: u32:1-255; Distance for this route diff --git a/templates/protocols/static/route6/node.tag/blackhole/node.def b/templates/protocols/static/route6/node.tag/blackhole/node.def index 24b15560..bd0918d7 100644 --- a/templates/protocols/static/route6/node.tag/blackhole/node.def +++ b/templates/protocols/static/route6/node.tag/blackhole/node.def @@ -1,4 +1,4 @@ -help: Set to silently discard pkts when matched +help: Silently discard pkts when matched end: if [ ${COMMIT_ACTION} = 'DELETE' ]; then vtysh -c "configure terminal" \ diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.def index 31e75a92..55574941 100644 --- a/templates/protocols/static/route6/node.tag/next-hop/node.def +++ b/templates/protocols/static/route6/node.tag/next-hop/node.def @@ -2,7 +2,7 @@ tag: type: ipv6 -help: Set the next-hop IPv6 router [REQUIRED] +help: Next-hop IPv6 router [REQUIRED] end: if [[ -z "$VAR(./disable)" ]] diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.tag/distance/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.tag/distance/node.def index 9b72a0c7..61abcc65 100644 --- a/templates/protocols/static/route6/node.tag/next-hop/node.tag/distance/node.def +++ b/templates/protocols/static/route6/node.tag/next-hop/node.tag/distance/node.def @@ -1,4 +1,4 @@ type: u32 -help: Set distance value for this route +help: Distance value for this route syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "Must be between (1-255)" val_help: u32:1-255; Distance for this route diff --git a/templates/protocols/static/route6/node.tag/next-hop/node.tag/interface/node.def b/templates/protocols/static/route6/node.tag/next-hop/node.tag/interface/node.def index cfa62570..8675ffdd 100644 --- a/templates/protocols/static/route6/node.tag/next-hop/node.tag/interface/node.def +++ b/templates/protocols/static/route6/node.tag/next-hop/node.tag/interface/node.def @@ -1,6 +1,6 @@ type: txt -help: Set the outgoing interface +help: Outgoing interface # show all current interface # but syntax accepts any interface since it may exist later (ppp etc) diff --git a/templates/system/gateway-address/node.def b/templates/system/gateway-address/node.def index c8772881..11f8e0f0 100644 --- a/templates/system/gateway-address/node.def +++ b/templates/system/gateway-address/node.def @@ -1,6 +1,6 @@ priority: 400 type: ipv4 -help: Set default gateway +help: Default gateway create: vtysh -c "configure terminal" -c "ip route 0.0.0.0/0 $VAR(@)" update: oldgw=`/opt/vyatta/sbin/vyatta-cli-expand-var.pl \\$VAR\(/system/gateway-address/@\)` if [ -n "$oldgw" ]; then |