summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-01-09 23:23:52 +0000
committerLaurent Bercot <ska@appnovation.com>2023-01-09 23:23:52 +0000
commitc026dea4c33adc3f18b9788cab4d6ce7d56345c8 (patch)
treecb6803bd89b19b2472d6382f076c9345920ed5b0
parentaeb3ad3d8cac8f1f085725711d2d8739b722b61b (diff)
downloads6-c026dea4c33adc3f18b9788cab4d6ce7d56345c8.tar.xz
Doc typo fixes
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rw-r--r--doc/instances.html4
-rw-r--r--doc/s6-instance-maker.html7
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/instances.html b/doc/instances.html
index 0586fdb..78b3cd5 100644
--- a/doc/instances.html
+++ b/doc/instances.html
@@ -94,8 +94,8 @@ are initially empty, except that the template service directory is stored in
<li> When the service is active, there is an <a href="s6-svscan.html">s6-svscan</a>
process running on <tt>instance</tt>. </li>
<li> <a href="s6-instance-create.html">s6-instance-create</a> makes a copy of
-<tt>instances/.template</tt> into <tt>instances/<em>name</em>/tt>, and
-<a href="s6-svlink.html">s6-svlink</a>s <tt>instances/<em>name</em>/tt> to
+<tt>instances/.template</tt> into <tt>instances/<em>name</em></tt>, and
+<a href="s6-svlink.html">s6-svlink</a>s <tt>instances/<em>name</em></tt> to
<tt>instance</tt>. When it returns, there is an <a href="s6-supervise.html">s6-supervise</a>
process running on <tt>instance/<em>name</em></tt>, and the instance may be up
or not depending on the given options. </li>
diff --git a/doc/s6-instance-maker.html b/doc/s6-instance-maker.html
index 2eb0f4e..ac86671 100644
--- a/doc/s6-instance-maker.html
+++ b/doc/s6-instance-maker.html
@@ -50,8 +50,9 @@ for the <a href="//skarnet.org/software/s6-rc/">s6-rc</a> service manager.
</pre>
<p>
-s6-instance-maker creates a service directory in <em>dir</em>. The
-created service will be a supervisor for a set of instances (initially empty)
+s6-instance-maker creates a service directory in <em>dir</em> (which must
+not already exist). The created service will be a supervisor for a set of
+instances &mdash; initially empty &mdash;
each running a copy of the service directory given in <em>template</em>.
</p>
@@ -195,7 +196,7 @@ built if s6 is built with <a href="//skarnet.org/software/execline/">execline</a
support - i.e. the <tt>--disable-execline</tt> switch has <em>not</em> been given
to configure. </li>
<li> If s6-instance-maker encounters failure (and exits 111), it does not clean up
-the directories it created. Make sure to always test s6-usertree-maker's return code
+the directories it created. Make sure to always test s6-instance-maker's return code
and clean up after it if needed. </li>
</ul>