From 92a39ae1989a7583d696afd4c89990aea802e9ea Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 22 May 2012 02:00:53 +0200
Subject: mount: use the same fstab extension option syntax everywhere

The man page and the actual code differed, and this is now corrected
---
 man/systemd.mount.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'man/systemd.mount.xml')

diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 2352b6a8fe..ddaa3ce744 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -109,12 +109,9 @@
                 <para>When reading <filename>/etc/fstab</filename> a
                 few special mount options are understood by systemd
                 which influence how dependencies are created for mount
-                points from <filename>/etc/fstab</filename>. If
-                <option>MountAuto=yes</option> is set in
-                <filename>system.conf</filename> (which is the
-                default), or if <option>x-systemd.mount</option> is
-                specified as mount option, then systemd will create a
-                dependency of type <option>Wants</option> from either
+                points from <filename>/etc/fstab</filename>. systemd
+                will create a dependency of type
+                <option>Wants</option> from either
                 <filename>local-fs.target</filename> or
                 <filename>remote-fs.target</filename>, depending
                 whether the file system is local or remote. If
@@ -123,7 +120,7 @@
                 system. See
                 <citerefentry><refentrytitle>systemd.automount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 for details. If
-                <option>x-systemd-device-timeout=</option> is
+                <option>x-systemd.device-timeout=</option> is
                 specified it may be used to configure how long systemd
                 should wait for a device to show up before giving up
                 on an entry from
-- 
cgit v1.2.3-54-g00ecf