through an optionnal /etc/sysmerge.ignore file
requested by many
man page tweak from jmc@
/etc/changelist addition suggested by sthen@
ok sthen@ jdixon@ jmc@ naddy@

ok oga@

please commit from deraadt@

Help and OK todd@, OK robert@

originally pointed out by Johan Torin

ok deraadt@, reyk@, pyr@

boot as discussed with claudio while eating tasty donairs.  ok todd

ok deraadt@ beck@ reyk@ phessler@

It has also been moved to /usr/share/doc/html/httpd/.  This will
ease sysmerge upgrades and help keep htdocs clean.
Help from okan and phessler, doc tweaks by jmc
ok deraadt@ millert@ beck@

ok deraadt@ dlg@

ok jsing@

ok pyr@

with the same configuration to be run on the same net and they will
keep their lease files/state in synch, and therefore allowing you to
run redundant dhcpd's. Synchronization code stolen from spamd, uses
an hmac key in /var/db/dhcpd.key if it exists.
ok krw@ deraadt@

including some "cleverly" positioned in the dynamic range :(
- add a couple of services relating to some ports/packages which
otherwise need a manual change to this file
looks good to ajacoutot, steven. suggestions/ok deraadt

ok jmc@, no objections espie@

An increasing number of types of these files (e.g. ppp, carp and
wlan adapters) may contain secrets.
ok deraadt oga johan

first version from todd, ok millert

inputs from jmc@
"looks ok" beck@ (similar older diff), "fine by me" jmc@

ok deraadt@

bsd.rd does not overlap the boot code... this problem is starting to
feel familiar.. tested by myself and claudio

bootblocks have been moved, but we want 4.2 to be upgradeable.  So
reduce the footprint of the bsd.rd by shrinking the ramdisk filesystem
because it is way too large.  tested by sthen and kettenis

also adjust the documentation a little bit to decrease confusion about
the check timeout.
From pyr@
ok deraadt@

- rdr-anchor "relayd/*": the anchor used by relayd to load
redirections into pf.
- pass in on $ext_if proto icmp to ($ext_if): it is a bad habit to
block icmp, this example proposes to allow it by default.
ok henning@

randomisations (among other things) benefit from it. We still try again
after /var has been definitely mounted in case it is on NFS;
ok deraadt@

ok espie@, henning@

pubkey authentication users with the correct file permissions a bit easier.
ok djm krw henning miod and many others

http://www.iana.org/reports/root-aaaa-announcement.html

approved by deraadt@, ok thib@

taken into consideration for rtsol.
ok reyk@ dlg@