From owner-svn-src-stable-7@FreeBSD.ORG  Thu Oct  4 22:32:28 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3C3C31065691;
	Thu,  4 Oct 2012 22:32:28 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 24F538FC08;
	Thu,  4 Oct 2012 22:32:28 +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 q94MWSbi036059;
	Thu, 4 Oct 2012 22:32:28 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q94MWRFh036056;
	Thu, 4 Oct 2012 22:32:27 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201210042232.q94MWRFh036056@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 4 Oct 2012 22:32:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r241210 - in stable/7/etc: . rc.d
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Oct 2012 22:32:28 -0000

Author: dougb
Date: Thu Oct  4 22:32:27 2012
New Revision: 241210
URL: http://svn.freebsd.org/changeset/base/241210

Log:
  MFC r229822:
  
  There is no longer a need to abstract ${rcvar_manpage} as we are not
  attempting to maintain compatibility with NetBSD for some years now.

Modified:
  stable/7/etc/rc.d/hostname
  stable/7/etc/rc.subr
Directory Properties:
  stable/7/etc/   (props changed)

Modified: stable/7/etc/rc.d/hostname
==============================================================================
--- stable/7/etc/rc.d/hostname	Thu Oct  4 22:32:12 2012	(r241209)
+++ stable/7/etc/rc.d/hostname	Thu Oct  4 22:32:27 2012	(r241210)
@@ -65,7 +65,7 @@ hostname_start()
 		# Null hostname is probably OK if DHCP is in use.
 		#
 		if [ -z "`list_net_interfaces dhcp`" ]; then
-			warn "\$hostname is not set -- see ${rcvar_manpage}."
+			warn "\$hostname is not set -- see rc.conf(5)."
 		fi
 		return
 	fi

Modified: stable/7/etc/rc.subr
==============================================================================
--- stable/7/etc/rc.subr	Thu Oct  4 22:32:12 2012	(r241209)
+++ stable/7/etc/rc.subr	Thu Oct  4 22:32:27 2012	(r241210)
@@ -39,7 +39,6 @@
 #	functions used by various rc scripts
 #
 
-: ${rcvar_manpage:='rc.conf(5)'}
 : ${RC_PID:=$$}; export RC_PID
 
 #
@@ -143,7 +142,7 @@ checkyesno()
 		return 1
 		;;
 	*)
-		warn "\$${1} is not set properly - see ${rcvar_manpage}."
+		warn "\$${1} is not set properly - see rc.conf(5)."
 		return 1
 		;;
 	esac