X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-udevd.service.xml;h=7fce3000f5516179613be6df208ec9c1103791df;hp=616c8f61f7aa0eb90e61565ca88a97cb839d32b3;hb=3fde5f30bda2a70d97f3dc8fa918e42e1c07cc2c;hpb=51dfddc2cceb345ffc994014e4a4b3f2d2d3a3aa

diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 616c8f61f..7fce3000f 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -50,9 +50,10 @@
   </refsynopsisdiv>
 
   <refsect1><title>Description</title>
-    <para>systemd-udevd listens to kernel uevents. For every event, systemd-udevd executes matching
-    instructions specified in udev rules. See <citerefentry>
-        <refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
+    <para><command>systemd-udevd</command> listens to kernel uevents.
+      For every event, systemd-udevd executes matching instructions
+      specified in udev rules. See <citerefentry>
+      <refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
       </citerefentry>.</para>
     <para>The behavior of the running daemon can be changed with
     <command>udevadm control</command>.</para>
@@ -75,15 +76,17 @@
       <varlistentry>
         <term><option>--children-max=</option></term>
         <listitem>
-          <para>Limit the number of parallel executed events.</para>
+          <para>Limit the number of events executed in parallel.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><option>--exec-delay=</option></term>
         <listitem>
-          <para>Number of seconds to delay the execution of RUN instructions.
-          This might be useful when debugging system crashes during coldplug
-          cause by loading non-working kernel modules.</para>
+
+          <para>Delay the execution of RUN instruction by the given
+          number of seconds. This option might be useful when
+          debugging system crashes during coldplug caused by loading
+          non-working kernel modules.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -113,9 +116,9 @@
   </refsect1>
 
   <refsect1><title>Environment</title>
-    <variablelist>
+    <variablelist class='environment-variables'>
       <varlistentry>
-        <term><varname>UDEV_LOG=</varname></term>
+        <term><varname>$UDEV_LOG=</varname></term>
         <listitem>
           <para>Set the logging priority.</para>
         </listitem>
@@ -124,8 +127,9 @@
  </refsect1>
 
   <refsect1><title>Kernel command line</title>
-    <variablelist>
-      <para>The parameters starting with "rd.", will be read when udev is used in an initrd.</para>
+    <variablelist class='kernel-commandline-options'>
+      <para>Parameters starting with "rd." will be read when
+      <command>systemd-udevd</command> is used in an initrd.</para>
       <varlistentry>
         <term><varname>udev.log-priority=</varname></term>
         <term><varname>rd.udev.log-priority=</varname></term>
@@ -137,19 +141,46 @@
         <term><varname>udev.children-max=</varname></term>
         <term><varname>rd.udev.children-max=</varname></term>
         <listitem>
-          <para>Limit the number of parallel executed events.</para>
+          <para>Limit the number of events executed in parallel.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><varname>udev.exec-delay=</varname></term>
         <term><varname>rd.udev.exec-delay=</varname></term>
         <listitem>
-          <para>Number of seconds to delay the execution of RUN instructions.
-          This might be useful when debugging system crashes during coldplug
-          cause by loading non-working kernel modules.</para>
+          <para>Delay the execution of RUN instruction by the given
+          number of seconds. This option might be useful when
+          debugging system crashes during coldplug caused by loading
+          non-working kernel modules.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><varname>net.ifnames=</varname></term>
+        <listitem>
+          <para>Network interfaces are renamed to give them predictable names
+          when possible. It is enabled by default, specifying 0 disables it.</para>
         </listitem>
       </varlistentry>
     </variablelist>
+    <!-- when adding entries here, consider also adding them
+         in kernel-command-line.xml -->
+ </refsect1>
+
+ <refsect1><title>Configuration file</title>
+   <para>udev 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:</para>
+   <variablelist>
+     <varlistentry>
+       <term><varname>udev_log</varname></term>
+       <listitem>
+         <para>The logging priority. Valid values are the numerical syslog priorities
+         or their textual representations: <option>err</option>, <option>info</option>
+         and <option>debug</option>.</para>
+       </listitem>
+     </varlistentry>
+   </variablelist>
  </refsect1>
 
   <refsect1>