From 8397297de5d42fbc3ee05d27c4b2a89c20a8a864 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Tue, 5 Mar 2013 15:06:00 -0500
Subject: [PATCH] Try to clarify that sudoedit in sudoers should not include a
 leading pathname.

---
 doc/sudoers.cat     |  8 +++++---
 doc/sudoers.man.in  | 11 +++++++++--
 doc/sudoers.mdoc.in | 11 +++++++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/doc/sudoers.cat b/doc/sudoers.cat
index 13bc3a3cf..0bd7e3161 100644
--- a/doc/sudoers.cat
+++ b/doc/sudoers.cat
@@ -329,9 +329,11 @@ SSUUDDOOEERRSS FFIILLEE FFOORRMMAATT
      the Cmnd must match exactly those given by the user on the command line
      (or match the wildcards if there are any).  Note that the following
      characters must be escaped with a `\' if they are used in command
-     arguments: `,', `:', `=', `\'.  The special command ``sudoedit'' is used
+     arguments: `,', `:', `=', `\'.  The built-in command ``sudoedit'' is used
      to permit a user to run ssuuddoo with the --ee option (or as ssuuddooeeddiitt).  It may
-     take command line arguments just as a normal command does.
+     take command line arguments just as a normal command does.  Note that
+     ``sudoedit'' is a command built-in to ssuuddoo itself and must be specified
+     in _s_u_d_o_e_r_s without a leading path.
 
    DDeeffaauullttss
      Certain configuration options may be changed from their default values at
@@ -2150,4 +2152,4 @@ DDIISSCCLLAAIIMMEERR
      file distributed with ssuuddoo or http://www.sudo.ws/sudo/license.html for
      complete details.
 
-Sudo 1.8.7                     February 24, 2013                    Sudo 1.8.7
+Sudo 1.8.7                       March 5, 2013                      Sudo 1.8.7
diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index b07041904..bf6d55d8e 100644
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.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 "SUDOERS" "@mansectsu@" "February 24, 2013" "Sudo @PACKAGE_VERSION@" "Programmer's Manual"
+.TH "SUDOERS" "@mansectsu@" "March 5, 2013" "Sudo @PACKAGE_VERSION@" "Programmer's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -730,7 +730,7 @@ if they are used in command arguments:
 `:\&',
 `=\&',
 `\e'.
-The special command
+The built-in command
 ``\fRsudoedit\fR''
 is used to permit a user to run
 \fBsudo\fR
@@ -739,6 +739,13 @@ with the
 option (or as
 \fBsudoedit\fR).
 It may take command line arguments just as a normal command does.
+Note that
+``\fRsudoedit\fR''
+is a command built-in to
+\fBsudo\fR
+itself and must be specified in
+\fIsudoers\fR
+without a leading path.
 .SS "Defaults"
 Certain configuration options may be changed from their default
 values at run-time via one or more
diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index 68efc84e4..452b26c7f 100644
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.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 24, 2013
+.Dd March 5, 2013
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -698,7 +698,7 @@ if they are used in command arguments:
 .Ql :\& ,
 .Ql =\& ,
 .Ql \e .
-The special command
+The built-in command
 .Dq Li sudoedit
 is used to permit a user to run
 .Nm sudo
@@ -707,6 +707,13 @@ with the
 option (or as
 .Nm sudoedit ) .
 It may take command line arguments just as a normal command does.
+Note that
+.Dq Li sudoedit
+is a command built-in to
+.Nm sudo
+itself and must be specified in
+.Em sudoers
+without a leading path.
 .Ss Defaults
 Certain configuration options may be changed from their default
 values at run-time via one or more