shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-10 05:18:17 +03:00
Code

man: correct references to DefaultTimeout*Sec

Browse Source 
Noticed by thp on #systemd.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-08-07 20:46:34 -04:00
parent d1fab3fe88
commit 5e34b37c9f
Notes: Lennart Poettering 2014-08-19 20:57:43 +02:00 
Backport: documentation
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
man/systemd.service.xml
View File

@ -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>

10
man/systemd.socket.xml
View File

@ -722,16 +722,18 @@
finish. If a command does not exit
within the configured time, the socket
will be considered failed and be shut
down again. All commands still running,
down again. All commands still running
will be terminated forcibly via
<constant>SIGTERM</constant>, and after another delay of
this time with <constant>SIGKILL</constant>. (See
<option>KillMode=</option> in <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>.)
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> from the
manager configuration file.</para></listitem>
20s". Pass <literal>0</literal> to disable the timeout
logic. Defaults to <varname>DefaultTimeoutStartSec=</varname> from the
manager configuration file
(see <citerefentry><refentrytitle>systemd-systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
</para></listitem>
</varlistentry>
<varlistentry>

8
man/systemd.swap.xml
View File

@ -185,9 +185,11 @@
<citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>.)
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> from the
manager configuration file.</para></listitem>
20s". Pass <literal>0</literal> to disable the timeout
logic. Defaults to <varname>DefaultTimeoutStartSec=</varname> from the
manager configuration file
(see <citerefentry><refentrytitle>systemd-systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
</para></listitem>
</varlistentry>
</variablelist>