summaryrefslogtreecommitdiff
path: root/templates-cfg/system
diff options
context:
space:
mode:
authorGaurav <gaurav.sinha@vyatta.com>2012-02-27 11:59:10 -0800
committerGaurav Sinha <gaurav.sinha@vyatta.com>2012-03-16 16:46:04 -0700
commit86524b38252bfcc4f143247947adbd280d98a222 (patch)
treecdb1cddc718d20e8975b370ba72e67cfc2d593b8 /templates-cfg/system
parenta7f35e8c7db79faa471b560d832732e58d8e75ec (diff)
downloadvyatta-conntrack-86524b38252bfcc4f143247947adbd280d98a222.tar.gz
vyatta-conntrack-86524b38252bfcc4f143247947adbd280d98a222.zip
Updated help strings to avoid confusion with global timeouts
(cherry picked from commit a9d6f31725efc5fa28af0b9df00b277054a5f45f)
Diffstat (limited to 'templates-cfg/system')
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/icmp/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/other/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/close-wait/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/close/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/established/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/fin-wait/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/last-ack/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/syn-recv/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/syn-sent/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/tcp/time-wait/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/other/node.def2
-rw-r--r--templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/udp/stream/node.def2
15 files changed, 15 insertions, 15 deletions
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 5fd267f..1adf950 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 in seconds
+help: ICMP timeout for matching flow(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/node.def b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/node.def
index 6fffc43..7f26da6 100644
--- a/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/node.def
+++ b/templates-cfg/system/conntrack/timeout/custom/rule/node.tag/protocol/node.def
@@ -1,2 +1,2 @@
-help: Customize protocol specific timers
+help: Customize protocol specific timers, one protocol configuration per rule
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 7a7ae98..09c433f 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 in seconds
+help: Generic connection timeout for matching flow(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 c8b12d7..a998533 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 in seconds
+help: TCP CLOSE-WAIT timeout for matching flow(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 fc6929f..ce41b0f 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 in seconds
+help: TCP CLOSE timeout for matching flow(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 9acfd15..6ebaae5 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 in seconds
+help: TCP ESTABLISHED timeout for matching flow(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 f11f16b..1b25e89 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 in seconds
+help: TCP FIN-WAIT timeout for matching flow(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 1beb31f..3d99efe 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 in seconds
+help: TCP LAST-ACK timeout for matching flow(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 2b67c51..bd0e39c 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 timeout options \ No newline at end of file
+help: TCP connection per flow 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 6d98386..070a185 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 in seconds
+help: TCP SYN-RECEIVED timeout for matching flow(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 c5edde3..87a69e0 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 in seconds
+help: TCP SYN-SENT timeout for matching flow(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 1342cc5..ef9ed4f 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 in seconds
+help: TCP TIME-WAIT timeout for matching flow(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 7ee8fd3..6a1e149 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 timeout \ No newline at end of file
+help: UDP per flow 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 b71294c..3c3e2ec 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 in seconds
+help: UDP generic timeout for matching flow(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 31830e1..7bb8619 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 in seconds
+help: UDP stream timeout for matching flow(s) in seconds
val_help: u32:1-21474836; UDP stream timeout in seconds