From 9fdde3fe9f514f021728db63f387593c273f028e Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 14 Jul 2015 20:11:53 +0000
Subject:  Various bugfixes, thanks Colin Booth  (haven't touched the timeouts
 yet)

---
 doc/index.html      |  7 -------
 doc/s6-rc-init.html |  4 +++-
 doc/s6-rc.html      | 11 ++++++++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'doc')

diff --git a/doc/index.html b/doc/index.html
index 4f717be..e9a70b4 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -131,12 +131,5 @@ for s6, with a similar design (but no compilation phase). </li>
 is a complete init system and service manager for Unix. </li>
 </ul>
 
-<h3> Discussion </h3>
-
-<ul>
- <li> <tt>s6-rc</tt> is discussed on the
-<a href="http://skarnet.org/lists.html#skaware">skaware</a> mailing-list. </li>
-</ul>
-
 </body>
 </html>
diff --git a/doc/s6-rc-init.html b/doc/s6-rc-init.html
index f2bd8e1..39d11a7 100644
--- a/doc/s6-rc-init.html
+++ b/doc/s6-rc-init.html
@@ -77,7 +77,9 @@ filesystem. Default is
 
 <p>
  Administrators should invoke <tt>s6-rc-init</tt> once, in their
-early boot scripts, after s6-svscan is functional but before any
+early boot scripts, after s6-svscan is functional and ready to
+supervise longrun services (and after its catch-all logger, if
+any, has started), but before any
 other initialization. (The rest of the initialization can be
 written as a set of s6-rc services, and performed by just one
 invocation of the <a href="s6-rc.html">s6-rc change</a> command.)
diff --git a/doc/s6-rc.html b/doc/s6-rc.html
index 8d976d6..ae3e469 100644
--- a/doc/s6-rc.html
+++ b/doc/s6-rc.html
@@ -217,7 +217,16 @@ readiness notification, the
 <a href="http://skarnet.org/software/s6/s6-svc.html">s6-svc</a>
 command that is invoked by s6-rc will print a warning message, and
 the transition will be considered successful as soon as the daemon
-is up.
+is up, i.e. as soon as the <tt>run</tt> script is executed by
+<a href="http://skarnet.org/software/s6/s6-supervise.html">s6-supervise</a>.
+</p>
+
+<p>
+ When a longrun service supports readiness notification, unless
+a nonzero timeout has been declared in the <tt>timeout-up</tt> file
+in the service definition directory,
+s6-rc will wait forever on an "up" transition for the notification
+to arrive. The transition will fail if a timeout occurs.
 </p>
 
 <p>
-- 
cgit v1.2.3