git: 33ed5220c2b8 - stable/12 - Revert "stats.7: Add dwatch(1) to the list"

[Fernando Apesteguía]

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 <fernape at FreeBSD.org>
AuthorDate: 2021-04-22 17:55:01 +0000
Commit:     Fernando Apesteguía <fernape at FreeBSD.org>
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 ,