holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Manpage updates

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-10-10 13:19:41 -07:00
parent 97e821d12d
commit 1db3bfb53e
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Shorewall/manpages/shorewall.conf.xml
View File

@ -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

11
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -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