X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.service.xml;h=233807d2b3313f6dc2a027051d96a964350a32b6;hp=12d0b8a12b98a91d7e388c32ecc47e5d7722dcd5;hb=98709151f3e782eb508ba15e2a12c0b46003f061;hpb=34cdc274edd870ffc27d21cf82655a0114948748

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 12d0b8a12..233807d2b 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -470,7 +470,9 @@
                                 time span value such as "5min
                                 20s". Pass 0 to disable the timeout
                                 logic. Defaults to
-                                90s.</para></listitem>
+                                90s, except when <varname>Type=oneshot</varname> is
+                                used in which case the timeout
+                                is disabled by default.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>