summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-08-23 11:48:59 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-08-23 11:48:59 +0000
commit62b08ed24bd50737ce090f9ab37acb832845ef4f (patch)
tree8530701aa65026481892876fdb5b7d25be4890e8 /doc
parent61a109af1f537a649611484a961cfd2c3819ef52 (diff)
downloads6-62b08ed24bd50737ce090f9ab37acb832845ef4f.tar.xz
Doc fix
Diffstat (limited to 'doc')
-rw-r--r--doc/s6-svc.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/s6-svc.html b/doc/s6-svc.html
index f21847a..86e6857 100644
--- a/doc/s6-svc.html
+++ b/doc/s6-svc.html
@@ -70,8 +70,8 @@ stdin, stdout and stderr redirected to <tt>/dev/null</tt>. </li>
<li> <tt>-O</tt>&nbsp;: Once at most. Do not restart the supervised process
when it dies. If it is down when the command is received, do not even start
it. </li>
- <li> <tt>-T&nbsp;<em>timeout</em></tt>&nbsp;: if the <tt>-D</tt> or
-<tt>-U</tt> option has been given, <tt>-T</tt> specifies a timeout
+ <li> <tt>-T&nbsp;<em>timeout</em></tt>&nbsp;: if the <tt>-w<em>state</em></tt>
+option has been given, <tt>-T</tt> specifies a timeout
(in milliseconds) after which s6-svc will exit 1 with an error message if
the service still hasn't reached the desired state. By default, the
timeout is 0, which means that s6-svc will block indefinitely. </li>