From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 6 Apr 2015 18:34:11 +0000 (+0200)
Subject: man: document default timeouts and start limit parameters
X-Git-Tag: v220~566
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f5a05fb578cddcf6e46be68e4a38fdbc4b853f16;p=platform%2Fupstream%2Fsystemd.git

man: document default timeouts and start limit parameters
---

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 1b74ed3..c06accd 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -260,7 +260,11 @@
         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         for details on the per-unit settings). For non-service units,
         <varname>DefaultTimeoutStartSec=</varname> sets the default
-        <varname>TimeoutSec=</varname> value. </para></listitem>
+        <varname>TimeoutSec=</varname>
+        value. <varname>DefaultTimeoutStartSec=</varname> and
+        <varname>DefaultTimeoutStopSec=</varname> default to
+        90s. <varname>DefaultRestartSec=</varname> defaults to
+        100ms.</para></listitem>
       </varlistentry>
 
       <varlistentry>
@@ -272,7 +276,10 @@
         <varname>StartLimitInterval=</varname> and
         <varname>StartLimitBurst=</varname>. See
         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for details on the per-service settings.</para></listitem>
+        for details on the per-service settings.
+        <varname>DefaultStartLimitInterval=</varname> defaults to
+        10s. <varname>DefaultStartLimitBurst=</varname> defaults to
+        5.</para></listitem>
       </varlistentry>
 
       <varlistentry>