X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fbinfmt.d.xml;h=1cc75da9acceb18803253e8ce7eeff785fe679ba;hb=401cc72da8e59a1e49acafee69280f7ebaa52e74;hp=5a8803f661997e0d4ae0c2e344576d797697e125;hpb=db1413d7380acacc4e50faf801ca0d401da89764;p=elogind.git

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 5a8803f66..1cc75da9a 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -7,16 +7,16 @@
   Copyright 2011 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  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">
@@ -46,9 +46,9 @@
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>/usr/lib/binfmt.d/*.conf</filename></para>
                 <para><filename>/etc/binfmt.d/*.conf</filename></para>
                 <para><filename>/run/binfmt.d/*.conf</filename></para>
+                <para><filename>/usr/lib/binfmt.d/*.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
@@ -57,9 +57,7 @@
 		<para><command>systemd</command> uses
 		files from the above directories to configure
 		additional binary formats to register during boot in
-		the kernel.  Each configuration file is named in the
-		style of
-		<filename>&lt;program&gt;.conf</filename>.</para>
+		the kernel.</para>
         </refsect1>
 
         <refsect1>
@@ -75,14 +73,16 @@
                 ignored. Note that this means you may not use ; and #
                 as delimiter in binary format rules.</para>
 
-                <para>Files in <filename>/etc/</filename> overwrite
+                <para>Each configuration file is named in the style of
+                <filename>&lt;program&gt;.conf</filename>.
+                Files in <filename>/etc/</filename> override
                 files with the same name in <filename>/usr/lib/</filename>.
-                Files in <filename>/run</filename> overwrite files with
+                Files in <filename>/run</filename> override files with
                 the same name in <filename>/etc/</filename> and
                 <filename>/usr/lib/</filename>. Packages should install their
                 configuration files in <filename>/usr/lib/</filename>, files
                 in <filename>/etc/</filename> are reserved for the local
-                administration, which possibly decides to overwrite the
+                administration, which possibly decides to override the
                 configurations installed from packages. All files are sorted
                 by filename in alphabetical order, regardless in which of the
                 directories they reside, to ensure that a specific