summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-01-16 13:42:32 +0000
committerLaurent Bercot <ska@appnovation.com>2023-01-16 13:42:32 +0000
commit676607fa9c6a81c79a3d11774ed3446ccb26475b (patch)
tree0e7789d3358824d49450948e0ae3fa44e707e3ed /doc
parent9c665f120690f91d270ffda27fc0cabafed85619 (diff)
downloads6-676607fa9c6a81c79a3d11774ed3446ccb26475b.tar.xz
Doc typo fixes
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/s6-fdholderd.html2
-rw-r--r--doc/s6-supervise.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/s6-fdholderd.html b/doc/s6-fdholderd.html
index cb8f667..80f77a7 100644
--- a/doc/s6-fdholderd.html
+++ b/doc/s6-fdholderd.html
@@ -218,7 +218,7 @@ that matches this rule will be allowed to store or delete file descriptors
using any identifier starting with <tt>unix:/tmp/</tt>. </li>
<li> File descriptor retrieval rights. This will be checked for retrieval
of individual file descriptors. This right is given if a non-empty
-file named <tt>S6_FDHOLDER_RETRIEVE_REGEX</tt> is found is the <tt>env/</tt>
+file named <tt>S6_FDHOLDER_RETRIEVE_REGEX</tt> is found in the <tt>env/</tt>
subdirectory of one of the subdirectories checked by
<a href="libs6/accessrules.html#uidgid">s6_accessrules_keycheck_uidgid</a>.
This file should contain a single line, which will be interpreted as an
diff --git a/doc/s6-supervise.html b/doc/s6-supervise.html
index d15e769..2cafba1 100644
--- a/doc/s6-supervise.html
+++ b/doc/s6-supervise.html
@@ -172,7 +172,7 @@ to <tt>./event</tt> <em>before</em> the <tt>'D'</tt>, and it
been called. This can be used to signify permanent failure to start the service. </li>
<li> There is a minimum 1-second delay between two <tt>./run</tt> spawns, to avoid busylooping
if <tt>./run</tt> exits too quickly. If the service has been <em>ready</em> for more
-than one second, it will restart immediately, but if it not <em>ready</em> when
+than one second, it will restart immediately, but if it is not <em>ready</em> when
it dies, s6-supervise will always pause for 1 second before spawning it again. </li>
<li> When killed or asked to exit, it waits for the service to go down one last time, then
sends a <tt>'x'</tt> event to <tt>./event</tt> before exiting 0. </li>