X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.8.in;h=3fb4bdb8da9e0ff08ad813d9d7ecaa3c8150f2cc;hp=90b7d833093b0d0653258df94100a58faf6f9062;hb=d384abd2bd61f0eb9abd9d1f8eca380ef12b988c;hpb=8b36cc0f179ee35176016ab67ae53078df4110fa

diff --git a/udev.8.in b/udev.8.in
index 90b7d8330..3fb4bdb8d 100644
--- 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 not explicitly matching in the permissions
-file. The default value is
-.IR 0666 .
-.TP
-.B default_owner
-The default owner for all nodes not explicitly matching in the permissions
-file. The default value is
-.IR root .
-.TP
-.B default_group
-The default group for all nodes not explicitly matching in the permissions
-file. 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 not
-#                explicitly matching in the permissions file
-default_mode="0666"
-
-# default_owner - set the default owner for all nodes not
-#                 explicitly matching in the permissions file
-default_owner="root"
-
-# default_group - set the default group for all nodes not
-#                 explicitly matching in the permissions file
-default_group="root"
 .fi
 .P
 The rules for device naming are read from the files located in the
@@ -203,10 +175,10 @@ separate rules file, while the device nodes are maintained by the
 distribution provided rules file.
 .TP
 .B OWNER, GROUP, MODE
-The permissions for this device. Every specified value overwrites the default
-value specified in the config file.
+The permissions for the device node. Every specified value overwrites the
+compiled-in default value.
 .P
-.RB "The " NAME " ," SYMLINK " and " PROGRAM
+.RB "The " NAME ", " SYMLINK ", " PROGRAM ", " OWNER " and " GROUP
 fields support simple printf-like string substitutions:
 .TP
 .B %n
@@ -216,6 +188,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 +214,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