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)
---
 share/man/man5/devfs.rules.5 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'share')

diff --git a/share/man/man5/devfs.rules.5 b/share/man/man5/devfs.rules.5
index cc641ec..24f7824 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
-- 
cgit v1.1