From nobody Thu May 1 19:51:20 2025 X-Original-To: dev-commits-src-branches@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 4ZpPnN53G0z5vdqv; Thu, 01 May 2025 19:51:20 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpPnN3h0fz46Mp; Thu, 01 May 2025 19:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129080; 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=PZYdNNYIIxFuUSwhYXVLOX+pyfBnZWKLunOEevu5VNU=; b=BUa4k7jHpC7H+KLL3qJz/KQLpL2aId04uEhnI3Hd8GQkdSjYZ9oV8YZui5rK0ftchKg1vh P/lJThPMWBCbfAa3pTmUsrPUHNJtCJB0Zxs+3Km4FnoJ2ITLsUJqT0t1xbeE2K1IeDYGBL LNV+ZWYiJAnvXNvngAxMCfU4CvPSlP/g7GX9gLpXlCRYGjQFD52koyoXJ+LgghS5d1dlYy LVn9XG08k/bWlEqlHnce9ak6INk2+qrFpZsNse6Da0eYcz7npGnLHaOzSE/uJOJRb5TKFU cg9H2s2Skww4KFtmiT70FBmobhWKUY+/J2uixCj40CXKqIps1nrMHjGd5APcag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129080; 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=PZYdNNYIIxFuUSwhYXVLOX+pyfBnZWKLunOEevu5VNU=; b=FW9uN0zUJeWoJSirLPmy1BFDOB6Tivd60WkHvtVuJcYYX++JH2R7IshtMnzd26duhZ8AYS EKKlTCWW/enpyMkOCC8H1ZG0DBieK6WkV7Lr/hxm10/PImWE6QVu9vFAItG1Nmib8irdp/ rUhBdpa7uvP8V5nzgExgbIBqJ0/3bIxeR9wHJMBOvHbiEkQkfZhVQUw+C+i9P1rl4KLObn BDbbSqkxNRMSCRGz/Yxh3nEMO20dxqs6HiC9zf6lscIX+/BEijwQUXFAR44alsjV4ywSJO iJmFwHrvU09xR+S8HoQbNQ7Nq8gJLZzNFK46WEZ0HIXlCs1I0EO/hF8flM6QSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746129080; a=rsa-sha256; cv=none; b=Ay0iQ0FoDTt565A6zho0ZIIyt/uU1tYYE5pW/jq5zdecKMeDX1O9qC0FGHp+Ld9TKYXKp1 7l8VarQ/09mmKGktbf6OgB4YnrynEG2dc8hDjPzGmFWtOBbK+XOwRCWrJk7GkfNcWuftH6 /C2NJKS3sBEJ2PtIwads0vJrjzAXzHQzMdiw2xBT0e+agwraDTt/abm/5I4cLDTaSi6c3p gXm/1RY0hBt3EoyzrvP36fW81arKf5eZTVE/BC3fEG/h3HBDujuUn0Qt6lVkp1wnGZGGv9 IIjKRWG8mSyJUwHJ2ssxK1oqxqaU6rr5EEDs4eogDVpU9JBcoy5hxMZ0spFJXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpPnN3GxFzj17; Thu, 01 May 2025 19:51:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 541JpKIM066938; Thu, 1 May 2025 19:51:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541JpKaO066935; Thu, 1 May 2025 19:51:20 GMT (envelope-from git) Date: Thu, 1 May 2025 19:51:20 GMT Message-Id: <202505011951.541JpKaO066935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: b4fb6e033914 - stable/14 - Extend description of -p to include interactions with -d and implying -x List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b4fb6e033914858c0454d8825cdf1f7df12ed295 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b4fb6e033914858c0454d8825cdf1f7df12ed295 commit b4fb6e033914858c0454d8825cdf1f7df12ed295 Author: Benedict Reuschling AuthorDate: 2023-10-06 14:29:21 +0000 Commit: Olivier Certner CommitDate: 2025-05-01 19:35:02 +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 (cherry picked from commit d6ae056e9dc96c2db45982ac358ba9ed716a9202) --- 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 95f7f15e26ad..368d50b46abc 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.