- doc fixes (changed mentions of s6-notifywhenup)

 - s6-svc -X
 - rc for 2.1.6.0

6 files changed, 32 insertions, 13 deletions

diff --git a/doc/index.html b/doc/index.html
index aae5399..87fe66b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -101,7 +101,7 @@ library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.1.5.0.tar.gz">2.1.5.0</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.1.6.0.tar.gz">2.1.6.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the s6 git repository:
 <pre> git clone git://git.skarnet.org/s6 </pre> </li>
  <li> There's also a
diff --git a/doc/s6-fdholderd.html b/doc/s6-fdholderd.html
index 889cacf..c1c72b9 100644
--- a/doc/s6-fdholderd.html
+++ b/doc/s6-fdholderd.html
@@ -65,10 +65,9 @@ state </li>
  <li> <tt>-1</tt>&nbsp;: write a newline to stdout, and close stdout,
 right before entering the client-accepting loop.
 If stdout is suitably redirected, this can be used by monitoring
-programs to check when the server is accepting connections.
-The <a href="s6-notifywhenup.html">s6-notifywhenup</a>
-program can be used before the s6-ipcserver
-invocation to notify listeners when the server is ready. </li>
+programs to check when the server is accepting connections. See
+The <a href="notifywhenup.html">this page</a> for more information on
+readiness notification. </li>
  <li> <tt>-v&nbsp;<em>verbosity</em></tt>&nbsp;: be more or less
 verbose. <em>verbosity</em> can be 0 (quiet), 1 (normal), or 2 or more
 (verbose). </li>
diff --git a/doc/s6-ipcserverd.html b/doc/s6-ipcserverd.html
index b1d59b4..3282038 100644
--- a/doc/s6-ipcserverd.html
+++ b/doc/s6-ipcserverd.html
@@ -77,10 +77,9 @@ IPCREMOTEEUID will be set, but empty.
  <li> <tt>-1</tt>&nbsp;: write a newline to stdout, and close stdout,
 right before entering the client-accepting loop.
 If stdout is suitably redirected, this can be used by monitoring
-programs to check when the server is accepting connections.
-The <a href="s6-notifywhenup.html">s6-notifywhenup</a>
-program can be used before the s6-ipcserver
-invocation to notify listeners when the server is ready. </li>
+programs to check when the server is accepting connections. See
+<a href="notifywhenup.html">this page</a> for more information on
+readiness notification. </li>
  <li> <tt>-v&nbsp;<em>verbosity</em></tt>&nbsp;: be more or less
 verbose. <em>verbosity</em> can be 0 (quiet), 1 (normal), or 2
 (verbose). </li>
diff --git a/doc/s6-supervise.html b/doc/s6-supervise.html
index 78db1fa..a16e0f5 100644
--- a/doc/s6-supervise.html
+++ b/doc/s6-supervise.html
@@ -111,7 +111,9 @@ daemon as <tt>fdmove -c 2 1 fdmove 1 3 prog...</tt> (in execline), or
 <a href="s6-svc.html">s6-svc -xd</a> command had been received </li>
  <li> SIGHUP: exit as soon as the service stops, as if a
 <a href="s6-svc.html">s6-svc -x</a> command had been received </li>
- <li> SIGQUIT: currently like SIGTERM, but this might change in the future </li>
+ <li> SIGQUIT: close stdin, stdout and stderr and exit as soon as
+the service stops, as if a
+<a href="s6-svc.html">s6-svc -X</a> command had been received </li>
 </ul>
 
 <h2> Usage notes </h2>
diff --git a/doc/s6-svc.html b/doc/s6-svc.html
index 5d45972..2de8ba4 100644
--- a/doc/s6-svc.html
+++ b/doc/s6-svc.html
@@ -60,6 +60,13 @@ Automatically restart it when it dies. </li>
  <li> <tt>-x</tt>&nbsp;: exit. When the service is asked to be down and
 the supervised process dies, s6-supervise will exit too. This command should
 normally never be used on a working system. </li>
+ <li> <tt>-X</tt>&nbsp;: close fds and exit. Like <tt>-x</tt>, but
+<a href="s6-supervise.html">s6-supervise</a> will immediately close its
+stdin, stdout and stderr. This is useful when s6-supervise has descriptors
+open to the service it is supervising and the service is waiting for them
+to close before exiting. Note that if this option is used, the last
+execution of the service's <tt>finish</tt> script will be run with
+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>
@@ -71,9 +78,10 @@ timeout is 0, which means that s6-svc will block indefinitely. </li>
  <li> <tt>-D</tt>&nbsp;: s6-svc will not exit until the service is down. </li>
  <li> <tt>-U</tt>&nbsp;: s6-svc will not exit until the service is up and
 <a href="notifywhenup.html">ready</a> as notified by the daemon itself.
-Be careful to only use this command on services that send readiness
-notifications and are managed by <a href="s6-notifywhenup.html">s6-notifywhenup</a>,
-else the command will never be successful. </li>
+If the <a href="servicedir.html">service directory</a> does not contain
+a <tt>notification-fd</tt> file to tell
+<a href="s6-supervise.html">s6-supervise</a> to accept readiness
+notification, s6-svc will print a warning and ignore the command. </li>
 </ul>
 
 <h2> Usage examples </h2>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index b200725..b6ae2c9 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,17 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.1.6.0 </h2>
+
+<ul>
+ <li> <a href="s6-svc.html">s6-svc</a> now checks for the existence
+of <tt>notification-fd</tt> before accepting a <tt>U</tt> command. </li>
+ <li> New <tt>-X</tt> option to <a href="s6-svc.html">s6-svc</a>. </li>
+ <li> Different meaning of SIGQUIT for
+<a href="s6-supervise">s6-supervise</a>: now the same as
+<tt>s6-svc -X</tt>. </li>
+</ul>
+
 <h2> in 2.1.5.0 </h2>
 
 <ul>