rename "mangle" to "modify"

29 files changed, 14 insertions, 13 deletions

diff --git a/scripts/firewall/vyatta-firewall.pl b/scripts/firewall/vyatta-firewall.pl
index 4ca5104..dfc16e1 100755
--- a/scripts/firewall/vyatta-firewall.pl
+++ b/scripts/firewall/vyatta-firewall.pl
@@ -21,7 +21,7 @@ GetOptions("setup"             => \$setup,
 
 # mapping from config node to iptables table
 my %table_hash = ( 'name'   => 'filter',
-                   'mangle' => 'mangle', );
+                   'modify' => 'mangle', );
 
 sub other_table {
   my $this = shift;
@@ -289,7 +289,8 @@ sub update_ints() {
 
   if ($action ne 'delete' && $table eq 'mangle' && $direction =~ /^local/) {
     print STDERR 'Firewall config error: ' .
-                 "Mangle rule set \"$chain\" cannot be used for \"local\"\n";
+                 "\"Modify\" rule set \"$chain\" cannot be used for " .
+                 "\"local\"\n";
     exit 1;
   }
 
diff --git a/templates/firewall/mangle/node.def b/templates/firewall/mangle/node.def
deleted file mode 100644
index 491fe71..0000000
--- a/templates/firewall/mangle/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: txt
-syntax:expression: pattern $VAR(@) "^[^-]" ; "Firewall rule set name cannot start with \"-\""
-help: Set firewall rule set name
diff --git a/templates/firewall/mangle/node.tag/description/node.def b/templates/firewall/mangle/node.tag/description/node.def
deleted file mode 100644
index 678e325..0000000
--- a/templates/firewall/mangle/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Set firewall description
diff --git a/templates/firewall/mangle/node.tag/rule/node.def b/templates/firewall/mangle/node.tag/rule/node.def
deleted file mode 100644
index 010f808..0000000
--- a/templates/firewall/mangle/node.tag/rule/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: u32
-help: Set firewall rule number (1-1024)
-syntax:expression: $VAR(@) > 0 && $VAR(@) < 1025; "firewall rule number must be between 1 and 1024"
diff --git a/templates/firewall/modify/node.def b/templates/firewall/modify/node.def
new file mode 100644
index 0000000..6fb513f
--- /dev/null
+++ b/templates/firewall/modify/node.def
@@ -0,0 +1,4 @@
+tag:
+type: txt
+syntax:expression: pattern $VAR(@) "^[^-]" ; "Modify rule set name cannot start with \"-\""
+help: Set modify rule set name
diff --git a/templates/firewall/modify/node.tag/description/node.def b/templates/firewall/modify/node.tag/description/node.def
new file mode 100644
index 0000000..d5d4dba
--- /dev/null
+++ b/templates/firewall/modify/node.tag/description/node.def
@@ -0,0 +1,2 @@
+type: txt
+help: Set modify rule set description
diff --git a/templates/firewall/modify/node.tag/rule/node.def b/templates/firewall/modify/node.tag/rule/node.def
new file mode 100644
index 0000000..f2e7c6f
--- /dev/null
+++ b/templates/firewall/modify/node.tag/rule/node.def
@@ -0,0 +1,4 @@
+tag:
+type: u32
+help: Set modify rule number (1-1024)
+syntax:expression: $VAR(@) > 0 && $VAR(@) < 1025; "modify rule number must be between 1 and 1024"
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/action/node.def b/templates/firewall/modify/node.tag/rule/node.tag/action/node.def
index 0842019..8a6396c 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/action/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/action/node.def
@@ -1,4 +1,4 @@
 type:  txt
-help: Set firewall rule action
+help: Set modify rule action
 syntax:expression: $VAR(@) in "drop", "reject", "accept", "modify";
                    "action must be one of drop, reject, accept, or modify"
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/description/node.def b/templates/firewall/modify/node.tag/rule/node.tag/description/node.def
index 9c0c2bb..9c0c2bb 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/description/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/description/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/destination/address/node.def b/templates/firewall/modify/node.tag/rule/node.tag/destination/address/node.def
index e25da77..e25da77 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/destination/address/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/destination/address/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/destination/node.def b/templates/firewall/modify/node.tag/rule/node.tag/destination/node.def
index 500e0bb..500e0bb 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/destination/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/destination/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/destination/port/node.def b/templates/firewall/modify/node.tag/rule/node.tag/destination/port/node.def
index 65170b2..65170b2 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/destination/port/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/destination/port/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/icmp/code/node.def b/templates/firewall/modify/node.tag/rule/node.tag/icmp/code/node.def
index 71bacfc..71bacfc 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/icmp/code/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/icmp/code/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/icmp/node.def b/templates/firewall/modify/node.tag/rule/node.tag/icmp/node.def
index dcf9fcc..dcf9fcc 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/icmp/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/icmp/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/icmp/type/node.def b/templates/firewall/modify/node.tag/rule/node.tag/icmp/type/node.def
index 6275a64..6275a64 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/icmp/type/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/icmp/type/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/log/node.def b/templates/firewall/modify/node.tag/rule/node.tag/log/node.def
index 5023547..5023547 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/log/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/log/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/modify/dscp/node.def b/templates/firewall/modify/node.tag/rule/node.tag/modify/dscp/node.def
index b20f58c..b20f58c 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/modify/dscp/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/modify/dscp/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/modify/mark/node.def b/templates/firewall/modify/node.tag/rule/node.tag/modify/mark/node.def
index 0830b9b..0830b9b 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/modify/mark/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/modify/mark/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/modify/node.def b/templates/firewall/modify/node.tag/rule/node.tag/modify/node.def
index f629b92..f629b92 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/modify/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/modify/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/protocol/node.def b/templates/firewall/modify/node.tag/rule/node.tag/protocol/node.def
index 3a912fb..3a912fb 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/protocol/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/protocol/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/source/address/node.def b/templates/firewall/modify/node.tag/rule/node.tag/source/address/node.def
index a11b2ba..a11b2ba 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/source/address/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/source/address/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/source/mac-address/node.def b/templates/firewall/modify/node.tag/rule/node.tag/source/mac-address/node.def
index fd10e26..fd10e26 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/source/mac-address/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/source/mac-address/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/source/node.def b/templates/firewall/modify/node.tag/rule/node.tag/source/node.def
index 16ab3ad..16ab3ad 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/source/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/source/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/source/port/node.def b/templates/firewall/modify/node.tag/rule/node.tag/source/port/node.def
index e65cbfd..e65cbfd 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/source/port/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/source/port/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/state/established/node.def b/templates/firewall/modify/node.tag/rule/node.tag/state/established/node.def
index 802e35d..802e35d 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/state/established/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/state/established/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/state/invalid/node.def b/templates/firewall/modify/node.tag/rule/node.tag/state/invalid/node.def
index ddba99f..ddba99f 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/state/invalid/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/state/invalid/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/state/new/node.def b/templates/firewall/modify/node.tag/rule/node.tag/state/new/node.def
index 23854e7..23854e7 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/state/new/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/state/new/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/state/node.def b/templates/firewall/modify/node.tag/rule/node.tag/state/node.def
index 3b7b383..3b7b383 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/state/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/state/node.def
diff --git a/templates/firewall/mangle/node.tag/rule/node.tag/state/related/node.def b/templates/firewall/modify/node.tag/rule/node.tag/state/related/node.def
index acddc3b..acddc3b 100644
--- a/templates/firewall/mangle/node.tag/rule/node.tag/state/related/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/state/related/node.def