* doc/runlevels.html, doc/upgrade.html, doc/useinit.html, man/runsvdir.8,

    man/runsvchdir.8: minor changes in wording, notations.

8 files changed, 48 insertions, 45 deletions

diff --git a/doc/runlevels.html b/doc/runlevels.html
index 8416ff0..e3cf11d 100644
--- a/doc/runlevels.html
+++ b/doc/runlevels.html
@@ -26,16 +26,16 @@ Create the following directories and symbolic links:
  # ln -s default /etc/runit/runsvdir/current
 </pre>
 Copy the contents of <tt>/var/service/</tt> to
-<tt>/etc/runit/runsvdir/current/</tt> and replace <tt>/var/service</tt>
+<tt>/etc/runit/runsvdir/current/</tt> and replace <tt>/var/service/</tt>
 with a symbolic link:
 <pre>
  # cp -pR /var/service/* /etc/runit/runsvdir/current/
- # mv -f /var/service /service.old && \
+ # mv -f /var/service /var/service.old && \
      ln -s /etc/runit/runsvdir/current /var/service
 </pre>
 You have now created two runlevels: <tt>default</tt> and <tt>single</tt>.
 The <tt>current</tt> runlevel is <tt>default</tt>.
-It is safe to remove <tt>/var/service.old</tt> if you don't need it anymore.
+It is safe to remove <tt>/var/service.old/</tt> if you don't need it anymore.
 <p>
 Finally edit <tt>/etc/runit/2</tt> to set the <tt>default</tt> runlevel when
 stage 2 starts:
diff --git a/doc/runsvchdir.8.html b/doc/runsvchdir.8.html
index 130cbcc..fc91c33 100644
--- a/doc/runsvchdir.8.html
+++ b/doc/runsvchdir.8.html
@@ -9,19 +9,19 @@
 <a href='http://smarden.org/pape/'>G. Pape</a><br><a href='index.html'>runit</A><hr><p>
 
 <h2><a name='sect0'>Name</a></h2>
-runsvchdir - change service directory of <i>runsvdir(8)</i> 
+runsvchdir - change services directory of <i>runsvdir(8)</i> 
 <h2><a name='sect1'>Synopsis</a></h2>
 <b>runsvchdir</b>
 <i>dir</i> 
 <h2><a name='sect2'>Description</a></h2>
-<i>dir</i> is a directory for the use with <i><b>runsvdir</b>(8)</i>. If <i>dir</i> does
-not start with a slash, it is searched in /etc/runit/runsvdir/. <i>dir</i> must
-not start with a dot. <p>
-<b>runsvchdir</b> switches to the directory <i>/etc/runit/runsvdir</i>,
+<i>dir</i> is a services directory for the use with <i><b>runsvdir</b>(8)</i>.
+If <i>dir</i> does not start with a slash, it is searched in /etc/runit/runsvdir/.
+<i>dir</i> must not start with a dot. <p>
+<b>runsvchdir</b> switches to the directory <i>/etc/runit/runsvdir/</i>,
 copies <i>current</i> to <i>previous</i>, and replaces <i>current</i> with a symlink pointing
 to <i>dir</i>. <p>
 Normally  <i>/var/service</i> is a symlink to <i>current</i>, and <i><b>runsvdir</b>(8)</i>
-is running <i>/var/service</i>. 
+is running <i>/var/service/</i>. 
 <h2><a name='sect3'>Exit Codes</a></h2>
 <b>runsvchdir</b> prints an error message and
 exits 111 on error. <b>runsvchdir</b> exits 0 on success. 
diff --git a/doc/runsvdir.8.html b/doc/runsvdir.8.html
index 606a44b..691ccac 100644
--- a/doc/runsvdir.8.html
+++ b/doc/runsvdir.8.html
@@ -17,37 +17,37 @@ runsvdir - starts and monitors a collection of <i>runsv(8)</i> processes
 <i>dir</i> must be a directory. <i>log</i> is a space holder for
 a readproctitle log, and must be at least seven characters long or absent.
 <p>
-<b>runsvdir</b> starts a <i><b>runsv</b>(8)</i> process for each subdirectory in <i>dir</i>, up to
-a limit of 1000 subdirectories. <b>runsvdir</b> skips subdirectory names starting
-with dots. <i><b>runsv</b>(8)</i> must be in <b>runsvdir</b>&rsquo;s PATH. <p>
-At least every five seconds,
-<b>runsvdir</b> checks if <i>dir</i> has changed. If it sees a new subdirectory in <i>dir</i>,
-it starts a new <i><b>runsv</b>(8)</i> process. If it sees an old sudirectory where a
-<i><b>runsv</b>(8)</i> process has exited, it restarts the <i><b>runsv</b>(8)</i> process. If <b>runsvdir</b>
-sees a subdirectory being removed that was previously there, it sends the
-corresponding <i><b>runsv</b>(8)</i> process a TERM signal, stops monitoring this process,
-and so does not restart the <i><b>runsv</b>(8)</i> process if it exits. <p>
-If the <i>log</i> argument
-is given to <b>runsvdir</b>, all output to standard error is redirected to this
-<i>log</i>, which is similar to the <i><b>readproctitle</b>(8)</i> log. To see the most recent
-error messages, use a process-listing tool such as <i><b>ps</b>(1)</i>. <b>runsvdir</b> writes
-a dot to the readproctitle log every 15 minutes so that old error messages
-expire. <p>
-Normally <b>runsvdir</b> is started by <i><b>runit</b>(8)</i> in stage 2. 
+<b>runsvdir</b> starts a <i><b>runsv</b>(8)</i> process for each subdirectory in the services
+directory <i>dir</i>, up to a limit of 1000 subdirectories. <b>runsvdir</b> skips subdirectory
+names starting with dots. <i><b>runsv</b>(8)</i> must be in <b>runsvdir</b>&rsquo;s PATH. <p>
+At least every
+five seconds, <b>runsvdir</b> checks if <i>dir</i> has changed. If it sees a new subdirectory
+in services directory <i>dir</i>, it starts a new <i><b>runsv</b>(8)</i> process. If it sees
+an old sudirectory where a <i><b>runsv</b>(8)</i> process has exited, it restarts the
+<i><b>runsv</b>(8)</i> process. If <b>runsvdir</b> sees a subdirectory being removed that was
+previously there, it sends the corresponding <i><b>runsv</b>(8)</i> process a TERM signal,
+stops monitoring this process, and so does not restart the <i><b>runsv</b>(8)</i> process
+if it exits. <p>
+If the <i>log</i> argument is given to <b>runsvdir</b>, all output to standard
+error is redirected to this <i>log</i>, which is similar to the <i><b>readproctitle</b>(8)</i>
+log. To see the most recent error messages, use a process-listing tool such
+as <i><b>ps</b>(1)</i>. <b>runsvdir</b> writes a dot to the readproctitle log every 15 minutes
+so that old error messages expire. <p>
+Normally <b>runsvdir</b> is started by <i><b>runit</b>(8)</i>
+in stage 2. 
 <h2><a name='sect3'>Signals</a></h2>
-If <b>runsvdir</b>
-receives a TERM signal, it exits with 0 immediately. <p>
-If <b>runsvdir</b> receives
-a HUP signal, it sends a TERM signal to each <i><b>runsv</b>(8)</i> process it is monitoring
-and then exits with 111. 
+If <b>runsvdir</b> receives a TERM signal, it exits with 0 immediately.
+<p>
+If <b>runsvdir</b> receives a HUP signal, it sends a TERM signal to each <i><b>runsv</b>(8)</i>
+process it is monitoring and then exits with 111. 
 <h2><a name='sect4'>See Also</a></h2>
-<i>runsv(8)</i>, <i>runit(8)</i>, <i>runit-init(8)</i>, <i>runsvchdir(8)</i>,
-<i>runsvctrl(8)</i>, <i>runsvstat(8)</i>, <i>chpst(8)</i>, <i>svlogd(8)</i>, <i>utmpset(8)</i>, <i>svwaitdown(8)</i>,
-<i>svwaitup(8)</i> <p>
+<i>runsv(8)</i>, <i>runit(8)</i>,
+<i>runit-init(8)</i>, <i>runsvchdir(8)</i>, <i>runsvctrl(8)</i>, <i>runsvstat(8)</i>, <i>chpst(8)</i>, <i>svlogd(8)</i>,
+<i>utmpset(8)</i>, <i>svwaitdown(8)</i>, <i>svwaitup(8)</i> <p>
 <i>http://smarden.org/runit/</i> 
 <h2><a name='sect5'>Author</a></h2>
-Gerrit Pape &lt;pape@smarden.org&gt;
-<p>
+Gerrit
+Pape &lt;pape@smarden.org&gt; <p>
 
 <hr><p>
 <a name='toc'><b>Table of Contents</b></a><p>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 90c7d3a..4cb5f3d 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -22,7 +22,7 @@ configure syslog compatible remote UDP system logging, see the
 With this version runit supports running under sysvinit on the Solaris
 platform.
 Replacing init on Solaris is not yet supported.
-The service directory now defaults to /var/service instead of /service.
+The services directory now defaults to /var/service/ instead of /service/.
 <h3>0.10.0 to 0.11.0 or 0.11.1 or 0.11.2</h3>
 This version introduces the new <a href="chpst.8.html">chpst</a> program,
 which changes the process state as specified by command line options, and
diff --git a/doc/useinit.html b/doc/useinit.html
index 5dce37e..6c11fd1 100644
--- a/doc/useinit.html
+++ b/doc/useinit.html
@@ -20,8 +20,8 @@ Normally this is done by either adding an entry for
 adding <tt>/sbin/runsvdir-start</tt> to the system's <tt>StartupItems</tt>.
 <p>
 In any case, you first need to copy the <i>stage 2</i> script to
-<tt>/sbin/runsvdir-start</tt>, and create the service directory
-<tt>/var/service</tt>:
+<tt>/sbin/runsvdir-start</tt>, and create the services directory
+<tt>/var/service/</tt>:
 <pre>
  # install -m0750 /package/admin/runit/etc/2 /sbin/runsvdir-start
  # mkdir -p /var/service
diff --git a/man/runsvchdir.8 b/man/runsvchdir.8
index 8e54cad..499703e 100644
--- a/man/runsvchdir.8
+++ b/man/runsvchdir.8
@@ -1,12 +1,12 @@
 .TH runsvchdir 8
 .SH NAME
-runsvchdir \- change service directory of runsvdir(8)
+runsvchdir \- change services directory of runsvdir(8)
 .SH SYNOPSIS
 .B runsvchdir
 .I dir
 .SH DESCRIPTION
 .I dir
-is a directory for the use with
+is a services directory for the use with
 .BR runsvdir (8).
 If
 .I dir
@@ -16,7 +16,7 @@ must not start with a dot.
 .P
 .B runsvchdir
 switches to the directory
-.IR /etc/runit/runsvdir ,
+.IR /etc/runit/runsvdir/ ,
 copies
 .I current
 to
@@ -33,7 +33,7 @@ is a symlink to
 and
 .BR runsvdir (8)
 is running
-.IR /var/service .
+.IR /var/service/ .
 .SH EXIT CODES
 .B runsvchdir
 prints an error message and exits 111 on error.
diff --git a/man/runsvdir.8 b/man/runsvdir.8
index 9065bbc..685b450 100644
--- a/man/runsvdir.8
+++ b/man/runsvdir.8
@@ -17,7 +17,7 @@ characters long or absent.
 .B runsvdir
 starts a
 .BR runsv (8)
-process for each subdirectory in
+process for each subdirectory in the services directory
 .IR dir ,
 up to a limit of 1000 subdirectories.
 .B runsvdir
@@ -32,7 +32,7 @@ At least every five seconds,
 checks if
 .I dir
 has changed.
-If it sees a new subdirectory in
+If it sees a new subdirectory in services directory
 .IR dir ,
 it starts a new
 .BR runsv (8)
diff --git a/package/CHANGES b/package/CHANGES
index af4db11..43866c3 100644
--- a/package/CHANGES
+++ b/package/CHANGES
@@ -1,3 +1,6 @@
+  * doc/runlevels.html, doc/upgrade.html, doc/useinit.html, man/runsvdir.8,
+    man/runsvchdir.8: minor changes in wording, notations.
+
 runit 1.0.3
 Sat, 26 Jun 2004 14:50:41 +0000
   * chpst.c, man/chpst.8: new option -/ chroot.