man: update udev.conf man page

diff --git a/man/rules/meson.build b/man/rules/meson.build
index 3592b862f718d1633d7bbc3800aa285358e08469..50493754db19e697e928b03f7d894ec402d0942c 100644 (file)
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -1174,7 +1174,7 @@ manpages = [
  ['timesyncd.conf', '5', ['timesyncd.conf.d'], 'ENABLE_TIMESYNCD'],
  ['tmpfiles.d', '5', [], ''],
  ['udev', '7', [], ''],
- ['udev.conf', '5', [], ''],
+ ['udev.conf', '5', ['udev.conf.d'], ''],
  ['udev_device_get_syspath',
   '3',
   ['udev_device_get_action',

diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index 4ebde474a3058289c9a0cce51a2cf568bd6fc3fa..054ab2d13958b32f775e22685f919d76bd8bee02 100644 (file)
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -18,23 +18,35 @@
 
   <refnamediv>
     <refname>udev.conf</refname>
+    <refname>udev.conf.d</refname>
     <refpurpose>Configuration for device event managing daemon</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>/etc/udev/udev.conf</filename></para>
+    <para>
+      <simplelist>
+        <member><filename>/etc/udev/udev.conf</filename></member>
+        <member><filename>/run/udev/udev.conf</filename></member>
+        <member><filename>/usr/lib/udev/udev.conf</filename></member>
+        <member><filename>/etc/udev/udev.conf.d/*.conf</filename></member>
+        <member><filename>/run/udev/udev.conf.d/*.conf</filename></member>
+        <member><filename>/usr/lib/udev/udev.conf.d/*.conf</filename></member>
+      </simplelist>
+    </para>
   </refsynopsisdiv>
 
   <refsect1>
     <title>Description</title>
 
+    <para>These files contain configuration options for
+      <citerefentry><refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+      The syntax of these files is very simple: a list
+      of assignments, one per line.
+      All empty lines or lines beginning with <literal>#</literal> are
+      ignored.
+    </para>
     <para>
-      <citerefentry><refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-      expects its main configuration file at
-      <filename>/etc/udev/udev.conf</filename>. It consists of a set
-      of variables allowing the user to override default udev
-      values. All empty lines or lines beginning with '#' are
-      ignored. The following variables can be set:
+      The following options can be set:
     </para>
 
     <variablelist class='config-directives'>
@@ -47,6 +59,12 @@
           <option>err</option>, <option>info</option> and
           <option>debug</option>.</para>
 
+          <note>
+            <para>This option is also honored by
+                <citerefentry><refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+            </para>
+          </note>
+
           <xi:include href="version-info.xml" xpointer="v216"/>
         </listitem>
       </varlistentry>