1 files changed, 41 insertions, 8 deletions
diff --git a/upstream/fedora-rawhide/man5/udev.conf.5 b/upstream/fedora-rawhide/man5/udev.conf.5
index db1e9cec..635aa734 100644
--- a/upstream/fedora-rawhide/man5/udev.conf.5
+++ b/upstream/fedora-rawhide/man5/udev.conf.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "UDEV\&.CONF" "5" "" "systemd 255" "udev.conf"
+.TH "UDEV\&.CONF" "5" "" "systemd 256~rc3" "udev.conf"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -20,15 +20,35 @@
 .\" * MAIN CONTENT STARTS HERE *
 .\" -----------------------------------------------------------------
 .SH "NAME"
-udev.conf \- Configuration for device event managing daemon
+udev.conf, udev.conf.d \- Configuration for device event managing daemon
 .SH "SYNOPSIS"
 .PP
+.RS 4
 /etc/udev/udev\&.conf
+.RE
+.RS 4
+/run/udev/udev\&.conf
+.RE
+.RS 4
+/usr/lib/udev/udev\&.conf
+.RE
+.RS 4
+/etc/udev/udev\&.conf\&.d/*\&.conf
+.RE
+.RS 4
+/run/udev/udev\&.conf\&.d/*\&.conf
+.RE
+.RS 4
+/usr/lib/udev/udev\&.conf\&.d/*\&.conf
+.RE
 .SH "DESCRIPTION"
 .PP
-\fBsystemd-udevd\fR(8)
-expects its main configuration file at
-/etc/udev/udev\&.conf\&. It consists of a set of variables allowing the user to override default udev values\&. All empty lines or lines beginning with \*(Aq#\*(Aq are ignored\&. The following variables can be set:
+These files contain configuration options for
+\fBsystemd-udevd\fR(8)\&. The syntax of these files is very simple: a list of assignments, one per line\&. All empty lines or lines beginning with
+"#"
+are ignored\&.
+.PP
+The following options can be set:
 .PP
 \fIudev_log=\fR
 .RS 4
@@ -37,7 +57,22 @@ The log level\&. Valid values are the numerical syslog priorities or their textu
 \fBinfo\fR
 and
 \fBdebug\fR\&.
+.if n \{\
 .sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+This option is also honored by
+\fBudevadm\fR(8)\&.
+.sp .5v
+.RE
 Added in version 216\&.
 .RE
 .PP
@@ -107,6 +142,4 @@ can be configured by command line options and the kernel command line (see
 \fBsystemd-udevd\fR(8))\&.
 .SH "SEE ALSO"
 .PP
-\fBsystemd-udevd\fR(8),
-\fBudev\fR(7),
-\fBudevadm\fR(8)
+\fBsystemd-udevd\fR(8), \fBudev\fR(7), \fBudevadm\fR(8)