From 0b89edb15676df97868d853aea1128ab6401f17f Mon Sep 17 00:00:00 2001
From: Gaurav <gaurav.sinha@vyatta.com>
Date: Mon, 27 Feb 2012 14:20:01 -0800
Subject: Using connection instead of flow to refer to 5 tuple in help strings
 (cherry picked from commit 43bf1c43f253f67ff195b0bd831d6903d2ddcefe)

---
 templates-cfg/system/conntrack/timeout/custom/node.def                  | 2 +-
 .../conntrack/timeout/custom/rule/node.tag/protocol/icmp/node.def       | 2 +-
 .../conntrack/timeout/custom/rule/node.tag/protocol/other/node.def      | 2 +-
 .../timeout/custom/rule/node.tag/protocol/tcp/close-wait/node.def       | 2 +-
 .../conntrack/timeout/custom/rule/node.tag/protocol/tcp/close/node.def  | 2 +-
 .../timeout/custom/rule/node.tag/protocol/tcp/established/node.def      | 2 +-
 .../timeout/custom/rule/node.tag/protocol/tcp/fin-wait/node.def         | 2 +-
 .../timeout/custom/rule/node.tag/protocol/tcp/last-ack/node.def         | 2 +-
 .../system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/node.def | 2 +-
 .../timeout/custom/rule/node.tag/protocol/tcp/syn-recv/node.def         | 2 +-
 .../timeout/custom/rule/node.tag/protocol/tcp/syn-sent/node.def         | 2 +-
 .../timeout/custom/rule/node.tag/protocol/tcp/time-wait/node.def        | 2 +-
 .../system/conntrack/timeout/custom/rule/node.tag/protocol/udp/node.def | 2 +-
 .../conntrack/timeout/custom/rule/node.tag/protocol/udp/other/node.def  | 2 +-
 .../conntrack/timeout/custom/rule/node.tag/protocol/udp/stream/node.def | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'templates-cfg')

diff --git a/templates-cfg/system/conntrack/timeout/custom/node.def b/templates-cfg/system/conntrack/timeout/custom/node.def
index 7967ead..94039fe 100644
--- a/templates-cfg/system/conntrack/timeout/custom/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/node.def
@@ -1,4 +1,4 @@
-help: Define custom timeouts per flow
+help: Define custom timeouts per connection 
 end: if sudo /opt/vyatta/bin/sudo-users/vyatta-conntrack-timeouts.pl --update 'true';
      then
        if [ ${COMMIT_ACTION} = 'DELETE' ] ; 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/icmp/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/icmp/node.def
index 1adf950..16c9224 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/icmp/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/icmp/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: ICMP timeout for matching flow(s) in seconds
+help: ICMP timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; ICMP timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/other/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/other/node.def
index 09c433f..4d50136 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/other/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/other/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: Generic connection timeout for matching flow(s) in seconds
+help: Generic connection timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; Generic connection timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/close-wait/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/close-wait/node.def
index a998533..7b9b089 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/close-wait/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/close-wait/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: TCP CLOSE-WAIT timeout for matching flow(s) in seconds
+help: TCP CLOSE-WAIT timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; TCP CLOSE-WAIT timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/close/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/close/node.def
index ce41b0f..c37bb68 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/close/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/close/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: TCP CLOSE timeout for matching flow(s) in seconds
+help: TCP CLOSE timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; TCP CLOSE timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/established/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/established/node.def
index 6ebaae5..dfc575d 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/established/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/established/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: TCP ESTABLISHED timeout for matching flow(s) in seconds
+help: TCP ESTABLISHED timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; TCP ESTABLISHED timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/fin-wait/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/fin-wait/node.def
index 1b25e89..4514d6a 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/fin-wait/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/fin-wait/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: TCP FIN-WAIT timeout for matching flow(s) in seconds
+help: TCP FIN-WAIT timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; TCP FIN-WAIT timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/last-ack/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/last-ack/node.def
index 3d99efe..5c1cc25 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/last-ack/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/last-ack/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: TCP LAST-ACK timeout for matching flow(s) in seconds
+help: TCP LAST-ACK timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; TCP LAST-ACK timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/node.def
index bd0e39c..2d58f9c 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/node.def
@@ -1 +1 @@
-help: TCP connection per flow timeout options
+help: TCP per connection timeout options
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/syn-recv/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/syn-recv/node.def
index 070a185..a9c5a57 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/syn-recv/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/syn-recv/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: TCP SYN-RECEIVED timeout for matching flow(s) in seconds
+help: TCP SYN-RECEIVED timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; TCP SYN-RECEIVED timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/syn-sent/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/syn-sent/node.def
index 87a69e0..af71067 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/syn-sent/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/syn-sent/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: TCP SYN-SENT timeout for matching flow(s) in seconds
+help: TCP SYN-SENT timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; TCP SYN-SENT timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/time-wait/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/time-wait/node.def
index ef9ed4f..1b85ba1 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/time-wait/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/time-wait/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: TCP TIME-WAIT timeout for matching flow(s) in seconds
+help: TCP TIME-WAIT timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; TCP TIME-WAIT timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/node.def
index 6a1e149..321f684 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/node.def
@@ -1 +1 @@
-help: UDP per flow timeout configuration options
+help: UDP per connection timeout configuration options
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/other/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/other/node.def
index 3c3e2ec..abfdc7e 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/other/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/other/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: UDP generic timeout for matching flow(s) in seconds
+help: UDP generic timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; UDP generic timeout in seconds
 
diff --git a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/stream/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/stream/node.def
index 7bb8619..431c94a 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/stream/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/stream/node.def
@@ -1,6 +1,6 @@
 type: u32
 
-help: UDP stream timeout for matching flow(s) in seconds
+help: UDP stream timeout for matching connection(s) in seconds
 
 val_help: u32:1-21474836; UDP stream timeout in seconds
 
-- 
cgit v1.2.3