X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.mount.xml;h=214f40c74296aecd0a35720f879994b1dd38b3dc;hp=022be4661d18e0731347ac2643ec9228cd7272c1;hb=7abfbe7903d8e792850ec39286a3d86e616a6477;hpb=ccc9a4f9ffdab069b0b785627c48962fdadf6d46
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 022be4661..214f40c74 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -48,14 +48,14 @@
- systemd.mount
+ mount.mountDescriptionA unit configuration file whose name ends in
- .mount encodes information about
+ .mount encodes information about
a file system mount point controlled and supervised by
systemd.
@@ -73,12 +73,16 @@
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
/etc/fstab if it is not run as
@@ -86,7 +90,7 @@
Mount units must be named after the mount point
directories they control. Example: the mount point
- /home/lennart must be configured
+ /home/lennart must be configured
in a unit file
home-lennart.mount. For details
about the escaping logic used to convert a file system
@@ -206,14 +210,14 @@
the mount point does not exist at the
time of mounting, it is created. This
string must be reflected in the unit
- file name. (See above.) This option is
+ filename. (See above.) This option is
mandatory.Type=Takes a string for the
- filesystem type. See
+ file system type. See
mount8
for details. This setting is
optional.
@@ -223,8 +227,8 @@
Options=Mount options to use
- when mounting. This takes a comma
- separated list of options. This
+ when mounting. This takes a
+ comma-separated list of options. This
setting is optional.
@@ -245,12 +249,12 @@
Configures the time to
wait for the mount command to
finish. If a command does not exit
- within the configured time the mount
+ within the configured time, the mount
will be considered failed and be shut
down again. All commands still running
will be terminated forcibly via
- SIGTERM, and after another delay of
- this time with SIGKILL. (See
+ SIGTERM, and after another delay of
+ this time with SIGKILL. (See
in
systemd.kill5.)
Takes a unit-less value in seconds, or
@@ -298,6 +302,7 @@
systemd.unit5,
systemd.exec5,
systemd.kill5,
+ systemd.cgroup5,
systemd.service5,
systemd.device5,
proc5,