Remove svn:mergeinfo from the releng/10.0 branch.After branch creation from stable/10, the stable/10 branch mergeinfowas moved to the root of the branch.Since there have not been any merges from stable/10 to releng/10.0yet, we do not need to track any of the existing mergeinfo here.Merges to releng/10.0 should now be done to the root of the branch.For future branches during the release cycle, unless otherwise noted,this change will be done as part of the stable/ and releng/ branchcreation.Discussed with: peterApproved by: re (implicit)Sponsored by: The FreeBSD Foundation
- Copy stable/10 (r259064) to releng/10.0 as part of the 10.0-RELEASE cycle.- Update __FreeBSD_version [1]- Set branch name to -RC1[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so start releng/10.0 at '100' so the branch is started with a value ending in zero.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
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/156494Submitted by: bcrRequested by: bcrObtained from: http://roy.marples.name/projects/openresolv/ticket/12
Import openresolv from vendor branch, actually.Helped by: jhb
Import openresolv-3.4.1.