From 4ac3e71c272b9eb8d081a4e332fb5d5f27c81e00 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 26 Dec 2008 15:31:08 +0000
Subject: [PATCH] Add traffic shaping warnings to shorewall6.conf(5)

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9169 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 manpages6/shorewall6.conf.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/manpages6/shorewall6.conf.xml b/manpages6/shorewall6.conf.xml
index 0819a9b64..59a503cb5 100644
--- a/manpages6/shorewall6.conf.xml
+++ b/manpages6/shorewall6.conf.xml
@@ -292,6 +292,13 @@
           defined in <ulink
           url="shorewall6-tcrules.html">shorewall6-tcrules</ulink>(5). If not
           specified, CLEAR_TC=No is assumed.</para>
+
+          <warning>
+            <para>If you also run Shorewall and if you have
+            TC_ENABLED=Internal in your <ulink
+            url="../manpages/shorewall.conf.html">shorewall-conf</ulink>(5),
+            then you will want CLEAR_TC=No in this file.</para>
+          </warning>
         </listitem>
       </varlistentry>
 
@@ -1047,6 +1054,13 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
           <para>If you set TC_ENABLED=Internal or internal or leave the option
           empty then Shorewall6 will use its builtin traffic shaper
           (tc4shorewall6 written by Arne Bernin.</para>
+
+          <warning>
+            <para>If you also run Shorewall and if you have
+            TC_ENABLED=Internal in your <ulink
+            url="../manpages/shorewall.conf.html">shorewall-conf</ulink>(5),
+            then you will want TC_ENABLED=No in this file.</para>
+          </warning>
         </listitem>
       </varlistentry>