summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorwblock <wblock@FreeBSD.org>2011-09-29 03:37:42 +0000
committerwblock <wblock@FreeBSD.org>2011-09-29 03:37:42 +0000
commitfc02252004dd6a6ce876d766ffe38222616705ca (patch)
treed0cb662757cefa5e2ec34a49772c163ccddc9580 /etc
parent51241a49efb34cbae8b825cae56e43b96973bd63 (diff)
downloadFreeBSD-src-fc02252004dd6a6ce876d766ffe38222616705ca.zip
FreeBSD-src-fc02252004dd6a6ce876d766ffe38222616705ca.tar.gz
Fix a confusing sentence. [1]
Other wording tweaks. Reviewed by: imp [1] Approved by: gjb
Diffstat (limited to 'etc')
-rw-r--r--etc/devd.conf33
1 files changed, 16 insertions, 17 deletions
diff --git a/etc/devd.conf b/etc/devd.conf
index 807ec05..2ba2e0e 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -8,10 +8,10 @@
# NB: device-name is shorthand for 'match device-name'
options {
- # Each directory directive adds a directory the list of directories
- # that we scan for files. Files are read-in in the order that they
- # are returned from readdir(3). The rule-sets are combined to
- # create a DFA that's used to match events to actions.
+ # Each "directory" directive adds a directory to the list of
+ # directories that we scan for files. Files are loaded in the order
+ # that they are returned from readdir(3). The rule-sets are combined
+ # to create a DFA that's used to match events to actions.
directory "/etc/devd";
directory "/usr/local/etc/devd";
pid-file "/var/run/devd.pid";
@@ -32,8 +32,8 @@ options {
# script is called pccard_ether.
#
# NB: DETACH events are ignored; the kernel should handle all cleanup
-# (routes, arp cache) if you need to do something beware of races
-# against immediate create of a device w/ the same name; e.g.
+# (routes, arp cache). Beware of races against immediate create
+# of a device with the same name; e.g.
# ifconfig bridge0 destroy; ifconfig bridge0 create
#
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
# run it. No link down rule exists because dhclient automatically exits
# when the link goes down.
@@ -87,7 +87,7 @@ detach 100 {
device-name "ed50";
};
-# When a USB Bluetooth dongle appears activate it
+# When a USB Bluetooth dongle appears, activate it
attach 100 {
device-name "ubt[0-9]+";
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
-# done the device detaches and reappears as something new and shiny
+# done, the device detaches and reappears as something new and shiny
# automatically.
attach 100 {
match "vendor" "0x0854";
@@ -265,12 +265,11 @@ notify 10 {
/* EXAMPLES TO END OF FILE
-# The following might be an example of something that a vendor might
-# install if you were to add their device. This might reside in
-# /usr/local/etc/devd/deqna.conf. A deqna is, in this hypothetical
-# example, a pccard ethernet-like device. Students of history may
-# know other devices by this name, and will get the in-jokes in this
-# entry.
+# An example of something that a vendor might install if you were to
+# add their device. This might reside in /usr/local/etc/devd/deqna.conf.
+# A deqna is, in this hypothetical example, a pccard ethernet-like device.
+# Students of history may know other devices by this name, and will get
+# the in-jokes in this entry.
nomatch 10 {
match "bus" "pccard[0-9]+";
match "manufacturer" "0x1234";
@@ -288,7 +287,7 @@ detach 10 {
# Examples of notify hooks. A notify is a generic way for a kernel
# subsystem to send event notification to userland.
-#
+
# Here are some examples of ACPI notify handlers. ACPI subsystems that
# generate notifies include the AC adapter, power/sleep buttons,
# control method batteries, lid switch, and thermal zones.
@@ -316,7 +315,7 @@ notify 10 {
};
# 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 {
match "system" "RCTL";
match "rule" "user:70:swap:.*";
OpenPOWER on IntegriCloud