Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 33 insertions, 13 deletions

diff --git a/man/udev.conf.xml b/man/udev.conf.xml
index bfdba7b..5e42bf3 100644
--- a/man/udev.conf.xml
+++ b/man/udev.conf.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
 <refentry id="udev.conf"
@@ -18,23 +18,37 @@
 
   <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/local/lib/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/local/lib/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 +61,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>
@@ -131,10 +151,10 @@
 
   <refsect1>
     <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-    </para>
+    <para><simplelist type="inline">
+      <member><citerefentry><refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+    </simplelist></para>
   </refsect1>
 </refentry>