diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/s6-sudoc.html | 2 | ||||
-rw-r--r-- | doc/s6-sudod.html | 2 | ||||
-rw-r--r-- | doc/s6-supervise.html | 2 | ||||
-rw-r--r-- | doc/s6-svok.html | 2 | ||||
-rw-r--r-- | doc/s6-svscan.html | 4 | ||||
-rw-r--r-- | doc/s6-svwait.html | 2 | ||||
-rw-r--r-- | doc/s6-usertree-maker.html | 4 | ||||
-rw-r--r-- | doc/servicedir.html | 4 |
8 files changed, 11 insertions, 11 deletions
diff --git a/doc/s6-sudoc.html b/doc/s6-sudoc.html index 88e187c..ab5c1a8 100644 --- a/doc/s6-sudoc.html +++ b/doc/s6-sudoc.html @@ -33,7 +33,7 @@ variables and standard descriptors. <ul> <li> s6-sudoc transmits its standard input, standard output and standard error via fd-passing over a Unix socket that must be open on its descriptors 6 and 7. - It expects a <a href="s6-sudod.html">s6-sudod</a> process to be receiving them + It expects an <a href="s6-sudod.html">s6-sudod</a> process to be receiving them on the other side. </li> <li> It also transmits its command-line arguments <em>args</em>, and also its environment by default. Note that s6-sudod will not necessarily accept all the diff --git a/doc/s6-sudod.html b/doc/s6-sudod.html index 255d946..2f91dc8 100644 --- a/doc/s6-sudod.html +++ b/doc/s6-sudod.html @@ -95,7 +95,7 @@ malicious or buggy clients that would uselessly consume resources. </li> The typical use of s6-sudod is in a <a href="localservice.html">local service</a> with a <a href="s6-ipcserver.html">s6-ipcserver</a> process listening on a Unix -socket, a <a href="s6-ipcserver-access.html">s6-ipcserver-access</a> process +socket, an <a href="s6-ipcserver-access.html">s6-ipcserver-access</a> process performing client authentication and access control, and possibly a <a href="s6-envdir.html">s6-envdir</a> process setting up the environment variables that will be accepted by diff --git a/doc/s6-supervise.html b/doc/s6-supervise.html index f116f99..404e896 100644 --- a/doc/s6-supervise.html +++ b/doc/s6-supervise.html @@ -109,7 +109,7 @@ daemon as <tt>fdmove -c 2 1 fdmove 1 3 prog...</tt> (in execline), or <li> SIGTERM: bring down the service and exit, as if a <a href="s6-svc.html">s6-svc -xd</a> command had been received </li> <li> SIGHUP: close its own stdin and stdout, and exit as soon as the -service stops, as if a <a href="s6-svc.html">s6-svc -x</a> command +service stops, as if an <a href="s6-svc.html">s6-svc -x</a> command had been received </li> <li> SIGQUIT: exit immediately without touching the service in any way. </li> diff --git a/doc/s6-svok.html b/doc/s6-svok.html index 0b77a06..e2564b9 100644 --- a/doc/s6-svok.html +++ b/doc/s6-svok.html @@ -30,7 +30,7 @@ currently supervised. </pre> <ul> -<li> s6-svok checks whether a <a href="s6-supervise.html">s6-supervise</a> +<li> s6-svok checks whether an <a href="s6-supervise.html">s6-supervise</a> process is currently monitoring <em>servicedir</em>. </li> <li> It exits 0 if there is one, or 1 if there is none. </li> </ul> diff --git a/doc/s6-svscan.html b/doc/s6-svscan.html index 61d7553..5c031c6 100644 --- a/doc/s6-svscan.html +++ b/doc/s6-svscan.html @@ -168,7 +168,7 @@ cannot be run. </li> <h2> The reaper </h2> <p> - Upon receipt of a SIGCHLD, or a <a href="s6-svscanctl.html">s6-svscanctl -z</a> + Upon receipt of a SIGCHLD, or an <a href="s6-svscanctl.html">s6-svscanctl -z</a> command, s6-svscan runs a <em>reaper</em> routine. </p> @@ -181,7 +181,7 @@ run as process 1</a>. </p> <p> - If the dead child is a <a href="s6-supervise.html">s6-supervise</a> process watched + If the dead child is an <a href="s6-supervise.html">s6-supervise</a> process watched by s6-svscan, and the last scan flagged that process as active, then it is restarted one second later. </p> diff --git a/doc/s6-svwait.html b/doc/s6-svwait.html index fb377b9..c371787 100644 --- a/doc/s6-svwait.html +++ b/doc/s6-svwait.html @@ -87,7 +87,7 @@ limit. </li> arguments, not a <em>scan directory</em>. If you need to wait for a whole scan directory, give all its contents as arguments to s6-svwait. </li> <li> s6-svwait will only work on service directories that are already -active, i.e. have a <a href="s6-supervise.html">s6-supervise</a> process +active, i.e. have an <a href="s6-supervise.html">s6-supervise</a> process running on them. It will not work on a service directory where s6-supervise has not been started yet. </li> </ul> diff --git a/doc/s6-usertree-maker.html b/doc/s6-usertree-maker.html index 4f6eef2..b62727a 100644 --- a/doc/s6-usertree-maker.html +++ b/doc/s6-usertree-maker.html @@ -20,7 +20,7 @@ <p> s6-usertree-maker creates a <a href="servicedir.html">service directory</a> -implementing a service that runs a <a href="s6-svscan.html">s6-svscan</a> +implementing a service that runs an <a href="s6-svscan.html">s6-svscan</a> instance owned by a given user, on a <a href="scandir.html">scan directory</a> belonging to that user. It is meant to help admins deploy systems where each user has their own supervision subtree, rooted in the main supervision @@ -157,7 +157,7 @@ variable substitution. </li> </ul> <p> - The service is logged: its stderr and stdout are piped to a + The service is logged: its stderr and stdout are piped to an <a href="s6-log.html">s6-log</a> process running as <em>loguser</em> and writing to the <em>logdir</em> directory. This logger is the catch-all logger for the supervision tree owned by <em>user</em>; it is recommended to make diff --git a/doc/servicedir.html b/doc/servicedir.html index 8b6871f..0eadb4c 100644 --- a/doc/servicedir.html +++ b/doc/servicedir.html @@ -142,13 +142,13 @@ notification from the service and broadcast readiness, i.e. any triggered. </li> <li style="margin-bottom:1em"> An optional regular file named <tt>timeout-kill</tt>. If such a file exists, it must only contain an unsigned integer <em>t</em>. If <em>t</em> -is nonzero, then on receipt of a <a href="s6-svc.html">s6-svc -d</a> command, +is nonzero, then on receipt of an <a href="s6-svc.html">s6-svc -d</a> command, which sends a SIGTERM (by default, see <tt>down-signal</tt> below) and a SIGCONT to the service, a timeout of <em>t</em> milliseconds is set; and if the service is still not dead after <em>t</em> milliseconds, then it is sent a SIGKILL. If <tt>timeout-kill</tt> does not exist, or contains 0 or an invalid value, then the service is never -forcibly killed (unless, of course, a <a href="s6-svc.html">s6-svc -k</a> +forcibly killed (unless, of course, an <a href="s6-svc.html">s6-svc -k</a> command is sent). </li> <li style="margin-bottom:1em"> An optional regular file named <tt>timeout-finish</tt>. If such a file exists, it must only contain an unsigned integer, which is the number of |