X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fbinfmt.d.xml;h=227016616a81ebfbf1a67256c76f8e47696915e4;hp=07ae0ac231b1e965737bf9030b7ec8fa19bc5fec;hb=9700d6980f7c212b10a69399e6430b82a6f45587;hpb=f274ece0f76b5709408821e317e87aef76123db6

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 07ae0ac23..227016616 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -19,7 +19,7 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
-<refentry id="binfmt.d">
+<refentry id="binfmt.d" conditional='ENABLE_BINFMT'>
 
         <refentryinfo>
                 <title>binfmt.d</title>
@@ -67,7 +67,7 @@
 
                 <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>
 
@@ -76,7 +76,7 @@
                 as delimiter in binary format rules.</para>
 
                 <para>Each configuration file shall be named in the
-                style of <filename>&lt;program&gt;.conf</filename>.
+                style of <filename><replaceable>program</replaceable>.conf</filename>.
                 Files in <filename>/etc/</filename> override files
                 with the same name in <filename>/usr/lib/</filename>
                 and <filename>/run/</filename>. Files in
@@ -88,17 +88,17 @@
                 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
+                configuration file supplied by the vendor, the
                 recommended way is to place a symlink to
                 <filename>/dev/null</filename> in
                 <filename>/etc/binfmt.d/</filename> bearing the
-                same file name.</para>
+                same filename.</para>
         </refsect1>
 
         <refsect1>
@@ -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>wine</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                        <citerefentry project='die-net'><refentrytitle>wine</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                 </para>
         </refsect1>