Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code

This commit is contained in:
Tom Eastep 2015-08-10 17:49:40 -07:00
commit 955a2e38b7
2 changed files with 13 additions and 22 deletions

View File

@ -121,13 +121,12 @@
<itemizedlist>
<listitem>
<para><ulink
url="http://www.kmyfirewall.org/">kmyfirewall</ulink></para>
<para><ulink url="https://help.ubuntu.com/community/UFW">UFW
(Uncomplicated Firewall)</ulink></para>
</listitem>
<listitem>
<para><ulink
url="http://www.fs-security.com/">firestarter</ulink></para>
<para><ulink url="http://www.ipcop.org">ipcop</ulink></para>
</listitem>
</itemizedlist>

View File

@ -71,29 +71,22 @@
running quickly in the three most common Shorewall configurations. If
you want to learn more about Shorewall than is explained in these simple
guides then the <ulink url="shorewall_setup_guide.htm">Shorewall Setup
Guide</ulink> (<ulink url="shorewall_setup_guide_fr.htm">Version
Française</ulink>) is for you.<itemizedlist>
Guide</ulink> is for you.<itemizedlist>
<listitem>
<para><ulink url="standalone.htm">Standalone</ulink> Linux System
(<ulink url="standalone_fr.html">Version Française</ulink>) <ulink
url="standalone_ru.html">(Russian Version)</ulink> <ulink
url="standalone_es.html">Version en Español</ulink></para>
<para><ulink url="standalone.htm">Standalone</ulink> Linux
System</para>
</listitem>
<listitem>
<para><ulink url="two-interface.htm">Two-interface</ulink> Linux
System acting as a firewall/router for a small local network
(<ulink url="two-interface_fr.html">Version Française</ulink>)
(<ulink url="two-interface_ru.html">Russian
Version</ulink>)</para>
System acting as a firewall/router for a small local
network</para>
</listitem>
<listitem>
<para><ulink url="three-interface.htm">Three-interface</ulink>
Linux System acting as a firewall/router for a small local network
and a DMZ.. (<ulink url="three-interface_fr.html">Version
Française</ulink>) (<ulink url="three-interface_ru.html">Russian
Version</ulink>)</para>
and a DMZ</para>
</listitem>
</itemizedlist></para>
</section>
@ -103,11 +96,10 @@
address</title>
<para>The <ulink url="shorewall_setup_guide.htm">Shorewall Setup
Guide</ulink> (<ulink url="shorewall_setup_guide_fr.htm">Version
Française</ulink>) outlines the steps necessary to set up a firewall
where there are multiple public IP addresses involved or if you want to
learn more about Shorewall than is explained in the single-address
guides above.</para>
Guide</ulink> outlines the steps necessary to set up a firewall where
there are multiple public IP addresses involved or if you want to learn
more about Shorewall than is explained in the single-address guides
above.</para>
</section>
</section>
</article>