From e0ee845dfcd92b864a649a9b750e86cc1e7e9e24 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Tue, 20 Jun 2023 15:12:43 -0600
Subject: [PATCH] Reference SETENV-related settings in the command environment
 section.

Based on GitHub PR #273 from Ilya Kulakov.
---
 docs/sudoers.man.in  | 28 ++++++++++++++++++++++++----
 docs/sudoers.mdoc.in | 27 +++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/docs/sudoers.man.in b/docs/sudoers.man.in
index 9864bd0eb..b0458888f 100644
--- a/docs/sudoers.man.in
+++ b/docs/sudoers.man.in
@@ -25,7 +25,7 @@
 .nr BA @BAMAN@
 .nr LC @LCMAN@
 .nr PS @PSMAN@
-.TH "SUDOERS" "@mansectform@" "June 18, 2023" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDOERS" "@mansectform@" "June 20, 2023" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -475,14 +475,34 @@ varies based on the operating system
 \fBsudo\fR
 is running on.
 .PP
-Other
+Other settings may influence the command environment:
+.TP 3n
+\fB\(bu\fR
 \fBsudoers\fR
-options may influence the command environment, such as
+options such as
 \fIalways_set_home\fR,
 \fIsecure_path\fR,
 \fIset_logname\fR,
+\fIset_home\fR,
 and
-\fIset_home\fR.
+\fIsetenv\fR.
+.TP 3n
+\fB\(bu\fR
+Command tags, such as
+\fRSETENV\fR
+and
+\fRNOSETENV\fR.
+Note that
+\fRSETENV\fR
+is implied if the command matched is
+\fBALL\fR.
+.TP 3n
+\fB\(bu\fR
+\fBsudo\fR
+options, such as
+\fB\-E\fR
+and
+\fB\-i\fR.
 .PP
 On systems that support PAM where the
 \fBpam_env\fR
diff --git a/docs/sudoers.mdoc.in b/docs/sudoers.mdoc.in
index af62f9b22..6b25a40f3 100644
--- a/docs/sudoers.mdoc.in
+++ b/docs/sudoers.mdoc.in
@@ -25,7 +25,7 @@
 .nr BA @BAMAN@
 .nr LC @LCMAN@
 .nr PS @PSMAN@
-.Dd June 18, 2023
+.Dd June 20, 2023
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -461,14 +461,33 @@ varies based on the operating system
 .Nm sudo
 is running on.
 .Pp
-Other
+Other settings may influence the command environment:
+.Bl -bullet -width 1n
+.It
 .Nm
-options may influence the command environment, such as
+options such as
 .Em always_set_home ,
 .Em secure_path ,
 .Em set_logname ,
+.Em set_home ,
 and
-.Em set_home .
+.Em setenv .
+.It
+Command tags, such as
+.Dv SETENV
+and
+.Dv NOSETENV .
+Note that
+.Dv SETENV
+is implied if the command matched is
+.Sy ALL .
+.It
+.Nm sudo
+options, such as
+.Fl E
+and
+.Fl i .
+.El
 .Pp
 On systems that support PAM where the
 .Sy pam_env