Fix a confusing sentence. [1]

Other wording tweaks.

Reviewed by:	imp [1]
Approved by:	gjb
This commit is contained in:
Warren Block 2011-09-29 03:37:42 +00:00
parent cc13988649
commit 762f55cd5f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=225861

View File

@ -8,10 +8,10 @@
# NB: device-name is shorthand for 'match device-name' # NB: device-name is shorthand for 'match device-name'
options { options {
# Each directory directive adds a directory the list of directories # Each "directory" directive adds a directory to the list of
# that we scan for files. Files are read-in in the order that they # directories that we scan for files. Files are loaded in the order
# are returned from readdir(3). The rule-sets are combined to # that they are returned from readdir(3). The rule-sets are combined
# create a DFA that's used to match events to actions. # to create a DFA that's used to match events to actions.
directory "/etc/devd"; directory "/etc/devd";
directory "/usr/local/etc/devd"; directory "/usr/local/etc/devd";
pid-file "/var/run/devd.pid"; pid-file "/var/run/devd.pid";
@ -32,8 +32,8 @@ options {
# script is called pccard_ether. # script is called pccard_ether.
# #
# NB: DETACH events are ignored; the kernel should handle all cleanup # NB: DETACH events are ignored; the kernel should handle all cleanup
# (routes, arp cache) if you need to do something beware of races # (routes, arp cache). Beware of races against immediate create
# against immediate create of a device w/ the same name; e.g. # of a device with the same name; e.g.
# ifconfig bridge0 destroy; ifconfig bridge0 create # ifconfig bridge0 destroy; ifconfig bridge0 create
# #
notify 0 { notify 0 {
@ -43,7 +43,7 @@ notify 0 {
}; };
# #
# Try to start dhclient on Ethernet like interfaces when the link comes # Try to start dhclient on Ethernet-like interfaces when the link comes
# up. Only devices that are configured to support DHCP will actually # up. Only devices that are configured to support DHCP will actually
# run it. No link down rule exists because dhclient automatically exits # run it. No link down rule exists because dhclient automatically exits
# when the link goes down. # when the link goes down.
@ -87,7 +87,7 @@ detach 100 {
device-name "ed50"; device-name "ed50";
}; };
# When a USB Bluetooth dongle appears activate it # When a USB Bluetooth dongle appears, activate it
attach 100 { attach 100 {
device-name "ubt[0-9]+"; device-name "ubt[0-9]+";
action "/etc/rc.d/bluetooth quietstart $device-name"; action "/etc/rc.d/bluetooth quietstart $device-name";
@ -125,7 +125,7 @@ detach 100 {
}; };
# Firmware download into the ActiveWire board. After the firmware download is # Firmware download into the ActiveWire board. After the firmware download is
# done the device detaches and reappears as something new and shiny # done, the device detaches and reappears as something new and shiny
# automatically. # automatically.
attach 100 { attach 100 {
match "vendor" "0x0854"; match "vendor" "0x0854";
@ -265,12 +265,11 @@ notify 10 {
/* EXAMPLES TO END OF FILE /* EXAMPLES TO END OF FILE
# The following might be an example of something that a vendor might # An example of something that a vendor might install if you were to
# install if you were to add their device. This might reside in # add their device. This might reside in /usr/local/etc/devd/deqna.conf.
# /usr/local/etc/devd/deqna.conf. A deqna is, in this hypothetical # A deqna is, in this hypothetical example, a pccard ethernet-like device.
# example, a pccard ethernet-like device. Students of history may # Students of history may know other devices by this name, and will get
# know other devices by this name, and will get the in-jokes in this # the in-jokes in this entry.
# entry.
nomatch 10 { nomatch 10 {
match "bus" "pccard[0-9]+"; match "bus" "pccard[0-9]+";
match "manufacturer" "0x1234"; match "manufacturer" "0x1234";
@ -288,7 +287,7 @@ detach 10 {
# Examples of notify hooks. A notify is a generic way for a kernel # Examples of notify hooks. A notify is a generic way for a kernel
# subsystem to send event notification to userland. # subsystem to send event notification to userland.
#
# Here are some examples of ACPI notify handlers. ACPI subsystems that # Here are some examples of ACPI notify handlers. ACPI subsystems that
# generate notifies include the AC adapter, power/sleep buttons, # generate notifies include the AC adapter, power/sleep buttons,
# control method batteries, lid switch, and thermal zones. # control method batteries, lid switch, and thermal zones.
@ -316,7 +315,7 @@ notify 10 {
}; };
# This example works around a memory leak in PostgreSQL, restarting # This example works around a memory leak in PostgreSQL, restarting
# it when "user:pgsql:swap:devctl=1G" rctl(8) rule gets triggered. # it when the "user:pgsql:swap:devctl=1G" rctl(8) rule gets triggered.
notify 0 { notify 0 {
match "system" "RCTL"; match "system" "RCTL";
match "rule" "user:70:swap:.*"; match "rule" "user:70:swap:.*";