diff options
author | Jilles Tjoelker <jilles@FreeBSD.org> | 2013-11-01 13:57:30 +0000 |
---|---|---|
committer | Jilles Tjoelker <jilles@FreeBSD.org> | 2013-11-01 13:57:30 +0000 |
commit | d2c068eaaccff272bf3492dea478d9a4b64e830b (patch) | |
tree | 6ae3771f46a5210442a71038a2b4d1bb1052b81c | |
parent | 5212e8bacff618a7f37086eca9beeef42745f5a3 (diff) | |
download | src-d2c068eaaccff272bf3492dea478d9a4b64e830b.tar.gz src-d2c068eaaccff272bf3492dea478d9a4b64e830b.zip |
sh(1),limits(1): Document kqueues (-k) rlimit.
Notes
Notes:
svn path=/head/; revision=257506
-rw-r--r-- | bin/sh/sh.1 | 9 | ||||
-rw-r--r-- | usr.bin/limits/limits.1 | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index ea1d899ed8e1..22e6ba6c552d 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd June 14, 2013 +.Dd November 1, 2013 .Dt SH 1 .Os .Sh NAME @@ -2551,7 +2551,7 @@ and not found. For aliases the alias expansion is printed; for commands and tracked aliases the complete pathname of the command is printed. -.It Ic ulimit Oo Fl HSabcdflmnpstuvw Oc Op Ar limit +.It Ic ulimit Oo Fl HSabcdfklmnpstuvw Oc Op Ar limit Set or display resource limits (see .Xr getrlimit 2 ) . If @@ -2598,6 +2598,11 @@ The maximal size of core dump files, in 512-byte blocks. The maximal size of the data segment of a process, in kilobytes. .It Fl f Ar filesize The maximal size of a file, in 512-byte blocks. +.It Fl k Ar kqueues +The maximal number of kqueues +(see +.Xr kqueue 2 ) +for this user ID. .It Fl l Ar lockedmem The maximal size of memory that can be locked by a process, in kilobytes. diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1 index efe3e6d221bd..3962feff1943 100644 --- a/usr.bin/limits/limits.1 +++ b/usr.bin/limits/limits.1 @@ -19,7 +19,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 31, 2013 +.Dd November 1, 2013 .Dt LIMITS 1 .Os .Sh NAME @@ -30,11 +30,11 @@ .Op Fl C Ar class | Fl P Ar pid | Fl U Ar user .Op Fl SHB .Op Fl ea -.Op Fl bcdflmnstuvpw Op Ar val +.Op Fl bcdfklmnstuvpw Op Ar val .Nm .Op Fl C Ar class | Fl U Ar user .Op Fl SHB -.Op Fl bcdflmnstuvpw Op Ar val +.Op Fl bcdfklmnstuvpw Op Ar val .Op Fl E .Oo .Op Ar name Ns = Ns Ar value ... @@ -207,6 +207,10 @@ resource limit. Select or set the .Va filesize resource limit. +.It Fl k Op Ar val +Select or set the +.Va kqueues +resource limit. .It Fl l Op Ar val Select or set the .Va memorylocked |