diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | doc/s6-ftrig-listen.html | 2 | ||||
| -rw-r--r-- | doc/s6-softlimit.html | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -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> : 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> : 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 <em>mem</em></tt> : limit all types of memory to <em>mem</em> bytes. </li> <li> <tt>-o <em>ofiles</em></tt> : limit the number of open fds to <em>ofiles</em>. </li> <li> <tt>-p <em>proc</em></tt> : limit the number of processes to <em>proc</em> (per user). </li> - <li> <tt>-r <em>allmem</em></tt> : limit the available physical memory to <em>res</em> bytes. </li> + <li> <tt>-r <em>res</em></tt> : limit the available physical memory to <em>res</em> bytes. </li> <li> <tt>-s <em>stack</em></tt> : limit the available stack memory to <em>stack</em> bytes. </li> <li> <tt>-t <em>cpusecs</em></tt> : limit the available CPU time to <em>cpusecs</em> seconds. </li> </ul> |