svn commit: r298135 - stable/10/sbin/devd

[Scott Long]

Author: scottl
Date: Sun Apr 17 01:38:37 2016
New Revision: 298135
URL: https://svnweb.freebsd.org/changeset/base/298135

Log:
  Merge r298008
  
   Update the devd.conf man page to describe the new CAM/periph system/subsystem.
  
  Sponsored by:	Netflix

Modified:
  stable/10/sbin/devd/devd.conf.5
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/devd/devd.conf.5
==============================================================================
--- stable/10/sbin/devd/devd.conf.5	Sun Apr 17 01:35:57 2016	(r298134)
+++ stable/10/sbin/devd/devd.conf.5	Sun Apr 17 01:38:37 2016	(r298135)
@@ -41,7 +41,7 @@
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 .\" SOFTWARE.
 .\"
-.Dd July 11, 2015
+.Dd April 14, 2016
 .Dt DEVD.CONF 5
 .Os
 .Sh NAME
@@ -492,6 +492,23 @@ Information about the state of the syste
 Notification that the system has woken from the suspended state.
 .El
 .El
+.Pp
+.It Li CAM
+Events related to the
+.Xr cam 4
+system.
+.Bl -tag -width ".Sy Subsystem" -compact
+.It Sy Subsystem
+.It Li periph
+Events related to peripheral devices.
+.Bl -tag -width ".li timeout" -compact
+.It Sy Type
+.It Li error
+Generic errors.
+.It Li timeout
+Command timeouts.
+.El
+.El
 .El
 .Pp
 A link state change to UP on the interface
@@ -621,4 +638,5 @@ has many additional examples.
 .Xr coretemp 4 ,
 .Xr devfs 5 ,
 .Xr re_format 7 ,
-.Xr devd 8
+.Xr devd 8 ,
+.Xr cam 4