summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-08-03 19:24:04 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-08-03 19:24:04 +0000
commite4beb335c144aa7d6eac978348063ab397ca1e2f (patch)
tree4214ebb29cdd2a584cefad11c0e410e75f00e560 /doc
parent042b7d0e92e4cf42506c79ab6bfe504ddb08dc86 (diff)
downloads6-e4beb335c144aa7d6eac978348063ab397ca1e2f.tar.xz
Doc typo fixes
Diffstat (limited to 'doc')
-rw-r--r--doc/s6-fdholderd.html2
-rw-r--r--doc/servicedir.html4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/s6-fdholderd.html b/doc/s6-fdholderd.html
index c1c72b9..7b35c09 100644
--- a/doc/s6-fdholderd.html
+++ b/doc/s6-fdholderd.html
@@ -31,7 +31,7 @@ and stores and retrieves file descriptors on their behalf.
<h2> Interface </h2>
<pre>
- s6-fdholderd [ -1 ] [ -v verbosity ] [ -c <em>maxconn</em> ] [ -n <em>maxfds</em> ] [ -i <em>rulesdir</em> | -x <em>rulesfile</em> ]
+ s6-fdholderd [ -1 ] [ -v verbosity ] [ -c <em>maxconn</em> ] [ -n <em>maxfds</em> ] [ -t <em>clienttimeout</em> ] [ -T <em>lameducktimeout</em> ] [ -i <em>rulesdir</em> | -x <em>rulesfile</em> ]
</pre>
<ul>
diff --git a/doc/servicedir.html b/doc/servicedir.html
index 952882a..f610cbb 100644
--- a/doc/servicedir.html
+++ b/doc/servicedir.html
@@ -109,8 +109,8 @@ exists, it means that the service supports
contain an unsigned integer, which is the number of the file descriptor that
the service writes its readiness notification to. (For instance, it should
be 1 if the daemon is <a href="s6-ipcserverd">s6-ipcserverd</a> run with the
-<tt>-1</tt> option.) </li>
- when a service is started, or restarted, by s6-supervise, if this file
+<tt>-1</tt> option.)
+ When a service is started, or restarted, by s6-supervise, if this file
exists and contains a valid descriptor number, s6-supervise will wait for the
notification from the service and broadcast readiness, i.e. any
<a href="s6-svwait.html">s6-svwait -U</a>,