From 4e63a98665ba43fd763c504c9dc877e29096f0ae Mon Sep 17 00:00:00 2001
From: gavin <gavin@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 28 Feb 2010 11:14:29 +0000
Subject: [PATCH] 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)


git-svn-id: svn://svn.freebsd.org/base/stable/8@204444 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sbin/devfs/devfs.8           |  9 +++++++--
 share/man/man5/devfs.rules.5 | 12 ++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/sbin/devfs/devfs.8 b/sbin/devfs/devfs.8
index 62e10d942..7a744d437 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
diff --git a/share/man/man5/devfs.rules.5 b/share/man/man5/devfs.rules.5
index cc641ec6e..24f78244a 100644
--- a/share/man/man5/devfs.rules.5
+++ b/share/man/man5/devfs.rules.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 30, 2006
+.Dd February 21, 2010
 .Dt DEVFS.RULES 5
 .Os
 .Sh NAME
@@ -83,8 +83,16 @@ devfs_system_ruleset="localrules"
 .Ed
 .Sh FILES
 .Bl -tag -compact
-.It Pa /etc/devfs.rules
 .It Pa /etc/defaults/devfs.rules
+Default
+.Nm
+configuration file.
+.It Pa /etc/devfs.rules
+Local
+.Nm
+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.
 .El
 .Sh EXAMPLES
 To make all the partitions of
-- 
2.45.0