[PATCH] updated the man page with the latest format specifier changes.

diff --git a/udev.8 b/udev.8
index 079d15f4d13c02ab2adddc709b42da90addd3aa0..e9470838b488646de48b370163c55a2d88cb6994 100644 (file)
--- a/udev.8
+++ b/udev.8
@@ -46,6 +46,11 @@ The line format is:
 .RE
 where valid methods with corresponding keys are:
 .TP
 .RE
 where valid methods with corresponding keys are:
 .TP

+.B CALLOUT
+calling external program, that returns a string to match
+.br
+keys: \fBBUS\fP, \fBPROGRAM\fP, \fBID\fP
+.TP

 .B LABEL
 device label or serial number, like USB serial number, SCSI UUID or
 file system label
 .B LABEL
 device label or serial number, like USB serial number, SCSI UUID or
 file system label


@@ -66,13 +71,23 @@ keys: \fBBUS\fP, \fBPLACE\fP
 string replacement of the kernel device name
 .br
 key: \fBKERNEL_NAME\fP
 string replacement of the kernel device name
 .br
 key: \fBKERNEL_NAME\fP

-.TP
+.P
+The methods are applied in the following order:

 .B CALLOUT
 .B CALLOUT

-calling external program, that returns a string to match
-.br
-keys: \fBBUS\fP, \fBPROGRAM\fP, \fBID\fP
+,
+.B LABEL
+,
+.B NUMBER
+,
+.B TOPOLOGY
+,
+.B REPLACE

 .P
 .P

-The name field supports simple printf-like string subtitution:
+The 
+.B NAME 
+and 
+.B PROGRAM 
+fields support simple printf-like string subtitution:

 .RS
 .TP
 .B %n
 .RS
 .TP
 .B %n


@@ -87,11 +102,17 @@ the kernel minor number for the device
 .TP
 .B %b
 the bus id for the device
 .TP
 .B %b
 the bus id for the device

+.TP
+.B %c
+the CALLOUT program return value (this does not work within the PROGRAM field for the obvious reason.)

 .RE
 .P
 A sample \fIudev.conf\fP might look like this:
 .sp
 .nf
 .RE
 .P
 A sample \fIudev.conf\fP might look like this:
 .sp
 .nf

+# if /sbin/scsi_id returns "OEM 0815" device will be called disk1
+CALLOUT, BUS="scsi", PROGRAM="/sbin/scsi_id", ID="OEM 0815", NAME="disk1"
+

 # USB printer to be called lp_color
 LABEL, BUS="usb", serial="W09090207101241330", NAME="lp_color"
 
 # USB printer to be called lp_color
 LABEL, BUS="usb", serial="W09090207101241330", NAME="lp_color"
 


@@ -104,9 +125,6 @@ TOPOLOGY, BUS="usb", PLACE="2.3", NAME="mouse1"
 # ttyUSB1 should always be called pda
 REPLACE, KERNEL="ttyUSB1", NAME="pda"
 
 # ttyUSB1 should always be called pda
 REPLACE, KERNEL="ttyUSB1", NAME="pda"
 

-# if /sbin/scsi_id returns "OEM 0815" device will be called disk1
-CALLOUT, BUS="scsi", PROGRAM="/sbin/scsi_id", ID="OEM 0815", NAME="disk1"
-

 # USB webcams to be called webcam0, webcam1, ...
 LABEL, BUS="usb", model="WebCam Version 3", NAME="webcam%n"
 .fi
 # USB webcams to be called webcam0, webcam1, ...
 LABEL, BUS="usb", model="WebCam Version 3", NAME="webcam%n"
 .fi


@@ -119,6 +137,8 @@ lines beginning with a '#' will be ignored.
 Every line lists a device name followed by numeric owner, group and permission
 mode. All values are separated by colons. The name field may end with a
 wildcard to apply the values to a whole class of devices.
 Every line lists a device name followed by numeric owner, group and permission
 mode. All values are separated by colons. The name field may end with a
 wildcard to apply the values to a whole class of devices.

+.br
+If udev was built using glibc, string owner and group names may be used.

 .sp
 A sample \fIudev.permissions\fP might look like this:
 .sp
 .sp
 A sample \fIudev.permissions\fP might look like this:
 .sp


@@ -128,6 +148,11 @@ ttyUSB1:0:8:0660
 video*:500:500:0660
 dsp1:::0666
 .fi
 video*:500:500:0660
 dsp1:::0666
 .fi

+.P
+If 
+.B
+udev
+was built using glibc, string owner and group names may be used.

 
 .SH "FILES"
 .nf
 
 .SH "FILES"
 .nf