PERFORCE change 135562 for review

[Gabor Pali]

http://perforce.freebsd.org/chv.cgi?CH=135562

Change 135562 by pgj at disznohal on 2008/02/17 13:27:59

	IFC before translation

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/firewalls/chapter.sgml#3 integrate

Differences ...

==== //depot/projects/docproj_hu/books/handbook/firewalls/chapter.sgml#3 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.77 2007/10/06 00:04:22 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.80 2008/01/17 17:50:30 remko Exp $
 -->
 
 <chapter id="firewalls">
@@ -153,7 +153,11 @@
       &man.altq.4; and &man.dummynet.4;.  Dummynet has traditionally been
       closely tied with <acronym>IPFW</acronym>, and
       <acronym>ALTQ</acronym> with
-      <acronym>IPF</acronym>/<acronym>PF</acronym>.  IPF,
+      <acronym>PF</acronym>.  Traffic shaping for <acronym>IPFILTER</acronym> can currently
+      be done with <acronym>IPFILTER</acronym> for NAT and filtering and
+      <acronym>IPFW</acronym> with &man.dummynet.4;
+      <emphasis>or</emphasis> by using <acronym>PF</acronym> with
+      <acronym>ALTQ</acronym>.
       IPFW, and PF all use rules to control the access of packets to and
       from your system, although they go about it different ways and
       have different rule syntaxes.</para>
@@ -2248,7 +2252,7 @@
 	by setting <literal>firewall_type</literal> variable to absolute
 	path of file, which contains <emphasis>firewall rules</emphasis>
 	without any command-line options for &man.ipfw.8; itself.  A
-	simple examble of ruleset file can be following:</para>
+	simple example of ruleset file can be following:</para>
 
      <programlisting>add block in  all
 add block out all</programlisting>