Catch up ata(4) controllers, fix a typo (s/Cyrex/Cyrix/).
Add stubs for testenv() and freeenv() in RELENG_4 to make MFC
easier.

Suggested by:	peter
Approved by:	peter
MFC option descriptions, rewording the BUGS section.

While I'm here, MFC the "The .Nm utility" changes to reduce diffs!
Fix misleading comment mistakenly merged from the equally stale -current.
The TCP_RESTRICT_RST option was dropped from RELENG_4 10 months ago.

Submitted by:	marius@alchemy.franken.de
Bump __FreeBSD_version to correspond to XFree86 3.x/4.x cutover
MFC entries relevant to the ifpi2 driver.
MFC: Add a manpage for the ifpi2 driver to the Makefile.
This commit was manufactured by cvs2svn to create branch 'RELENG_4'.
MFC 1.9: typo in connect(2) error handling.
MFC 1.19: Correct timer management (deprecated) in nd6_timer.
Update (finally) IPFilter on RELENG_4 CVS branch.
remove
Merge changes from 3.4.20 to 3.4.27 into RELENG_4
* Adjust include paths to match changes in source code - ie. no longer need
 to include ipfilter/netinet, just ipfilter.
* man page for ipnat is now in section 8, not 1
* ipnat now links against and is dependant on libkvm.
* Adjust include paths to match changes in source code - ie. no longer need
 to include ipfilter/netinet, just ipfilter.
* ipfstat now links against and is dependant on libkvm.
Adjust include paths to match changes in source code - ie. no longer need
to include ipfilter/netinet, just ipfilter.
* Clean up CFLAGS additions
* add extra source files now needed to build
* compile all sources with -DIPFILTER_LOG to enable log testing
bring in examples from head
Remove ifpi2.4 from Makefile until I figure out how to get cvs to
let me import the darned thing.

cvs complains that ifpi2.4 was already added by another party, but
I have no idea _why_ :(
MFC:  IPFitler 3.4.27, ifpi2(4).