Merge branch 'master' into 5.0.0

This commit is contained in:
Tom Eastep 2015-07-27 07:05:00 -07:00
commit 2356b814e9
5 changed files with 732 additions and 522 deletions

View File

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

File diff suppressed because it is too large Load Diff

BIN
docs/images/Network2015.dia Executable file

Binary file not shown.

BIN
docs/images/Network2015.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

View File

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