summaryrefslogtreecommitdiff
path: root/man/binfmt.d.xml
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-04-25 21:38:21 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-04-25 21:38:21 +0200
commit772f83719e3c2262d948a4c4e70fe9babc4c4610 (patch)
tree973ea77bd6d44c6a96518b8bf9c0ee9aa43159fe /man/binfmt.d.xml
parentdb1413d7380acacc4e50faf801ca0d401da89764 (diff)
tmpfiles.d: switch to stacked config dirs in /lib, /etc, /run
Diffstat (limited to 'man/binfmt.d.xml')
-rw-r--r--man/binfmt.d.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 5a8803f661..966778ded2 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -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,7 +73,9 @@
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> 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