Release Notes update for ZPH polish.

diff --git a/doc/release-notes/release-3.1.html b/doc/release-notes/release-3.1.html
index 94ffc7c2f76c09fa8d8c48c4340fbefe7ae4828b..109c41da848d3434af734476f448c2b8784a453e 100644 (file)
--- a/doc/release-notes/release-3.1.html
+++ b/doc/release-notes/release-3.1.html
@@ -295,9 +295,9 @@ Microsoft NTLM Authentication instead of HTTP standard authentication through a
 <UL>
 <LI>Allows you to select a TOS/Diffserv value to mark local hits.</LI>
 <LI>Allows you to select a TOS/Diffserv value to mark peer hits.</LI>
-<LI>Allows you to selectively set only sibling or sibling+parent requests</LI>
-<LI>Allows any HTTP response towards clients will have the TOS value of the response coming from
-the remote server masked with the value of zph_preserve_miss_tos_mask.
+<LI>Allows you to selectively mark only sibling or parent requests</LI>
+<LI>Allows any HTTP response towards clients to have the TOS value of the response coming from
+the remote server preserved.
 For this to work correctly, you will need to patch your linux kernel with the TOS preserving ZPH patch.
 The kernel patch can be downloaded from 
 <A HREF="http://zph.bratcheda.org">http://zph.bratcheda.org</A></LI>
@@ -311,17 +311,20 @@ before copying the value to the TOS send towards clients.</LI>
 <P>Squid 3.1 needs to be configured with --enable-zph-qos for the ZPH QoS controls to be available.</P>
 
 <P>The configuration options for 2.7 and 3.1 are based on different ZPH patches.
-The two releases configuration differs and is not at this point directly translatable.</P>
+The two releases configuration differs and only the TOS mode settings are directly translatable.</P>
 <P>
 <UL>
-<LI><EM>zph_tos_local</EM>              Responses found as a HIT in the local cache</LI>
-<LI><EM>zph_tos_peer</EM>               Responses found as a HIT on peer caches.</LI>
-<LI><EM>zph_tos_parent</EM>             Qos to Sibling caches only or all peers.</LI>
-<LI><EM>zph_preserve_miss_tos</EM>      Use the same ToS settings received by Squid from the remote server,
-on the client connection. Requires a kernel patch.</LI>
+<LI><EM>qos_flows local-hit=0xff</EM>           Responses found as a HIT in the local cache</LI>
+<LI><EM>qos_flows sibling-hit=0xff</EM> Responses found as a HIT in a sibling peer</LI>
+<LI><EM>qos_flows parent-hit=0xff</EM>  Responses found as a HIT in a parent peer</LI>
 </UL>
 </P>
 
+<P>The lines above are spearated for documentation. qos_flows may be configured with all options on one line, or separated as shown.
+Also options may be repeated as many times as desired. Only the final configured value for any option will be used.</P>
+
+<P>The legacy Option and Priority modes available in Squid-2.7 are no longer supported.</P>
+
 
 <H2><A NAME="ss2.7">2.7</A> <A HREF="#toc2.7">SSL Bump (for HTTPS Filtering and Adaptation)</A>
 </H2>

diff --git a/doc/release-notes/release-3.1.sgml b/doc/release-notes/release-3.1.sgml
index d0ada1b78d43bfd0a8c2acd8971a6bc4d773e7a6..6da0ebbc511874d3ad327dbb5f00c97828458957 100644 (file)
--- a/doc/release-notes/release-3.1.sgml
+++ b/doc/release-notes/release-3.1.sgml
@@ -211,9 +211,9 @@ Microsoft NTLM Authentication instead of HTTP standard authentication through a
 <itemize>
        <item>Allows you to select a TOS/Diffserv value to mark local hits.
        <item>Allows you to select a TOS/Diffserv value to mark peer hits.
-       <item>Allows you to selectively set only sibling or sibling+parent requests
-       <item>Allows any HTTP response towards clients will have the TOS value of the response coming from
-               the remote server masked with the value of zph_preserve_miss_tos_mask.
+       <item>Allows you to selectively mark only sibling or parent requests
+       <item>Allows any HTTP response towards clients to have the TOS value of the response coming from
+               the remote server preserved.
                For this to work correctly, you will need to patch your linux kernel with the TOS preserving ZPH patch.
                The kernel patch can be downloaded from <url url="http://zph.bratcheda.org" name="http://zph.bratcheda.org">
        <item>Allows you to mask certain bits in the TOS received from the remote server,
@@ -224,16 +224,19 @@ Microsoft NTLM Authentication instead of HTTP standard authentication through a
 <p>Squid 3.1 needs to be configured with --enable-zph-qos for the ZPH QoS controls to be available.
 
 <p>The configuration options for 2.7 and 3.1 are based on different ZPH patches.
-The two releases configuration differs and is not at this point directly translatable.
+The two releases configuration differs and only the TOS mode settings are directly translatable.
 
 <itemize>
-<item><em>zph_tos_local</em>           Responses found as a HIT in the local cache
-<item><em>zph_tos_peer</em>            Responses found as a HIT on peer caches.
-<item><em>zph_tos_parent</em>          Qos to Sibling caches only or all peers.
-<item><em>zph_preserve_miss_tos</em>   Use the same ToS settings received by Squid from the remote server,
-                                       on the client connection. Requires a kernel patch.
+<item><em>qos_flows local-hit=0xff</em>                Responses found as a HIT in the local cache
+<item><em>qos_flows sibling-hit=0xff</em>      Responses found as a HIT in a sibling peer
+<item><em>qos_flows parent-hit=0xff</em>       Responses found as a HIT in a parent peer
 </itemize>
 
+<p>The lines above are spearated for documentation. qos_flows may be configured with all options on one line, or separated as shown.
+Also options may be repeated as many times as desired. Only the final configured value for any option will be used.
+
+<p>The legacy <b>Option</b> and <b>Priority</b> modes available in Squid-2.7 are no longer supported.
+
 
 <sect1>SSL Bump (for HTTPS Filtering and Adaptation)