[PATCH] remove PLACE key match

[elogind.git] / udev.8.in

diff --git a/udev.8.in b/udev.8.in
index 0cc2f939e3fa77dc924263273e16386e4d1384cb..e02596053258523a99715330630b5ad1f3d2d1a6 100644 (file)
--- a/udev.8.in
+++ b/udev.8.in
@@ -59,22 +59,6 @@ All rule files are read in lexical order. The default value is
 The switch to enable/disable logging of udev information
 The default value is
 .IR yes .
-.TP
-.B default_mode
-The default mode for all nodes where no explicit value is given by a rule.
-The default value is
-.IR 0660 .
-.TP
-.B default_owner
-The default owner for all nodes where no explicit value is given by a rule.
-The default value is
-.IR root .
-.TP
-.B default_group
-The default group for all nodes where no explicitly value is given by a rule.
-The default value is
-.IR root .
-.br
 .P
 .RI "A sample " udev.conf " file might look like this:
 .sp
@@ -91,18 +75,6 @@ udev_rules="/etc/udev/rules.d/"
 
 # udev_log - set to "yes" if you want logging, else "no"
 udev_log="yes"
-
-# default_mode - set the default mode for all nodes that have no
-#                permissions specified
-default_mode="0660"
-
-# default_owner - set the default owner for all nodes that have no
-#                 permissions specified
-default_owner="root"
-
-# default_group - set the default group for all nodes that have no
-#                 permissions specified
-default_group="root"
 .fi
 .P
 The rules for device naming are read from the files located in the
@@ -142,9 +114,6 @@ Match the kernel driver name.
 .B ID
 Match the device number on the bus, like PCI bus id.
 .TP
-.B PLACE
-Match the topological position on bus, like physical port of USB device
-.TP
 .BI SYSFS{ filename }
 Match sysfs device attribute like label, vendor, USB serial number, SCSI UUID
 or file system label. Up to 5 different sysfs files can be checked, with
@@ -173,20 +142,6 @@ call.
 .B NAME
 The name of the node to be created, or the name, the network interface
 should be renamed to.
-.br
-If given with the attribute
-.BR NAME{ all_partitions }
-.B udev
-will create device nodes for all 15 partitions of a blockdevice.
-This may be useful for removable media devices.
-.br
-If given with the attribute
-.BR NAME{ ignore_remove }
-.B udev
-will ignore any later remove event for this device.
-This may be useful as a workaround for broken device drivers.
-.sp
-Multiple attributes may be separated by comma.
 .TP
 .B SYMLINK
 The name of a symlink targeting the node. Multiple symlinks may be
@@ -204,7 +159,22 @@ distribution provided rules file.
 .TP
 .B OWNER, GROUP, MODE
 The permissions for the device node. Every specified value overwrites the
-default value specified in the config file.
+compiled-in default value.
+.TP
+.B OPTIONS
+.B ignore_device
+will ignore this device. No node will be created.
+.sp
+.B ignore_remove
+will ignore any later remove event for this device.
+This may be useful as a workaround for broken device drivers.
+.sp
+.B all_partitions
+will create device nodes for all available partitions of a blockdevice.
+This may be useful for removable media devices which do not detect a media
+change.
+.sp
+Multiple attributes may be separated by comma.
 .P
 .RB "The " NAME ", " SYMLINK ", " PROGRAM ", " OWNER " and " GROUP
 fields support simple printf-like string substitutions:
@@ -216,6 +186,9 @@ For example, 'sda3' has a "kernel number" of '3'.
 .B %k
 The "kernel name" for the device.
 .TP
+.B %p
+The devpath for the device.
+.TP
 .B %M
 The kernel major number for the device.
 .TP
@@ -239,6 +212,13 @@ If the number is followed by the + char this part plus
 all remaining parts of the result string are substituted:
 .BI %c{ N+ }
 .TP
+.B %N
+The name of a created temporary device node to provide access to the
+device from a external program.
+.TP
+.B %P
+The node name of the parent device.
+.TP
 .BI %s{ filename }
 The content of a sysfs attribute.
 .TP
@@ -272,7 +252,7 @@ BUS="scsi", SYSFS{vendor}="IBM", SYSFS{model}="ST336", NAME="boot%n"
 BUS="pci", ID="00:0b.0", NAME="dsp"
 
 # USB mouse at third port of the second hub to be called mouse1
-BUS="usb", PLACE="2.3", NAME="mouse1"
+BUS="usb", ID="2.3", NAME="mouse1"
 
 # ttyUSB1 should always be called pda with two additional symlinks
 KERNEL="ttyUSB1", NAME="pda", SYMLINK="palmtop handheld"