From 0675664bec8d7581486a86543ea0c09ea07d407a Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 30 Sep 2023 13:03:40 +0000
Subject: [PATCH] list tracepoints directly in kdump.1 instead of pointing to
 ktrace.1

Also add a note to the respective section in kdump.1, ktrace.1, and
ltrace.1 to keep in sync with each other; suggested by schwarze@.

ok deraadt@ schwarze@
---
 usr.bin/kdump/kdump.1   | 44 ++++++++++++++++++++++++++++++++---------
 usr.bin/ktrace/ktrace.1 |  5 +++--
 usr.bin/ktrace/ltrace.1 |  5 +++--
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index 936c630a109..1c745572321 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kdump.1,v 1.37 2023/04/17 05:43:12 jmc Exp $
+.\"	$OpenBSD: kdump.1,v 1.38 2023/09/30 13:03:40 naddy Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)kdump.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: April 17 2023 $
+.Dd $Mdocdate: September 30 2023 $
 .Dt KDUMP 1
 .Os
 .Sh NAME
@@ -100,13 +100,39 @@ Display absolute timestamps for each entry (seconds since the Epoch).
 If both options are specified, display timestamps relative to trace start.
 .It Fl t Ar trstr
 Select which tracepoints to display.
-The argument can contain one or more of the letters
-.Cm cinpstuxX+ .
-See the
-.Fl t
-option of
-.Xr ktrace 1
-for the meaning of the letters.
+The argument can contain one or more of the following letters.
+By default all trace points except for
+.Cm X
+are enabled.
+.Pp
+.Bl -tag -width flag -offset indent -compact
+.\" Keep this list in sync with ktrace(1) and ltrace(1).
+.It Cm c
+trace system calls
+.It Cm i
+trace I/O
+.It Cm n
+trace namei translations
+.It Cm p
+trace violation of
+.Xr pledge 2
+restrictions
+.It Cm s
+trace signal processing
+.It Cm t
+trace various structures
+.It Cm u
+trace user data coming from
+.Xr utrace 2
+.It Cm x
+trace argument vector in
+.Xr execve 2
+.It Cm X
+trace environment in
+.Xr execve 2
+.It Cm +
+trace the default points
+.El
 .It Fl u Ar label
 Display
 .Xr utrace 2
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 45db1468107..1bae9cd5e54 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ktrace.1,v 1.32 2022/07/30 07:19:30 jsg Exp $
+.\"	$OpenBSD: ktrace.1,v 1.33 2023/09/30 13:03:40 naddy Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)ktrace.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: July 30 2022 $
+.Dd $Mdocdate: September 30 2023 $
 .Dt KTRACE 1
 .Os
 .Sh NAME
@@ -119,6 +119,7 @@ By default all trace points except for
 are enabled.
 .Pp
 .Bl -tag -width flag -offset indent -compact
+.\" Keep this list in sync with kdump(1) and ltrace(1).
 .It Cm c
 trace system calls
 .It Cm i
diff --git a/usr.bin/ktrace/ltrace.1 b/usr.bin/ktrace/ltrace.1
index 55717db6f65..0d906a03850 100644
--- a/usr.bin/ktrace/ltrace.1
+++ b/usr.bin/ktrace/ltrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ltrace.1,v 1.10 2016/07/18 09:36:50 guenther Exp $
+.\"	$OpenBSD: ltrace.1,v 1.11 2023/09/30 13:03:40 naddy Exp $
 .\"
 .\" Copyright (c) 2013 Miodrag Vallat.
 .\"
@@ -43,7 +43,7 @@
 .\"
 .\"	from: @(#)ktrace.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: July 18 2016 $
+.Dd $Mdocdate: September 30 2023 $
 .Dt LTRACE 1
 .Os
 .Sh NAME
@@ -107,6 +107,7 @@ The default is just
 The following table equates the letters with the trace points:
 .Pp
 .Bl -tag -width flag -offset indent -compact
+.\" Keep this list in sync with kdump(1) and ktrace(1).
 .It Cm c
 trace system calls
 .It Cm i
-- 
2.20.1