X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.xml;h=5ba3d3636cacdd20ab544b56375528fec36f10f7;hp=68edb8fb99000826084c8f74392c401bd1a5cd09;hb=7a17ca7e798bd97678eb5e053f710b35b4674250;hpb=e7c39acbe724f0bc067dbab7eb3f8cdc073f3c67

diff --git a/udev.xml b/udev.xml
index 68edb8fb9..5ba3d3636 100644
--- a/udev.xml
+++ b/udev.xml
@@ -30,11 +30,11 @@
 
         <para>Usually udev runs as <citerefentry><refentrytitle>udevd</refentrytitle>
         <manvolnum>8</manvolnum></citerefentry> and receives uevents directly from the
-        kernel if a device is added or removed form the system.</para>
+        kernel if a device is added or removed from the system.</para>
 
         <para>If udev receives a device event, it matches its configured rules
         against the available device attributes provided in sysfs to identify the device.
-        Rules that match, may provide additional device information or specify a device
+        Rules that match may provide additional device information or specify a device
         node name and multiple symlink names and instruct udev to run additional programs
         as part of the device event handling.</para>
       </refsect1>
@@ -90,7 +90,7 @@
           pointing to the node, or run a specified program as part of the event handling.
           If no matching rule is found, the default device node name is used.</para>
 
-          <para>A rule may consists of a list of one or more key value pairs separated by
+          <para>A rule may consist of a list of one or more key value pairs separated by
           a comma. Each key has a distinct operation, depending on the used operator. Valid
           operators are:</para>
           <variablelist>
@@ -228,8 +228,8 @@
               <term><option>PROGRAM</option></term>
               <listitem>
                 <para>Execute external program. The key is true, if the program returns
-                without exit code zero. The whole event environment is available to the
-                executed program. The program's output printed to stdout is available for
+                with exit code zero. The whole event environment is available to the
+                executed program. The program's output printed to stdout, is available in
                 the RESULT key.</para>
               </listitem>
             </varlistentry>
@@ -374,7 +374,7 @@
                   </varlistentry>
                 </variablelist>
                 <para>If no option is given, udev will choose between <option>program</option>
-                and <option>file</option> based on the executable bit of of the file
+                and <option>file</option> based on the executable bit of the file
                 permissions.</para>
               </listitem>
             </varlistentry>
@@ -390,14 +390,44 @@
             <varlistentry>
               <term><option>OPTIONS</option></term>
               <listitem>
-                <para><option>last_rule</option> stops further rules application. No later rules
-                will have any effect.
-                <option>ignore_device</option> will ignore this event completely.
-                <option>ignore_remove</option> will ignore  any  later  remove  event  for  this
-                device. This may be useful as a workaround for broken device drivers.
-                <option>all_partitions</option> will create the device nodes for all available
-                partitions of a block device. This may be useful for removable media devices where
-                media changes are not detected.</para>
+                <para>Rule and device options:</para>
+                <variablelist>
+                  <varlistentry>
+                    <term><option>last_rule</option></term>
+                    <listitem>
+                      <para>Stops further rules application. No later rules will have
+                      any effect.</para>
+                    </listitem>
+                  </varlistentry>
+                  <varlistentry>
+                    <term><option>ignore_device</option></term>
+                    <listitem>
+                      <para>Ignore this event completely.</para>
+                    </listitem>
+                  </varlistentry>
+                  <varlistentry>
+                    <term><option>ignore_remove</option></term>
+                    <listitem>
+                      <para>Ignore any later remove event for this device. This may be useful
+                      as a workaround for broken device drivers.</para>
+                    </listitem>
+                  </varlistentry>
+                  <varlistentry>
+                    <term><option>link_priority=<replaceable>value</replaceable></option></term>
+                    <listitem>
+                      <para>Specify the priority of the created symlinks. Devices with higher
+                      priorities overwrite existing symlinks of other devices.</para>
+                    </listitem>
+                  </varlistentry>
+                  <varlistentry>
+                    <term><option>all_partitions</option></term>
+                    <listitem>
+                      <para>Create the device nodes for all available partitions of a block device.
+                      This may be useful for removable media devices where media changes are not
+                      detected.</para>
+                    </listitem>
+                  </varlistentry>
+                </variablelist>
               </listitem>
             </varlistentry>
           </variablelist>
@@ -468,7 +498,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><option>$minor</option> <option>%m</option></term>
+              <term><option>$minor</option>, <option>%m</option></term>
               <listitem>
                 <para>The kernel minor number for the device.</para>
               </listitem>