From 238aa68b28f946b882313e8a9548eda19ffdc086 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 27 Feb 2014 15:54:05 -0800
Subject: [PATCH] Describe the mangle file in the config file basics article.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 docs/configuration_file_basics.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/configuration_file_basics.xml b/docs/configuration_file_basics.xml
index 3b9b7c17b..db78b38fc 100644
--- a/docs/configuration_file_basics.xml
+++ b/docs/configuration_file_basics.xml
@@ -109,6 +109,12 @@
           Translation (SNAT).</para>
         </listitem>
 
+        <listitem>
+          <para><filename>/etc/shorewall/mangle</filename> - supercedes
+          <filename>/etc/shorewall/tcrules</filename> in Shorewall 4.6.0.
+          Contains rules for packet marking, TTL, TPROXY, etc.</para>
+        </listitem>
+
         <listitem>
           <para><filename>/etc/shorewall/rules</filename> - defines rules that
           are exceptions to the overall policies established in
@@ -221,7 +227,9 @@
 
         <listitem>
           <para><filename>/etc/shorewall/tcrules</filename> - Mark or classify
-          traffic for traffic shaping or multiple providers.</para>
+          traffic for traffic shaping or multiple providers. Deprecated in
+          Shorewall 4.6.0 in favor of
+          <filename>/etc/shorewall/mangle</filename>.</para>
         </listitem>
 
         <listitem>