udev: link_setup - respect kernel name assign policy

[elogind.git] / man / binfmt.d.xml

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 7f31b76de959c4939d1c1e41710323308486c9f9..227016616a81ebfbf1a67256c76f8e47696915e4 100644 (file)
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -67,7 +67,7 @@
 
                 <para>Each file contains a list of binfmt_misc kernel
                 binary format rules. Consult <ulink
 
                 <para>Each file contains a list of binfmt_misc kernel
                 binary format rules. Consult <ulink

-                url="http://www.kernel.org/doc/Documentation/binfmt_misc.txt">binfmt_misc.txt</ulink>
+                url="https://www.kernel.org/doc/Documentation/binfmt_misc.txt">binfmt_misc.txt</ulink>

                 for more information on registration of additional
                 binary formats and how to write rules.</para>
 
                 for more information on registration of additional
                 binary formats and how to write rules.</para>
 


@@ -88,10 +88,10 @@
                 administrator, who may use this logic to override the
                 configuration files installed from vendor
                 packages. All files are sorted by their filename in
                 administrator, who may use this logic to override the
                 configuration files installed from vendor
                 packages. All files are sorted by their filename in

-                alphabetical order, regardless in which of the
-                directories they reside, to guarantee that a specific
-                configuration file takes precedence over another file
-                with an alphabetically later name.</para>
+                lexicographic order, regardless of which of the
+                directories they reside in. If multiple files specify
+                the same binary type name, the entry in the file with
+                the lexicographically latest name will be applied.</para>

 
                 <para>If the administrator wants to disable a
                 configuration file supplied by the vendor, the
 
                 <para>If the administrator wants to disable a
                 configuration file supplied by the vendor, the


@@ -117,7 +117,7 @@
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-binfmt.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-binfmt.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-delta</refentrytitle><manvolnum>1</manvolnum></citerefentry>,

-                        <citerefentry><refentrytitle>wine</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                        <citerefentry project='die-net'><refentrytitle>wine</refentrytitle><manvolnum>8</manvolnum></citerefentry>

                 </para>
         </refsect1>
 
                 </para>
         </refsect1>