X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=e5b5c3c7c33b92451b9f28b292569838f5f05c22;hb=69ab80881552d5f79ca95f6b3be48ad122ab1ec2;hp=c57f613290dc3d95590152700837d078dd57981e;hpb=479fe882ae92e4c2eac3c995cd0d23d4c604889f;p=elogind.git
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index c57f61329..e5b5c3c7c 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -73,14 +73,18 @@
which define the execution environment the
mount8
binary is executed in, and in
- systemd.kill5
- which define the way the processes are
- terminated. Note that the User= and Group= options are
- not particularly useful for mount units specifying a
- Type= option or using configuration
- not specified in /etc/fstab;
+ systemd.kill5,
+ which define the way the processes are terminated, and
+ in
+ systemd.cgroup5,
+ which configure control group settings for the
+ processes of the service. Note that the User= and
+ Group= options are not particularly useful for mount
+ units specifying a Type= option or
+ using configuration not specified in
+ /etc/fstab;
mount8
- will refuse options that aren't listed in
+ will refuse options that are not listed in
/etc/fstab if it is not run as
UID 0.
@@ -147,7 +151,7 @@
systemd.automount5
for details. If
is
- specified it may be used to configure how long systemd
+ 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
/etc/fstab. Specify a time in
@@ -157,9 +161,9 @@
If a mount point is configured in both
/etc/fstab and a unit file that
- is stored below /usr the former
+ is stored below /usr, the former
will take precedence. If the unit file is stored below
- /etc it will take
+ /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
@@ -298,6 +302,7 @@
systemd.unit5,
systemd.exec5,
systemd.kill5,
+ systemd.cgroup5,
systemd.service5,
systemd.device5,
proc5,