From owner-dev-commits-src-all@freebsd.org Thu Apr 22 17:59:01 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7A7155FA1F6; Thu, 22 Apr 2021 17:59:01 +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 4FR4tF338Yz4dsm; Thu, 22 Apr 2021 17:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5B9381E7FA; Thu, 22 Apr 2021 17:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13MHx1Vc033455; Thu, 22 Apr 2021 17:59:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13MHx1X6033454; Thu, 22 Apr 2021 17:59:01 GMT (envelope-from git) Date: Thu, 22 Apr 2021 17:59:01 GMT Message-Id: <202104221759.13MHx1X6033454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= Subject: git: 33ed5220c2b8 - stable/12 - Revert "stats.7: Add dwatch(1) to the list" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 33ed5220c2b8d6a67317df8a0b1adc31dae6557a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 17:59:01 -0000 The branch stable/12 has been updated by fernape (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=33ed5220c2b8d6a67317df8a0b1adc31dae6557a commit 33ed5220c2b8d6a67317df8a0b1adc31dae6557a Author: Fernando Apesteguía AuthorDate: 2021-04-22 17:55:01 +0000 Commit: Fernando Apesteguía CommitDate: 2021-04-22 17:55:01 +0000 Revert "stats.7: Add dwatch(1) to the list" As gbe@ notes, the stats(7) framework is not present in stable/12 This reverts commit 76b02b5cea1dc548d30b2ec5e95ce5a27deb16e3. --- share/man/man7/stats.7 | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/share/man/man7/stats.7 b/share/man/man7/stats.7 index 5ccba52057dc..e72407c96fee 100644 --- a/share/man/man7/stats.7 +++ b/share/man/man7/stats.7 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 22, 2021 +.Dd May 14, 2020 .Dt STATS 7 .Os .Sh NAME @@ -46,8 +46,6 @@ are currently included in the base system, with more appearing periodically. Show Bluetooth socket information .It Nm ctlstat CAM Target Layer statistics utility -.It Nm dwatch -watch processes as they trigger a particular DTrace probe .It Nm fstat Identify active files .It Nm gstat @@ -89,12 +87,6 @@ Report virtual memory statistics .It Nm zpool iostat Report ZFS I/O statistics .Sh SEE ALSO -<<<<<<< HEAD -======= -.Xr btsockstat 1 , -.Xr dwatch 1 , -.Xr fstat 1 , ->>>>>>> 2e5929a75634 (stats.7: Add dwatch(1) to the list) .Xr intro 1 , .Xr intro 7 , .Xr intro 8 ,