From 1db3bfb53e87597deabc9931d6906ae43b39842c Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Sat, 10 Oct 2015 13:19:41 -0700
Subject: [PATCH] Manpage updates

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/manpages/shorewall.conf.xml   |  5 +++--
 Shorewall6/manpages/shorewall6.conf.xml | 11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Shorewall/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml
index b3f8538b1..992ecd1db 100644
--- a/Shorewall/manpages/shorewall.conf.xml
+++ b/Shorewall/manpages/shorewall.conf.xml
@@ -89,7 +89,7 @@
     colon (":") and a <firstterm>log tag</firstterm>. The log tag normally
     follows the packet disposition in Shorewall-generated Netfilter log
     messages, separated from the disposition by a colon (e.g, "DROP:mytag").
-    See LOGTAGONLY below for additional information. </para>
+    See LOGTAGONLY below for additional information.</para>
 
     <para>Beginning with Shorewall 4.4.22, LOGMARK is also a valid level which
     logs the packet's mark value along with the other usual information. The
@@ -2479,7 +2479,8 @@ INLINE          -       -       -       ; -j REJECT
         role="bold">Yes</emphasis>|<emphasis
         role="bold">No</emphasis>|<emphasis
         role="bold">Internal</emphasis>|<emphasis
-        role="bold">Simple</emphasis>|Shared]</term>
+        role="bold">Simple</emphasis>|<emphasis
+        role="bold">Shared</emphasis>]</term>
 
         <listitem>
           <para>If you say <emphasis role="bold">Yes</emphasis> or <emphasis
diff --git a/Shorewall6/manpages/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml
index 67ff6f66a..db6c3ae39 100644
--- a/Shorewall6/manpages/shorewall6.conf.xml
+++ b/Shorewall6/manpages/shorewall6.conf.xml
@@ -2143,7 +2143,9 @@ INLINE          -       -       -       ; -j REJECT
         <term><emphasis role="bold">TC_ENABLED=</emphasis>[<emphasis
         role="bold">Yes</emphasis>|<emphasis
         role="bold">No</emphasis>|<emphasis
-        role="bold">Internal|Shared</emphasis>]</term>
+        role="bold">Internal</emphasis>|<emphasis
+        role="bold">Simple</emphasis>|<emphasis
+        role="bold">Shared</emphasis>]</term>
 
         <listitem>
           <para>If you say <emphasis role="bold">Yes</emphasis> or <emphasis
@@ -2160,6 +2162,13 @@ INLINE          -       -       -       ; -j REJECT
           empty then Shorewall6 will use its builtin traffic shaper
           (tc4shorewall6 written by Arne Bernin.</para>
 
+          <para>If you set TC_ENABLED=Simple (Shorewall 4.4.6 and later),
+          simple traffic shaping using <ulink
+          url="/manpages/shorewall-tcinterfaces.html">shorewall-tcinterfaces</ulink>(5)
+          and <ulink
+          url="/manpages/shorewall-tcpri.html">shorewall-tcpri</ulink>(5) is
+          enabled.</para>
+
           <para>Beginning with Shorewall 4.4.15, if you set TC_ENABLED=Shared
           or shared, then you should create symbolic links from your
           Shorewall6 configuration directory (normally