From owner-svn-src-all@FreeBSD.ORG  Sun Aug 26 05:20:33 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2D797106566B;
	Sun, 26 Aug 2012 05:20:33 +0000 (UTC)
	(envelope-from ache@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 182BC8FC08;
	Sun, 26 Aug 2012 05:20:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7Q5KWaL067047;
	Sun, 26 Aug 2012 05:20:32 GMT (envelope-from ache@svn.freebsd.org)
Received: (from ache@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7Q5KWIt067044;
	Sun, 26 Aug 2012 05:20:32 GMT (envelope-from ache@svn.freebsd.org)
Message-Id: <201208260520.q7Q5KWIt067044@svn.freebsd.org>
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sun, 26 Aug 2012 05:20:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239708 - stable/9/contrib/openresolv
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Aug 2012 05:20:33 -0000

Author: ache
Date: Sun Aug 26 05:20:32 2012
New Revision: 239708
URL: http://svn.freebsd.org/changeset/base/239708

Log:
  MFC r239477
  
  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.

Modified:
  stable/9/contrib/openresolv/resolvconf.conf.5.in
Directory Properties:
  stable/9/contrib/openresolv/   (props changed)

Modified: stable/9/contrib/openresolv/resolvconf.conf.5.in
==============================================================================
--- stable/9/contrib/openresolv/resolvconf.conf.5.in	Sun Aug 26 05:11:52 2012	(r239707)
+++ stable/9/contrib/openresolv/resolvconf.conf.5.in	Sun Aug 26 05:20:32 2012	(r239708)
@@ -113,7 +113,7 @@ This file tells dnsmasq which nameserver
 This file tells dnsmasq which nameservers to use for global lookups.
 .Pp
 Example resolvconf.conf for dnsmasq:
-.D1 nameservers=127.0.0.1
+.D1 name_servers=127.0.0.1
 .D1 dnsmasq_conf=/etc/dnsmasq-conf.conf
 .D1 dnsmasq_resolv=/etc/dnsmasq-resolv.conf
 .Pp
@@ -129,7 +129,7 @@ Include this file in the named global sc
 This file tells named which nameservers to use for specific domains.
 .Pp
 Example resolvconf.conf for named:
-.D1 nameservers=127.0.0.1
+.D1 name_servers=127.0.0.1
 .D1 named_options=/etc/named-options.conf
 .D1 named_zones=/etc/named-zones.conf
 .Pp
@@ -152,7 +152,7 @@ If this variable is not set then it's wr
 .Pa pdnsd_conf .
 .Pp
 Example resolvconf.conf for pdnsd:
-.D1 nameservers=127.0.0.1
+.D1 name_servers=127.0.0.1
 .D1 pdnsd_conf=/etc/pdnsd.conf
 .D1 # pdnsd_resolv=/etc/pdnsd-resolv.conf
 .Pp
@@ -171,7 +171,7 @@ Example pdnsd.conf:
 This file tells unbound about specific and global nameservers.
 .Pp
 Example resolvconf.conf for unbound:
-.D1 nameservers=127.0.0.1
+.D1 name_servers=127.0.0.1
 .D1 unbound_conf=/etc/unbound-resolvconf.conf
 .Pp
 Example unbound.conf: