From owner-svn-src-head@freebsd.org  Fri Jun 10 01:10:49 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A36C5ADCA04;
 Fri, 10 Jun 2016 01:10:49 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 74F9716BA;
 Fri, 10 Jun 2016 01:10:49 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5A1AmX5041307;
 Fri, 10 Jun 2016 01:10:48 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5A1AmYr041306;
 Fri, 10 Jun 2016 01:10:48 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201606100110.u5A1AmYr041306@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Fri, 10 Jun 2016 01:10:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r301775 - head/contrib/ipfilter/man
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2016 01:10:49 -0000

Author: cy
Date: Fri Jun 10 01:10:48 2016
New Revision: 301775
URL: https://svnweb.freebsd.org/changeset/base/301775

Log:
  Clarify the wording to be more accurate.
  
  Approved by:	re@ (gjb)
  MFC after:	1 week
  X-MFC with:	r301773

Modified:
  head/contrib/ipfilter/man/ipf.8

Modified: head/contrib/ipfilter/man/ipf.8
==============================================================================
--- head/contrib/ipfilter/man/ipf.8	Fri Jun 10 00:08:25 2016	(r301774)
+++ head/contrib/ipfilter/man/ipf.8	Fri Jun 10 01:10:48 2016	(r301775)
@@ -35,11 +35,10 @@ which they appear when given to \fBipf\f
 .SH OPTIONS
 .TP
 .B \-6
-This option was required in previous releases of IP FIlter to parse IPv6
-rules and to have them loaded. As of IP FIlter 5.0.0 all rules are stored
-in a single table loaded from a single file. This option is a noop. It
-will produce the message "IPv6 rules are no longer seperate." It is
-included for backward compatibility.
+IPv4 and IPv6 rules are stored in a single table and can be read from a
+single file. This option is no longer required to load IPv6 rules. This
+option is ignored when specified with the -F option and the -F option
+will flush IPv4 rules even if this option is specified.
 .TP
 .B \-A
 Set the list to make changes to the active list (default).