From owner-svn-src-stable-7@FreeBSD.ORG  Mon Jan 24 15:18:18 2011
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 [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E2F55106566B;
	Mon, 24 Jan 2011 15:18:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D047B8FC16;
	Mon, 24 Jan 2011 15:18:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0OFIIB3096277;
	Mon, 24 Jan 2011 15:18:18 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0OFIIJB096275;
	Mon, 24 Jan 2011 15:18:18 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201101241518.p0OFIIJB096275@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 24 Jan 2011 15:18:18 +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: r217788 - stable/7/share/man/man5
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: Mon, 24 Jan 2011 15:18:19 -0000

Author: gjb (doc committer)
Date: Mon Jan 24 15:18:18 2011
New Revision: 217788
URL: http://svn.freebsd.org/changeset/base/217788

Log:
  MFC 217148, 217786:
  Document rc.conf.d in rc.conf(5).
  
  PR:		140495
  Approved by:	keramida (mentor)

Modified:
  stable/7/share/man/man5/rc.conf.5
Directory Properties:
  stable/7/share/man/man5/   (props changed)

Modified: stable/7/share/man/man5/rc.conf.5
==============================================================================
--- stable/7/share/man/man5/rc.conf.5	Mon Jan 24 15:17:10 2011	(r217787)
+++ stable/7/share/man/man5/rc.conf.5	Mon Jan 24 15:18:18 2011	(r217788)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 13, 2010
+.Dd January 7, 2011
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -64,7 +64,19 @@ The file
 is used to override settings in
 .Pa /etc/rc.conf
 for historical reasons.
-See the
+In addition to
+.Pa /etc/rc.conf.local
+you can also place smaller configuration files for each
+.Xr rc 8
+script in the
+.Pa /etc/rc.conf.d
+directory, which will be included by the
+.Va load_rc_config
+function.
+For jail configurations you could use the file
+.Pa /etc/rc.conf.d/jail
+to store jail specific configuration options.
+Also see the
 .Va rc_conf_files
 variable below.
 .Pp