From dd74c73772894c6988582eb4aec0fbaf6ed558d5 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 16 Mar 2015 16:05:54 +0000
Subject:  - doc fixes  - added -X to s6-notifywhenup

---
 doc/s6-notifywhenup.html | 5 ++++-
 doc/s6-svc.html          | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/s6-notifywhenup.html b/doc/s6-notifywhenup.html
index ee5a99e..b958125 100644
--- a/doc/s6-notifywhenup.html
+++ b/doc/s6-notifywhenup.html
@@ -31,7 +31,7 @@ needed.
 <h2> Interface </h2>
 
 <pre>
-     s6-notifywhenup [ -d <em>fd</em> ] [ -e <em>fifodir</em> ] [ -f ] [ -t <em>timeout</em> ] <em>prog...</em>
+     s6-notifywhenup [ -d <em>fd</em> ] [ -e <em>fifodir</em> ] [ -f ] [ -X ] [ -t <em>timeout</em> ] <em>prog...</em>
 </pre>
 
 <ul>
@@ -59,6 +59,9 @@ set if <em>prog</em> reaps even children it doesn't know it has. </li>
  <li> <tt>-t&nbsp;<em>timeout</em></tt>&nbsp;: if no EOF has been received
 after <em>timeout</em> milliseconds, exit without sending the event.
 Default is 0, meaning infinite. </li>
+ <li> <tt>-X</tt>&nbsp;: fake readiness. s6-notifywhenup will actually send
+the newline itself before executing <em>prog</em>. This option should in
+principle never be used. </li>
 </ul>
 
 <h2> Notes </h2>
diff --git a/doc/s6-svc.html b/doc/s6-svc.html
index 0ca3bd7..02ef8f0 100644
--- a/doc/s6-svc.html
+++ b/doc/s6-svc.html
@@ -27,7 +27,7 @@ knowing their PIDs, and without using horrible hacks such as .pid files.
 <h2> Interface </h2>
 
 <pre>
-     s6-svc [ -D | -U ] [ -t <em>timeout</em> ] [ -abqhkti12pcoduxO ] <em>servicedir</em>
+     s6-svc [ -D | -U ] [ -T <em>timeout</em> ] [ -abqhkti12pcoduxO ] <em>servicedir</em>
 </pre>
 
 <p>
@@ -62,8 +62,8 @@ normally never be used on a working system. </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>
- <li> <tt>-t&nbsp;<em>timeout</em></tt>&nbsp;: if the <tt>-D</tt> or
-<tt>-U</tt> option has been given, <tt>-t</tt> specifies a timeout
+ <li> <tt>-T&nbsp;<em>timeout</em></tt>&nbsp;: if the <tt>-D</tt> or
+<tt>-U</tt> option has been given, <tt>-T</tt> specifies a timeout
 (in milliseconds) after which s6-svc will exit 1 with an error message if
 the service still hasn't reached the desired state. By default, the
 timeout is 0, which means that s6-svc will block indefinitely. </li>
@@ -96,7 +96,7 @@ typically the sshd server.
  Take down the ftpd server and block until the process is really down.
 </p>
 
-<pre> s6-svc -Uu -t 5000 /service/ftpd </pre>
+<pre> s6-svc -Uu -T 5000 /service/ftpd </pre>
 <p>
  Bring up the ftpd server and block until it has sent notification that it
 is ready. Exit 1 if it is still not ready after 5 seconds.
-- 
cgit v1.3.1