From 9e2a4f90cec1f2883a492f23a81d2c5d0fd53929 Mon Sep 17 00:00:00 2001
From: gavin <gavin@FreeBSD.org>
Date: Sun, 28 Feb 2010 11:14:29 +0000
Subject: Merge r204166 from head:

  Document the interaction between /etc/devfs.conf and
  /etc/defaults/devfs.conf

PR:		docs/117308
Submitted by:	Mel <mel.xyzzy rachie.is-a-geek.net> (partially)
---
 sbin/devfs/devfs.8 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'sbin')

diff --git a/sbin/devfs/devfs.8 b/sbin/devfs/devfs.8
index 62e10d9..7a744d4 100644
--- a/sbin/devfs/devfs.8
+++ b/sbin/devfs/devfs.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 27, 2008
+.Dd February 21, 2010
 .Dt DEVFS 8
 .Os
 .Sh NAME
@@ -196,6 +196,9 @@ Apply all the rules in ruleset number
 to the node.
 This does not necessarily result in any changes to the node
 (e.g., if none of the rules in the included ruleset match).
+Include commands in the referenced
+.Ar ruleset
+are not resolved.
 .It Cm mode Ar filemode
 Set the file mode to
 .Ar filemode ,
@@ -243,7 +246,9 @@ configuration file.
 .It Pa /etc/devfs.rules
 Local
 .Nm
-configuration file.
+configuration file.  Rulesets in here override those in
+.Pa /etc/defaults/devfs.rules 
+with the same ruleset number, otherwise the two files are effectively merged. 
 .It Pa /etc/devfs.conf
 Boot-time
 .Nm
-- 
cgit v1.1