X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=23e1e6c28eea439a3e8f45559d792a6342178ba8;hp=d1940831a9d6bd14f23442386a66eaf55088f8ee;hb=72536eb73674883f0c8522a241ecd86c032665db;hpb=236bc7573a400b77e515c441a34419b133d11b18
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index d1940831a..23e1e6c28 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -48,7 +48,7 @@
- systemd.mount
+ mount.mount
@@ -105,7 +105,10 @@
Mount points created at runtime (independently of
unit files or /etc/fstab) will be
monitored by systemd and appear like any other mount
- unit in systemd.
+ unit in systemd.
+ See /proc/self/mountinfo description
+ in proc5.
+
Some file systems have special semantics as API
file systems for kernel-to-userspace and
@@ -153,8 +156,16 @@
h, ms.
If a mount point is configured in both
- /etc/fstab and a unit file, the
- configuration in the latter takes precedence.
+ /etc/fstab and a unit file that
+ is stored below /usr the former
+ will take precedence. If the unit file is stored below
+ /etc 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
+ /etc will always take precedence
+ over configuration in
+ /usr.
@@ -171,7 +182,7 @@
options specific to the [Mount] section of mount
units are the following:
-
+
What=
@@ -265,7 +276,7 @@
for compatibility reasons and should not be used in
newly written mount files.
-
+
FsckPassNo=
@@ -289,8 +300,10 @@
systemd.kill5,
systemd.service5,
systemd.device5,
+ proc5,
mount8,
- systemd-fstab-generator8
+ systemd-fstab-generator8,
+ systemd.directives7