X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fbinfmt.d.xml;h=e997bcf21cd709340f3d1f11a36506e30358f2a1;hb=5430f7f2bc7330f3088b894166bf3524a067e3d8;hp=64c27554e672bf9b609b944c254df06b2e36bd02;hpb=c91faef3b3facfdf13282aee957af25dd555890b;p=elogind.git

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 64c27554e..e997bcf21 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">
@@ -47,19 +47,17 @@
 
         <refsynopsisdiv>
                 <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>
                 <title>Description</title>
 
 		<para><command>systemd</command> uses
-		<filename>/etc/binfmt.d/</filename> to configure
+		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>/etc/binfmt.d/&lt;program&gt;.conf</filename>.</para>
-
-
+		the kernel.</para>
         </refsect1>
 
         <refsect1>
@@ -75,11 +73,21 @@
                 ignored. Note that this means you may not use ; and #
                 as delimiter in binary format rules.</para>
 
-                <para>Configuration files are loaded in alphabetical
-                order. To ensure that a specific rule takes precedence
-                over another place it in a file with an alphabetically
-                later name.</para>
-
+                <para>Each configuration file is named in the style of
+                <filename>&lt;program&gt;.conf</filename>.
+                Files in <filename>/etc/</filename> overwrite
+                files with the same name in <filename>/usr/lib/</filename>.
+                Files in <filename>/run</filename> overwrite 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
+                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
+                configuration file takes precedence over another file with
+                an alphabetically later name.</para>
         </refsect1>
 
         <refsect1>