diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-07 20:46:34 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-08-07 20:46:49 -0400 |
| commit | 5e34b37c9fec5da130f6549ddabd8a2af5c9faac (patch) | |
| tree | 68e28fa361a39235bf198399466290d9cd63df75 /man/systemd.service.xml | |
| parent | d1fab3fe88ae873b26b50359758776ad9e31968e (diff) | |
man: correct references to DefaultTimeout*Sec
Noticed by thp on #systemd.
Diffstat (limited to 'man/systemd.service.xml')
| -rw-r--r-- | man/systemd.service.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 0131250260..5c4bd6569f 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -605,11 +605,12 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting> time span value such as "5min 20s". Pass <literal>0</literal> to disable the timeout logic. Defaults to - <varname>TimeoutStartSec=</varname> from + <varname>DefaultTimeoutStartSec=</varname> from the manager configuration file, except when <varname>Type=oneshot</varname> is used, in which case the timeout - is disabled by default. + is disabled by default + (see <citerefentry><refentrytitle>systemd-systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>). </para></listitem> </varlistentry> @@ -628,8 +629,9 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting> time span value such as "5min 20s". Pass <literal>0</literal> to disable the timeout logic. Defaults to - <varname>TimeoutStartSec=</varname> from the - manager configuration file. + <varname>DefaultTimeoutStopSec=</varname> from the + manager configuration file + (see <citerefentry><refentrytitle>systemd-systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>). </para></listitem> </varlistentry> |