X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.8.in;h=581d6f4ed5417bfa64a5037404167810f1c1d961;hp=328f602e031708640023afbe938a4a39ce1b938b;hb=a866c0a305372305bc8363b8f3b24832082711aa;hpb=3ac0326962c93f381bec325583e26f47fb7d4833

diff --git a/udev.8.in b/udev.8.in
index 328f602e0..581d6f4ed 100644
--- a/udev.8.in
+++ b/udev.8.in
@@ -55,31 +55,24 @@ The name of the udev rules file or directory to look for files with the suffix
 All rule files are read in lexical order. The default value is
 .IR /etc/udev/rules.d/ .
 .TP
-.B udev_permissions
-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
 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 .
+The default mode for all nodes where no explicit value is given by a rule.
+The default value is
+.IR 0600 .
 .TP
 .B default_owner
-The default owner for all nodes not explicitly matching in the permissions
-file. The default value is
+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 not explicitly matching in the permissions
-file. The default value is
+The default group for all nodes where no explicitly value is given by a rule.
+The default value is
 .IR root .
 .br
 .P
@@ -96,23 +89,19 @@ udev_db="/udev/.udevdb"
                for files with the suffix .rules
 udev_rules="/etc/udev/rules.d/"
 
-# 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"
 udev_log="yes"
 
-# default_mode - set the default mode for all nodes not
-#                explicitly matching in the permissions file
+# default_mode - set the default mode for all nodes that have no
+#                permissions specified
 default_mode="0666"
 
-# default_owner - set the default owner for all nodes not
-#                 explicitly matching in the permissions file
+# 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 not
-#                 explicitly matching in the permissions file
+# default_group - set the default group for all nodes that have no
+#                 permissions specified
 default_group="root"
 .fi
 .P
@@ -214,8 +203,8 @@ 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 value
-given in the permissions file.
+The permissions for this device. Every specified value overwrites the default
+value specified in the config file.
 .P
 .RB "The " NAME " ," SYMLINK " and " PROGRAM
 fields support simple printf-like string substitutions:
@@ -299,29 +288,6 @@ KERNEL="hd[a-z]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom",
   NAME="%k", SYMLINK="cdrom%e"
 .fi
 .P
-The permissions and ownership of the created device file are 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
-file.
-.br
-Every line lists a device name followed by owner, group and permission
-mode. All values are separated by colons. The name field may contain a
-pattern to apply the values to a whole class of devices.
-.sp
-.RI "A sample " udev.permissions " file might look like this:"
-.sp
-.nf
-#name:user:group:mode
-input/*:root:root:644
-ttyUSB1:0:8:0660
-video*:root:video:0660
-dsp1:::0666
-.fi
-.P
 A number of different fields in the above configuration files support a simple
 form of shell style pattern matching. It supports the following pattern characters:
 .TP