From owner-svn-src-all@FreeBSD.ORG Fri Nov 1 13:57:31 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 53EBFCE8; Fri, 1 Nov 2013 13:57:31 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 27B712E54; Fri, 1 Nov 2013 13:57:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1DvVbf005153; Fri, 1 Nov 2013 13:57:31 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1DvULe005151; Fri, 1 Nov 2013 13:57:30 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201311011357.rA1DvULe005151@svn.freebsd.org> From: Jilles Tjoelker Date: Fri, 1 Nov 2013 13:57:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257506 - in head: bin/sh usr.bin/limits X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2013 13:57:31 -0000 Author: jilles Date: Fri Nov 1 13:57:30 2013 New Revision: 257506 URL: http://svnweb.freebsd.org/changeset/base/257506 Log: sh(1),limits(1): Document kqueues (-k) rlimit. Modified: head/bin/sh/sh.1 head/usr.bin/limits/limits.1 Modified: head/bin/sh/sh.1 ============================================================================== --- head/bin/sh/sh.1 Fri Nov 1 12:37:36 2013 (r257505) +++ head/bin/sh/sh.1 Fri Nov 1 13:57:30 2013 (r257506) @@ -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 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. Modified: head/usr.bin/limits/limits.1 ============================================================================== --- head/usr.bin/limits/limits.1 Fri Nov 1 12:37:36 2013 (r257505) +++ head/usr.bin/limits/limits.1 Fri Nov 1 13:57:30 2013 (r257506) @@ -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