Merge branch '4.6.2' of ssh://server.shorewall.net/home/teastep/shorewall/code into 4.6.2

This commit is contained in:
Tom Eastep 2014-07-18 15:15:33 -07:00
commit 29e6bc9379
2 changed files with 2 additions and 2 deletions

View File

@ -1805,7 +1805,7 @@
Shorewall-configured firewall.</para>
<para>The <option>-i </option>option was added in Shorewall 4.6.2
and causes the status of each optional interface to be
and causes the status of each optional or provider interface to be
displayed.</para>
</listitem>
</varlistentry>

View File

@ -1641,7 +1641,7 @@
Shorewall6-configured firewall.</para>
<para>The <option>-i </option>option was added in Shorewall 4.6.2
and causes the status of each optional interface to be
and causes the status of each optional or provider interface to be
displayed.</para>
</listitem>
</varlistentry>