X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=man%2Fsystemd.service.xml;h=d1f4a2d7d76c9f73b9b9dad540e1ec9da90a16cd;hb=1405bef3f1f204fdee001e1d002a8e91a56ef0d3;hp=b1e3af2fefa485aead9214ad94c052c2fccc9b52;hpb=accdd018ede77ef1c057775396c18c73406cbcb4;p=elogind.git

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index b1e3af2fe..d1f4a2d7d 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -524,9 +524,10 @@
                                 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 <varname>TimeoutStartSec=</varname> from the
+                                manager configuration file, except when
                                 <varname>Type=oneshot</varname> is
-                                used in which case the timeout
+                                used, in which case the timeout
                                 is disabled by default.
                                 </para></listitem>
                         </varlistentry>
@@ -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 <varname>TimeoutStartSec=</varname> from the
+                                manager configuration file.
                                 </para></listitem>
                         </varlistentry>