man: describe masking of .network files better

This should clear up some confusion in
https://github.com/systemd/systemd/issues/717.

This basically copies the description from systemd.unit to this
man page. Masking can happen also in /run, so strike the part
about /etc, and also add the magic work "mask".

diff --git a/man/systemd.link.xml b/man/systemd.link.xml
index d9b1879c5981833c8a03f6c9ce9d7b7a89fbe310..b630ef7a17ed7b2eb6c9133e2931a25f7ec3d9cf 100644 (file)
--- a/man/systemd.link.xml
+++ b/man/systemd.link.xml
@@ -68,11 +68,10 @@
     in <filename>/etc</filename> have the highest priority, files in
     <filename>/run</filename> take precedence over files with the same
     name in <filename>/usr/lib</filename>. This can be used to
-    override a system-supplied link file with a local file if needed;
-    a symlink in <filename>/etc</filename> with the same name as a
-    link file in <filename>/usr/lib</filename>, pointing to
-    <filename>/dev/null</filename>, disables the link file
-    entirely.</para>
+    override a system-supplied link file with a local file if needed.
+    As a special case, an empty file (file size 0) or symlink with the
+    same name pointing to <filename>/dev/null</filename>, disable the
+    configuration file entirely (it is "masked").</para>
 
     <para>The link file contains a <literal>[Match]</literal> section,
     which determines if a given link file may be applied to a given

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 7e92d1d99c646b1e9436ddb29c368fd9251c7334..3ef14207584d4aa2c6501c6dd8a0360760d13b6b 100644 (file)
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -80,11 +80,9 @@
     <filename>/run</filename> take precedence over files with the same
     name in <filename>/usr/lib</filename>. This can be used to
     override a system-supplied configuration file with a local file if
-    needed; a symlink in <filename>/etc</filename> with the same name
-    as a configuration file in <filename>/usr/lib</filename>, pointing
-    to <filename>/dev/null</filename>, disables the configuration file
-    entirely.</para>
-
+    needed. As a special case, an empty file (file size 0) or symlink
+    with the same name pointing to <filename>/dev/null</filename>,
+    disable the configuration file entirely (it is "masked").</para>
   </refsect1>
 
   <refsect1>

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index fbb0bef5c26074a2fc1f465741d37595ca3a6c01..5be1102894fd6a4879f3d3fd11d3fac00c1801ca 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -76,11 +76,9 @@
     <filename>/run</filename> take precedence over files with the same
     name in <filename>/usr/lib</filename>. This can be used to
     override a system-supplied configuration file with a local file if
-    needed; a symlink in <filename>/etc</filename> with the same name
-    as a configuration file in <filename>/usr/lib</filename>, pointing
-    to <filename>/dev/null</filename>, disables the configuration file
-    entirely.</para>
-
+    needed. As a special case, an empty file (file size 0) or symlink
+    with the same name pointing to <filename>/dev/null</filename>,
+    disable the configuration file entirely (it is "masked").</para>
   </refsect1>
 
   <refsect1>