Document that "-p prompt" overrides SUDO_PROMPT.

diff --git a/doc/sudo.cat b/doc/sudo.cat
index 81b6f194e990a00c6847bf20eaf4f648df62c368..747f72b7126068755798167d39ee8e601d01c078 100644 (file)
--- a/doc/sudo.cat
+++ b/doc/sudo.cat
@@ -522,7 +522,8 @@ E\bEN\bNV\bVI\bIR\bRO\bON\bNM\bME\bEN\bNT\bT
 
      SUDO_GID         Set to the group ID of the user who invoked sudo.
 
-     SUDO_PROMPT      Used as the default password prompt.
+     SUDO_PROMPT      Used as the default password prompt unless the -\b-p\bp option
+                      was specified.
 
      SUDO_PS1         If set, PS1 will be set to its value for the program
                       being run.
@@ -628,4 +629,4 @@ D\bDI\bIS\bSC\bCL\bLA\bAI\bIM\bME\bER\bR
      file distributed with s\bsu\bud\bdo\bo or https://www.sudo.ws/license.html for
      complete details.
 
-Sudo 1.8.21                    February 16, 2017                   Sudo 1.8.21
+Sudo 1.8.21                      July 20, 2017                     Sudo 1.8.21

diff --git a/doc/sudo.man.in b/doc/sudo.man.in
index 1fb104894643c22b21c9bd2b536156217fd46dea..d43654bfc1ae8c2be8c05ecdf8eac5f697277799 100644 (file)
--- a/doc/sudo.man.in
+++ b/doc/sudo.man.in
@@ -21,7 +21,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.TH "SUDO" "8" "February 16, 2017" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
+.TH "SUDO" "8" "July 20, 2017" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -1048,7 +1048,10 @@ Default editor to use in
 Set to the group ID of the user who invoked sudo.
 .TP 17n
 \fRSUDO_PROMPT\fR
-Used as the default password prompt.
+Used as the default password prompt unless
+the
+\fB\-p\fR
+option was specified.
 .TP 17n
 \fRSUDO_PS1\fR
 If set,

diff --git a/doc/sudo.mdoc.in b/doc/sudo.mdoc.in
index 9ce51b1d2babe39ee9043f368f31495bee66643a..4f3ff9da91ac2f7734ec93153e2b90b85e4fb321 100644 (file)
--- a/doc/sudo.mdoc.in
+++ b/doc/sudo.mdoc.in
@@ -19,7 +19,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd February 16, 2017
+.Dd July 20, 2017
 .Dt SUDO @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -965,7 +965,10 @@ Default editor to use in
 .It Ev SUDO_GID
 Set to the group ID of the user who invoked sudo.
 .It Ev SUDO_PROMPT
-Used as the default password prompt.
+Used as the default password prompt unless
+the
+.Fl p
+option was specified.
 .It Ev SUDO_PS1
 If set,
 .Ev PS1