From owner-svn-src-stable@FreeBSD.ORG  Wed Nov  2 13:51:29 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79E1C106566C;
	Wed,  2 Nov 2011 13:51:29 +0000 (UTC)
	(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 698E28FC1C;
	Wed,  2 Nov 2011 13:51:29 +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 pA2DpTbS024238;
	Wed, 2 Nov 2011 13:51:29 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA2DpTeb024236;
	Wed, 2 Nov 2011 13:51:29 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201111021351.pA2DpTeb024236@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Wed, 2 Nov 2011 13:51:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227018 - stable/9/etc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Nov 2011 13:51:29 -0000

Author: gavin
Date: Wed Nov  2 13:51:29 2011
New Revision: 227018
URL: http://svn.freebsd.org/changeset/base/227018

Log:
  Merge r226860 from head:
    Update the example rules in devfs.conf to reflect the changes since
    ATA_CAM.  While here, add another example rule, as many applications
    these days expect to find /dev/dvd instead.
  
  Approved by:	re (kib)
  
  _M   etc
  M    etc/devfs.conf

Modified:
  stable/9/etc/devfs.conf
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/devfs.conf
==============================================================================
--- stable/9/etc/devfs.conf	Wed Nov  2 11:05:11 2011	(r227017)
+++ stable/9/etc/devfs.conf	Wed Nov  2 13:51:29 2011	(r227018)
@@ -35,7 +35,8 @@
 #link	ttyv0	vga
 
 # Commonly used by many ports
-#link	acd0	cdrom
+#link	cd0	cdrom
+#link	cd0	dvd
 
 # Allow a user in the wheel group to query the smb0 device
 #perm	smb0	0660