diff options
Diffstat (limited to 'man/systemd.service.xml')
| -rw-r--r-- | man/systemd.service.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 0cb3d9e351..d1f4a2d7d7 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -524,10 +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 <varname>TimeoutStartSec=</varname> in + 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> @@ -546,7 +546,7 @@ 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 <varname>TimeoutStartSec=</varname> in + logic. Defaults to <varname>TimeoutStartSec=</varname> from the manager configuration file. </para></listitem> </varlistentry> |