From owner-svn-src-stable@freebsd.org  Fri Jun 17 02:48:58 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 96B5FA77038;
 Fri, 17 Jun 2016 02:48:58 +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 656211A2E;
 Fri, 17 Jun 2016 02:48:58 +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 u5H2mvbu074227;
 Fri, 17 Jun 2016 02:48:57 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5H2mvb4074226;
 Fri, 17 Jun 2016 02:48:57 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201606170248.u5H2mvb4074226@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, 17 Jun 2016 02:48:57 +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: r301978 - stable/10/contrib/ipfilter/man
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jun 2016 02:48:58 -0000

Author: cy
Date: Fri Jun 17 02:48:57 2016
New Revision: 301978
URL: https://svnweb.freebsd.org/changeset/base/301978

Log:
  MFC r301773 & r301775:
  
  Clarify the wording to be more accurate.

Modified:
  stable/10/contrib/ipfilter/man/ipf.8
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/ipfilter/man/ipf.8
==============================================================================
--- stable/10/contrib/ipfilter/man/ipf.8	Fri Jun 17 02:31:18 2016	(r301977)
+++ stable/10/contrib/ipfilter/man/ipf.8	Fri Jun 17 02:48:57 2016	(r301978)
@@ -35,7 +35,10 @@ which they appear when given to \fBipf\f
 .SH OPTIONS
 .TP
 .B \-6
-This option is required to parse IPv6 rules and to have them loaded.
+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).