Commit Graph

5 Commits

Author SHA1 Message Date
gjb
89cd18cd05 MFV r225523, r282431:
r225523 (hrs):
  Import openresolv-3.4.4.

 r282431:
  Import openresolv-3.7.0.

PR:		199854
Submitted by:	yuri@rawbw.com
MFC after:	1 week
Relnotes:	yes
Sponsored by:	The FreeBSD Foundation
2015-05-04 21:07:20 +00:00
ache
9a0fdc89f1 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.
2012-08-21 06:14:08 +00:00
hrs
ce750aacfc Merge from openresolv 3.4.4 in the vendor branch.
Approved by:	re (kib)
2011-09-13 02:46:22 +00:00
ume
6bad1f364e 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
2011-05-01 15:46:18 +00:00
ume
c23159e1a2 Import openresolv from vendor branch, actually.
Helped by:	jhb
2011-03-18 12:09:27 +00:00