From 6f3d826f8b90876c4feac51f514e6273e5f7fde6 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Fri, 19 Jul 2019 17:46:57 -0600
Subject: [PATCH] Update error message when the password cannot be read from
 the terminal.

---
 doc/sudo.man.in  | 13 ++++++++-----
 doc/sudo.mdoc.in | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/doc/sudo.man.in b/doc/sudo.man.in
index a3e7fdd15..6425a17f9 100644
--- a/doc/sudo.man.in
+++ b/doc/sudo.man.in
@@ -1312,15 +1312,18 @@ This may happen if no terminal is available (or the
 option is specified) and the standard input has been redirected from
 \fI/dev/null\fR.
 .TP 6n
-\fRno tty present and no askpass program specified\fR
+\fRa terminal is required to read the password\fR
 \fBsudo\fR
-needs to read the password but there is no mechanism available to do so.
+needs to read the password but there is no mechanism available for it
+to do so.
 A terminal is not present to read the password from,
 \fBsudo\fR
 has not been configured to read from the standard input,
-and no askpass program has been specified either via the
-\fB\-A\fR
-option or the
+the
+\fB\-S\fR
+option was not used, and no askpass helper has been specified either via the
+sudo.conf(@mansectform@)
+file or the
 \fRSUDO_ASKPASS\fR
 environment variable.
 .TP 6n
diff --git a/doc/sudo.mdoc.in b/doc/sudo.mdoc.in
index e605ee252..c49be2748 100644
--- a/doc/sudo.mdoc.in
+++ b/doc/sudo.mdoc.in
@@ -1209,15 +1209,18 @@ This may happen if no terminal is available (or the
 .Fl S
 option is specified) and the standard input has been redirected from
 .Pa /dev/null .
-.It Li no tty present and no askpass program specified
+.It Li a terminal is required to read the password
 .Nm
-needs to read the password but there is no mechanism available to do so.
+needs to read the password but there is no mechanism available for it
+to do so.
 A terminal is not present to read the password from,
 .Nm
 has not been configured to read from the standard input,
-and no askpass program has been specified either via the
-.Fl A
-option or the
+the
+.Fl S
+option was not used, and no askpass helper has been specified either via the
+.Xr sudo.conf @mansectform@
+file or the
 .Ev SUDO_ASKPASS
 environment variable.
 .It Li no writable temporary directory found