summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2020-08-30 09:42:00 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2020-08-30 09:42:00 +0000
commit997b02adcc8384906339ea81ece5ba7244f3ef60 (patch)
treeeed2d9fb0566cd8000b718f114e68d62a62f7c49
parentfd1ac9f946604eb1c6626d589c8a8c4f2e820997 (diff)
downloads6-997b02adcc8384906339ea81ece5ba7244f3ef60.tar.xz
Doc typo fixes (thanks flexibeast)
-rw-r--r--AUTHORS1
-rw-r--r--doc/s6-ftrig-listen.html2
-rw-r--r--doc/s6-softlimit.html2
3 files changed, 3 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index e619bcb..edb29a6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,3 +35,4 @@ Thanks to:
Luis Ressel <aranea@aixah.de>
Eric Vidal <eric@obarun.org>
Jens Rehsack <rehsack@gmail.com>
+ Alexis <flexibeast@gmail.com>
diff --git a/doc/s6-ftrig-listen.html b/doc/s6-ftrig-listen.html
index 3206fbc..5726fa6 100644
--- a/doc/s6-ftrig-listen.html
+++ b/doc/s6-ftrig-listen.html
@@ -51,7 +51,7 @@ s6-ftrig-listen exits 0. </li>
<ul>
<li> <tt>-t <em>timeout</em></tt>&nbsp;: if the events on the <em>fifodir</em>s have not
matched the <em>regexp</em>s after <em>timeout</em> milliseconds, print an error message on
-stderr and exit 1. By default, s6-ftrig-listen1 waits indefinitely for a matching series
+stderr and exit 1. By default, s6-ftrig-listen waits indefinitely for a matching series
of events. </li>
<li> <tt>-a</tt>&nbsp;: and (conjunction). s6-ftrig-listen will only exit when <em>all</em>
the <em>fifodir-i</em> have been notified with events matching the corresponding <em>regexp-i</em>.
diff --git a/doc/s6-softlimit.html b/doc/s6-softlimit.html
index ad73409..7d53248 100644
--- a/doc/s6-softlimit.html
+++ b/doc/s6-softlimit.html
@@ -46,7 +46,7 @@ s6-softlimit changes its process limits, then executes into another program.
<li> <tt>-m&nbsp;<em>mem</em></tt>&nbsp;: limit all types of memory to <em>mem</em> bytes. </li>
<li> <tt>-o&nbsp;<em>ofiles</em></tt>&nbsp;: limit the number of open fds to <em>ofiles</em>. </li>
<li> <tt>-p&nbsp;<em>proc</em></tt>&nbsp;: limit the number of processes to <em>proc</em> (per user). </li>
- <li> <tt>-r&nbsp;<em>allmem</em></tt>&nbsp;: limit the available physical memory to <em>res</em> bytes. </li>
+ <li> <tt>-r&nbsp;<em>res</em></tt>&nbsp;: limit the available physical memory to <em>res</em> bytes. </li>
<li> <tt>-s&nbsp;<em>stack</em></tt>&nbsp;: limit the available stack memory to <em>stack</em> bytes. </li>
<li> <tt>-t&nbsp;<em>cpusecs</em></tt>&nbsp;: limit the available CPU time to <em>cpusecs</em> seconds. </li>
</ul>