From owner-svn-src-all@FreeBSD.ORG  Fri Nov 22 19:26:52 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DB70F8F0;
 Fri, 22 Nov 2013 19:26:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CA24A292C;
 Fri, 22 Nov 2013 19:26:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAMJQqbJ017097;
 Fri, 22 Nov 2013 19:26:52 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAMJQqc3017096;
 Fri, 22 Nov 2013 19:26:52 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201311221926.rAMJQqc3017096@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 22 Nov 2013 19:26:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r258482 - stable/10/share/man/man4
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Nov 2013 19:26:52 -0000

Author: glebius
Date: Fri Nov 22 19:26:52 2013
New Revision: 258482
URL: http://svnweb.freebsd.org/changeset/base/258482

Log:
  Merge r258122 from head:
    Emphasize that pf(4) in FreeBSD doesn't match pf(4) in
    OpenBSD 4.5, but is derived from it, and got some
    important local changes.
  
  Approved by:	re (kib)

Modified:
  stable/10/share/man/man4/pf.4
Directory Properties:
  stable/10/share/man/   (props changed)
  stable/10/share/man/man4/   (props changed)

Modified: stable/10/share/man/man4/pf.4
==============================================================================
--- stable/10/share/man/man4/pf.4	Fri Nov 22 19:26:04 2013	(r258481)
+++ stable/10/share/man/man4/pf.4	Fri Nov 22 19:26:52 2013	(r258482)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 18 2012
+.Dd November 14, 2013
 .Dt PF 4
 .Os
 .Sh NAME
@@ -1181,5 +1181,8 @@ packet filtering mechanism first appeare
 and then
 .Fx 5.2 .
 .Pp
-This implementation matches
+This implementation is derived from
 .Ox 4.5 .
+It has been heavily modified to be capable of running in multithreaded
+.Fx
+kernel and scale its performance on multiple CPUs.