From nobody Sat Nov 11 19:55:10 2023 X-Original-To: dev-commits-src-main@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 4SSRHf44mqz5115l; Sat, 11 Nov 2023 19:55:10 +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 4SSRHf3GlWz3LKP; Sat, 11 Nov 2023 19:55:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699732510; 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=6tlCdkhj5qiVhwpLqljdwa7h9cTlgbjax1m+2OWXFwk=; b=FLYKGxcSNN1455bHqpZZpqXyFdgQpbKTB4T5H/tbGMj7sRfNQOTab3gWfYZuPFersnsQnF 7GKa6SWykQNxhWC6GB4mPhN0iFvnNEWfSsqTllQ2evGVwUNTBM/gU9/ILEz1ZJY2YzgyGB xRnWzPBdaQf2eXAHv5A4soWnCM0u+j+5yFMRe7kQ1Dzt9DNEbWGKG+3Aa3FAl6dKJ+bh7r VPY7UvsgCw13f176utSbS1J1CTTvYnhsQSUNoxVxJN9dUDIcOwT7ZwYu6N/76TSmYKtVIK 6sxTqT76qTY413Nr8oNoRUWNtj/SwuAj1sLM+6SZ6FavLpExa5hAxd70WCtenA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699732510; 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=6tlCdkhj5qiVhwpLqljdwa7h9cTlgbjax1m+2OWXFwk=; b=s1LWah4cPmKyUdIo7kE6TjD+YHjUN8g8eLQTMfMflwExkl9zlutT+L5jg+pxaNknrnf3oI Kdc+DfWKZ/OO3P1KuidVfJWHojbxuDbaWAIEk7OrSjizxy0tVakLTu96IibLfezO4ZthEY IdywaGmh9HGN4z1ln1LasIyVjQLRBNA9priWnAwKumT17HncdjyH2VHv/ndL3fVUcWTn+Z Inj9l2dvoVVz3eRiKUb59n9sol8tt1O1cpo0GBWgULm3HtDdblc77ux8c5oVTE2H8O3L0M iDO9MmnXFvvzwyGMCM7Nhi4CyTeHQbX61p6P7gsvBQAGGhNzp1wQjZ/N9M3oVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699732510; a=rsa-sha256; cv=none; b=aF0P2fjpjjZoy5L/qybTi+/T8fOf1DefIFMeNP8h+pgSMVuSxrMmGo1Pra7KpZPuBb2n7X b6wKpEpm8MZlsvaWDcckuFnJ3Ws4VRkTKytukdWQUqvOal6IPNgVwQh9JGz3s0piRbDa8j c1A6LikADFNsW/fYbtigRI7T0P6SVL64xSrweeGd9tqKTgBwMHyebEyE4qNT4wl0cFH8NW bVx/6gcYa4hjdZaLD1ow+Xtez7MlBSjjE363NWGtjiGFXCRkIKE0GQ77zvO6R5yUsRdFq4 MVIzPw4zllsunFU/2NZmZk2Wkjh8H3K2f2ieUW51V34Hl6j29XzRH2c7/oO8fQ== 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 4SSRHf2BFlztBT; Sat, 11 Nov 2023 19:55:10 +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 3ABJtAlh004863; Sat, 11 Nov 2023 19:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ABJtAO0004860; Sat, 11 Nov 2023 19:55:10 GMT (envelope-from git) Date: Sat, 11 Nov 2023 19:55:10 GMT Message-Id: <202311111955.3ABJtAO0004860@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: ba44650a0b1e - main - ps.1: update regarding -D option and -p x/d interaction List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ba44650a0b1e3b0f52554380937a3ffc16d396f3 Auto-Submitted: auto-generated The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=ba44650a0b1e3b0f52554380937a3ffc16d396f3 commit ba44650a0b1e3b0f52554380937a3ffc16d396f3 Author: Benedict Reuschling AuthorDate: 2023-11-11 19:49:24 +0000 Commit: Benedict Reuschling CommitDate: 2023-11-11 19:49:24 +0000 ps.1: update regarding -D option and -p x/d interaction The -p option does not imply -x, it is merely a different mode that ps uses. Remove that statement from the -p option, effectively rolling back d6ae056e9dc96c2db45982ac358ba9ed716a9202. pstef@ introduced the -D option in 5c0a1c15ff8cb66128f4826ace8ba91e0a31486d which also turns ps into a similar mode. List the -D option along with the others in the first sentence of the second paragraph of the DESCRIPTION section for completeness and correctness sake. Pointed out by: pstef@ Differential Revision: https://reviews.freebsd.org/D42552 --- bin/ps/ps.1 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index c393b2e49c28..0afd53523854 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -28,7 +28,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd October 6, 2023 +.Dd November 11, 2023 .Dt PS 1 .Os .Sh NAME @@ -65,7 +65,7 @@ will also display processes that do not have controlling terminals. .Pp A different set of processes can be selected for display by using any combination of the -.Fl a , G , J , p , T , t , +.Fl a , D , G , J , p , T , t , and .Fl U options. @@ -238,11 +238,6 @@ 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.