X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=0cb3d9e351415bca7e50134d417a00633b3a3a47;hb=74df0fca09b3c31ed19e14ba80f996fdff772417;hp=b1e3af2fefa485aead9214ad94c052c2fccc9b52;hpb=accdd018ede77ef1c057775396c18c73406cbcb4;p=elogind.git
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index b1e3af2fe..0cb3d9e35 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -524,7 +524,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, except when
+ logic. Defaults to TimeoutStartSec= in
+ manager configuration file, except when
Type=oneshot is
used in which case the timeout
is disabled by default.
@@ -545,7 +546,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= in
+ manager configuration file.