summaryrefslogtreecommitdiff
path: root/templates/firewall/ipv6-modify
diff options
context:
space:
mode:
authorMohit Mehta <mohit.mehta@vyatta.com>2010-07-21 14:09:16 -0700
committerMohit Mehta <mohit.mehta@vyatta.com>2010-07-21 14:09:16 -0700
commitec4aae6176eaea28a5ec9cd8200f4de791fdb5f2 (patch)
treed7f255133ba3c96a52e9b55da48408608b302ad0 /templates/firewall/ipv6-modify
parent3ad5af523f8086d71508d30e0c3f95ea73faf546 (diff)
downloadvyatta-cfg-firewall-ec4aae6176eaea28a5ec9cd8200f4de791fdb5f2.tar.gz
vyatta-cfg-firewall-ec4aae6176eaea28a5ec9cd8200f4de791fdb5f2.zip
undo verb usage at the start of help strings
Diffstat (limited to 'templates/firewall/ipv6-modify')
-rw-r--r--templates/firewall/ipv6-modify/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/default-action/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/description/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/enable-default-log/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/action/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/description/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/address/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/port/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/disable/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/type/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/match-ipsec/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/match-none/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/burst/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/rate/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/log/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/dscp/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/mark/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/all/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/applejuice/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/bittorrent/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/directconnect/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/edonkey/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/gnutella/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/kazaa/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/protocol/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/count/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/time/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/address/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/mac-address/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/port/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/established/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/invalid/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/new/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/related/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/tcp/flags/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/tcp/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/monthdays/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/startdate/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/starttime/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/stopdate/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/stoptime/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/utc/node.def2
-rw-r--r--templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/weekdays/node.def2
54 files changed, 54 insertions, 54 deletions
diff --git a/templates/firewall/ipv6-modify/node.def b/templates/firewall/ipv6-modify/node.def
index 733f989..9a4b487 100644
--- a/templates/firewall/ipv6-modify/node.def
+++ b/templates/firewall/ipv6-modify/node.def
@@ -27,4 +27,4 @@ end: if sudo /opt/vyatta/sbin/vyatta-firewall.pl --update-rules ipv6-modify "$VA
create: sudo /opt/vyatta/sbin/vyatta-firewall.pl --setup ip6tables ipv6-modify
-help: Set IPv6 modify rule set name
+help: IPv6 modify rule-set name
diff --git a/templates/firewall/ipv6-modify/node.tag/default-action/node.def b/templates/firewall/ipv6-modify/node.tag/default-action/node.def
index 6c514b0..34ed318 100644
--- a/templates/firewall/ipv6-modify/node.tag/default-action/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/default-action/node.def
@@ -1,6 +1,6 @@
type: txt
-help: Set firewall default-action
+help: Default-action for rule-set
default: "drop"
diff --git a/templates/firewall/ipv6-modify/node.tag/description/node.def b/templates/firewall/ipv6-modify/node.tag/description/node.def
index cbd090b..e8e221b 100644
--- a/templates/firewall/ipv6-modify/node.tag/description/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/description/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Set IPv6 modify rule set description
+help: Rule-set description
diff --git a/templates/firewall/ipv6-modify/node.tag/enable-default-log/node.def b/templates/firewall/ipv6-modify/node.tag/enable-default-log/node.def
index 96b37ea..e540d3f 100644
--- a/templates/firewall/ipv6-modify/node.tag/enable-default-log/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/enable-default-log/node.def
@@ -1 +1 @@
-help: Set logging on default-action
+help: Option to log packets hitting default-action
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.def
index 33fa91b..e2dc34e 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.def
@@ -2,6 +2,6 @@ tag:
type: u32
-help: Set IPv6 modify rule number (1-9999)
+help: Rule number (1-9999)
syntax:expression: $VAR(@) > 0 && $VAR(@) <= 9999; "firewall rule number must be between 1 and 9999"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/action/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/action/node.def
index d5e7408..25a9069 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/action/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/action/node.def
@@ -1,6 +1,6 @@
type: txt
-help: Set firewall rule action
+help: Rule action
syntax:expression: $VAR(@) in "drop", "accept", "modify";
"action must be one of drop, accept, or modify"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/description/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/description/node.def
index b49b91e..90bf88b 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/description/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/description/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Set rule description
+help: Rule description
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/address/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/address/node.def
index 5c7f5e9..1adbe8d 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/address/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/address/node.def
@@ -1,6 +1,6 @@
type: txt
-help: Set source IPv6 address, prefix or range to match
+help: Destination IPv6 address, prefix or range
comp_help: Possible completions:
<x:x:x:x:x:x:x:x> IPv6 address to match
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/node.def
index 500e0bb..dc227b7 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/node.def
@@ -1 +1 @@
-help: Set firewall destination parameters
+help: Destination parameters
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/port/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/port/node.def
index b292864..760c0e8 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/port/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/destination/port/node.def
@@ -1,6 +1,6 @@
type: txt
-help: Set destination port
+help: 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)
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/disable/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/disable/node.def
index 498a027..70565eb 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/disable/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/disable/node.def
@@ -1 +1 @@
-help: Set firewall rule disabled \ No newline at end of file
+help: Option to disable rule
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/node.def
index d4dc9c0..7032b30 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/node.def
@@ -1 +1 @@
-help: Set rule ICMPv6 type and code information
+help: ICMPv6 type and code information
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/type/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/type/node.def
index 13ff654..a066647 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/type/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/icmpv6/type/node.def
@@ -1,6 +1,6 @@
type: txt
-help: Set ICMPv6 type/code
+help: ICMPv6 type/code
comp_help: Possible completions:
destination-unreachable ICMPv6 type/code name
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/match-ipsec/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/match-ipsec/node.def
index 8d4bf12..96ada47 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/match-ipsec/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/match-ipsec/node.def
@@ -1 +1 @@
-help: Match inbound IPsec packets
+help: Inbound IPsec packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/match-none/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/match-none/node.def
index cfcbc8a..2d717d5 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/match-none/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/match-none/node.def
@@ -1 +1 @@
-help: Match inbound non-IPsec packets
+help: Inbound non-IPsec packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/node.def
index c905e2d..96ada47 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/ipsec/node.def
@@ -1 +1 @@
-help: Set inbound IPsec packet matching
+help: Inbound IPsec packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/burst/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/burst/node.def
index 307e602..9097370 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/burst/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/burst/node.def
@@ -1,4 +1,4 @@
type: u32
default: 1
-help: Set maximum number of packets to allow in excess of rate
+help: Maximum number of packets to allow in excess of rate
syntax:expression: ($VAR(@) >0) ; "Burst should be a value greater then zero"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/node.def
index 42081fe..75460b1 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/node.def
@@ -1 +1 @@
-help: Set to match rule at a limited rate using a token bucket filter
+help: Rate limit using a token bucket filter
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/rate/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/rate/node.def
index 7a3b7d0..cd108f4 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/rate/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/limit/rate/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set maximum average matching rate
+help: Maximum average matching rate
syntax:expression: pattern $VAR(@) "^[[:digit:]]+/(second|minute|hour|day)$" ; \
"Invalid value for rate. Rate should be specified as an integer followed by
a forward slash '/' and either of these time units - second, minute, hour or day
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/log/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/log/node.def
index 5023547..ba0e74b 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/log/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/log/node.def
@@ -1,3 +1,3 @@
type: txt; "firwall logging must be enable or disable"
-help: Set firewall logging
+help: Option to log packets matching rule
syntax:expression: $VAR(@) in "enable", "disable"; "firwall logging must be enable or disable"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/dscp/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/dscp/node.def
index b20f58c..3ed8f0d 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/dscp/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/dscp/node.def
@@ -1,4 +1,4 @@
type: u32
-help: Set packet Differentiated Services Codepoint (DSCP)
+help: Packet Differentiated Services Codepoint (DSCP)
syntax:expression: $VAR(@) >= 0 && $VAR(@) < 64;
"DSCP must be between 0 and 63"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/mark/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/mark/node.def
index 0830b9b..0776b34 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/mark/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/mark/node.def
@@ -1,2 +1,2 @@
type: u32
-help: Set packet marking
+help: Packet marking
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/node.def
index f629b92..c61402f 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/modify/node.def
@@ -1 +1 @@
-help: Set packet modifications
+help: Packet modifications
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/all/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/all/node.def
index 3359454..bd61a90 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/all/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/all/node.def
@@ -1 +1 @@
-help: Match AppleJuice/BitTorrent/Direct Connect/eDonkey/eMule/Gnutella/KaZaA application packets
+help: AppleJuice/BitTorrent/Direct Connect/eDonkey/eMule/Gnutella/KaZaA application packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/applejuice/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/applejuice/node.def
index 35c2182..8e9f704 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/applejuice/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/applejuice/node.def
@@ -1 +1 @@
-help: Match AppleJuice application packets
+help: AppleJuice application packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/bittorrent/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/bittorrent/node.def
index a6330de..1a56963 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/bittorrent/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/bittorrent/node.def
@@ -1 +1 @@
-help: Match BitTorrent application packets
+help: BitTorrent application packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/directconnect/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/directconnect/node.def
index ab11805..eb84108 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/directconnect/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/directconnect/node.def
@@ -1 +1 @@
-help: Match Direct Connect application packets
+help: Direct Connect application packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/edonkey/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/edonkey/node.def
index 25a97e5..255e618 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/edonkey/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/edonkey/node.def
@@ -1 +1 @@
-help: Match eDonkey/eMule application packets
+help: eDonkey/eMule application packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/gnutella/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/gnutella/node.def
index 52d9d6c..f21b60b 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/gnutella/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/gnutella/node.def
@@ -1 +1 @@
-help: Match Gnutella application packets
+help: Gnutella application packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/kazaa/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/kazaa/node.def
index a6eab48..44c3156 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/kazaa/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/kazaa/node.def
@@ -1 +1 @@
-help: Match KaZaA application packets
+help: KaZaA application packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/node.def
index 9013fe5..5959d3d 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/p2p/node.def
@@ -1 +1 @@
-help: Set P2P application packet matching
+help: P2P application packets
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/protocol/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/protocol/node.def
index b8a0c55..0ea2382 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/protocol/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/protocol/node.def
@@ -1,6 +1,6 @@
type: txt
-help: Set IPv6 protocol to match (protocol name, number, or "all")
+help: IPv6 protocol to match (protocol name, number, or "all")
syntax:expression: exec "
param=$VAR(@)
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/count/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/count/node.def
index 7f72b46..efd8dd8 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/count/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/count/node.def
@@ -1,3 +1,3 @@
type: u32
-help: Set to N to only match source addresses seen more than N times
+help: Source addresses seen more than N times
syntax:expression: $VAR(@) >=1 && $VAR(@) <= 255; "recent count value must be between 1 and 255"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/node.def
index e1be0a3..3acc871 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/node.def
@@ -1 +1 @@
-help: Set parameters for matching recently seen sources
+help: Parameters for matching recently seen sources
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/time/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/time/node.def
index b84a0b7..9c49ed8 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/time/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/recent/time/node.def
@@ -1,2 +1,2 @@
type: u32
-help: Set to N to only match source addresses seen in the last N seconds
+help: Source addresses seen in the last N seconds
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/address/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/address/node.def
index 81f2b03..01a7b99 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/address/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/address/node.def
@@ -1,7 +1,7 @@
type: txt
-help: Set source IPv6 address, prefix or range to match
+help: Source IPv6 address, prefix or range
comp_help: Possible completions:
<x:x:x:x:x:x:x:x> IPv6 address to match
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/mac-address/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/mac-address/node.def
index fd10e26..ad07881 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/mac-address/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/mac-address/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Set source MAC address
+help: Source MAC address
syntax:expression: exec "/opt/vyatta/sbin/vyatta-validate-type.pl macaddr_negate '$VAR(@)'" ; "invalid MAC address \"$VAR(@)\""
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/node.def
index 16ab3ad..84cdc1f 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/node.def
@@ -1 +1 @@
-help: Set firewall source parameters
+help: Source parameters
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/port/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/port/node.def
index e65cbfd..4cec3cf 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/port/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/source/port/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set source port
+help: 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)
<1-65535> Numbered port
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/established/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/established/node.def
index 802e35d..a4f3120 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/established/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/established/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Set established state
+help: Established state
syntax:expression: $VAR(@) in "enable", "disable" ; "state value must be enable or disable"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/invalid/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/invalid/node.def
index ddba99f..dc6110d 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/invalid/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/invalid/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Set invalid state
+help: Invalid state
syntax:expression: $VAR(@) in "enable", "disable" ; "state value must be enable or disable"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/new/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/new/node.def
index 23854e7..6ef1f7a 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/new/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/new/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Set new state
+help: New state
syntax:expression: $VAR(@) in "enable", "disable" ; "state value must be enable or disable"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/node.def
index 3b7b383..0e38df4 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/node.def
@@ -1 +1 @@
-help: Set session state
+help: Session state
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/related/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/related/node.def
index acddc3b..2364c31 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/related/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/state/related/node.def
@@ -1,3 +1,3 @@
type: txt
-help: Set related state
+help: Related state
syntax:expression: $VAR(@) in "enable", "disable" ; "state value must be enable or disable"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/tcp/flags/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/tcp/flags/node.def
index 95f6a68..b86e707 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/tcp/flags/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/tcp/flags/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set TCP flags to match
+help: TCP flags to match
syntax:expression: pattern $VAR(@) "^((!?ALL)|((!?(SYN|ACK|FIN|RST|PSH|URG),)*(!?(SYN|ACK|FIN|RST|PSH|URG))))$" ; \
"Invalid value for TCP flags. Allowed values : SYN ACK FIN RST URG PSH ALL
When specifying more than one flag, flags should be comma-separated.
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/tcp/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/tcp/node.def
index 636f4a2..66bc295 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/tcp/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/tcp/node.def
@@ -1 +1 @@
-help: Set tcp flags to match
+help: TCP flags to match
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/monthdays/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/monthdays/node.def
index 025a2a9..14c1d5c 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/monthdays/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/monthdays/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set monthdays on which to apply rule
+help: Monthdays to match rule on
syntax:expression: pattern $VAR(@) "^!?([[:digit:]]\{1,2\}\,)*[[:digit:]]\{1,2\}$" ; \
"Incorrect value for monthdays. Monthdays should be specified as 2,12,21
For negation, add ! in front eg. !2,12,21"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/node.def
index 8061ba6..238acd2 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/node.def
@@ -1 +1 @@
-help: Set time during which to apply rule
+help: Time to match rule
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/startdate/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/startdate/node.def
index a971375..46f9eb9 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/startdate/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/startdate/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set to apply rule starting from specified date
+help: Date to start matching rule
syntax:expression: pattern $VAR(@) "^[[:digit:]]\{4\}[-][[:digit:]]\{2\}[-][[:digit:]]\{2\}(T[[:digit:]]\{2\}[:][[:digit:]]\{2\}[:][[:digit:]]\{2\})?$" ; \
"Invalid value for startdate. Date should use yyyy-mm-dd format. To specify time
of date with startdate, append 'T' to date followed by time in 24 hour notation
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/starttime/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/starttime/node.def
index 7e34510..ab69c45 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/starttime/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/starttime/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set to apply rule starting from specified time
+help: Time of day to start matching rule
syntax:expression: pattern $VAR(@) "^[[:digit:]]\{2\}[:][[:digit:]]\{2\}[:][[:digit:]]\{2\}$" ; \
"Incorrect value for starttime. Time should be entered using 24 hour notation - hh:mm:ss"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/stopdate/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/stopdate/node.def
index c99dd7b..93fc8b6 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/stopdate/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/stopdate/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set to apply rule till specified date
+help: Date to stop matching rule
syntax:expression: pattern $VAR(@) "^[[:digit:]]\{4\}[-][[:digit:]]\{2\}[-][[:digit:]]\{2\}(T[[:digit:]]\{2\}[:][[:digit:]]\{2\}[:][[:digit:]]\{2\})?$" ; \
"Invalid value for stopdate. Date should use yyyy-mm-dd format. To specify time
of date with stopdate, append 'T' to date followed by time in 24 hour notation
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/stoptime/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/stoptime/node.def
index 5047259..4a42ca3 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/stoptime/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/stoptime/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set to apply rule till specified time
+help: Time of day to stop matching rule
syntax:expression: pattern $VAR(@) "^[[:digit:]]\{2\}[:][[:digit:]]\{2\}[:][[:digit:]]\{2\}$" ; \
"Incorrect value for stoptime. Time should be entered using 24 hour notation - hh:mm:ss"
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/utc/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/utc/node.def
index 68a0689..167f191 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/utc/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/utc/node.def
@@ -1 +1 @@
-help: Set to interpret the times given for startdate, stopdate, starttime and stoptime to be UTC
+help: Interpret times for startdate, stopdate, starttime and stoptime to be U$
diff --git a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/weekdays/node.def b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/weekdays/node.def
index aea3e22..dd2649b 100644
--- a/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/weekdays/node.def
+++ b/templates/firewall/ipv6-modify/node.tag/rule/node.tag/time/weekdays/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set weekdays on which to apply rules on
+help: Weekdays to match rule on
syntax:expression: pattern $VAR(@) "^!?([[:upper:]][[:lower:]]\{2\}\,)*[[:upper:]][[:lower:]]\{2\}$" ; \
"Incorrect value for weekdays. Weekdays should be specified using the first
three characters of the day with the first character capitalized eg. Mon,Thu,Sat