X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=docs%2Fudev.xml;h=7f6a30df521de55a379bf8c8b957b59f09ff03d5;hb=1aa1e24848903d11780db1ade355be73ad61a937;hp=02dcd2586a8173939d55f0341a8bc9e74f6d195d;hpb=7b86ada7d4a6b2597299912964d1b8da3d059691;p=elogind.git

diff --git a/docs/udev.xml b/docs/udev.xml
index 02dcd2586..7f6a30df5 100644
--- a/docs/udev.xml
+++ b/docs/udev.xml
@@ -42,9 +42,7 @@
 
         <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. The program
-        <command>udev</command> itself may be used as an event handler in situations,
-        where running the daemon is not appropriate, like in initramfs.</para>
+        kernel if a device is added or removed form 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.
@@ -55,7 +53,7 @@
 
       <refsect1><title>CONFIGURATION</title>
         <para>All udev configuration files are placed in <filename>/etc/udev/*</filename>.
-        Every file consist of a set of lines of text. All empty lines or lines beginning
+        Every file consists of a set of lines of text. All empty lines or lines beginning
         with '#' will be ignored.</para>
 
         <refsect2><title>Configuration file</title>
@@ -71,14 +69,6 @@
               </listitem>
             </varlistentry>
 
-            <varlistentry>
-              <term><option>udev_db</option></term>
-              <listitem>
-                <para>The name and location of the udev database. The default value is
-                <filename>/dev/.udevdb</filename>.</para>
-              </listitem>
-            </varlistentry>
-
             <varlistentry>
               <term><option>udev_rules</option></term>
               <listitem>
@@ -186,7 +176,7 @@
             <varlistentry>
               <term><option>BUS</option></term>
               <listitem>
-                <para>Match the typ of bus the device is connected to.</para>
+                <para>Match the type of bus the device is connected to.</para>
               </listitem>
             </varlistentry>
 
@@ -208,7 +198,7 @@
               <term><option>ENV{<replaceable>key</replaceable>}</option></term>
               <listitem>
                 <para>Match against the value of an environment key. Depending on
-                the specified operation, this key is also used as a assignment.</para>
+                the specified operation, this key is also used as an assignment.</para>
               </listitem>
             </varlistentry>
 
@@ -273,8 +263,8 @@
             <varlistentry>
               <term><option>NAME</option></term>
               <listitem>
-                <para>The name of the node to be created, or the name, the network interface
-                should be renamed to. Only one rule can set the a name, all later rules with
+                <para>The name of the node to be created, or the name the network interface
+                should be renamed to. Only one rule can set the node name, all later rules with
                 a NAME key will be ignored.</para>
               </listitem>
             </varlistentry>
@@ -292,7 +282,7 @@
             <varlistentry>
               <term><option>OWNER, GROUP, MODE</option></term>
               <listitem>
-                <para>The permissions for the device node. Every specified value over writes
+                <para>The permissions for the device node. Every specified value overwrites
                 the compiled-in default value.</para>
               </listitem>
             </varlistentry>
@@ -371,13 +361,6 @@
               </listitem>
             </varlistentry>
 
-            <varlistentry>
-              <term><option>%b</option>, <option>$id</option></term>
-              <listitem>
-                <para>The kernel bus id for this device.</para>
-              </listitem>
-            </varlistentry>
-
             <varlistentry>
               <term><option>%n</option>, <option>$number</option></term>
               <listitem>
@@ -401,7 +384,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><option>%e{<replaceable>key</replaceable>}</option>, <option>$env{<replaceable>key</replaceable>}</option></term>
+              <term><option>%E{<replaceable>key</replaceable>}</option>, <option>$env{<replaceable>key</replaceable>}</option></term>
               <listitem>
                 <para>The value of an environment variable.</para>
               </listitem>
@@ -432,18 +415,6 @@
               </listitem>
             </varlistentry>
 
-            <varlistentry>
-              <term><option>%e</option>, <option>$enum</option></term>
-              <listitem>
-                <para>If a device node already exists with the name, the smallest next free
-                number is used. This  can be used to create compatibility symlinks and enumerate
-                devices of the same type originating from different kernel subsystems.</para>
-                <para>Note: The use of the enumeration facility is unreliable for events that
-                request a number at the same time. The  use  of enumerations in todays setups
-                where devices can come and go at any time is not recomended.</para>
-              </listitem>
-            </varlistentry>
-
             <varlistentry>
               <term><option>%P</option>, <option>$parent</option></term>
               <listitem>