From 7a6766da53fa06a02d818208c51801dd79e88a54 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 9 Oct 2017 10:38:37 +0000
Subject:  Replace suffix with prefix

---
 doc/s6-rc-init.html | 21 ++++++++++++---------
 doc/upgrade.html    |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'doc')

diff --git a/doc/s6-rc-init.html b/doc/s6-rc-init.html
index c531ad6..2e9c88c 100644
--- a/doc/s6-rc-init.html
+++ b/doc/s6-rc-init.html
@@ -28,7 +28,7 @@ invocation of the
 <h2> Interface </h2>
 
 <pre>
-     s6-rc-init [ -c <em>compiled</em> ] [ -l <em>live</em> ] [ -s <em>suffix</em> ] [ -t <em>timeout</em> ] [ -b ] <em>scandir</em>
+     s6-rc-init [ -c <em>compiled</em> ] [ -l <em>live</em> ] [ -p <em>prefix</em> ] [ -t <em>timeout</em> ] [ -b ] <em>scandir</em>
 </pre>
 
 <ul>
@@ -74,15 +74,18 @@ filesystem. Default is
 <tt>/run/s6-rc</tt>. The default can be changed at compile time by
 giving the <tt>--livedir=<em>live</em></tt> option to
 <tt>./configure</tt>. </li>
- <li> <tt>-s&nbsp;<em>suffix</em></tt>&nbsp;: when linking all the
-service directory into <em>scandir</em>, add <em>suffix</em> to the
-names of the symbolic links. This allows several live directories
+ <li> <tt>-p&nbsp;<em>prefix</em></tt>&nbsp;: when linking all the
+service directory into <em>scandir</em>, prepend the symbolic link
+names with <em>prefix</em>, i.e. a longrun named <tt>A</tt> will
+have its service directory accessible via
+<tt><em>scandir</em>/<em>prefix</em>A</tt>.
+This allows several live directories
 to be used with a unique scandir without risking conflicts between
-longruns that would have the same name. This option is only useful
-if you intend to have several sets of services independently managed
-by s6-rc, with different live directories, all using the same scandir
-to supervise their longruns. The default is no suffix at all, which
-is best when you only have one live directory. </li>
+longruns with the same name from different service databases.
+This option is only useful if you intend to have several sets of services
+independently managed by s6-rc, with different live directories, all
+using the same scandir to supervise their longruns. The default is no
+prefix at all, which is good when you only have one live directory. </li>
  <li> <tt>-b</tt>&nbsp;: blocking lock. If the database is currently
 being used by another program, s6-rc-init will wait until that
 other program has released its lock on the database, then proceed.
diff --git a/doc/upgrade.html b/doc/upgrade.html
index d48cb98..23e4631 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -39,7 +39,7 @@ dependency bumped to 2.6.0.1. </li>
 dependency bumped to 2.3.0.3. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a>
 dependency bumped to 2.6.1.1. </li>
- <li> New <tt>-s</tt> option to <a href="s6-rc-init.html">s6-rc-init</a>
+ <li> New <tt>-p</tt> option to <a href="s6-rc-init.html">s6-rc-init</a>
 to allow using several live directories with the same scandir. </li>
 </ul>
 
-- 
cgit v1.2.3