Merge branch 'master' into 4.6.1

This commit is contained in:
Tom Eastep 2014-06-11 15:26:16 -07:00
commit e6372a3e04

View File

@ -32,7 +32,7 @@
<row> <row>
<entry>NIST <emphasis>Guide on Firewalls and Firewall <entry>NIST <emphasis>Guide on Firewalls and Firewall
Policy</emphasis> - <ulink Policy</emphasis> - <ulink
url="http://csrc.nist.gov/publications/nistpubs/800-41/sp800-41.pdf">http://csrc.nist.gov/publications/nistpubs/800-41/sp800-41.pdf</ulink></entry> url="http://csrc.nist.gov/publications/nistpubs/800-41-Rev1/sp800-41-rev1.pdf">http://csrc.nist.gov/publications/nistpubs/800-41-Rev1/sp800-41-rev1.pdf</ulink></entry>
</row> </row>
<row> <row>
@ -59,7 +59,7 @@
<row rowsep="0" valign="middle"> <row rowsep="0" valign="middle">
<entry align="left">Iproute Downloads: <ulink <entry align="left">Iproute Downloads: <ulink
url="http://developer.osdl.org/dev/iproute2/download/">http://developer.osdl.org/dev/iproute2/download/</ulink></entry> url="https://www.kernel.org/pub/linux/utils/net/iproute2/">https://www.kernel.org/pub/linux/utils/net/iproute2/</ulink></entry>
</row> </row>
<row rowsep="0" valign="middle"> <row rowsep="0" valign="middle">
@ -74,7 +74,7 @@
<row rowsep="0" valign="middle"> <row rowsep="0" valign="middle">
<entry>Iptables Tutorial: <ulink <entry>Iptables Tutorial: <ulink
url="http://iptables-tutorial.frozentux.net/">http://iptables-tutorial.frozentux.net/</ulink></entry> url="https://www.frozentux.net/documents/iptables-tutorial/">https://www.frozentux.net/documents/iptables-tutorial/</ulink></entry>
</row> </row>
<row rowsep="0" valign="middle"> <row rowsep="0" valign="middle">
@ -127,10 +127,6 @@
url="http://www.shorewall.net/SeaGL2013.pdf">http://www.shorewall.net/SeaGL2013.pdf</ulink></entry> url="http://www.shorewall.net/SeaGL2013.pdf">http://www.shorewall.net/SeaGL2013.pdf</ulink></entry>
</row> </row>
<row>
<entry>Shorewall CIA tracker <ulink
url="http://cia.navi.cx/stats/project/shorewall">http://cia.navi.cx/stats/project/shorewall</ulink></entry>
</row>
</tbody> </tbody>
</tgroup> </tgroup>
</informaltable> </informaltable>