Doc fixes, thanks flexibeast

14 files changed, 25 insertions, 25 deletions

diff --git a/AUTHORS b/AUTHORS
index 1254022..fa18529 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@ Main author:
 Contributors:
   John Regan <john@jrjrtech.com>
   Michael Forney <mforney@mforney.org>
+  Alexis <flexibeast@gmail.com>
 
 Thanks to:
   Jean Marot <jean.marot@skarnet.org>
diff --git a/doc/minidentd.html b/doc/minidentd.html
index 007326c..d1fb546 100644
--- a/doc/minidentd.html
+++ b/doc/minidentd.html
@@ -45,7 +45,7 @@ call failure.
 
 <p>
  minidentd does not contact the network directly. It's meant to
-run under a superserver like
+run under a super-server like
 <a href="s6-tcpserver.html">s6-tcpserver</a>. minidentd will
 work with IPv4 as well as IPv6.
 </p>
@@ -53,9 +53,9 @@ work with IPv4 as well as IPv6.
 <h2> Options </h2>
 
 <ul>
- <li> <tt>-v</tt>&nbsp;: verbose mode. Log queries and replies.. </li>
+ <li> <tt>-v</tt>&nbsp;: verbose mode. Log queries and replies. </li>
  <li> <tt>-n</tt>&nbsp;: send ERROR&nbsp;:&nbsp;HIDDEN-USER replies if
-the user has a <tt>.ident</tt> file in his home directory. </li>
+the user has a <tt>.ident</tt> file in their home directory. </li>
  <li> <tt>-i</tt>&nbsp;: user-defined answers. The first 14 chars of the
 user's <tt>.ident</tt> file, up to EOF or newline, are used instead of
 the user name. If the file exists and is empty, send
diff --git a/doc/s6-sntpclock.html b/doc/s6-sntpclock.html
index 156dacc..3403226 100644
--- a/doc/s6-sntpclock.html
+++ b/doc/s6-sntpclock.html
@@ -19,7 +19,7 @@
 <h1> The <tt>s6-sntpclock</tt> program </h1>
 
 <p>
-<tt>s6-sntpclock</tt> is a small SNTP client. It connects to a
+<tt>s6-sntpclock</tt> is a small SNTP client. It connects to an
 SNTP or NTP server, computes an estimated discrepancy between the
 local clock time and the absolute time given by the server, and
 outputs it on stdout.
@@ -53,7 +53,7 @@ error is too big. </li>
 By default, <em>verbosity</em> is 1. 0 means only print fatal error
 messages; 3 means trace every exchange with the server. </li>
  <li> <tt>-r&nbsp;<em>roundtrips</em></tt>&nbsp;: perform <em>roundtrips</em>
-exchanges with the server. By default, <em>roundtrip</em> is 10. A lower
+exchanges with the server. By default, <em>roundtrips</em> is 10. A lower
 value yields a higher time uncertainty; a higher value puts more load on
 the server. </li>
  <li> <tt>-t&nbsp;<em>triptimeout</em></tt>&nbsp;: if a SNTP exchange with
diff --git a/doc/s6-taiclock.html b/doc/s6-taiclock.html
index ddbc660..3cbf21e 100644
--- a/doc/s6-taiclock.html
+++ b/doc/s6-taiclock.html
@@ -55,7 +55,7 @@ error is too big. </li>
 By default, <em>verbosity</em> is 1. 0 means only print fatal error
 messages; 2 means print advanced warnings. </li>
  <li> <tt>-r&nbsp;<em>roundtrips</em></tt>&nbsp;: perform <em>roundtrips</em>
-exchanges with the server. By default, <em>roundtrip</em> is 10. A lower
+exchanges with the server. By default, <em>roundtrips</em> is 10. A lower
 value yields a higher time uncertainty; a higher value puts more load on
 the server. </li>
  <li> <tt>-t&nbsp;<em>triptimeout</em></tt>&nbsp;: if a TAICLOCK exchange with
diff --git a/doc/s6-tcpclient.html b/doc/s6-tcpclient.html
index 66fe415..b5eafa5 100644
--- a/doc/s6-tcpclient.html
+++ b/doc/s6-tcpclient.html
@@ -63,7 +63,7 @@ in the list is able to answer. </li>
  <li> PROTO: always set to TCP </li>
  <li> TCPREMOTEIP: set to the chosen IP address of <em>host</em>. </li>
  <li> TCPREMOTEPORT: set to <em>port</em>. </li>
- <li> TCPREMOTEHOST: if the <tt>-H</tt> has been given, set to the
+ <li> TCPREMOTEHOST: if the <tt>-H</tt> option has been given, set to the
 name obtained by a reverse DNS resolution of the IP address chosen
 for <em>host</em>. Else unset. </li>
  <li> TCPLOCALHOST: if the <tt>-l</tt> option has been given, set to
diff --git a/doc/s6-tcpserver.html b/doc/s6-tcpserver.html
index 28833ec..362dbf5 100644
--- a/doc/s6-tcpserver.html
+++ b/doc/s6-tcpserver.html
@@ -61,7 +61,7 @@ given, s6-tcpserver will parse <em>ip</em> to determine its family. </li>
 
 <ul>
  <li> s6-tcpserver executes either into s6-tcpserver4, which only serves
-IPv4, or into IPv6, which only serves IPv6. It will not bind to every
+IPv4, or into s6-tcpserver6, which only serves IPv6. It will not bind to every
 available IP address of the machine whether they are v4 or v6; on the
 other hand, it can bind to every available IPv4 address (if <em>ip</em>
 is <tt>0.0.0.0</tt>) or to every available IPv6 address (if <em>ip</em>
diff --git a/doc/s6-tcpserver4-socketbinder.html b/doc/s6-tcpserver4-socketbinder.html
index 18e9fd7..6bf1c58 100644
--- a/doc/s6-tcpserver4-socketbinder.html
+++ b/doc/s6-tcpserver4-socketbinder.html
@@ -30,7 +30,7 @@ socket to an IPv4 address and port, then executes a program.
 </pre>
 
 <ul>
- <li> s6-tcpserver4-socketbinder creates an TCP socket
+ <li> s6-tcpserver4-socketbinder creates a TCP socket
 and binds it to IPv4 address <em>ip</em>, port <em>port</em>.
 It prepares the socket to accept connections by calling
 <a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/listen.html">listen()</a>. </li>
diff --git a/doc/s6-tcpserver4.html b/doc/s6-tcpserver4.html
index 1914ff0..bc1bd5e 100644
--- a/doc/s6-tcpserver4.html
+++ b/doc/s6-tcpserver4.html
@@ -85,10 +85,10 @@ connection attempts will rejected by the kernel. </li>
 supplementary group list to <em>gidlist</em> after binding the socket.
 This is only valid when run as root. <em>gidlist</em> must be a
 comma-separated list of numerical group IDs. </li>
- <li> <tt>-g&nbsp;<em>gid</em></tt>&nbsp;: change s6-tcpserver4's groupid
+ <li> <tt>-g&nbsp;<em>gid</em></tt>&nbsp;: change s6-tcpserver4's group id
 to <em>gid</em> after binding the socket. This is only valid when run
 as root. </li>
- <li> <tt>-u&nbsp;<em>uid</em></tt>&nbsp;: change s6-tcpserver4's userid
+ <li> <tt>-u&nbsp;<em>uid</em></tt>&nbsp;: change s6-tcpserver4's user id
 to <em>uid</em> after binding the socket. This is only valid when run
 as root. </li>
  <li> <tt>-U</tt>&nbsp;: change s6-tcpserver4's user id, group id and
diff --git a/doc/s6-tcpserver6.html b/doc/s6-tcpserver6.html
index ee502bc..01be274 100644
--- a/doc/s6-tcpserver6.html
+++ b/doc/s6-tcpserver6.html
@@ -85,10 +85,10 @@ connection attempts will rejected by the kernel. </li>
 supplementary group list to <em>gidlist</em> after binding the socket.
 This is only valid when run as root. <em>gidlist</em> must be a
 comma-separated list of numerical group IDs. </li>
- <li> <tt>-g&nbsp;<em>gid</em></tt>&nbsp;: change s6-tcpserver6's groupid
+ <li> <tt>-g&nbsp;<em>gid</em></tt>&nbsp;: change s6-tcpserver6's group id
 to <em>gid</em> after binding the socket. This is only valid when run
 as root. </li>
- <li> <tt>-u&nbsp;<em>uid</em></tt>&nbsp;: change s6-tcpserver6's userid
+ <li> <tt>-u&nbsp;<em>uid</em></tt>&nbsp;: change s6-tcpserver6's user id
 to <em>uid</em> after binding the socket. This is only valid when run
 as root. </li>
  <li> <tt>-U</tt>&nbsp;: change s6-tcpserver6's user id, group id and
diff --git a/doc/s6-tlsc-io.html b/doc/s6-tlsc-io.html
index f432f1e..4466293 100644
--- a/doc/s6-tlsc-io.html
+++ b/doc/s6-tlsc-io.html
@@ -38,7 +38,7 @@ the options given when configuring s6-networking.
 <h2> Interface </h2>
 
 <pre>
-     s6-tlsc-io [ -S | -s ] [ -Y | -y ] [ -v <em>verbosity</em> ] [ -K kimeout ] [ -k <em>servername</em> ] [ -d notif ] [ -- ] <em>fdr</em> <em>fdw</em>
+     s6-tlsc-io [ -S | -s ] [ -Y | -y ] [ -v <em>verbosity</em> ] [ -K kimeout ] [ -k <em>servername</em> ] [ -d <em>notif</em> ] [ -- ] <em>fdr</em> <em>fdw</em>
 </pre>
 
 <ul>
@@ -205,8 +205,8 @@ TLS handshake has completed, some data (terminated by two null
 characters) will be sent to file descriptor <em>notif</em>. The
 data contains information about the TLS parameters of the connection;
 its exact contents are left unspecified, but there's at least
-a <tt>SSL_PROTOCOL=<em>protocol</em></tt> string and
-a <tt>SSL_CIPHER=<em>cipher</em></tt> string, both
+an <tt>SSL_PROTOCOL=<em>protocol</em></tt> string and
+an <tt>SSL_CIPHER=<em>cipher</em></tt> string, both
 null-terminated.
 Sending this data serves a dual purpose: telling the <em>notif</em>
 reader that the handshake has completed, and providing it with some
diff --git a/doc/s6-tlsc.html b/doc/s6-tlsc.html
index 6f644c4..d4e6a98 100644
--- a/doc/s6-tlsc.html
+++ b/doc/s6-tlsc.html
@@ -36,7 +36,7 @@ TLS/SSL.
  <li> s6-tlsc expects to have an open TCP connection it
 can talk to on its (by default) descriptors 6 (for reading)
 and 7 (for writing). </li>
- <li> It spawns a <a href="s6-tlsc-io.html">s6-tlsc-io</a>
+ <li> It spawns an <a href="s6-tlsc-io.html">s6-tlsc-io</a>
 child process that will initiate the TLS connection, perform the
 handshake (expecting a TLS server on the other side of the
 network) and maintain the TLS tunnel. </li>
@@ -63,7 +63,7 @@ into <em>prog...</em> instead.
 
 <p>
  s6-tlsc does not expect to have any particular
-environment variables, but it spawns a
+environment variables, but it spawns an
 <a href="s6-tlsc-io.html">s6-tlsc-io</a> program that does.
 So it should pay attention to the following variables:
 </p>
diff --git a/doc/s6-tlsserver.html b/doc/s6-tlsserver.html
index 04d9951..12de659 100644
--- a/doc/s6-tlsserver.html
+++ b/doc/s6-tlsserver.html
@@ -40,7 +40,7 @@ involving:
 listens to TCP connections on IP address <em>ip</em> port <em>port</em>
 and forks a command line for every connection. Note that
 <a href="s6-tcpserver.html">s6-tcpserver</a> also rewrites
-itself into a more complex commnd line (the final long-lived
+itself into a more complex command line (the final long-lived
 process being <a href="s6-tcpserver4d.html">s6-tcpserver4d</a>
 or <a href="s6-tcpserver4d.html">s6-tcpserver6d</a>),
 so your end command line may look a lot longer in <tt>ps</tt>
@@ -49,7 +49,7 @@ than what you originally wrote. This is normal and healthy. </li>
 which performs TCP access control and various operations on the
 TCP connection. </li>
    <li> <a href="s6-tlsd.html">s6-tlsd</a>, which establishes
-a TLS transport (server-side) over a connection, via a
+a TLS transport (server-side) over a connection, via an
 <a href="s6-tlsd-io.html">s6-tlsd-io</a> child process. </li>
    <li> (if applicable)
 <a href="//skarnet.org/software/s6/s6-applyuidgid.html">s6-applyuidgid</a>,
@@ -63,7 +63,7 @@ same pid as <a href="s6-tlsd.html">s6-tlsd</a>. </li>
 <p>
  <em>prog</em> is expected to read from its peer on its
 standard input and write to its peer on its standard output.
-Since there will be a <a href="s6-tlsd-io.html">s6-tlsd-io</a>
+Since there will be an <a href="s6-tlsd-io.html">s6-tlsd-io</a>
 program between <em>prog</em> and the network to perform
 the SSL encryption/decryption, those descriptors will not
 be a network socket - they will be pipes.
@@ -193,7 +193,6 @@ given but no <tt>-i</tt> or <tt>-x</tt> option. </li>
  <li> <tt>-Z</tt>, <tt>-z</tt> </li>
  <li> <tt>-S</tt>, <tt>-s</tt> </li>
  <li> <tt>-Y</tt>, <tt>-y</tt> </li>
- <li> <tt>-k <em>servername</em></tt> </li>
  <li> <tt>-K <em>kimeout</em></tt> </li>
 </ul>
 
@@ -220,7 +219,7 @@ This will start a server listening to 1.2.3.4 on TCP port 443,
 reading queries on stdin and replying on stdout, as user <tt>www</tt>,
 with a TLS layer protecting the connection, the TLS engine running
 as user <tt>nobody</tt> (<tt>65534:65534</tt>). The server is
-authentified by the certificate in <tt>/etc/ssl/public/mycert.pem</tt>
+authenticated by the certificate in <tt>/etc/ssl/public/mycert.pem</tt>
 that it sends to the client, and the private key in
 <tt>/etc/ssl/private/mykey.der</tt> that it keeps to itself.
 </p>
diff --git a/doc/s6-ucspitlsc.html b/doc/s6-ucspitlsc.html
index 627945f..518de5b 100644
--- a/doc/s6-ucspitlsc.html
+++ b/doc/s6-ucspitlsc.html
@@ -50,7 +50,7 @@ command. </li>
  <li> At any time, <em>prog...</em> can send a command to its
 control socket provided by s6-ucspitlsc, following the
 <a href="https://web.archive.org/web/20150311223933/http://www.suspectclass.com/sgifford/ucspi-tls/ucspi-tls.txt">UCSPI-TLS</a>
-protocol. Then the s6-ucspitlsc child will exec into a
+protocol. Then the s6-ucspitlsc child will exec into an
 <a href="s6-tlsc-io.html">s6-tlsc-io</a>
 process that will initiate the TLS connection, perform the
 handshake (expecting a TLS server on the other side of the
diff --git a/doc/tls-overview.html b/doc/tls-overview.html
index 4ba3f69..32568f0 100644
--- a/doc/tls-overview.html
+++ b/doc/tls-overview.html
@@ -16,7 +16,7 @@
 <a href="//skarnet.org/">skarnet.org</a>
 </p>
 
-<h1> An overview of the tls-related programs </h1>
+<h1> An overview of the TLS-related programs </h1>
 
 <p>
  The <tt>s6-*tls*</tt> programs are organized in a way that minimizes