X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.8.in;h=9c22f8aa633a9e78fb78717a031bfa230427d130;hp=76e727f5984e4fa489f9b3d0358d237807b89708;hb=d30ef6b192a39cf69f9e6037a4c984ccf533f721;hpb=326e0876e40eb7559e7fbbde47785685013cb624

diff --git a/udev.8.in b/udev.8.in
index 76e727f59..9c22f8aa6 100644
--- a/udev.8.in
+++ b/udev.8.in
@@ -77,45 +77,43 @@ in this file:
 .B udev_root
 Indicates where to place the device nodes in the filesystem. The default
 value is
-.IR @udevdir@ .
+.IR @udevdir@/ .
 .TP
 .B udev_db
 The name and location of the udev database. The default value is
 .IR @udevdir@/.udev.tdb .
 .TP
 .B udev_rules
-This is the location of the udev rules file. The default value for this is
-.IR /etc/udev/udev.rules .
-If a directory is specified, the whole directory is
-scanned for files ending with
-.I .rules
-and all rule files are read in lexical order.
+The name of the udev rules file or directory to look for files with the suffix
+.IR .rules .
+All rule files are read in lexical order. The default value is
+.IR /etc/udev/rules.d/ .
 .TP
 .B udev_permissions
-This is the location of the udev permission file. The default value for this is
-.IR /etc/udev/udev.permissions .
-If a directory is specified, the whole directory is scanned for files ending with
-.I .permissions
-and all permission files are read in lexical order.
+The name of the udev permission file or directory to look for files with the
+suffix
+.IR .permissions .
+All permission files are read in lexical order. The default value is
+.IR /etc/udev/permissions.d/ .
 .TP
 .B udev_log
-If you want udev to log some information to the syslog for every device handled.
+The switch, if udev logs some information for every device handled.
 The default value is
 .IR yes .
 .TP
 .B default_mode
-This is the default mode for all nodes not explicitely matching in the
-permissions file. The default value is
+The default mode for all nodes not explicitely matching in the permissions
+file. The default value is
 .IR 0666 .
 .TP
 .B default_owner
-This is the default owner for all nodes not explicitely matching in the
-permissions file. The default value is
+The default owner for all nodes not explicitely matching in the permissions
+file. The default value is
 .IR root .
 .TP
 .B default_group
-This is the default group for all nodes not explicitely matching in the
-permissions file. The default value is
+The default group for all nodes not explicitely matching in the permissions
+file. The default value is
 .IR root .
 .br
 .P
@@ -123,16 +121,17 @@ permissions file. The default value is
 .sp
 .nf
 # udev_root - where to place the device nodes in the filesystem
-udev_root="@udevdir@"
+udev_root="/udev"
 
 # udev_db - The name and location of the udev database
-udev_db="@udevdir@/.udev.tdb"
+udev_db="/udev/.udev.tdb"
 
-# udev_rules - The location of the directory where to look for files
-               which names ending with .rules
-udev_rules="/etc/udev/"
+# udev_rules - The name of the udev rules file or directory to look
+               for files with the suffix .rules
+udev_rules="/etc/udev/rules.d/"
 
-# udev_permissions - The name and location of the udev permission file
+# udev_permissions - The name of the udev permission file or directory
+                     to look for files with the suffix .permissions
 udev_permissions="/etc/udev/udev.permissions"
 
 # udev_log - set to "yes" if you want logging, else "no"
@@ -151,14 +150,14 @@ default_owner="root"
 default_group="root"
 .fi
 .P
-The rules for udev to use when naming devices may specified in
-.I /etc/udev/udev.rules
-or by the
+The rules for device naming, are read from the files located in the
+.I /etc/udev/rules.d/
+directory, or at the location specified by the
 .I udev_rules
 value in the
 .I /etc/udev/udev.conf
 file.
-.P
+.br
 Every line in the rules file defines the mapping between device attributes
 and the device name. One or more keys are specified to match a rule with
 the current device. If all keys are matching, the rule will be applied and
@@ -273,6 +272,13 @@ all remaining parts of the result string are substituted:
 .BI %s{ filename }
 The content of a sysfs attribute.
 .TP
+.B %e
+If a device node already exists with the name, the smallest positive
+decimal integer N is substituted such that the resulting name doesn't
+match an existing device node. Otherwise nothing is substituted. This
+can be used to create compatibility symlinks and enumerate devices of
+the same type originating from different kernel subsystems.
+.TP
 .B %%
 The '%' character itself.
 .P
@@ -303,11 +309,20 @@ KERNEL="ttyUSB1", NAME="pda", SYMLINK="palmtop handheld"
 
 # multiple USB webcams with symlinks to be called webcam0, webcam1, ...
 BUS="usb", SYSFS{model}="XV3", NAME="video%n", SYMLINK="webcam%n"
+
+# grouping of optical drives from multiple kernel subsystems
+KERNEL="sr*", NAME="%k", SYMLINK="cdrom%e"
+KERNEL="scd*", NAME="%k", SYMLINK="cdrom%e"
+KERNEL="pcd*", NAME="%k", SYMLINK="cdrom%e"
+KERNEL="hd[a-z]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom",
+  NAME="%k", SYMLINK="cdrom%e"
+
 .fi
 .P
-Permissions and ownership for the created device files may specified in
-.I /etc/udev/udev.permissions
-or by the
+The permissions and ownership of the created device file is read from
+the files located in the
+.I /etc/udev/permissions.d/
+directory, or at the location specified by the
 .I udev_permission
 value in the
 .I /etc/udev/udev.conf