From c842df488905df8d2df5e8fbecd4f96a809469c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Apestegu=C3=ADa?= <fernape@FreeBSD.org>
Date: Sat, 27 Jun 2020 11:28:11 +0000
Subject: [PATCH] killall(1): Clarify -d, -s and -v options

-d and -v are not equivalent options. The former is more verbose than the
latter and the former does not actually send the signals while the latter does.
Let them have their own paragraphs.

From the point of view of the output, -v is equivalent to -s, so describe them
close to each other. The difference is that former actually sends the signals
and the latter doesn't.

PR:	247411
Approved by:	manpages(0mp)
Differential Revision:	https://reviews.freebsd.org/D25413
---
 usr.bin/killall/killall.1 | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index ed59ec37ffa5..83b839c5525b 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 4, 2020
+.Dd June 27, 2020
 .Dt KILLALL 1
 .Os
 .Sh NAME
@@ -58,13 +58,11 @@ The super-user is allowed to kill any process.
 .Pp
 The options are as follows:
 .Bl -tag -width ".Fl c Ar procname"
-.It Fl d | v
-Be more verbose about what will be done.
-For a single
-.Fl d
-option, a list of the processes that will be sent the signal will be
-printed, or a message indicating that no matching processes have been
-found.
+.It Fl d
+Be more verbose about what will be done, but do not send any signal.
+The total number of user processes and the real user ID is shown.
+A list of the processes that will be sent the signal will be printed, or a
+message indicating that no matching processes have been found.
 .It Fl e
 Use the effective user ID instead of the (default) real user ID for matching
 processes specified with the
@@ -86,8 +84,12 @@ of processes found.
 CAUTION!
 This is dangerous, a single dot will match any process
 running under the real UID of the caller.
+.It Fl v
+Be verbose about what will be done.
 .It Fl s
-Show only what would be done, but do not send any signal.
+Same as
+.Fl v ,
+but do not send any signal.
 .It Fl Ar SIGNAL
 Send a different signal instead of the default
 .Dv TERM .
@@ -190,9 +192,9 @@ to all processes matching provided pattern (like vim and vimdiff):
 killall -m 'vim*'
 .Ed
 .Sh DIAGNOSTICS
-Diagnostic messages will only be printed if requested by
+Diagnostic messages will only be printed if the
 .Fl d
-options.
+flag is used.
 .Sh SEE ALSO
 .Xr kill 1 ,
 .Xr pkill 1 ,