Doc fixes

4 files changed, 12 insertions, 12 deletions

diff --git a/doc/index.html b/doc/index.html
index 9d03f43..6aab8e8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -175,7 +175,7 @@ synchronization</a>.
 
 <ul>
 <li><a href="s6-ftrigrd.html">The <tt>s6-ftrigrd</tt> internal program</a></li>
-<li><a href="libs6lock/s6-lockd.html">The <tt>s6lockd</tt> internal program</a></li>
+<li><a href="libs6lock/s6lockd.html">The <tt>s6lockd</tt> internal program</a></li>
 <li><a href="libs6lock/s6lockd-helper.html">The <tt>s6lockd-helper</tt> internal program</a></li>
 </ul>
 
@@ -236,8 +236,8 @@ traditional init system for Linux. </li>
  <li> <a href="http://upstart.ubuntu.com/">Upstart</a> is a well-known init system
 for Linux, with complete service management, that comes with the Ubuntu
 distribution. It includes a coffee machine and the kitchen sink.</li>
- <li> Because Upstart wasn't bloated or unreliable enough, someone came up with
-<a href="systemd.html">systemd</a>, yet another Linux init system. </li>
+ <li> Because Upstart wasn't complex enough, someone came up with
+<a href="systemd.html">systemd</a>, which is a problem in its own category. </li>
  <li> The various BSD flavors have their own style of
 <a href="http://www.freebsd.org/doc/handbook/boot-init.html">init</a>. </li>
  <li> MacOS X has its own init spaghetti monster called
diff --git a/doc/libs6lock/index.html b/doc/libs6lock/index.html
index 3696b41..7237823 100644
--- a/doc/libs6lock/index.html
+++ b/doc/libs6lock/index.html
@@ -70,10 +70,10 @@ practices. </li>
 
 <pre>
 s6lock_t a = S6LOCK_ZERO ;
-struct taia deadline ;
+tain_t deadline ;
 
-taia_now_g() ;
-taia_addsec_g(&amp;deadline, 2)
+tain_now_g() ;
+tain_addsec_g(&amp;deadline, 2)
 
 char const *path = S6LOCK_IPCPATH ;
 s6lock_start_g(&amp;a, path, &amp;deadline) ;
@@ -128,8 +128,8 @@ s6lock_end(&amp;a) ;
 <pre>
 uint16 id ;
 char const *file = "lockfile" ;
-struct taia limit ;
-struct taia deadline ;
+tain_t limit ;
+tain_t deadline ;
 
 int r = s6lock_acquire_sh_g (&amp;a, &amp;id, file, &amp;limit, &amp;deadline) ;
 /* int r = s6lock_acquire_ex_g (&amp;a, &amp;id, file, &amp;limit, &amp;deadline) ; */
@@ -236,7 +236,7 @@ number may have been transmitted from
 <h3> Synchronously waiting for locks </h3>
 
 <p>
-<code> int s6lock_wait_or_g (s6lock_t *a, uint16 const *idlist, unsigned int n, struct taia const *deadline) </code> <br />
+<code> int s6lock_wait_or_g (s6lock_t *a, uint16 const *idlist, unsigned int n, tain_t const *deadline) </code> <br />
 Synchronously waits for <em>one</em> of the locks represented by the array pointed to
 by <em>idlist</em> of length <em>n</em> to be acquired. Returns -1 if it fails,
 or a nonnegative number on success, which is the index in <em>idlist</em> of the
@@ -245,7 +245,7 @@ function returns -1 ETIMEDOUT.
 </p>
 
 <p>
-<code> int s6lock_wait_and_g (s6lock_t *a, uint16 const *idlist, unsigned int n, struct taia const *deadline) </code> <br />
+<code> int s6lock_wait_and_g (s6lock_t *a, uint16 const *idlist, unsigned int n, tain_t const *deadline) </code> <br />
 Synchronously waits for <em>all</em> of the locks represented by the array pointed to
 by <em>idlist</em> of length <em>n</em> to be acquired. Returns -1 if it fails and
 0 if it succeeds. If no result has been obtained by <em>deadline</em>, the
diff --git a/doc/s6-ftrig-notify.html b/doc/s6-ftrig-notify.html
index fa1e8b5..4f881eb 100644
--- a/doc/s6-ftrig-notify.html
+++ b/doc/s6-ftrig-notify.html
@@ -29,7 +29,7 @@ s6-ftrig-notify sends a series of events to a <a href="fifodir.html">fifodir</a>
 
 <p>
 s6-ftrig-notify notifies all the current listeners in <em>fifodir</em>
-with all the characters in <em>message</em>, one by one.
+with all the characters in <em>message</em>.
 </p>
 
 <h2> Notes </h2>
diff --git a/doc/s6-setlock.html b/doc/s6-setlock.html
index bab3e23..f425656 100644
--- a/doc/s6-setlock.html
+++ b/doc/s6-setlock.html
@@ -40,7 +40,7 @@ s6-setlock takes a lock on a file, then executes into another program.
 exit 1 immediately. </li>
  <li> <tt>-N</tt>&nbsp;: blocking lock. s6-setlock will wait until it can acquire the lock.
 This is the default. </li>
- <li> <tt>-t&nbsp;<em>timeout</em>&nbsp;: timed lock. If s6-setlock cannot acquire
+ <li> <tt>-t&nbsp;<em>timeout</em></tt>&nbsp;: timed lock. If s6-setlock cannot acquire
 the lock after <em>timeout</em> milliseconds, it will exit 1. </li>
  <li> <tt>-r</tt>&nbsp;: shared lock. Other shared locks on the same file will not prevent
 the lock from being acquired (but an exclusive lock will). </li>