From nobody Fri Oct 6 14:31:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S29qM3fz1z4whGJ; Fri, 6 Oct 2023 14:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S29qM1b97z3Wj8; Fri, 6 Oct 2023 14:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696602719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/TlNgeaMdHJrty2P4soXxbHXEPK9vpEqNlLnDLfsjOE=; b=LwNjV0c1S5GzUzj0CTqcIpIdmhsgsUfpTq2+NEQl9w33FkBXwMuDb+GBoxZDJtZKvgR9C2 hU9qRqYySEjVM8j7P+q0I4bOrbucOzPrUGHpGIIrsAM4WSYwgQem3r3rZ74aup3FdZvRGr ICaEbxGP2EC2FUQfMzqrnBynyGpOb8lv6E8oVjLeERF76Y/ZCjPz6t1Z69sgByPQtzrf9G DK4H3T6HDI3wc/ibSOYgcMVop/JDllO7ir2tVY77ZSSTe7m9PWH3QGh7/1jM/xAYEhC/+6 4wVbYBkope1VEoaPo8qdbTamveoQKTGHOkc6maei77eSpKNvM1VFXAFi0y7u+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696602719; a=rsa-sha256; cv=none; b=uE9d8jRxI+hpJk/z2EEyK6jXwu1p3GJPOwp8w9Z8pQGtTpX28TOWTtd0Wowfr+zwF9hl7h E2k9MLCESRq2mXae16I5gxi90SkconrgPq0ciBrmG7w8WTh+U3AG29damaQrGjiahXWT3k 5iElQSn+IWiOgF3n0vVcDVqYgmki03tOiHTI2LNBPFfEFzM0chY5ZUiFlRxHjdYUB9EOiw lB6PCeupcoAdJBPm3U3o78SKlhqz8KPgP8epbdqAbLI+fLzfZOI7me2KG0VXke/qME8k7S OogIxULfZZdvt5s1ShdpNayihNO8zglWr23s5lxAOTD3EMmcPeKoEEwP6QwW/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696602719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/TlNgeaMdHJrty2P4soXxbHXEPK9vpEqNlLnDLfsjOE=; b=qg5Mtv5PvBbUCG8MkAJoJGm8ajZ/23ViXW1QoNCxBryf0ATaM2WJm19d1EoTGCOO6R2j3M WyoHgEysgE9URIH+rLkI7XrVDSLn9OS6iwPzjrVDKGQUsFttv8D2f4iOpG6aBZbYFPDK/+ WMxyZEsNWHY+lqSIG0EIXh86UzLJU+hpsNJuqnOgxcy4x7XFNmzF2kriH0ym1qlCboV9h9 UHyz8sm5LJ89/0tmVjwdFdWZflYe/RHxlOgE/A1xvmva8WXgbhVOxjoLIOgDjVhhC2WypY +iSZt+6ShkcFM+SY886LELUE8s60/53N9YzTqsbvVjlaTJXFiaTvcqtahNdjyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S29qM0gZ2zrPH; Fri, 6 Oct 2023 14:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 396EVwss007835; Fri, 6 Oct 2023 14:31:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396EVwW1007832; Fri, 6 Oct 2023 14:31:58 GMT (envelope-from git) Date: Fri, 6 Oct 2023 14:31:58 GMT Message-Id: <202310061431.396EVwW1007832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Benedict Reuschling Subject: git: d6ae056e9dc9 - main - Extend description of -p to include interactions with -d and implying -x List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6ae056e9dc96c2db45982ac358ba9ed716a9202 Auto-Submitted: auto-generated The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=d6ae056e9dc96c2db45982ac358ba9ed716a9202 commit d6ae056e9dc96c2db45982ac358ba9ed716a9202 Author: Benedict Reuschling AuthorDate: 2023-10-06 14:29:21 +0000 Commit: Benedict Reuschling CommitDate: 2023-10-06 14:29:21 +0000 Extend description of -p to include interactions with -d and implying -x PR: 268052 Event: Oslo Hackathon Differential Revision: https://reviews.freebsd.org/D40595 --- bin/ps/ps.1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 23868d8b3009..c393b2e49c28 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -28,7 +28,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd August 24, 2023 +.Dd October 6, 2023 .Dt PS 1 .Os .Sh NAME @@ -238,6 +238,11 @@ So the header texts for multiple keywords can be changed. If all keywords have empty header texts, no header line is written. .It Fl p Display information about processes which match the specified process IDs. +It implies the use of +.Fl x . +When combined with +.Fl d , +all descendent processes are included. .It Fl r Sort by current CPU usage, instead of the combination of controlling terminal and process ID.