Resolve conflicts

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4900 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-11-17 15:56:43 +00:00
parent 66727c93b3
commit c41e4c1173

View File

@ -851,14 +851,25 @@
<term>[ <emphasis>chain</emphasis> ] ...</term> <term>[ <emphasis>chain</emphasis> ] ...</term>
<listitem> <listitem>
<para>Using the <emphasis role="bold">iptables -L</emphasis> <para>The rules in each <emphasis>chain</emphasis> are
<emphasis>chain</emphasis> <emphasis role="bold">-n displayed ssing the <emphasis role="bold">iptables
-v</emphasis> command, the rules in each -L</emphasis> <emphasis>chain</emphasis> <emphasis
<emphasis>chain</emphasis> are displayed. If no role="bold">-n -v</emphasis> command. If no
<emphasis>chain</emphasis> is given, all of the chains in the <emphasis>chain</emphasis> is given, all of the chains in the
filter table are displayed. The <emphasis filter table are displayed. The <emphasis
role="bold">-x</emphasis> option is passed directly through to role="bold">-x</emphasis> option is passed directly through to
iptables.</para> iptables and causes actual packet and byte counts to be
displayed. Without this option, those counts are
abbreviated.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis role="bold">actions</emphasis></term>
<listitem>
<para>Produces a report about the available actions (built-in,
standard and user-defined).</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -914,9 +925,11 @@
<listitem> <listitem>
<para>Displays the Netfilter mangle table using the command <para>Displays the Netfilter mangle table using the command
<emphasis role="bold">iptables -t mangle -L -n -v</emphasis>. <emphasis role="bold">iptables -t mangle -L -n
The <emphasis role="bold">-x</emphasis> option is passed -v</emphasis>.The <emphasis role="bold">-x</emphasis> option
directly through to iptables.</para> is passed directly through to iptables and causes actual
packet and byte counts to be displayed. Without this option,
those counts are abbreviated.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -927,7 +940,9 @@
<para>Displays the Netfilter nat table using the command <para>Displays the Netfilter nat table using the command
<emphasis role="bold">iptables -t nat -L -n -v</emphasis>.The <emphasis role="bold">iptables -t nat -L -n -v</emphasis>.The
<emphasis role="bold">-x</emphasis> option is passed directly <emphasis role="bold">-x</emphasis> option is passed directly
through to iptables.</para> through to iptables and causes actual packet and byte counts
to be displayed. Without this option, those counts are
abbreviated.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>