From b0b82d6d70933b7256c1d3663e57198dfa742bed Mon Sep 17 00:00:00 2001 From: Mohit Mehta <mohit.mehta@vyatta.com> Date: Thu, 10 Apr 2008 08:30:37 +0000 Subject: Fix Bug 3069 Help strings should be standardized - help strings standardized in vyatta-nat --- templates-cfg/service/nat/node.def | 2 +- templates-cfg/service/nat/rule/node.def | 2 +- .../service/nat/rule/node.tag/destination/address/node.def | 14 +++++++------- .../service/nat/rule/node.tag/destination/node.def | 2 +- .../service/nat/rule/node.tag/destination/port/node.def | 4 ++-- templates-cfg/service/nat/rule/node.tag/exclude/node.def | 2 +- .../service/nat/rule/node.tag/inbound-interface/node.def | 2 +- .../nat/rule/node.tag/inside-address/address/node.def | 6 +++--- .../service/nat/rule/node.tag/inside-address/node.def | 2 +- .../service/nat/rule/node.tag/inside-address/port/node.def | 4 ++-- .../service/nat/rule/node.tag/outbound-interface/node.def | 2 +- .../nat/rule/node.tag/outside-address/address/node.def | 6 +++--- .../service/nat/rule/node.tag/outside-address/node.def | 2 +- .../nat/rule/node.tag/outside-address/port/node.def | 4 ++-- templates-cfg/service/nat/rule/node.tag/protocol/node.def | 11 +++++------ .../service/nat/rule/node.tag/source/address/node.def | 14 +++++++------- templates-cfg/service/nat/rule/node.tag/source/node.def | 2 +- .../service/nat/rule/node.tag/source/port/node.def | 4 ++-- templates-cfg/service/nat/rule/node.tag/type/node.def | 2 +- templates-op/clear/nat/node.def | 2 +- templates-op/show/nat/node.def | 2 +- 21 files changed, 45 insertions(+), 46 deletions(-) diff --git a/templates-cfg/service/nat/node.def b/templates-cfg/service/nat/node.def index b053f84..900251c 100644 --- a/templates-cfg/service/nat/node.def +++ b/templates-cfg/service/nat/node.def @@ -1,2 +1,2 @@ -help: NAT configuration +help: Configure Network Address Translation (NAT) parameters end:expression: "sudo /opt/vyatta/sbin/vyatta-update-nat.pl" diff --git a/templates-cfg/service/nat/rule/node.def b/templates-cfg/service/nat/rule/node.def index 5a6d3c8..41c8377 100644 --- a/templates-cfg/service/nat/rule/node.def +++ b/templates-cfg/service/nat/rule/node.def @@ -1,4 +1,4 @@ tag: type: u32 -help: Rule number for NAT +help: Set rule number for NAT syntax:expression: ($VAR(@) > 0 && $VAR(@) < 1025) ; "rule number must be between 1 and 1024" diff --git a/templates-cfg/service/nat/rule/node.tag/destination/address/node.def b/templates-cfg/service/nat/rule/node.tag/destination/address/node.def index 9c81afa..7b67f2b 100644 --- a/templates-cfg/service/nat/rule/node.tag/destination/address/node.def +++ b/templates-cfg/service/nat/rule/node.tag/destination/address/node.def @@ -1,9 +1,9 @@ type: txt -help: Destination IP address, subnet, or range +help: Set destination IP address, subnet, or range comp_help: Possible completions: - <IP address> IP address to match - <IP address>/<prefix length> Subnet to match - <IP address>-<IP address> IP range to match - !<IP address> Match everything except the specified address - !<IP address>/<prefix length> Match everything except the specified subnet - !<IP address>-<IP address> Match everything except the specified range + <x.x.x.x> IP address to match + <x.x.x.x/x> Subnet to match + <x.x.x.x>-<x.x.x.x> IP range to match + !<x.x.x.x> Match everything except the specified address + !<x.x.x.x/x> Match everything except the specified subnet + !<x.x.x.x>-<x.x.x.x> Match everything except the specified range diff --git a/templates-cfg/service/nat/rule/node.tag/destination/node.def b/templates-cfg/service/nat/rule/node.tag/destination/node.def index 8fc8e75..36d6b91 100644 --- a/templates-cfg/service/nat/rule/node.tag/destination/node.def +++ b/templates-cfg/service/nat/rule/node.tag/destination/node.def @@ -1 +1 @@ -help: NAT destination parameters +help: Set NAT destination parameters diff --git a/templates-cfg/service/nat/rule/node.tag/destination/port/node.def b/templates-cfg/service/nat/rule/node.tag/destination/port/node.def index 6f655d7..65170b2 100644 --- a/templates-cfg/service/nat/rule/node.tag/destination/port/node.def +++ b/templates-cfg/service/nat/rule/node.tag/destination/port/node.def @@ -1,8 +1,8 @@ type: txt -help: Configure destination port +help: Set destination port comp_help: Destination port(s) can be specified as a comma-separated list of: <port name> Named port (any name in /etc/services, e.g., http) - <port number> Numbered port (between 1 and 65535) + <1-65535> Numbered port <start>-<end> Numbered port range (e.g., 1001-1005) The whole list can also be "negated" using '!'. For example: '!22,telnet,http,123,1001-1005' diff --git a/templates-cfg/service/nat/rule/node.tag/exclude/node.def b/templates-cfg/service/nat/rule/node.tag/exclude/node.def index 3fc118a..3c624ae 100644 --- a/templates-cfg/service/nat/rule/node.tag/exclude/node.def +++ b/templates-cfg/service/nat/rule/node.tag/exclude/node.def @@ -1 +1 @@ -help: Exclude packets matching this rule from NAT +help: Set to exclude packets matching this rule from NAT diff --git a/templates-cfg/service/nat/rule/node.tag/inbound-interface/node.def b/templates-cfg/service/nat/rule/node.tag/inbound-interface/node.def index 05f556a..b9cd4ee 100644 --- a/templates-cfg/service/nat/rule/node.tag/inbound-interface/node.def +++ b/templates-cfg/service/nat/rule/node.tag/inbound-interface/node.def @@ -1,4 +1,4 @@ type: txt -help: Inbound interface of NAT traffic +help: Set inbound interface of NAT traffic allowed: ls /sys/class/net 2>/dev/null comp_help:Enter a network interface name, for example, "eth0" diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def index 0f3e879..910ae61 100644 --- a/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def +++ b/templates-cfg/service/nat/rule/node.tag/inside-address/address/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure inside IP address or range for NAT +help: Set inside IP address or range for NAT comp_help: Possible completions: - <IP address> NAT to the specified IP address - <IP address>-<IP address> NAT to the specified IP range + <x.x.x.x> NAT to the specified IP address + <x.x.x.x>-<x.x.x.x> NAT to the specified IP range diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/node.def index e13cd32..6c3d82a 100644 --- a/templates-cfg/service/nat/rule/node.tag/inside-address/node.def +++ b/templates-cfg/service/nat/rule/node.tag/inside-address/node.def @@ -1 +1 @@ -help: Inside NAT IP (used by destination NAT only) +help: Set inside NAT IP (used by destination NAT only) diff --git a/templates-cfg/service/nat/rule/node.tag/inside-address/port/node.def b/templates-cfg/service/nat/rule/node.tag/inside-address/port/node.def index f3e02c2..669b051 100644 --- a/templates-cfg/service/nat/rule/node.tag/inside-address/port/node.def +++ b/templates-cfg/service/nat/rule/node.tag/inside-address/port/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure inside port +help: Set inside port comp_help: The inside port can be one of the following: - <port number> Numbered port (between 1 and 65535) + <1-65535> Numbered port (between 1 and 65535) <start>-<end> Numbered port range (e.g., 1001-1005) diff --git a/templates-cfg/service/nat/rule/node.tag/outbound-interface/node.def b/templates-cfg/service/nat/rule/node.tag/outbound-interface/node.def index 4aaf5b7..a9b0b4e 100644 --- a/templates-cfg/service/nat/rule/node.tag/outbound-interface/node.def +++ b/templates-cfg/service/nat/rule/node.tag/outbound-interface/node.def @@ -1,4 +1,4 @@ type: txt -help: Outbound interface for NAT traffic +help: Set outbound interface for NAT traffic allowed: ls /sys/class/net 2>/dev/null comp_help:Enter a network interface name, for example, "eth0" diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def index 4434bdb..0bfb506 100644 --- a/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def +++ b/templates-cfg/service/nat/rule/node.tag/outside-address/address/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure outside IP address or range for NAT +help: Set outside IP address or range for NAT comp_help: Possible completions: - <IP address> NAT to the specified IP address - <IP address>-<IP address> NAT to the specified IP range + <x.x.x.x> NAT to the specified IP address + <x.x.x.x>-<x.x.x.x> NAT to the specified IP range diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/node.def index b8e1e19..6d14e21 100644 --- a/templates-cfg/service/nat/rule/node.tag/outside-address/node.def +++ b/templates-cfg/service/nat/rule/node.tag/outside-address/node.def @@ -1 +1 @@ -help: Outside NAT IP (used by source NAT only) +help: Set outside NAT IP (used by source NAT only) diff --git a/templates-cfg/service/nat/rule/node.tag/outside-address/port/node.def b/templates-cfg/service/nat/rule/node.tag/outside-address/port/node.def index 2b94d31..dd8cb58 100644 --- a/templates-cfg/service/nat/rule/node.tag/outside-address/port/node.def +++ b/templates-cfg/service/nat/rule/node.tag/outside-address/port/node.def @@ -1,5 +1,5 @@ type: txt -help: Configure outside port +help: Set outside port comp_help: The outside port can be one of the following: - <port number> Numbered port (between 1 and 65535) + <1-65535> Numbered port (between 1 and 65535) <start>-<end> Numbered port range (e.g., 1001-1005) diff --git a/templates-cfg/service/nat/rule/node.tag/protocol/node.def b/templates-cfg/service/nat/rule/node.tag/protocol/node.def index bea3fa3..fdd589a 100644 --- a/templates-cfg/service/nat/rule/node.tag/protocol/node.def +++ b/templates-cfg/service/nat/rule/node.tag/protocol/node.def @@ -1,9 +1,8 @@ type: txt -help: Protocol to NAT (this can be a protocol name in /etc/protocols, a protocol number, or "all") +help: Set protocol to NAT (this can be a protocol name in /etc/protocols, a protocol number, or "all") syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl protocol_negate '$VAR(@)'" ; "invalid protocol \"$VAR(@)\"" comp_help:Possible completions: - <text> An IP protocol name from /etc/protocols (e.g. "tcp" or "udp"). - <0-255> An IP protocol number. - all All IP protocols. - !<protocol> All IP protocols except for the specified name or number - (negation). + <text> An IP protocol name from /etc/protocols (e.g. "tcp" or "udp") + <0-255> An IP protocol number + all All IP protocols + !<protocol> All IP protocols except for the specified name or number (negation) diff --git a/templates-cfg/service/nat/rule/node.tag/source/address/node.def b/templates-cfg/service/nat/rule/node.tag/source/address/node.def index ae18e02..311516d 100644 --- a/templates-cfg/service/nat/rule/node.tag/source/address/node.def +++ b/templates-cfg/service/nat/rule/node.tag/source/address/node.def @@ -1,9 +1,9 @@ type: txt -help: Source IP address, subnet, or range +help: Set source IP address, subnet, or range comp_help: Possible completions: - <IP address> IP address to match - <IP address>/<prefix length> Subnet to match - <IP address>-<IP address> IP range to match - !<IP address> Match everything except the specified address - !<IP address>/<prefix length> Match everything except the specified subnet - !<IP address>-<IP address> Match everything except the specified range + <x.x.x.x> IP address to match + <x.x.x.x/x> Subnet to match + <x.x.x.x>-<x.x.x.x> IP range to match + !<x.x.x.x> Match everything except the specified address + !<x.x.x.x/x> Match everything except the specified subnet + !<x.x.x.x>-<x.x.x.x> Match everything except the specified range diff --git a/templates-cfg/service/nat/rule/node.tag/source/node.def b/templates-cfg/service/nat/rule/node.tag/source/node.def index 299f6e5..4b5eb8c 100644 --- a/templates-cfg/service/nat/rule/node.tag/source/node.def +++ b/templates-cfg/service/nat/rule/node.tag/source/node.def @@ -1 +1 @@ -help: NAT source parameters +help: Set NAT source parameters diff --git a/templates-cfg/service/nat/rule/node.tag/source/port/node.def b/templates-cfg/service/nat/rule/node.tag/source/port/node.def index 1973f1c..e65cbfd 100644 --- a/templates-cfg/service/nat/rule/node.tag/source/port/node.def +++ b/templates-cfg/service/nat/rule/node.tag/source/port/node.def @@ -1,8 +1,8 @@ type: txt -help: Configure source port +help: Set source port comp_help: Source port(s) can be specified as a comma-separated list of: <port name> Named port (any name in /etc/services, e.g., http) - <port number> Numbered port (between 1 and 65535) + <1-65535> Numbered port <start>-<end> Numbered port range (e.g., 1001-1005) The whole list can also be "negated" using '!'. For example: '!22,telnet,http,123,1001-1005' diff --git a/templates-cfg/service/nat/rule/node.tag/type/node.def b/templates-cfg/service/nat/rule/node.tag/type/node.def index f8191cf..c8e68e1 100644 --- a/templates-cfg/service/nat/rule/node.tag/type/node.def +++ b/templates-cfg/service/nat/rule/node.tag/type/node.def @@ -1,5 +1,5 @@ type: txt -help: Source, destination, or masquerade NAT +help: Set source, destination, or masquerade NAT syntax:expression: $VAR(@) in "source", "destination", "masquerade"; "invalid type $VAR(@)" comp_help:Possible completions: source Source NAT diff --git a/templates-op/clear/nat/node.def b/templates-op/clear/nat/node.def index aae6adc..bbfa370 100644 --- a/templates-op/clear/nat/node.def +++ b/templates-op/clear/nat/node.def @@ -1 +1 @@ -help: Clear Network Address Translation tables +help: Clear Network Address Translation (NAT) tables diff --git a/templates-op/show/nat/node.def b/templates-op/show/nat/node.def index 20ecd4d..5f1338e 100644 --- a/templates-op/show/nat/node.def +++ b/templates-op/show/nat/node.def @@ -1 +1 @@ -help: Show Network Address Translation information +help: Show Network Address Translation (NAT) information -- cgit v1.2.3