X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fudev.xml;h=7ec7a3fed00cd1cef242bbc4c255987fa0e91986;hp=b5c7cd4be44e4012b25d8b22585e0e271fc16edb;hb=e5e991a11c7749f8cb424e99ca4206264b0cf836;hpb=b79f817b1bec4f7e39a1ed8b9d42a0c191c22ef5

diff --git a/man/udev.xml b/man/udev.xml
index b5c7cd4be..7ec7a3fed 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -94,7 +94,7 @@
       extensions are ignored.</para>
 
       <para>Every line in the rules file contains at least one key-value pair.
-      There are two kind of keys: match and assignment.
+      There are two kinds of keys: match and assignment.
       If all match keys are matching against its value, the rule gets applied and the
       assignment keys get the specified value assigned.</para>
 
@@ -327,7 +327,7 @@
           <term><option>NAME</option></term>
           <listitem>
             <para>The name to use for a network interface. The name of a device node
-            can not be changed by udev, only additional symlinks can be created.</para>
+            cannot be changed by udev, only additional symlinks can be created.</para>
           </listitem>
         </varlistentry>
 
@@ -335,15 +335,20 @@
           <term><option>SYMLINK</option></term>
           <listitem>
             <para>The name of a symlink targeting the node. Every matching rule adds
-            this value to the list of symlinks to be created. Multiple symlinks may be
-            specified by separating the names by the space character. In case multiple
-            devices claim the same name, the link always points to the device with
-            the highest link_priority. If the current device goes away, the links are
-            re-evaluated and the device with the next highest link_priority becomes the owner of
-            the link. If no link_priority is specified, the order of the devices (and
-            which one of them owns the link) is undefined. Also, symlink names must
-            never conflict with the kernel's default device node names, as that would
-            result in unpredictable behavior.
+            this value to the list of symlinks to be created.</para>
+            <para>The set of characters to name a symlink is limited. Allowed
+            characters are [0-9A-Za-z#+-.:=@_/], valid utf8 character sequences,
+            and "\x00" hex encoding. All other characters are replaced by
+            a '_' character.</para>
+            <para>Multiple symlinks may be specified by separating the names by the
+            space character. In case multiple devices claim the same name, the link
+            always points to the device with the highest link_priority. If the current
+            device goes away, the links are re-evaluated and the device with the
+            next highest link_priority becomes the owner of the link. If no
+            link_priority is specified, the order of the devices (and which one of
+            them owns the link) is undefined.</para>
+            <para>Symlink names must never conflict with the kernel's default device
+            node names, as that would result in unpredictable behavior.
             </para>
           </listitem>
         </varlistentry>