X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fbinfmt.d.xml;h=966778ded27479ae177ae02ea4ab03e4c4c73281;hp=d2a0d7932cdcaf462a15ed47915063b2d9e637c7;hb=772f83719e3c2262d948a4c4e70fe9babc4c4610;hpb=151b190e79e64824552e01849352ca8f6ac7dedb

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index d2a0d7932..966778ded 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -4,7 +4,7 @@
 <!--
   This file is part of systemd.
 
-  Copyright 2010 Brandon Philips
+  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
@@ -46,20 +46,18 @@
         </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>
         </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>