summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/s6-connlimit.html2
-rw-r--r--doc/s6-sudoc.html2
-rw-r--r--doc/s6-sudod.html2
-rw-r--r--doc/s6-tcpserver-access.html6
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/s6-connlimit.html b/doc/s6-connlimit.html
index f0422e6..5008b4d 100644
--- a/doc/s6-connlimit.html
+++ b/doc/s6-connlimit.html
@@ -39,7 +39,7 @@ of ${PROTO}CONNMAX, s6-connlimit exits 1 with an error message. </li>
<li> Else it execs into <em>prog...</em>. </li>
<li> If ${PROTO}CONNMAX is unset, s6-connlimit directly execs into
<em>prog...</em> without performing any check:
-no maximum number of connection has been defined. </li>
+no maximum number of connections has been defined. </li>
</ul>
<h2> Usage </h2>
diff --git a/doc/s6-sudoc.html b/doc/s6-sudoc.html
index 0ca9918..def09a9 100644
--- a/doc/s6-sudoc.html
+++ b/doc/s6-sudoc.html
@@ -65,7 +65,7 @@ default, <em>timeoutrun</em> is 0, meaning infinite. </li>
while the server program is still running, s6-sudod will send a SIGTERM and a
SIGCONT to the server program - but this does not guarantee that it will die.
If the server program keeps running, it might still read from the file that
-was s6-sudoc's stdin, or write to the files that were s6-sudod's stdout or
+was s6-sudoc's stdin, or write to the files that were s6-sudoc's stdout or
stderr. <strong>This is a potential security risk</strong>.
Administrators should audit their server programs to make sure this does not
happen. </li>
diff --git a/doc/s6-sudod.html b/doc/s6-sudod.html
index ac93219..d896d87 100644
--- a/doc/s6-sudod.html
+++ b/doc/s6-sudod.html
@@ -143,7 +143,7 @@ while the server program is still running, s6-sudod will send a SIGTERM and a
SIGCONT to its child, then exit 1. However, sending a SIGTERM to the child
does not guarantee that it will die; and
if it keeps running, it might still read from the file that
-was s6-sudoc's stdin, or write to the files that were s6-sudod's stdout or
+was s6-sudoc's stdin, or write to the files that were s6-sudoc's stdout or
stderr. <strong>This is a potential security risk</strong>.
Administrators should audit their server programs to make sure this does not
happen. </li>
diff --git a/doc/s6-tcpserver-access.html b/doc/s6-tcpserver-access.html
index c7bb27a..cb758d9 100644
--- a/doc/s6-tcpserver-access.html
+++ b/doc/s6-tcpserver-access.html
@@ -170,7 +170,7 @@ client and converts it to canonical form. Then it checks it with the
function. In other words, it tries to match broader and broader network
prefixes of <em>ip</em>, from <tt>ip4/</tt><em>ip</em><tt>_32</tt> to
<tt>ip4/0.0.0.0_0</tt> if <em>ip</em> is v4, or from
-<tt>ip6/</tt><em>ip</em><tt>/128</tt> to <tt>ip6/::_0</tt> if <em>ip</em>
+<tt>ip6/</tt><em>ip</em><tt>_128</tt> to <tt>ip6/::_0</tt> if <em>ip</em>
is v6. If the result is:
</p>
@@ -195,8 +195,8 @@ S6NET_ACCESSRULES_ALLOW.
<p>
Note that even if the access check succeeds, the connection can still be
-denied if paranoid mode has been required (<tt>-p</tt>) and a forward DNS query
-on <em>remotehost</em> does not match <em>ip</em>.
+denied if paranoid mode has been requested (<tt>-p</tt>) and a forward DNS
+query on <em>remotehost</em> does not match <em>ip</em>.
</p>
<h2> Environment and executable modifications </h2>