MFC r282434:
MFV r225523, r282431:
r225523 (hrs):
Import openresolv-3.4.4.

r282431:
Import openresolv-3.7.0.

PR: 199854
Submitted by: yuri@rawbw.com
Relnotes: yes
Sponsored by: The FreeBSD Foundation

Hoist all the mergeinfo up to the root in preparation for enforcing merges
to the root only. All MFC's were rerecorded to the root.

Going forward, if an MFC includes mergeinfo, it will need to be made to
the root and committed from the root. Merges with --ignore-ancestry
or diff | patch can go anywhere.

The mergeinfo in HEAD is in a bad state from years of neglect and manual
tampering and this was branched into 10.x. This confuses the coalescing
code and prevents it from doing its job.

Approved by: re (gjb, implicit)

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

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

According to resolvconf.conf(5) manpage and sources, there is no
'nameservers' option which used in examples in resolvconf.conf(5),
it spelled 'name_servers', so fix examples.

Merge from openresolv 3.4.4 in the vendor branch.

Approved by: re (kib)

Fix typo in manpage resolvconf.conf(5).

PR: docs/156494
Submitted by: bcr
Requested by: bcr
Obtained from: http://roy.marples.name/projects/openresolv/ticket/12

Import openresolv from vendor branch, actually.

Helped by: jhb

Import openresolv-3.4.1.