From: Andrew Beverley <andy@andybev.com>
Date: Sun, 6 Apr 2014 04:41:59 +0000 (-0600)
Subject: Updates to qos_flows documentation
X-Git-Tag: SQUID_3_4_4_1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=499df9380040f84fa7bebf17fcd81049fe0f223b;p=thirdparty%2Fsquid.git

Updates to qos_flows documentation

Minor updates to the qos_flows documentation based on recent squid-users
questions.
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 7b981d15b6..f5a8b125da 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -2035,10 +2035,19 @@ DEFAULT: none
 LOC: Ip::Qos::TheConfig
 DOC_START
 	Allows you to select a TOS/DSCP value to mark outgoing
-	connections with, based on where the reply was sourced.	For
-	platforms using netfilter, allows you to set a netfilter mark
+	connections to the client, based on where the reply was sourced.
+	For platforms using netfilter, allows you to set a netfilter mark
 	value instead of, or in addition to, a TOS value.
 
+	By default this functionality is disabled. To enable it with the default
+	settings simply use "qos_flows mark" or "qos_flows tos". Default
+	settings will result in the netfilter mark or TOS value being copied
+	from the upstream connection to the client. Note that it is the connection
+	CONNMARK value not the packet MARK value that is copied.
+
+	It is not currently possible to copy the mark or TOS value from the
+	client to the upstream connection request.
+
 	TOS values really only have local significance - so you should
 	know what you're specifying. For more information, see RFC2474,
 	RFC2475, and RFC3260.