4 files changed, 68 insertions, 14 deletions
diff --git a/man/udev.7 b/man/udev.7
index 7aec25193a..b54683dcd0 100644
--- a/man/udev.7
+++ b/man/udev.7
@@ -2,7 +2,7 @@
 .\"     Title: udev
 .\"    Author: Greg Kroah-Hartmann <greg@kroah.com>
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 11/07/2014
+.\"      Date: 05/30/2015
 .\"    Manual: udev
 .\"    Source: udev
 .\"  Language: English
@@ -131,9 +131,10 @@ Match the subsystem of the event device\&.
 Match the driver name of the event device\&. Only set this key for devices which are bound to a driver at the time the event is generated\&.
 .RE
 .PP
-\fIATTR{\fR\fI\fIfilename\fR\fR\fI}\fR
+\fIATTR{\fR\fI\fIfilename\fR\fR\fI}\fR, \fISYSCTL{\fR\fI\fIkernel parameter\fR\fR\fI}\fR
 .RS 4
 Match sysfs attribute values of the event device\&. Trailing whitespace in the attribute values is ignored unless the specified match value itself contains trailing whitespace\&.
+Match a kernel parameter value\&.
 .RE
 .PP
 \fIKERNELS\fR
@@ -274,6 +275,11 @@ Applies the specified Linux Security Module label to the device node\&.
 The value that should be written to a sysfs attribute of the event device\&.
 .RE
 .PP
+\fISYSCTL{\fR\fI\fIkernel parameter\fR\fR\fI}\fR
+.RS 4
+The value that should be written to kernel parameter\&.
+.RE
+.PP
 \fIENV{\fR\fI\fIkey\fR\fR\fI}\fR
 .RS 4
 Set a device property value\&. Property names with a leading
@@ -566,6 +572,37 @@ The content of all hwdb files is read by
 \fBudevadm\fR(8)
 and compiled to a binary database located at
 /etc/udev/hwdb\&.bin\&. During runtime only the binary database is used\&.
+.SH "HARDWARE DATABASE FILES"
+.PP
+The hwdb files are read from the files located in the system hwdb directory
+/usr/lib/udev/hwdb\&.d, the volatile runtime directory
+/run/udev/hwdb\&.d
+and the local administration directory
+/etc/udev/hwdb\&.d\&. All hwdb files are collectively sorted and processed in lexical order, regardless of the directories in which they live\&. However, files with identical filenames replace each other\&. Files in
+/etc
+have the highest priority, files in
+/run
+take precedence over files with the same name in
+/usr/lib\&. This can be used to override a system\-supplied hwdb file with a local file if needed; a symlink in
+/etc
+with the same name as a hwdb file in
+/usr/lib, pointing to
+/dev/null, disables the hwdb file entirely\&. hwdb files must have the extension
+\&.hwdb; other extensions are ignored\&.
+.PP
+The hwdb file contains data records consisting of matches and associated key\-value pairs\&. Every record in the hwdb starts with one or more match string, specifying a shell glob to compare the database lookup string against\&. Multiple match lines are specified in additional consecutive lines\&. Every match line is compared indivdually, they are combined by OR\&. Every match line must start at the first character of the line\&.
+.PP
+The match lines are followed by one or more key\-value pair lines, which are recognized by a leading space character\&. The key name and value are separated by
+=\&. An empty line signifies the end of a record\&. Lines beginning with
+#
+are ignored\&.
+.PP
+The content of all hwdb files is read by
+\fBudevadm\fR(8)
+and compiled to a binary database located at
+/etc/udev/hwdb\&.bin, or alternatively
+/usr/lib/udev/hwdb\&.bin
+if you want ship the compiled database in an immutable image\&. During runtime only the binary database is used\&.
 .SH "SEE ALSO"
 .PP
 
diff --git a/man/udev.conf.5 b/man/udev.conf.5
index be1bba7f0a..81424208aa 100644
--- a/man/udev.conf.5
+++ b/man/udev.conf.5
@@ -2,7 +2,7 @@
 .\"     Title: udev.conf
 .\"    Author: Kay Sievers <kay@vrfy.org>
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 11/07/2014
+.\"      Date: 05/30/2015
 .\"    Manual: udev.conf
 .\"    Source: eudev
 .\"  Language: English
diff --git a/man/udevadm.8 b/man/udevadm.8
index 828830be51..64b56e59ea 100644
--- a/man/udevadm.8
+++ b/man/udevadm.8
@@ -2,7 +2,7 @@
 .\"     Title: udevadm
 .\"    Author: Kay Sievers <kay@vrfy.org>
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 11/07/2014
+.\"      Date: 05/30/2015
 .\"    Manual: udevadm
 .\"    Source: eudev
 .\"  Language: English
@@ -69,7 +69,7 @@ Print version number\&.
 .RS 4
 Print help text\&.
 .RE
-.SS "udevadm info [\fIOPTIONS\fR] [\fIDEVPATH\fR|\fIFILE\fR]"
+.SS "udevadm info [\fIoptions\fR] [\fIdevpath\fR|\fIfile\fR]"
 .PP
 Queries the udev database for device information stored in the udev database\&. It can also query the properties of a device from its sysfs representation to help creating udev rules that match this device\&.
 .PP
@@ -160,7 +160,13 @@ Print version\&.
 .RS 4
 Print help text\&.
 .RE
-.SS "udevadm trigger [options]"
+.PP
+In addition an optional positional argument can be used to specify a device name or a sys path\&. It must start with
+/dev
+or
+/sys
+respectively\&.
+.SS "udevadm trigger [\fIoptions\fR] [\fIdevpath\fR|\fIfile\fR...]"
 .PP
 Request device events from the kernel\&. Primarily used to replay events at system coldplug time\&.
 .PP
@@ -218,9 +224,14 @@ Trigger events for devices with a matching property value\&. This option can be
 Trigger events for devices with a matching tag\&. This option can be specified multiple times\&.
 .RE
 .PP
-\fB\-y\fR, \fB\-\-sysname\-match=\fR\fB\fINAME\fR\fR
+\fB\-y\fR, \fB\-\-sysname\-match=\fR\fB\fIPATH\fR\fR
 .RS 4
-Trigger events for devices with a matching sys device name\&. This option can be specified multiple times and supports shell style pattern matching\&.
+Trigger events for devices with a matching sys device path\&. This option can be specified multiple times and supports shell style pattern matching\&.
+.RE
+.PP
+\fB\-\-name\-match=\fR\fB\fINAME\fR\fR
+.RS 4
+Trigger events for devices with a matching device path\&. This options can be specified multiple times\&.
 .RE
 .PP
 \fB\-b\fR, \fB\-\-parent\-match=\fR\fB\fISYSPATH\fR\fR
@@ -232,7 +243,13 @@ Trigger events for all children of a given device\&.
 .RS 4
 Print help text\&.
 .RE
-.SS "udevadm settle [options]"
+.PP
+In addition optional positional arguments can be used to specify device names or sys paths\&. They must start with
+/dev
+or
+/sys
+respectively\&.
+.SS "udevadm settle [\fIoptions\fR]"
 .PP
 Watches the udev event queue, and exits if all current events are handled\&.
 .PP
@@ -307,7 +324,7 @@ The maximum number of seconds to wait for a reply from udevd\&.
 .RS 4
 Print help text\&.
 .RE
-.SS "udevadm monitor [options]"
+.SS "udevadm monitor [\fIoptions\fR]"
 .PP
 Listens to the kernel uevents and events sent out by a udev rule and prints the devpath of the event to the console\&. It can be used to analyze the event timing, by comparing the timestamps of the kernel uevent and the udev event\&.
 .PP
@@ -340,7 +357,7 @@ Filter events by property\&. Only udev events with a given tag attached will pas
 .RS 4
 Print help text\&.
 .RE
-.SS "udevadm hwdb [options]"
+.SS "udevadm hwdb [\fIoptions\fR]"
 .PP
 Maintain the hardware database index in
 /etc/udev/hwdb\&.bin\&.
@@ -365,7 +382,7 @@ Alternative root path in the file system for reading and writing files\&.
 .RS 4
 Print help text\&.
 .RE
-.SS "udevadm test [options] \fIdevpath\fR"
+.SS "udevadm test [\fIoptions\fR] [\fIdevpath\fR]"
 .PP
 Simulate a udev event run for the given device, and print debug output\&.
 .PP
@@ -387,7 +404,7 @@ Specify when udevadm should resolve names of users and groups\&. When set to
 .RS 4
 Print help text\&.
 .RE
-.SS "udevadm test\-builtin [options] \fICOMMAND\fR \fIDEVPATH\fR"
+.SS "udevadm test\-builtin [\fIoptions\fR] [\fIcommand\fR] [\fIdevpath\fR]"
 .PP
 Run a built\-in command
 \fICOMMAND\fR
diff --git a/man/udevd.8 b/man/udevd.8
index 73aba7576f..fef6eeb934 100644
--- a/man/udevd.8
+++ b/man/udevd.8
@@ -2,7 +2,7 @@
 .\"     Title: udevd
 .\"    Author: Kay Sievers <kay@vrfy.org>
 .\" Generator: DocBook XSL Stylesheets v1.78.0 <http://docbook.sf.net/>
-.\"      Date: 11/07/2014
+.\"      Date: 05/30/2015
 .\"    Manual: udevd
 .\"    Source: eudev
 .\"  Language: English