From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 Jan 2013 17:10:11 +0000 (+0100)
Subject: man: correct order of precedence for fstab units
X-Git-Tag: v198~531
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c32247e9d7c4231d4f731c9103d90b4e2e1682a2;p=elogind.git

man: correct order of precedence for fstab units
---

diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 2dc095e47..7f879db70 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -153,8 +153,16 @@
                 <literal>h</literal>, <literal>ms</literal>.</para>
 
                 <para>If a mount point is configured in both
-                <filename>/etc/fstab</filename> and a unit file, the
-                configuration in the latter takes precedence.</para>
+                <filename>/etc/fstab</filename> and a unit file that
+                is stored below <filename>/usr</filename> the former
+                will take precedence. If the unit file is stored below
+                <filename>/etc</filename> it will take
+                precedence. This means: native unit files take
+                precedence over traditional configuration files, but
+                this is superseded by the rule that configuration in
+                <filename>/etc</filename> will always take precedence
+                over configuration in
+                <filename>/usr</filename>.</para>
         </refsect1>
 
         <refsect1>