man: updates to the passive target section

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

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 1f5a51db4adbe45bfef49ccb64c5611059b3d125..6f8668b478196abe109525da0cba81785608df56 100644 (file)
--- 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/>.
 -->
   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>
 
         <refentryinfo>
                 <title>binfmt.d</title>


@@ -55,19 +55,19 @@
         <refsect1>
                 <title>Description</title>
 
         <refsect1>
                 <title>Description</title>
 

-               <para>At boot,
-               <citerefentry><refentrytitle>systemd-binfmt.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-               reads configuration files from the above directories
-               to register in the kernel additional binary
-               formats for executables.</para>
+                <para>At boot,
+                <citerefentry><refentrytitle>systemd-binfmt.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+                reads configuration files from the above directories
+                to register in the kernel additional binary
+                formats for executables.</para>

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

-               <title>Configuration Format</title>
+                <title>Configuration Format</title>

 
                 <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>
 


@@ -76,7 +76,7 @@
                 as delimiter in binary format rules.</para>
 
                 <para>Each configuration file shall be named in the
                 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
                 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
                 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
 
                 <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
                 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>
         </refsect1>
 
         <refsect1>