X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.swap.xml;h=041123285307564d9d56793fd767fddfda3eb4b6;hp=5e339ea18c43582353cbd3693a4f8b98252950ce;hb=059d9fbb5a691ced7428cff5ff1da5681cacf6da;hpb=d868475ad62547f0a034dfaf038aff31b3d05372
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 5e339ea18..041123285 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -76,8 +76,8 @@
systemd.kill5,
which define the way the processes are
terminated, and in
- systemd.cgroup5,
- which configure control group settings for the
+ systemd.resource-control5,
+ which configure resource control settings for the
processes of the service.
Swap units must be named after the devices
@@ -114,7 +114,7 @@
for details about the conversion.If a swap device or file is configured in both
- /etc/fstab and a unit file the
+ /etc/fstab and a unit file, the
configuration in the latter takes precedence.Unless the option is set
@@ -175,7 +175,7 @@
Configures the time to
wait for the swapon command to
finish. If a command does not exit
- within the configured time the swap
+ within the configured time, the swap
will be considered failed and be shut
down again. All commands still running
will be terminated forcibly via
@@ -186,8 +186,8 @@
Takes a unit-less value in seconds, or
a time span value such as "5min
20s". Pass 0 to disable the timeout
- logic. Defaults to
- 90s.
+ logic. Defaults to TimeoutStartSec= from the
+ manager configuration file.
@@ -206,7 +206,7 @@
systemd.unit5,
systemd.exec5,
systemd.kill5,
- systemd.cgroup5,
+ systemd.resource-control5,
systemd.device5,
systemd.mount5,
swapon8,