From owner-p4-projects@FreeBSD.ORG  Sun Feb 17 13:28:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 28A8D16A41A; Sun, 17 Feb 2008 13:28:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E1C4016A417
	for <perforce@FreeBSD.org>; Sun, 17 Feb 2008 13:28:52 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D372D13C474
	for <perforce@FreeBSD.org>; Sun, 17 Feb 2008 13:28:52 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1HDSquE013382
	for <perforce@FreeBSD.org>; Sun, 17 Feb 2008 13:28:52 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1HDSq7M013379
	for perforce@freebsd.org; Sun, 17 Feb 2008 13:28:52 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 17 Feb 2008 13:28:52 GMT
Message-Id: <200802171328.m1HDSq7M013379@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 135562 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Feb 2008 13:28:53 -0000

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

Change 135562 by pgj@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>