X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.7;h=e7de82ea0736316934e7ee659e6f50e6e6d83672;hp=3bc04b7c634860cf26b0539dfb030f6fd81ae8ec;hb=01e8dd08ef317175d8299ef4cbe24802de80770a;hpb=c7969cdbcb1f6d39177f6cc2e28597fabe186594

diff --git a/udev.7 b/udev.7
index 3bc04b7c6..e7de82ea0 100644
--- a/udev.7
+++ b/udev.7
@@ -105,6 +105,11 @@ Match the devpath of the event device\.
 Match the name of the event device\.
 .RE
 .PP
+\fBNAME\fR
+.RS 4
+Match the name of the node or network interface\. It can be used once the NAME key has been set in one of the preceding rules\.
+.RE
+.PP
 \fBSUBSYSTEM\fR
 .RS 4
 Match the subsystem of the event device\.
@@ -257,9 +262,9 @@ and
 based on the executable bit of the file permissions\.
 .RE
 .PP
-\fBWAIT_FOR_SYSFS\fR
+\fBWAIT_FOR\fR
 .RS 4
-Wait for the specified sysfs file of the device to be created\. Can be used to fight against kernel sysfs timing issues\.
+Wait for a file to become available\.
 .RE
 .PP
 \fBOPTIONS\fR
@@ -291,6 +296,11 @@ Specify the priority of the created symlinks\. Devices with higher priorities ov
 Create the device nodes for all available partitions of a block device\. This may be useful for removable media devices where media changes are not detected\.
 .RE
 .PP
+\fBevent_timeout=\fR
+.RS 4
+Number of seconds an event will wait for operations to finish, before it will terminate itself\.
+.RE
+.PP
 \fBstring_escape=\fR\fB\fInone|replace\fR\fR
 .RS 4
 Usually control and other possibly unsafe characters are replaced in strings used for device naming\. The mode of replacement can be specified with this option\.
@@ -302,7 +312,8 @@ The
 \fBSYMLINK\fR,
 \fBPROGRAM\fR,
 \fBOWNER\fR,
-\fBGROUP\fR
+\fBGROUP\fR,
+\fBMODE\fR
 and
 \fBRUN\fR
 fields support simple printf\-like string substitutions\. The
@@ -346,7 +357,7 @@ and
 .PP
 \fB$attr{\fR\fB\fIfile\fR\fR\fB}\fR, \fB%s{\fR\fB\fIfile\fR\fR\fB}\fR
 .RS 4
-The value of a sysfs attribute found at the device, where all keys of the rule have matched\. If the matching device does not have such an attribute, all devices along the chain of parents are searched for a matching attribute\. If the attribute is a symlink, the last element of the symlink target is returned as the value\.
+The value of a sysfs attribute found at the device, where all keys of the rule have matched\. If the matching device does not have such an attribute, follow the chain of parent devices and use the value of the first attribute that matches\. If the attribute is a symlink, the last element of the symlink target is returned as the value\.
 .RE
 .PP
 \fB$env{\fR\fB\fIkey\fR\fR\fB}\fR, \fB%E{\fR\fB\fIkey\fR\fR\fB}\fR
@@ -378,7 +389,12 @@ The node name of the parent device\.
 .PP
 \fB$name\fR
 .RS 4
-The name of the device node\. The value is only set if an earlier rule assigned a value, or during a remove events\.
+The current name of the device node\. If not changed by a rule, it is the name of the kernel device\.
+.RE
+.PP
+\fB$links\fR
+.RS 4
+The current list of symlinks, separated by a space character\. The value is only set if an earlier rule assigned a value, or during a remove events\.
 .RE
 .PP
 \fB$root\fR, \fB%r\fR