summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--doc/servicedir.html5
2 files changed, 5 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 311d34c..b7fd202 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,3 +24,4 @@ Thanks to:
Buck Evan <buck@yelp.com>
John O'Meara <john.fr.omeara@gmail.com>
Michael Zuo <muh.muhten@gmail.com>
+ Casper Ti. Vector <caspervector@gmail.com>
diff --git a/doc/servicedir.html b/doc/servicedir.html
index 8e27bfc..98929bb 100644
--- a/doc/servicedir.html
+++ b/doc/servicedir.html
@@ -92,7 +92,10 @@ its work and exit in less than
5 seconds; if it takes more than that, it is killed. (The point is that the run
script, not the finish script, should be running; the finish script should really
be short-lived.) The maximum duration of a <tt>finish</tt> execution can be
-configured via the <tt>timeout-finish</tt> file, see below. </li>
+configured via the <tt>timeout-finish</tt> file, see below. The finish script is
+executed with two arguments: the exit code from the run script (resp. 256 if the
+run script was killed by a signal), and an undefined number (resp. the number of
+the signal that killed the run script). </li>
<li> A directory named <tt>supervise</tt>. It is automatically created by
<a href="s6-supervise.html">s6-supervise</a> if it does not exist. This is where
<a href="s6-supervise.html">s6-supervise</a> stores its information. The directory