man: tweak description of auto/noauto

I think the current behaviour is stupid: 'x-systemd.automount,noauto' should
mean that we create the units, but don't add .mount or .automount to any targets.
Instead, we completely ignore 'noauto'. But let's at least describe the
implementation.

Text suggested by dpartrid in the bug.

Fixes #21040.

(cherry picked from commit 55fabe92e2efb1a907d4c3c93dc63b96ff5b6860)

diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 6b0efb68df43f1028403cad6eda1a8e63481801a..6d21d32778b8d6148e8dee3477acf68ddcd8b624 100644 (file)
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -399,11 +399,13 @@
         <term><option>auto</option></term>
 
         <listitem><para>With <option>noauto</option>, the mount unit will not be added as a dependency for
-        <filename>local-fs.target</filename> or <filename>remote-fs.target</filename>. This means that it will not be
-        mounted automatically during boot, unless it is pulled in by some other unit. The <option>auto</option> option
-        has the opposite meaning and is the default. Note that the <option>noauto</option> option has an effect on the
-        mount unit itself only — if <option>x-systemd.automount</option> is used (see above), then the matching
-        automount unit will still be pulled in by these targets.</para>
+        <filename>local-fs.target</filename> or <filename>remote-fs.target</filename>. This means that it
+        will not be mounted automatically during boot, unless it is pulled in by some other unit. The
+        <option>auto</option> option has the opposite meaning and is the default.</para>
+
+        <para>Note that if <option>x-systemd.automount</option> (see above) is used, neither
+        <option>auto</option> nor <option>noauto</option> have any effect. The matching automount unit will
+        be added as a dependency to the appropriate target.</para>
         </listitem>
       </varlistentry>