MFC r367070:

Remove a random equal sign from the example. It should not be there.
It's a syntax error.

PR: 210303
Reported by: leventelist at gmail.com

MFC r355300:

Fix a typo (upto --> up to) and reword to improve word flow.

MFC r319962:

Correct example directory location.

Submitted by: olivier@
Approved by: re@ (kib@)

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Fix another typo.

Reported by: cem
MFC after: 6 days

Fix typo.

Reported by: Ruben Kerkhof <ruben@rubenkerkhof.com>
MFC after: 6 days

Revert r288682

I meant to do this on ^/user/ngie/more-tests

Pointyhat to: ngie (use svn info next time...)

Update ipfilter 4.1.28 --> 5.1.2.

Approved by: glebius (mentor)
BSD Licensed by: Darren Reed <darrenr@reed.wattle.id.au> (author)

Resolve conflicts (and believe me...you don't want to know).

* Someone imported a lot of files with the wrong CVS tag, so lots of files need
that fixed in them....
* Keep unnecessary files out of the non-vendor part of this CVS repository.

Committ changes from 3.4.31 -> 3.4.35
* fix bug parsing port comparisons in proxy rules
* make parsing errors in ipf/ipnat return an error rather than return
indicating success.
* make parsing errors in ipf/ipnat return an error rather than return
indicating success.
* make ipfstat work as a set{g,u}id thing - gave up privs before opening
/dev/ipl
* fix ipfstat -A
* make "ipfstat -f" output more informative
* various changes to ipsend for sending packets with ipv4 options
* ipmon was not correctly calculating the length of the IPv6 packet (excluded
ipv6 header length)

MFC: 1 week

bring changes in IPFilter to 3.4.31 on to the head

fix conflicts created by import

fix conflicts from rcsids

Not in this commit: Many spammed deltas have been removed to restore
back to the vendor branch.

Re-merge changes from the vendor branch.

Undo the local spammed changes that I could find. There are probably
more local fixes that were clobbered that I've missed.

remove non-existant references, correct spelling errors.

PR: docs/7963, docs/7790
Submitted by: Stefan Eggers seggers@semyam.dinoco.de
Norihiro Kumagai kuma@jp.freebsd.org

Typo fix: "whether on not" -> "whether or not".

PR: 8102
Submitted by: Kazuo Horikawa <horikawa@jp.freebsd.org>

This commit was generated by cvs2svn to compensate for changes in r37074,
which included commits to RCS files with non-trunk default branches.

Import trimmed version of ipfilter 3.2.7.

Obtained from: Darren Reed via http://cheops.anu.edu.au/~avalon/

Import ipfilter 3.2.3

Import ipfilter 3.2.1 (update from 3.1.8)

Import version 3.2alpha7

Import IP Filter v3.1.7 into FreeBSD tree