X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.socket.xml;h=7c10c5858bb813df63b30ca7418edbea13651342;hb=c4708f132381e4bbc864d5241381b5cde4f54878;hp=419a38caa71a8f5dab2ce3240a0d41a7b1c0c830;hpb=79640424059328268b9fb6c5fa8eb777b27a177e;p=elogind.git
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 419a38caa..7c10c5858 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -78,11 +78,11 @@
commands are executed
in, and in
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.
+ which define the way the processes are terminated, and
+ in
+ systemd.resource-control5,
+ which configure resource control settings for the
+ processes of the socket.
For each socket file a matching service file
(see
@@ -679,8 +679,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.
@@ -712,7 +712,7 @@
systemd.unit5,
systemd.exec5,
systemd.kill5,
- systemd.cgroup5,
+ systemd.resource-control5,
systemd.service5,
systemd.directives7