From 4363782bc3d5d08d3e192a320b3e581315404dc6 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 9 Oct 2017 13:53:41 +0000
Subject: [PATCH] Undocument "tdnam" (leaving it as an alias), and rename the
 column to TDNAME.

Suggested by:	bde
MFC after:	2 weeks
Sponsored by:	DARPA, AFRL
---
 bin/ps/keyword.c | 4 ++--
 bin/ps/ps.1      | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index e1a125b238a..5c873910f33 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -199,9 +199,9 @@ static VAR var[] = {
 	{"tdaddr", "TDADDR", NULL, "thread-address", 0, kvar, KOFF(ki_tdaddr),
 	    KPTR, "lx", 0},
 	{"tdev", "TDEV", NULL, "terminal-device", 0, tdev, 0, CHAR, NULL, 0},
-	{"tdnam", "TDNAM", NULL, "thread-name", LJUST, tdnam, 0, CHAR,
+	{"tdnam", "", "tdname", NULL, 0, NULL, 0, CHAR, NULL, 0},
+	{"tdname", "TDNAME", NULL, "thread-name", LJUST, tdnam, 0, CHAR,
 	    NULL, 0},
-	{"tdname", "", "tdnam", NULL, 0, NULL, 0, CHAR, NULL, 0},
 	{"time", "TIME", NULL, "cpu-time", USER, cputime, 0, CHAR, NULL, 0},
 	{"tpgid", "TPGID", NULL, "terminal-process-gid", 0, kvar,
 	    KOFF(ki_tpgid), UINT, PIDFMT, 0},
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 896f22cff6d..67bea88f1a4 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -675,9 +675,8 @@ saved UID from a setuid executable
 accumulated system CPU time
 .It Cm tdaddr
 thread address
-.It Cm tdnam
-thread name (alias
-.Cm tdname )
+.It Cm tdname
+thread name
 .It Cm tdev
 control terminal device number
 .It Cm time