diff --git a/sudo.cat b/sudo.cat
index b0c32c8b2..4964f70ba 100644
--- a/sudo.cat
+++ b/sudo.cat
@@ -26,19 +26,19 @@ DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
        time (five minutes by default).
 
        ssssuuuuddddoooo determines who is an authorized user by consulting
-       the file _/_e_t_c_/_s_u_d_o_e_r_s.  By giving ssssuuuuddddoooo the -v flag a user
-       can update the time stamp without running a _c_o_m_m_a_n_d_.  The
-       password prompt itself will also time out if the user's
-       password is not entered with N minutes (again, this is
-       defined at configure time and defaults to 5 minutes).
+       the file _/_e_t_c_/_s_u_d_o_e_r_s.  By giving ssssuuuuddddoooo the `-v' flag a
+       user can update the time stamp without running a _c_o_m_m_a_n_d_.
+       The password prompt itself will also time out if the
+       user's password is not entered with N minutes (again, this
+       is defined at configure time and defaults to 5 minutes).
 
        If a user that is not listed in the _s_u_d_o_e_r_s file tries to
-       run a command via ssssuuuuddddoooo, mail is sent to the proper
-       authorities, as defined at configure time (defaults to
-       root).  Note that the mail will not be sent if an
-       unauthorized user tries to run sudo with the -l or -v
-       flags.  This allows users to determine for themselves
-       whether or not they are allowed to use ssssuuuuddddoooo.
+       run a command via ssssuuuuddddoooo, mail is sent to the proper author­
+       ities, as defined at configure time (defaults to root).
+       Note that the mail will not be sent if an unauthorized
+       user tries to run sudo with the `-l' or `-v' flags.  This
+       allows users to determine for themselves whether or not
+       they are allowed to use ssssuuuuddddoooo.
 
        ssssuuuuddddoooo can log both successful an unsuccessful attempts (as
        well as errors) to _s_y_s_l_o_g(3), a log file, or both.  By
@@ -48,20 +48,20 @@ DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
 OOOOPPPPTTTTIIIIOOOONNNNSSSS
        ssssuuuuddddoooo accepts the following command line options:
 
-       -V  The -V (_v_e_r_s_i_o_n) option causes ssssuuuuddddoooo to print the
+       -V  The `-V' (_v_e_r_s_i_o_n) option causes ssssuuuuddddoooo to print the
            version number and exit.
 
-       -l  The -l (_l_i_s_t) option will list out the allowed (and
+       -l  The `-l' (_l_i_s_t) option will list out the allowed (and
            forbidden) commands for the user on the current host.
 
-       -L  The -L (_l_i_s_t defaults) option will list out the
+       -L  The `-L' (_l_i_s_t defaults) option will list out the
            parameters that may be set in a _D_e_f_a_u_l_t_s line along
            with a short description for each.  This option is
            useful in conjunction with _g_r_e_p(1).
 
 
 
-28/Mar/2000                   1.6.3                             1
+April  7, 2000                1.6.3                             1
 
 
 
@@ -70,42 +70,42 @@ OOOOPPPPTTTTIIIIOOOONNNNSSSS
 sudo(1m)               MAINTENANCE COMMANDS              sudo(1m)
 
 
-       -h  The -h (_h_e_l_p) option causes ssssuuuuddddoooo to print a usage
+       -h  The `-h' (_h_e_l_p) option causes ssssuuuuddddoooo to print a usage
            message and exit.
 
-       -v  If given the -v (_v_a_l_i_d_a_t_e) option, ssssuuuuddddoooo will update
-           the user's timestamp, prompting for the user's
-           password if necessary.  This extends the ssssuuuuddddoooo timeout
-           to for another N minutes (where N is defined at
-           installation time and defaults to 5 minutes) but does
-           not run a command.
+       -v  If given the `-v' (_v_a_l_i_d_a_t_e) option, ssssuuuuddddoooo will update
+           the user's timestamp, prompting for the user's pass­
+           word if necessary.  This extends the ssssuuuuddddoooo timeout to
+           for another N minutes (where N is defined at installa­
+           tion time and defaults to 5 minutes) but does not run
+           a command.
 
-       -k  The -k (_k_i_l_l) option to ssssuuuuddddoooo invalidates the user's
+       -k  The `-k' (_k_i_l_l) option to ssssuuuuddddoooo invalidates the user's
            timestamp by setting the time on it to the epoch.  The
            next time ssssuuuuddddoooo is run a password will be required.
            This option does not require a password and was added
            to allow a user to revoke ssssuuuuddddoooo permissions from a
            .logout file.
 
-       -K  The -K (sure _k_i_l_l) option to ssssuuuuddddoooo removes the user's
+       -K  The `-K' (sure _k_i_l_l) option to ssssuuuuddddoooo removes the user's
            timestamp entirely.  This option does not require a
            password.
 
-       -b  The -b (_b_a_c_k_g_r_o_u_n_d) option tells ssssuuuuddddoooo to run the given
-           command in the background.  Note that if you use the
-           -b option you cannot use shell job control to
+       -b  The `-b' (_b_a_c_k_g_r_o_u_n_d) option tells ssssuuuuddddoooo to run the
+           given command in the background.  Note that if you use
+           the `-b' option you cannot use shell job control to
            manipulate the command.
 
-       -p  The -p (_p_r_o_m_p_t) option allows you to override the
+       -p  The `-p' (_p_r_o_m_p_t) option allows you to override the
            default password prompt and use a custom one.  If the
-           password prompt contains the %u escape, %u will be
-           replaced with the user's login name.  Similarly, %h
+           password prompt contains the `%u' escape, `%u' will be
+           replaced with the user's login name.  Similarly, `%h'
            will be replaced with the local hostname.
 
-       -c  The -c (_c_l_a_s_s) option causes ssssuuuuddddoooo to run the specified
-           command with resources limited by the specified login
-           class.  The _c_l_a_s_s argument can be either a class name
-           as defined in /etc/login.conf, or a single '-'
+       -c  The `-c' (_c_l_a_s_s) option causes ssssuuuuddddoooo to run the speci­
+           fied command with resources limited by the specified
+           login class.  The _c_l_a_s_s argument can be either a class
+           name as defined in /etc/login.conf, or a single '-'
            character.  Specifying the _c_l_a_s_s as '-' means that the
            command should be run restricted by the default login
            capibilities of the user the command is run as.  If
@@ -116,18 +116,18 @@ sudo(1m)               MAINTENANCE COMMANDS              sudo(1m)
            classes where ssssuuuuddddoooo has been configured with the
            --with-logincap option.
 
-       -u  The -u (_u_s_e_r) option causes ssssuuuuddddoooo to run the specified
-           command as a user other than _r_o_o_t.  To specify a _u_i_d
-           instead of a _u_s_e_r_n_a_m_e, use "#uid".
+       -u  The `-u' (_u_s_e_r) option causes ssssuuuuddddoooo to run the speci­
+           fied command as a user other than _r_o_o_t.  To specify a
+           _u_i_d instead of a _u_s_e_r_n_a_m_e, use "#uid".
 
-       -s  The -s (_s_h_e_l_l) option runs the shell specified by the
-           _S_H_E_L_L environment variable if it is set or the shell
-           as specified in _p_a_s_s_w_d(4).
+       -s  The `-s' (_s_h_e_l_l) option runs the shell specified by
+           the _S_H_E_L_L environment variable if it is set or the
+           shell as specified in _p_a_s_s_w_d(4).
 
 
 
 
-28/Mar/2000                   1.6.3                             2
+April  7, 2000                1.6.3                             2
 
 
 
@@ -136,17 +136,18 @@ sudo(1m)               MAINTENANCE COMMANDS              sudo(1m)
 sudo(1m)               MAINTENANCE COMMANDS              sudo(1m)
 
 
-       -H  The -H (_H_O_M_E) option sets the _H_O_M_E environment
-           variable to the homedir of the target user (root by
+       -H  The `-H' (_H_O_M_E) option sets the _H_O_M_E environment vari­
+           able to the homedir of the target user (root by
            default) as specified in _p_a_s_s_w_d(4).  By default, ssssuuuuddddoooo
            does not modify _H_O_M_E.
 
-       -S  The -S (_s_t_d_i_n) option causes ssssuuuuddddoooo to read the password
-           from standard input instead of the terminal device.
+       -S  The `-S' (_s_t_d_i_n) option causes ssssuuuuddddoooo to read the pass­
+           word from standard input instead of the terminal
+           device.
 
-       --  The -- flag indicates that ssssuuuuddddoooo should stop processing
-           command line arguments.  It is most useful in
-           conjunction with the -s flag.
+       --  The `--' flag indicates that ssssuuuuddddoooo should stop process­
+           ing command line arguments.  It is most useful in con­
+           junction with the `-s' flag.
 
 RRRREEEETTTTUUUURRRRNNNN VVVVAAAALLLLUUUUEEEESSSS
        Upon successful execution of a program, the return value
@@ -154,46 +155,45 @@ RRRREEEETTTTUUUURRRRNNNN VVVVAAAALLLLUUUUEEEES
        that was executed.
 
        Otherwise, ssssuuuuddddoooo quits with an exit value of 1 if there is
-       a configuration/permission problem or if ssssuuuuddddoooo cannot
-       execute the given command.  In the latter case the error
+       a configuration/permission problem or if ssssuuuuddddoooo cannot exe­
+       cute the given command.  In the latter case the error
        string is printed to stderr.  If ssssuuuuddddoooo cannot _s_t_a_t(2) one
-       or more entries in the user's PATH an error is printed on
-       stderr.  (If the directory does not exist or if it is not
-       really a directory, the entry is ignored and no error is
-       printed.)  This should not happen under normal
-       circumstances.  The most common reason for _s_t_a_t(2) to
-       return "permission denied" is if you are running an
-       automounter and one of the directories in your PATH is on
-       a machine that is currently unreachable.
+       or more entries in the user's `PATH' an error is printed
+       on stderr.  (If the directory does not exist or if it is
+       not really a directory, the entry is ignored and no error
+       is printed.)  This should not happen under normal circum­
+       stances.  The most common reason for _s_t_a_t(2) to return
+       "permission denied" is if you are running an automounter
+       and one of the directories in your `PATH' is on a machine
+       that is currently unreachable.
 
 SSSSEEEECCCCUUUURRRRIIIITTTTYYYY NNNNOOOOTTTTEEEESSSS
        ssssuuuuddddoooo tries to be safe when executing external commands.
        Variables that control how dynamic loading and binding is
        done can be used to subvert the program that ssssuuuuddddoooo runs.
-       To combat this the LD_*, _RLD_*, SHLIB_PATH (HP-UX only),
-       and LIBPATH (AIX only) environment variables are removed
-       from the environment passed on to all commands executed.
-       ssssuuuuddddoooo will also remove the IFS, ENV, BASH_ENV, KRB_CONF,
-       KRB5_CONFIG, LOCALDOMAIN, RES_OPTIONS and HOSTALIASES
-       variables as they too can pose a threat.
+       To combat this the `LD_*', `_RLD_*', `SHLIB_PATH' (HP-UX
+       only), and `LIBPATH' (AIX only) environment variables are
+       removed from the environment passed on to all commands
+       executed.  ssssuuuuddddoooo will also remove the `IFS', `ENV',
+       `BASH_ENV', `KRB_CONF', `KRB5_CONFIG', `LOCALDOMAIN',
+       `RES_OPTIONS' and `HOSTALIASES' variables as they too can
+       pose a threat.
 
        To prevent command spoofing, ssssuuuuddddoooo checks "." and "" (both
-       denoting current directory) last when searching for a
-       command in the user's PATH (if one or both are in the
-       PATH).  Note, however, that the actual PATH environment
-       variable is _n_o_t modified and is passed unchanged to the
-       program that ssssuuuuddddoooo executes.
+       denoting current directory) last when searching for a com­
+       mand in the user's PATH (if one or both are in the PATH).
+       Note, however, that the actual `PATH' environment variable
+       is _n_o_t modified and is passed unchanged to the program
+       that ssssuuuuddddoooo executes.
 
        For security reasons, if your OS supports shared libraries
        and does not disable user-defined library search paths for
        setuid programs (most do), you should either use a linker
        option that disables this behavior or link ssssuuuuddddoooo
-       statically.
 
 
 
-
-28/Mar/2000                   1.6.3                             3
+April  7, 2000                1.6.3                             3
 
 
 
@@ -202,28 +202,30 @@ SSSSEEEECCCCUUUURRRRIIIITTTTYYYY NNNNOOOOTTTTE
 sudo(1m)               MAINTENANCE COMMANDS              sudo(1m)
 
 
+       statically.
+
        ssssuuuuddddoooo will check the ownership of its timestamp directory
-       (_/_v_a_r_/_r_u_n_/_s_u_d_o by default) and ignore the directory's
-       contents if it is not owned by root and only writable by
+       (_/_v_a_r_/_r_u_n_/_s_u_d_o by default) and ignore the directory's con­
+       tents if it is not owned by root and only writable by
        root.  On systems that allow non-root users to give away
        files via _c_h_o_w_n(2), if the timestamp directory is located
-       in a directory writable by anyone (eg: _/_t_m_p), it is
-       possible for a user to create the timestamp directory
-       before ssssuuuuddddoooo is run.  However, because ssssuuuuddddoooo checks the
-       ownership and mode of the directory and its contents, the
-       only damage that can be done is to "hide" files by putting
-       them in the timestamp dir.  This is unlikely to happen
-       since once the timestamp dir is owned by root and
-       inaccessible by any other user the user placing files
-       there would be unable to get them back out.  To get around
-       this issue you can use a directory that is not world-
-       writable for the timestamps (_/_v_a_r_/_a_d_m_/_s_u_d_o for instance)
-       or create _/_v_a_r_/_r_u_n_/_s_u_d_o with the appropriate owner (root)
-       and permissions (0700) in the system startup files.
+       in a directory writable by anyone (eg: _/_t_m_p), it is possi­
+       ble for a user to create the timestamp directory before
+       ssssuuuuddddoooo is run.  However, because ssssuuuuddddoooo checks the ownership
+       and mode of the directory and its contents, the only dam­
+       age that can be done is to "hide" files by putting them in
+       the timestamp dir.  This is unlikely to happen since once
+       the timestamp dir is owned by root and inaccessible by any
+       other user the user placing files there would be unable to
+       get them back out.  To get around this issue you can use a
+       directory that is not world-writable for the timestamps
+       (_/_v_a_r_/_a_d_m_/_s_u_d_o for instance) or create _/_v_a_r_/_r_u_n_/_s_u_d_o with
+       the appropriate owner (root) and permissions (0700) in the
+       system startup files.
 
        ssssuuuuddddoooo will not honor timestamps set far in the future.
        Timestamps with a date greater than current_time + 2 *
-       TIMEOUT will be ignored and sudo will log and complain.
+       `TIMEOUT' will be ignored and sudo will log and complain.
        This is done to keep a user from creating his/her own
        timestamp with a bogus date on system that allow users to
        give away files.
@@ -252,14 +254,12 @@ EEEEXXXXAAAAMMMMPPPPLLLLEEEESSSS
 
        To make a usage listing of the directories in the /home
        partition.  Note that this runs the commands in a sub-
-       shell to make the cd and file redirection work.
-
-        % sudo sh -c "cd /home ; du -s * | sort -rn > USAGE"
+       shell to make the `cd' and file redirection work.
 
 
 
 
-28/Mar/2000                   1.6.3                             4
+April  7, 2000                1.6.3                             4
 
 
 
@@ -268,6 +268,9 @@ EEEEXXXXAAAAMMMMPPPPLLLLEEEESSSS
 sudo(1m)               MAINTENANCE COMMANDS              sudo(1m)
 
 
+        % sudo sh -c "cd /home ; du -s * | sort -rn > USAGE"
+
+
 EEEENNNNVVVVIIIIRRRROOOONNNNMMMMEEEENNNNTTTT
        ssssuuuuddddoooo utilizes the following environment variables:
 
@@ -292,8 +295,8 @@ FFFFIIIILLLLEEEESSSS
 
 
 AAAAUUUUTTTTHHHHOOOORRRRSSSS
-       Many people have worked on ssssuuuuddddoooo over the years, this
-       version consists of code written primarily by:
+       Many people have worked on ssssuuuuddddoooo over the years, this ver­
+       sion consists of code written primarily by:
 
                Todd Miller
                Chris Jepeway
@@ -306,9 +309,9 @@ BBBBUUUUGGGGSSSS
        bug report at http://www.courtesan.com/sudo/bugs/
 
 DDDDIIIISSSSCCCCLLLLAAAAIIIIMMMMEEEERRRR
-       SSSSuuuuddddoooo is provided ``AS IS'' and any express or implied
-       warranties, including, but not limited to, the implied
-       warranties of merchantability and fitness for a particular
+       SSSSuuuuddddoooo is provided ``AS IS'' and any express or implied war­
+       ranties, including, but not limited to, the implied war­
+       ranties of merchantability and fitness for a particular
        purpose are disclaimed.  See the LICENSE file distributed
        with ssssuuuuddddoooo for complete details.
 
@@ -317,15 +320,12 @@ CCCCAAAAVVVVEEEEAAAATTTTSSSS
        shell if that user has access to commands allowing shell
        escapes.
 
-       If users have sudo ALL there is nothing to prevent them
+       If users have sudo `ALL' there is nothing to prevent them
        from creating their own program that gives them a root
-       shell regardless of any '!'  elements in the user
-       specification.
 
 
 
-
-28/Mar/2000                   1.6.3                             5
+April  7, 2000                1.6.3                             5
 
 
 
@@ -334,10 +334,13 @@ CCCCAAAAVVVVEEEEAAAATTTTSSSS
 sudo(1m)               MAINTENANCE COMMANDS              sudo(1m)
 
 
+       shell regardless of any '!'  elements in the user specifi­
+       cation.
+
        Running shell scripts via ssssuuuuddddoooo can expose the same kernel
-       bugs that make setuid shell scripts unsafe on some
-       operating systems (if your OS supports the /dev/fd/
-       directory, setuid shell scripts are generally safe).
+       bugs that make setuid shell scripts unsafe on some operat­
+       ing systems (if your OS supports the /dev/fd/ directory,
+       setuid shell scripts are generally safe).
 
 SSSSEEEEEEEE AAAALLLLSSSSOOOO
        _l_o_g_i_n___c_a_p(3), _s_u_d_o_e_r_s(4), _v_i_s_u_d_o(1m), _s_u(1).
@@ -388,9 +391,6 @@ SSSSEEEEEEEE AAAALLLLSSSSOOOO
 
 
 
-
-
-
-28/Mar/2000                   1.6.3                             6
+April  7, 2000                1.6.3                             6
 
 
diff --git a/sudo.man.in b/sudo.man.in
index ae38e71e1..4e4fd4c5c 100644
--- a/sudo.man.in
+++ b/sudo.man.in
@@ -1,12 +1,9 @@
-.rn '' }`
-''' $RCSfile$$Revision$$Date$
-'''
-''' $Log$
-''' Revision 1.4  2000/04/01 21:22:11  millert
-''' Clear up confusion wrt sudo's return value.
-'''
-'''
-.de Sh
+.\" Automatically generated by Pod::Man version 1.02
+.\" Fri Apr  7 08:37:05 2000
+.\"
+.\" Standard preamble:
+.\" ======================================================================
+.de Sh \" Subsection heading
 .br
 .if t .Sp
 .ne 5
@@ -14,150 +11,106 @@
 \fB\\$1\fR
 .PP
 ..
-.de Sp
+.de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
 ..
-.de Ip
+.de Ip \" List item
 .br
 .ie \\n(.$>=3 .ne \\$3
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.de Vb
+.de Vb \" Begin verbatim text
 .ft CW
 .nf
 .ne \\$1
 ..
-.de Ve
+.de Ve \" End verbatim text
 .ft R
 
 .fi
 ..
-'''
-'''
-'''     Set up \*(-- to give an unbreakable dash;
-'''     string Tr holds user defined translation string.
-'''     Bell System Logo is used as a dummy character.
-'''
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used
+.\" to do unbreakable dashes and therefore won't be available.  \*(C` and
+.\" \*(C' expand to `' in nroff, nothing in troff, for use with C<>
 .tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
-.ds -- \(*W-
-.ds PI pi
-.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-.ds L" ""
-.ds R" ""
-'''   \*(M", \*(S", \*(N" and \*(T" are the equivalent of
-'''   \*(L" and \*(R", except that they are used on ".xx" lines,
-'''   such as .IP and .SH, which do another additional levels of
-'''   double-quote interpretation
-.ds M" """
-.ds S" """
-.ds N" """""
-.ds T" """""
-.ds L' '
-.ds R' '
-.ds M' '
-.ds S' '
-.ds N' '
-.ds T' '
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` `
+.    ds C' '
 'br\}
 .el\{\
-.ds -- \(em\|
-.tr \*(Tr
-.ds L" ``
-.ds R" ''
-.ds M" ``
-.ds S" ''
-.ds N" ``
-.ds T" ''
-.ds L' `
-.ds R' '
-.ds M' `
-.ds S' '
-.ds N' `
-.ds T' '
-.ds PI \(*p
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
 'br\}
-.\"	If the F register is turned on, we'll generate
-.\"	index entries out stderr for the following things:
-.\"		TH	Title 
-.\"		SH	Header
-.\"		Sh	Subsection 
-.\"		Ip	Item
-.\"		X<>	Xref  (embedded
-.\"	Of course, you have to process the output yourself
-.\"	in some meaninful fashion.
-.if \nF \{
-.de IX
-.tm Index:\\$1\t\\n%\t"\\$2"
-..
-.nr % 0
-.rr F
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr
+.\" for titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and
+.\" index entries marked with X<> in POD.  Of course, you'll have to process
+.\" the output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+.    .
+.    nr % 0
+.    rr F
 .\}
-.TH sudo @mansectsu@ "1.6.3" "28/Mar/2000" "MAINTENANCE COMMANDS"
-.UC
-.if n .hy 0
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it
+.\" makes way too many mistakes in technical documents.
+.hy 0
 .if n .na
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.de CQ          \" put $1 in typewriter font
-.ft CW
-'if n "\c
-'if t \\&\\$1\c
-'if n \\&\\$1\c
-'if n \&"
-\\&\\$2 \\$3 \\$4 \\$5 \\$6 \\$7
-'.ft R
-..
-.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
-.	\" AM - accent mark definitions
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
 .bd B 3
-.	\" fudge factors for nroff and troff
+.    \" fudge factors for nroff and troff
 .if n \{\
-.	ds #H 0
-.	ds #V .8m
-.	ds #F .3m
-.	ds #[ \f1
-.	ds #] \fP
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
 .\}
 .if t \{\
-.	ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.	ds #V .6m
-.	ds #F 0
-.	ds #[ \&
-.	ds #] \&
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
 .\}
-.	\" simple accents for nroff and troff
+.    \" simple accents for nroff and troff
 .if n \{\
-.	ds ' \&
-.	ds ` \&
-.	ds ^ \&
-.	ds , \&
-.	ds ~ ~
-.	ds ? ?
-.	ds ! !
-.	ds /
-.	ds q
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
 .\}
 .if t \{\
-.	ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.	ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.	ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.	ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.	ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.	ds ? \s-2c\h'-\w'c'u*7/10'\u\h'\*(#H'\zi\d\s+2\h'\w'c'u*8/10'
-.	ds ! \s-2\(or\s+2\h'-\w'\(or'u'\v'-.8m'.\v'.8m'
-.	ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.	ds q o\h'-\w'o'u*8/10'\s-4\v'.4m'\z\(*i\v'-.4m'\s+4\h'\w'o'u*8/10'
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
 .\}
-.	\" troff and (daisy-wheel) nroff accents
+.    \" troff and (daisy-wheel) nroff accents
 .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
 .ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#]
-.ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u'
-.ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u'
-.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#]
 .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
 .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
 .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
@@ -165,39 +118,38 @@
 .ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
 .ds ae a\h'-(\w'a'u*4/10)'e
 .ds Ae A\h'-(\w'A'u*4/10)'E
-.ds oe o\h'-(\w'o'u*4/10)'e
-.ds Oe O\h'-(\w'O'u*4/10)'E
-.	\" corrections for vroff
+.    \" corrections for vroff
 .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
 .if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.	\" for low resolution devices (crt and lpr)
+.    \" for low resolution devices (crt and lpr)
 .if \n(.H>23 .if \n(.V>19 \
 \{\
-.	ds : e
-.	ds 8 ss
-.	ds v \h'-1'\o'\(aa\(ga'
-.	ds _ \h'-1'^
-.	ds . \h'-1'.
-.	ds 3 3
-.	ds o a
-.	ds d- d\h'-1'\(ga
-.	ds D- D\h'-1'\(hy
-.	ds th \o'bp'
-.	ds Th \o'LP'
-.	ds ae ae
-.	ds Ae AE
-.	ds oe oe
-.	ds Oe OE
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
 .\}
 .rm #[ #] #H #V #F C
+.\" ======================================================================
+.\"
+.IX Title "sudo @mansectsu@"
+.TH sudo @mansectsu@ "1.6.3" "April  7, 2000" "MAINTENANCE COMMANDS"
+.UC
 .SH "NAME"
 sudo \- execute a command as another user
 .SH "SYNOPSIS"
-\fBsudo\fR \fB\-V\fR | \fB\-h\fR | \fB\-l\fR | \fB\-L\fR | \fB\-v\fR | \fB\-k\fR | \fB\-K\fR | \fB\-s\fR |
+.IX Header "SYNOPSIS"
+\&\fBsudo\fR \fB\-V\fR | \fB\-h\fR | \fB\-l\fR | \fB\-L\fR | \fB\-v\fR | \fB\-k\fR | \fB\-K\fR | \fB\-s\fR |
 [ \fB\-H\fR ] [\fB\-S\fR ] [ \fB\-b\fR ] | [ \fB\-p\fR prompt ] [ \fB\-c\fR class|\- ]
 [ \fB\-u\fR username/#uid ] \fIcommand\fR
 .SH "DESCRIPTION"
-\fBsudo\fR allows a permitted user to execute a \fIcommand\fR as the
+.IX Header "DESCRIPTION"
+\&\fBsudo\fR allows a permitted user to execute a \fIcommand\fR as the
 superuser or another user, as specified in the sudoers file.  The
 real and effective uid and gid are set to match those of the target
 user as specified in the passwd file (the group vector is also
@@ -208,8 +160,8 @@ a user has been authenticated, a timestamp is updated and the
 user may then use sudo without a password for a short period of time
 (five minutes by default).
 .PP
-\fBsudo\fR determines who is an authorized user by consulting the
-file \fI@sysconfdir@/sudoers\fR.  By giving \fBsudo\fR the \f(CW-v\fR flag a user
+\&\fBsudo\fR determines who is an authorized user by consulting the
+file \fI@sysconfdir@/sudoers\fR.  By giving \fBsudo\fR the \f(CW\*(C`\-v\*(C'\fR flag a user
 can update the time stamp without running a \fIcommand.\fR
 The password prompt itself will also time out if the user's password is
 not entered with N minutes (again, this is defined at configure
@@ -219,81 +171,97 @@ If a user that is not listed in the \fIsudoers\fR file tries to run
 a command via \fBsudo\fR, mail is sent to the proper authorities,
 as defined at configure time (defaults to root).  Note that the
 mail will not be sent if an unauthorized user tries to run sudo
-with the \f(CW-l\fR or \f(CW-v\fR flags.  This allows users to determine
+with the \f(CW\*(C`\-l\*(C'\fR or \f(CW\*(C`\-v\*(C'\fR flags.  This allows users to determine
 for themselves whether or not they are allowed to use \fBsudo\fR.
 .PP
-\fBsudo\fR can log both successful an unsuccessful attempts (as well
+\&\fBsudo\fR can log both successful an unsuccessful attempts (as well
 as errors) to \fIsyslog\fR\|(3), a log file, or both.  By default \fBsudo\fR
 will log via \fIsyslog\fR\|(3) but this is changeable at configure time.
 .SH "OPTIONS"
-\fBsudo\fR accepts the following command line options:
-.Ip "-V" 4
-The \f(CW-V\fR (\fIversion\fR) option causes \fBsudo\fR to print the
+.IX Header "OPTIONS"
+\&\fBsudo\fR accepts the following command line options:
+.Ip "\-V" 4
+.IX Item "-V"
+The \f(CW\*(C`\-V\*(C'\fR (\fIversion\fR) option causes \fBsudo\fR to print the
 version number and exit.
-.Ip "-l" 4
-The \f(CW-l\fR (\fIlist\fR) option will list out the allowed (and
+.Ip "\-l" 4
+.IX Item "-l"
+The \f(CW\*(C`\-l\*(C'\fR (\fIlist\fR) option will list out the allowed (and
 forbidden) commands for the user on the current host.
-.Ip "-L" 4
-The \f(CW-L\fR (\fIlist\fR defaults) option will list out the parameters
+.Ip "\-L" 4
+.IX Item "-L"
+The \f(CW\*(C`\-L\*(C'\fR (\fIlist\fR defaults) option will list out the parameters
 that may be set in a \fIDefaults\fR line along with a short description
 for each.  This option is useful in conjunction with \fIgrep\fR\|(1).
-.Ip "-h" 4
-The \f(CW-h\fR (\fIhelp\fR) option causes \fBsudo\fR to print a usage message and exit.
-.Ip "-v" 4
-If given the \f(CW-v\fR (\fIvalidate\fR) option, \fBsudo\fR will update the
+.Ip "\-h" 4
+.IX Item "-h"
+The \f(CW\*(C`\-h\*(C'\fR (\fIhelp\fR) option causes \fBsudo\fR to print a usage message and exit.
+.Ip "\-v" 4
+.IX Item "-v"
+If given the \f(CW\*(C`\-v\*(C'\fR (\fIvalidate\fR) option, \fBsudo\fR will update the
 user's timestamp, prompting for the user's password if necessary.
 This extends the \fBsudo\fR timeout to for another N minutes
 (where N is defined at installation time and defaults to 5
 minutes) but does not run a command.
-.Ip "-k" 4
-The \f(CW-k\fR (\fIkill\fR) option to \fBsudo\fR invalidates the user's timestamp
+.Ip "\-k" 4
+.IX Item "-k"
+The \f(CW\*(C`\-k\*(C'\fR (\fIkill\fR) option to \fBsudo\fR invalidates the user's timestamp
 by setting the time on it to the epoch.  The next time \fBsudo\fR is
 run a password will be required.  This option does not require a password
 and was added to allow a user to revoke \fBsudo\fR permissions from a .logout
 file.
-.Ip "-K" 4
-The \f(CW-K\fR (sure \fIkill\fR) option to \fBsudo\fR removes the user's timestamp
+.Ip "\-K" 4
+.IX Item "-K"
+The \f(CW\*(C`\-K\*(C'\fR (sure \fIkill\fR) option to \fBsudo\fR removes the user's timestamp
 entirely.  This option does not require a password.
-.Ip "-b" 4
-The \f(CW-b\fR (\fIbackground\fR) option tells \fBsudo\fR to run the given
-command in the background.  Note that if you use the \f(CW-b\fR
+.Ip "\-b" 4
+.IX Item "-b"
+The \f(CW\*(C`\-b\*(C'\fR (\fIbackground\fR) option tells \fBsudo\fR to run the given
+command in the background.  Note that if you use the \f(CW\*(C`\-b\*(C'\fR
 option you cannot use shell job control to manipulate the command.
-.Ip "-p" 4
-The \f(CW-p\fR (\fIprompt\fR) option allows you to override the default
+.Ip "\-p" 4
+.IX Item "-p"
+The \f(CW\*(C`\-p\*(C'\fR (\fIprompt\fR) option allows you to override the default
 password prompt and use a custom one.  If the password prompt
-contains the \f(CW%u\fR escape, \f(CW%u\fR will be replaced with the user's
-login name.  Similarly, \f(CW%h\fR will be replaced with the local
+contains the \f(CW\*(C`%u\*(C'\fR escape, \f(CW\*(C`%u\*(C'\fR will be replaced with the user's
+login name.  Similarly, \f(CW\*(C`%h\*(C'\fR will be replaced with the local
 hostname.
-.Ip "-c" 4
-The \f(CW-c\fR (\fIclass\fR) option causes \fBsudo\fR to run the specified command
+.Ip "\-c" 4
+.IX Item "-c"
+The \f(CW\*(C`\-c\*(C'\fR (\fIclass\fR) option causes \fBsudo\fR to run the specified command
 with resources limited by the specified login class.  The \fIclass\fR
 argument can be either a class name as defined in /etc/login.conf,
-or a single \*(L'\-\*(R' character.  Specifying the \fIclass\fR as \*(L'\-\*(R' means
+or a single '\-' character.  Specifying the \fIclass\fR as '\-' means
 that the command should be run restricted by the default login
 capibilities of the user the command is run as.  If the \fIclass\fR
 argument specifies an existing user class, the command must be run
 as root, or the \fBsudo\fR command must be run from a shell that is already
-root.  This option is only available on systems with \s-1BSD\s0 login classes
-where \fBsudo\fR has been configured with the --with-logincap option.
-.Ip "-u" 4
-The \f(CW-u\fR (\fIuser\fR) option causes \fBsudo\fR to run the specified command
+root.  This option is only available on systems with BSD login classes
+where \fBsudo\fR has been configured with the \-\-with-logincap option.
+.Ip "\-u" 4
+.IX Item "-u"
+The \f(CW\*(C`\-u\*(C'\fR (\fIuser\fR) option causes \fBsudo\fR to run the specified command
 as a user other than \fIroot\fR.  To specify a \fIuid\fR instead of a
-\fIusername\fR, use \*(L"#uid\*(R".
-.Ip "-s" 4
-The \f(CW-s\fR (\fIshell\fR) option runs the shell specified by the \fI\s-1SHELL\s0\fR
+\&\fIusername\fR, use \*(L"#uid\*(R".
+.Ip "\-s" 4
+.IX Item "-s"
+The \f(CW\*(C`\-s\*(C'\fR (\fIshell\fR) option runs the shell specified by the \fISHELL\fR
 environment variable if it is set or the shell as specified
 in \fIpasswd\fR\|(@mansectform@).
-.Ip "-H" 4
-The \f(CW-H\fR (\fI\s-1HOME\s0\fR) option sets the \fI\s-1HOME\s0\fR environment variable
+.Ip "\-H" 4
+.IX Item "-H"
+The \f(CW\*(C`\-H\*(C'\fR (\fIHOME\fR) option sets the \fIHOME\fR environment variable
 to the homedir of the target user (root by default) as specified
-in \fIpasswd\fR\|(@mansectform@).  By default, \fBsudo\fR does not modify \fI\s-1HOME\s0\fR.
-.Ip "-S" 4
-The \f(CW-S\fR (\fIstdin\fR) option causes \fBsudo\fR to read the password from
+in \fIpasswd\fR\|(@mansectform@).  By default, \fBsudo\fR does not modify \fIHOME\fR.
+.Ip "\-S" 4
+.IX Item "-S"
+The \f(CW\*(C`\-S\*(C'\fR (\fIstdin\fR) option causes \fBsudo\fR to read the password from
 standard input instead of the terminal device.
-.Ip "--" 4
-The \f(CW--\fR flag indicates that \fBsudo\fR should stop processing command
-line arguments.  It is most useful in conjunction with the \f(CW-s\fR flag.
+.Ip "\-\-" 4
+The \f(CW\*(C`\-\-\*(C'\fR flag indicates that \fBsudo\fR should stop processing command
+line arguments.  It is most useful in conjunction with the \f(CW\*(C`\-s\*(C'\fR flag.
 .SH "RETURN VALUES"
+.IX Header "RETURN VALUES"
 Upon successful execution of a program, the return value from \fBsudo\fR
 will simply be the return value of the program that was executed.
 .PP
@@ -301,28 +269,29 @@ Otherwise, \fBsudo\fR quits with an exit value of 1 if there is a
 configuration/permission problem or if \fBsudo\fR cannot execute the
 given command.  In the latter case the error string is printed to
 stderr.  If \fBsudo\fR cannot \fIstat\fR\|(2) one or more entries in the user's
-\f(CWPATH\fR an error is printed on stderr.  (If the directory does not
+\&\f(CW\*(C`PATH\*(C'\fR an error is printed on stderr.  (If the directory does not
 exist or if it is not really a directory, the entry is ignored and
 no error is printed.)  This should not happen under normal
 circumstances.  The most common reason for \fIstat\fR\|(2) to return
-\*(L"permission denied\*(R" is if you are running an automounter and one
-of the directories in your \f(CWPATH\fR is on a machine that is currently
+\&\*(L"permission denied\*(R" is if you are running an automounter and one
+of the directories in your \f(CW\*(C`PATH\*(C'\fR is on a machine that is currently
 unreachable.
 .SH "SECURITY NOTES"
-\fBsudo\fR tries to be safe when executing external commands.  Variables
+.IX Header "SECURITY NOTES"
+\&\fBsudo\fR tries to be safe when executing external commands.  Variables
 that control how dynamic loading and binding is done can be used
 to subvert the program that \fBsudo\fR runs.  To combat this the
-\f(CWLD_*\fR, \f(CW_RLD_*\fR, \f(CWSHLIB_PATH\fR (HP\-UX only), and \f(CWLIBPATH\fR (AIX
+\&\f(CW\*(C`LD_*\*(C'\fR, \f(CW\*(C`_RLD_*\*(C'\fR, \f(CW\*(C`SHLIB_PATH\*(C'\fR (HP-UX only), and \f(CW\*(C`LIBPATH\*(C'\fR (AIX
 only) environment variables are removed from the environment passed
-on to all commands executed.  \fBsudo\fR will also remove the \f(CWIFS\fR,
-\f(CWENV\fR, \f(CWBASH_ENV\fR, \f(CWKRB_CONF\fR, \f(CWKRB5_CONFIG\fR, \f(CWLOCALDOMAIN\fR,
-\f(CWRES_OPTIONS\fR and \f(CWHOSTALIASES\fR variables as they too can pose a
+on to all commands executed.  \fBsudo\fR will also remove the \f(CW\*(C`IFS\*(C'\fR,
+\&\f(CW\*(C`ENV\*(C'\fR, \f(CW\*(C`BASH_ENV\*(C'\fR, \f(CW\*(C`KRB_CONF\*(C'\fR, \f(CW\*(C`KRB5_CONFIG\*(C'\fR, \f(CW\*(C`LOCALDOMAIN\*(C'\fR,
+\&\f(CW\*(C`RES_OPTIONS\*(C'\fR and \f(CW\*(C`HOSTALIASES\*(C'\fR variables as they too can pose a
 threat.
 .PP
-To prevent command spoofing, \fBsudo\fR checks "." and "" (both denoting
+To prevent command spoofing, \fBsudo\fR checks \*(L".\*(R" and "" (both denoting
 current directory) last when searching for a command in the user's
 PATH (if one or both are in the PATH).  Note, however, that the
-actual \f(CWPATH\fR environment variable is \fInot\fR modified and is passed
+actual \f(CW\*(C`PATH\*(C'\fR environment variable is \fInot\fR modified and is passed
 unchanged to the program that \fBsudo\fR executes.
 .PP
 For security reasons, if your OS supports shared libraries and does
@@ -330,13 +299,13 @@ not disable user-defined library search paths for setuid programs
 (most do), you should either use a linker option that disables this
 behavior or link \fBsudo\fR statically.
 .PP
-\fBsudo\fR will check the ownership of its timestamp directory
+\&\fBsudo\fR will check the ownership of its timestamp directory
 (\fI@TIMEDIR@\fR by default) and ignore the directory's contents if
 it is not owned by root and only writable by root.  On systems that
 allow non-root users to give away files via \fIchown\fR\|(2), if the timestamp
 directory is located in a directory writable by anyone (eg: \fI/tmp\fR),
 it is possible for a user to create the timestamp directory before
-\fBsudo\fR is run.  However, because \fBsudo\fR checks the ownership and
+\&\fBsudo\fR is run.  However, because \fBsudo\fR checks the ownership and
 mode of the directory and its contents, the only damage that can
 be done is to \*(L"hide\*(R" files by putting them in the timestamp dir.
 This is unlikely to happen since once the timestamp dir is owned
@@ -347,12 +316,13 @@ timestamps (\fI/var/adm/sudo\fR for instance) or create \fI@TIMEDIR@\fR
 with the appropriate owner (root) and permissions (0700) in the
 system startup files.
 .PP
-\fBsudo\fR will not honor timestamps set far in the future.
-Timestamps with a date greater than current_time + 2 * \f(CWTIMEOUT\fR
+\&\fBsudo\fR will not honor timestamps set far in the future.
+Timestamps with a date greater than current_time + 2 * \f(CW\*(C`TIMEOUT\*(C'\fR
 will be ignored and sudo will log and complain.  This is done to
 keep a user from creating his/her own timestamp with a bogus
 date on system that allow users to give away files.
 .SH "EXAMPLES"
+.IX Header "EXAMPLES"
 Note: the following examples assume suitable \fIsudoers\fR\|(@mansectform@) entries.
 .PP
 To get a file listing of an unreadable directory:
@@ -378,13 +348,14 @@ To shutdown a machine:
 .Ve
 To make a usage listing of the directories in the /home
 partition.  Note that this runs the commands in a sub-shell
-to make the \f(CWcd\fR and file redirection work.
+to make the \f(CW\*(C`cd\*(C'\fR and file redirection work.
 .PP
 .Vb 1
 \& % sudo sh -c "cd /home ; du -s * | sort -rn > USAGE"
 .Ve
 .SH "ENVIRONMENT"
-\fBsudo\fR utilizes the following environment variables:
+.IX Header "ENVIRONMENT"
+\&\fBsudo\fR utilizes the following environment variables:
 .PP
 .Vb 13
 \& PATH                   Set to a sane value if SECURE_PATH is set
@@ -402,12 +373,13 @@ to make the \f(CWcd\fR and file redirection work.
 \& SUDO_PS1               If set, PS1 will be set to its value
 .Ve
 .SH "FILES"
-.PP
+.IX Header "FILES"
 .Vb 2
 \& @sysconfdir@/sudoers           List of who can run what
 \& @TIMEDIR@              Directory containing timestamps
 .Ve
 .SH "AUTHORS"
+.IX Header "AUTHORS"
 Many people have worked on \fBsudo\fR over the years, this
 version consists of code written primarily by:
 .PP
@@ -418,19 +390,22 @@ version consists of code written primarily by:
 See the HISTORY file in the \fBsudo\fR distribution for a short history
 of \fBsudo\fR.
 .SH "BUGS"
+.IX Header "BUGS"
 If you feel you have found a bug in sudo, please submit a bug report
 at http://www.courtesan.com/sudo/bugs/
 .SH "DISCLAIMER"
-\fBSudo\fR is provided ``AS IS'\*(R' and any express or implied warranties,
+.IX Header "DISCLAIMER"
+\&\fBSudo\fR is provided ``AS IS'' and any express or implied warranties,
 including, but not limited to, the implied warranties of merchantability
 and fitness for a particular purpose are disclaimed.
 See the LICENSE file distributed with \fBsudo\fR for complete details.
 .SH "CAVEATS"
+.IX Header "CAVEATS"
 There is no easy way to prevent a user from gaining a root shell if
 that user has access to commands allowing shell escapes.
 .PP
-If users have sudo \f(CWALL\fR there is nothing to prevent them from creating
-their own program that gives them a root shell regardless of any \*(L'!\*(R'
+If users have sudo \f(CW\*(C`ALL\*(C'\fR there is nothing to prevent them from creating
+their own program that gives them a root shell regardless of any '!'
 elements in the user specification.
 .PP
 Running shell scripts via \fBsudo\fR can expose the same kernel bugs
@@ -438,67 +413,5 @@ that make setuid shell scripts unsafe on some operating systems
 (if your OS supports the /dev/fd/ directory, setuid shell scripts
 are generally safe).
 .SH "SEE ALSO"
-\fIlogin_cap\fR\|(3), \fIsudoers\fR\|(@mansectform@), \fIvisudo\fR\|(@mansectsu@), \fIsu\fR\|(1).
-
-.rn }` ''
-.IX Title "sudo @mansectsu@"
-.IX Name "sudo - execute a command as another user"
-
-.IX Header "NAME"
-
-.IX Header "SYNOPSIS"
-
-.IX Header "DESCRIPTION"
-
-.IX Header "OPTIONS"
-
-.IX Item "-V"
-
-.IX Item "-l"
-
-.IX Item "-L"
-
-.IX Item "-h"
-
-.IX Item "-v"
-
-.IX Item "-k"
-
-.IX Item "-K"
-
-.IX Item "-b"
-
-.IX Item "-p"
-
-.IX Item "-c"
-
-.IX Item "-u"
-
-.IX Item "-s"
-
-.IX Item "-H"
-
-.IX Item "-S"
-
-.IX Item "--"
-
-.IX Header "RETURN VALUES"
-
-.IX Header "SECURITY NOTES"
-
-.IX Header "EXAMPLES"
-
-.IX Header "ENVIRONMENT"
-
-.IX Header "FILES"
-
-.IX Header "AUTHORS"
-
-.IX Header "BUGS"
-
-.IX Header "DISCLAIMER"
-
-.IX Header "CAVEATS"
-
 .IX Header "SEE ALSO"
-
+\&\fIlogin_cap\fR\|(3), \fIsudoers\fR\|(@mansectform@), \fIvisudo\fR\|(@mansectsu@), \fIsu\fR\|(1).
diff --git a/sudoers.cat b/sudoers.cat
index ed0d9987a..db3a02e79 100644
--- a/sudoers.cat
+++ b/sudoers.cat
@@ -1,7 +1,7 @@
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
 NNNNAAAAMMMMEEEE
@@ -9,8 +9,8 @@ NNNNAAAAMMMMEEEE
 
 DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
        The _s_u_d_o_e_r_s file is composed two types of entries: aliases
-       (basically variables) and user specifications (which
-       specify who may run what).  The grammar of _s_u_d_o_e_r_s will be
+       (basically variables) and user specifications (which spec­
+       ify who may run what).  The grammar of _s_u_d_o_e_r_s will be
        described below in Extended Backus-Naur Form (EBNF).
        Don't despair if you don't know what EBNF is, it is fairly
        simple and the definitions below are annotated.
@@ -18,26 +18,26 @@ DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
        QQQQuuuuiiiicccckkkk gggguuuuiiiiddddeeee ttttoooo EEEEBBBBNNNNFFFF
 
        EBNF is a concise and exact way of describing the grammar
-       of a language.  Each EBNF definition is made up of
-       _p_r_o_d_u_c_t_i_o_n _r_u_l_e_s.  Eg.
+       of a language.  Each EBNF definition is made up of _p_r_o_d_u_c_­
+       _t_i_o_n _r_u_l_e_s.  Eg.
 
         symbol ::= definition | alternate1 | alternate2 ...
 
        Each _p_r_o_d_u_c_t_i_o_n _r_u_l_e references others and thus makes up a
-       grammar for the language.  EBNF also contains the
-       following operators, which many readers will recognize
-       from regular expressions.  Do not, however, confuse them
-       with "wildcard" characters, which have different meanings.
+       grammar for the language.  EBNF also contains the follow­
+       ing operators, which many readers will recognize from reg­
+       ular expressions.  Do not, however, confuse them with
+       "wildcard" characters, which have different meanings.
 
-       ?       Means that the preceding symbol (or group of
-               symbols) is optional.  That is, it may appear once
-               or not at all.
+       `?'     Means that the preceding symbol (or group of sym­
+               bols) is optional.  That is, it may appear once or
+               not at all.
 
-       *       Means that the preceding symbol (or group of
-               symbols) may appear zero or more times.
+       `*'     Means that the preceding symbol (or group of sym­
+               bols) may appear zero or more times.
 
-       +       Means that the preceding symbol (or group of
-               symbols) may appear one or more times.
+       `+'     Means that the preceding symbol (or group of sym­
+               bols) may appear one or more times.
 
        Parentheses may be used to group symbols together.  For
        clarity, we will use single quotes ('') to designate what
@@ -46,8 +46,8 @@ DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
 
        AAAAlllliiiiaaaasssseeeessss
 
-       There are four kinds of aliases: the User_Alias,
-       Runas_Alias, Host_Alias and Cmnd_Alias.
+       There are four kinds of aliases: the `User_Alias',
+       `Runas_Alias', `Host_Alias' and `Cmnd_Alias'.
 
         Alias ::= 'User_Alias' = User_Alias (':' User_Alias)* |
                   'Runas_Alias' = Runas_Alias (':' Runas_Alias)* |
@@ -61,13 +61,13 @@ DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
 
 
 
-1/Apr/2000                    1.6.3                             1
+April  7, 2000                1.6.3                             1
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
         Host_Alias ::= NAME '=' Host_List
@@ -80,10 +80,10 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
         Alias_Type NAME = item1, item2, ...
 
-       where _A_l_i_a_s___T_y_p_e is one of User_Alias, Runas_Alias,
-       Host_Alias, or Cmnd_Alias.  A NAME is a string of upper
-       case letters, numbers, and the underscore characters
-       ('_').  A NAME mmmmuuuusssstttt start with an upper case letter.  It
+       where _A_l_i_a_s___T_y_p_e is one of `User_Alias', `Runas_Alias',
+       `Host_Alias', or `Cmnd_Alias'.  A `NAME' is a string of
+       upper case letters, numbers, and the underscore characters
+       ('_').  A `NAME' mmmmuuuusssstttt start with an upper case letter.  It
        is possible to put several alias definitions of the same
        type on a single line, joined by a semicolon (':').  Eg.
 
@@ -101,7 +101,7 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
                  '!'* '+'netgroup |
                  '!'* User_Alias
 
-       A User_List is made up of one or more usernames, uids
+       A `User_List' is made up of one or more usernames, uids
        (prefixed with '#'), System groups (prefixed with '%'),
        netgroups (prefixed with '+') and other aliases.  Each
        list item may be prefixed with one or more '!' operators.
@@ -117,9 +117,9 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
                        '!'* +netgroup |
                        '!'* Runas_Alias
 
-       Likewise, a Runas_List has the same possible elements as a
-       User_List, except that it can include a Runas_Alias,
-       instead of a User_Alias.
+       Likewise, a `Runas_List' has the same possible elements as
+       a `User_List', except that it can include a `Runas_Alias',
+       instead of a `User_Alias'.
 
         Host_List ::= Host |
                       Host ',' Host_List
@@ -127,13 +127,13 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
 
 
-1/Apr/2000                    1.6.3                             2
+April  7, 2000                1.6.3                             2
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
         Host ::= '!'* hostname |
@@ -142,7 +142,7 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
                  '!'* '+'netgroup |
                  '!'* Host_Alias
 
-       A Host_List is made up of one or more hostnames, IP
+       A `Host_List' is made up of one or more hostnames, IP
        addresses, network numbers, netgroups (prefixed with '+')
        and other aliases.  Again, the value of an item may be
        negated with the '!' operator.  If you do not specify a
@@ -151,10 +151,10 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
        netmask may be specified either in dotted quad notation
        (eg.  255.255.255.0) or CIDR notation (number of bits, eg.
        24).  A hostname may include shell-style wildcards (see
-       `Wildcards' section below), but unless the hostname
-       command on your machine returns the fully qualified
-       hostname, you'll need to use the _f_q_d_n option for wildcards
-       to be useful.
+       `Wildcards' section below), but unless the `hostname' com­
+       mand on your machine returns the fully qualified hostname,
+       you'll need to use the _f_q_d_n option for wildcards to be
+       useful.
 
         Cmnd_List ::= Cmnd |
                       Cmnd ',' Cmnd_List
@@ -167,50 +167,50 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
                  '!'* directory |
                  '!'* Cmnd_Alias
 
-       A Cmnd_List is a list of one or more commandnames,
+       A `Cmnd_List' is a list of one or more commandnames,
        directories, and other aliases.  A commandname is a fully
        qualified filename which may include shell-style wildcards
        (see `Wildcards' section below).  A simple filename allows
        the user to run the command with any arguments he/she
        wishes.  However, you may also command line arguments
-       (including wildcards).  Alternately, you can specify "" to
-       indicate that the command may only be run wwwwiiiitttthhhhoooouuuutttt command
-       line arguments.  A directory is a fully qualified pathname
-       ending in a '/'.  When you specify a directory in a
-       Cmnd_List, the user will be able to run any file within
-       that directory (but not in any subdirectories therein).
+       (including wildcards).  Alternately, you can specify `""'
+       to indicate that the command may only be run wwwwiiiitttthhhhoooouuuutttt com­
+       mand line arguments.  A directory is a fully qualified
+       pathname ending in a '/'.  When you specify a directory in
+       a `Cmnd_List', the user will be able to run any file
+       within that directory (but not in any subdirectories
+       therein).
 
-       If a Cmnd has associated command line arguments, then the
-       arguments in the Cmnd must match exactly those given by
-       the user on the command line (or match the wildcards if
+       If a `Cmnd' has associated command line arguments, then
+       the arguments in 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: ',', ':', '=', '\'.
+       be escaped with a '\' if they are used in command argu­
+       ments: ',', ':', '=', '\'.
 
 
 
 
 
 
-
-1/Apr/2000                    1.6.3                             3
+April  7, 2000                1.6.3                             3
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
        DDDDeeeeffffaaaauuuullllttttssss
 
        Certain configuration options may be changed from their
-       default values at runtime via one or more Default_Entry
+       default values at runtime via one or more `Default_Entry'
        lines.  These may affect all users on any host, all users
-       on a specific host, or just a specific user.  When
-       multiple entries match, they are applied in order.  Where
-       there are conflicting values, the last value on a matching
-       line takes effect.
+       on a specific host, or just a specific user.  When multi­
+       ple entries match, they are applied in order.  Where there
+       are conflicting values, the last value on a matching line
+       takes effect.
 
         Default_Type ::= 'Defaults' ||
                          'Defaults' ':' User ||
@@ -225,9 +225,9 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
        Flags are implicitly boolean and can be turned off via the
        '!' operator.  Some integer and string parameters may also
        be used in a boolean context to disable them.  Values may
-       be enclosed in double quotes (") when they contain
-       multiple words.  Special characters may be escaped with a
-       backslash (\).
+       be enclosed in double quotes (`"') when they contain mul­
+       tiple words.  Special characters may be escaped with a
+       backslash (`\').
 
        FFFFllllaaaaggggssss:
 
@@ -240,7 +240,7 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
                    more convenient.  This flag is off by default.
 
        ignore_dot  If set, ssssuuuuddddoooo will ignore '.' or '' (current
-                   dir) in $PATH; the $PATH itself is not
+                   dir) in `$PATH'; the `$PATH' itself is not
                    modified.  This flag is off by default.
 
        mail_always Send mail to the _m_a_i_l_t_o user every time a
@@ -259,13 +259,13 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
 
 
-1/Apr/2000                    1.6.3                             4
+April  7, 2000                1.6.3                             4
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
                    default.
@@ -279,8 +279,8 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
        tty_tickets If set, users must authenticate on a per-tty
                    basis.  Normally, ssssuuuuddddoooo uses a directory in the
-                   ticket dir with the same name as the user
-                   running it.  With this flag enabled, ssssuuuuddddoooo will
+                   ticket dir with the same name as the user run­
+                   ning it.  With this flag enabled, ssssuuuuddddoooo will
                    use a file named for the tty the user is
                    logged in on in that directory.  This flag is
                    off by default.
@@ -293,14 +293,14 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
                    If set, users must authenticate themselves via
                    a password (or other means of authentication)
                    before they may run commands.  This default
-                   may be overridden via the PASSWD and NOPASSWD
-                   tags.  This flag is on by default.
+                   may be overridden via the `PASSWD' and
+                   `NOPASSWD' tags.  This flag is on by default.
 
-       root_sudo   If set, root is allowed to run ssssuuuuddddoooo too.
-                   Disabling this prevents users from "chaining"
+       root_sudo   If set, root is allowed to run ssssuuuuddddoooo too.  Dis­
+                   abling this prevents users from "chaining"
                    ssssuuuuddddoooo commands to get a root shell by doing
-                   something like "sudo sudo /bin/sh".  This flag
-                   is on by default.
+                   something like `"sudo sudo /bin/sh"'.  This
+                   flag is on by default.
 
        log_host    If set, the hostname will be logged in the
                    (non-syslog) ssssuuuuddddoooo log file.  This flag is off
@@ -312,61 +312,61 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
        shell_noargs
                    If set and ssssuuuuddddoooo is invoked with no arguments
-                   it acts as if the -s flag had been given.
+                   it acts as if the `-s' flag had been given.
                    That is, it runs a shell as root (the shell is
-                   determined by the SHELL environment variable
+                   determined by the `SHELL' environment variable
                    if it is set, falling back on the shell listed
                    in the invoking user's /etc/passwd entry if
                    not).  This flag is off by default.
 
-       set_home    If set and ssssuuuuddddoooo is invoked with the -s flag
-                   the HOME environment variable will be set to
+       set_home    If set and ssssuuuuddddoooo is invoked with the `-s' flag
+                   the `HOME' environment variable will be set to
                    the home directory of the target user (which
 
 
 
-1/Apr/2000                    1.6.3                             5
+April  7, 2000                1.6.3                             5
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
-                   is root unless the -u option is used).  This
-                   effectively makes the -s flag imply -H.  This
-                   flag is off by default.
+                   is root unless the `-u' option is used).  This
+                   effectively makes the `-s' flag imply `-H'.
+                   This flag is off by default.
 
-       path_info   Normally, ssssuuuuddddoooo will tell the user when a
-                   command could not be found in their $PATH.
+       path_info   Normally, ssssuuuuddddoooo will tell the user when a com­
+                   mand could not be found in their `$PATH'.
                    Some sites may wish to disable this as it
                    could be used to gather information on the
                    location of executables that the normal user
                    does not have access to.  The disadvantage is
                    that if the executable is simply not in the
-                   user's $PATH, ssssuuuuddddoooo will tell the user that
+                   user's `$PATH', ssssuuuuddddoooo will tell the user that
                    they are not allowed to run it, which can be
                    confusing.  This flag is off by default.
 
-       fqdn        Set this flag if you want to put fully
-                   qualified hostnames in the _s_u_d_o_e_r_s file.  Ie:
-                   instead of myhost you would use
-                   myhost.mydomain.edu.  You may still use the
-                   short form if you wish (and even mix the two).
-                   Beware that turning on _f_q_d_n requires ssssuuuuddddoooo to
-                   make DNS lookups which may make ssssuuuuddddoooo unusable
-                   if DNS stops working (for example if the
-                   machine is not plugged into the network).
-                   Also note that you must use the host's
-                   official name as DNS knows it.  That is, you
-                   may not use a host alias (CNAME entry) due to
-                   performance issues and the fact that there is
-                   no way to get all aliases from DNS.  If your
-                   machine's hostname (as returned by the
-                   hostname command) is already fully qualified
-                   you shouldn't need to set _f_q_f_n.  This flag is
-                   off by default.
+       fqdn        Set this flag if you want to put fully quali­
+                   fied hostnames in the _s_u_d_o_e_r_s file.  Ie:
+                   instead of myhost you would use myhost.mydo­
+                   main.edu.  You may still use the short form if
+                   you wish (and even mix the two).  Beware that
+                   turning on _f_q_d_n requires ssssuuuuddddoooo to make DNS
+                   lookups which may make ssssuuuuddddoooo unusable if DNS
+                   stops working (for example if the machine is
+                   not plugged into the network).  Also note that
+                   you must use the host's official name as DNS
+                   knows it.  That is, you may not use a host
+                   alias (`CNAME' entry) due to performance
+                   issues and the fact that there is no way to
+                   get all aliases from DNS.  If your machine's
+                   hostname (as returned by the `hostname' com­
+                   mand) is already fully qualified you shouldn't
+                   need to set _f_q_f_n.  This flag is off by
+                   default.
 
        insults     If set, ssssuuuuddddoooo will insult users when they enter
                    an incorrect password.  This flag is off by
@@ -374,15 +374,15 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
        requiretty  If set, ssssuuuuddddoooo will only run when the user is
                    logged in to a real tty.  This will disallow
-                   things like "rsh somehost sudo ls" since
+                   things like `"rsh somehost sudo ls"' since
                    _r_s_h(1) does not allocate a tty.  Because it is
                    not possible to turn of echo when there is no
                    tty present, some sites may with to set this
                    flag to prevent a user from entering a visible
                    password.  This flag is off by default.
 
-       env_editor  If set, vvvviiiissssuuuuddddoooo will use the value of the
-                   EDITOR or VISUAL environment variables before
+       env_editor  If set, vvvviiiissssuuuuddddoooo will use the value of the EDI­
+                   TOR or VISUAL environment variables before
                    falling back on the default editor list.  Note
                    that this may create a security hole as it
                    allows the user to run any arbitrary command
@@ -391,19 +391,19 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
 
 
-1/Apr/2000                    1.6.3                             6
+April  7, 2000                1.6.3                             6
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
-                   in the editor variable.  vvvviiiissssuuuuddddoooo will then only
-                   use the EDITOR or VISUAL if they match a value
-                   specified in editor.  This flag is off by
-                   default.
+                   in the `editor' variable.  vvvviiiissssuuuuddddoooo will then
+                   only use the EDITOR or VISUAL if they match a
+                   value specified in `editor'.  This flag is off
+                   by default.
 
        rootpw      If set, ssssuuuuddddoooo will prompt for the root password
                    instead of the password of the invoking user.
@@ -416,19 +416,19 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
                    default.
 
        targetpw    If set, ssssuuuuddddoooo will prompt for the password of
-                   the user specified by the -u flag (defaults to
-                   root) instead of the password of the invoking
-                   user.  This flag is off by default.
+                   the user specified by the `-u' flag (defaults
+                   to root) instead of the password of the invok­
+                   ing user.  This flag is off by default.
 
-       set_logname Normally, ssssuuuuddddoooo will set the LOGNAME and USER
-                   environment variables to the name of the
-                   target user (usually root unless the -u flag
-                   is given).  However, since some programs
+       set_logname Normally, ssssuuuuddddoooo will set the `LOGNAME' and
+                   `USER' environment variables to the name of
+                   the target user (usually root unless the `-u'
+                   flag is given).  However, since some programs
                    (including the RCS revision control system)
-                   use LOGNAME to determine the real identity of
-                   the user, it may be desirable to change this
-                   behavior.  This can be done by negating the
-                   set_logname option.
+                   use `LOGNAME' to determine the real identity
+                   of the user, it may be desirable to change
+                   this behavior.  This can be done by negating
+                   the set_logname option.
 
        use_loginclass
                    If set, ssssuuuuddddoooo will apply the defaults specified
@@ -457,20 +457,20 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
 
 
-1/Apr/2000                    1.6.3                             7
+April  7, 2000                1.6.3                             7
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
        timestamp_timeout
                    Number of minutes that can elapse before ssssuuuuddddoooo
                    will ask for a passwd again.  The default is
-                   5, set this to 0 to always prompt for a
-                   password.
+                   5, set this to 0 to always prompt for a pass­
+                   word.
 
        passwd_timeout
                    Number of minutes before the ssssuuuuddddoooo password
@@ -484,9 +484,9 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
        SSSSttttrrrriiiinnnnggggssss:
 
        mailsub     Subject of the mail sent to the _m_a_i_l_t_o user.
-                   The escape %h will expand to the hostname of
-                   the machine.  Default is "*** SECURITY
-                   information for %h ***".
+                   The escape `%h' will expand to the hostname of
+                   the machine.  Default is "*** SECURITY infor­
+                   mation for %h ***".
 
        badpass_message
                    Message that is displayed if a user enters an
@@ -494,21 +494,21 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
                    try again." unless insults are enabled.
 
        timestampdir
-                   The directory in which ssssuuuuddddoooo stores its
-                   timestamp files.  The default is _@_T_I_M_E_D_I_R_@.
+                   The directory in which ssssuuuuddddoooo stores its times­
+                   tamp files.  The default is _/_v_a_r_/_r_u_n_/_s_u_d_o.
 
        passprompt  The default prompt to use when asking for a
-                   password; can be overridden via the -p option
-                   or the SUDO_PROMPT environment variable.
-                   Supports two escapes: "%u" expands to the
-                   user's login name and "%h" expands to the
-                   local hostname.  The default value is
-                   "Password:".
+                   password; can be overridden via the `-p'
+                   option or the `SUDO_PROMPT' environment vari­
+                   able. Supports two escapes: "%u" expands to
+                   the user's login name and "%h" expands to the
+                   local hostname.  The default value is "Pass­
+                   word:".
 
        runas_default
-                   The default user to run commands as if the -u
-                   flag is not specified on the command line.
-                   This defaults to "root".
+                   The default user to run commands as if the
+                   `-u' flag is not specified on the command
+                   line.  This defaults to "root".
 
        syslog_goodpri
                    Syslog priority to use when user authenticates
@@ -523,19 +523,19 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
 
 
-1/Apr/2000                    1.6.3                             8
+April  7, 2000                1.6.3                             8
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
                    choose the editor that matches the user's USER
                    environment variable if possible, or the first
-                   editor in the list that exists and is
-                   executable.  The default is the path to vi on
+                   editor in the list that exists and is exe­
+                   cutable.  The default is the path to vi on
                    your system.
 
        SSSSttttrrrriiiinnnnggggssss tttthhhhaaaatttt ccccaaaannnn bbbbeeee uuuusssseeeedddd iiiinnnn aaaa bbbboooooooolllleeeeaaaannnn ccccoooonnnntttteeeexxxxtttt:
@@ -553,7 +553,7 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
                    at configure time.
 
        mailerflags Flags to use when invoking mailer. Defaults to
-                   -t.
+                   `-t'.
 
        mailto      Address to send warning and erorr mail to.
                    Defaults to "root".
@@ -565,10 +565,10 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
        secure_path Path used for every command run from ssssuuuuddddoooo.  If
                    you don't trust the people running ssssuuuuddddoooo to
-                   have a sane PATH environment variable you may
-                   want to use this.  Another use is if you want
-                   to have the "root path" be separate from the
-                   "user path."  This is not set by default.
+                   have a sane `PATH' environment variable you
+                   may want to use this.  Another use is if you
+                   want to have the "root path" be separate from
+                   the "user path."  This is not set by default.
 
        verifypw    This option controls when a password will be
                    required when a user runs ssssuuuuddddoooo with the ----vvvv.
@@ -589,13 +589,13 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
 
 
-1/Apr/2000                    1.6.3                             9
+April  7, 2000                1.6.3                             9
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
                        always      The user must always enter a password to use
@@ -626,15 +626,14 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
        When logging via _s_y_s_l_o_g(3), ssssuuuuddddoooo accepts the following
        values for the syslog facility (the value of the ssssyyyysssslllloooogggg
-       Parameter): aaaauuuutttthhhhpppprrrriiiivvvv (if your OS supports it), aaaauuuutttthhhh,
-       ddddaaaaeeeemmmmoooonnnn, uuuusssseeeerrrr, llllooooccccaaaallll0000, llllooooccccaaaallll1111, llllooooccccaaaallll2222, llllooooccccaaaallll3333, llllooooccccaaaallll4444,
-       llllooooccccaaaallll5555, llllooooccccaaaallll6666, and llllooooccccaaaallll7777.  The following syslog
-       priorities are supported: aaaalllleeeerrrrtttt, ccccrrrriiiitttt, ddddeeeebbbbuuuugggg, eeeemmmmeeeerrrrgggg, eeeerrrrrrrr,
-       iiiinnnnffffoooo, nnnnoooottttiiiicccceeee, and wwwwaaaarrrrnnnniiiinnnngggg.
+       Parameter): aaaauuuutttthhhhpppprrrriiiivvvv (if your OS supports it), aaaauuuutttthhhh, ddddaaaaeeee­­­­
+       mmmmoooonnnn, uuuusssseeeerrrr, llllooooccccaaaallll0000, llllooooccccaaaallll1111, llllooooccccaaaallll2222, llllooooccccaaaallll3333, llllooooccccaaaallll4444, llllooooccccaaaallll5555,
+       llllooooccccaaaallll6666, and llllooooccccaaaallll7777.  The following syslog priorities are
+       supported: aaaalllleeeerrrrtttt, ccccrrrriiiitttt, ddddeeeebbbbuuuugggg, eeeemmmmeeeerrrrgggg, eeeerrrrrrrr, iiiinnnnffffoooo, nnnnoooottttiiiicccceeee,
+       and wwwwaaaarrrrnnnniiiinnnngggg.
 
        UUUUsssseeeerrrr SSSSppppeeeecccciiiiffffiiiiccccaaaattttiiiioooonnnn
 
-
         User_Spec ::= User_list Host_List '=' User_List Cmnd_Spec_List \
                       (':' User_Spec)*
 
@@ -655,23 +654,24 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
 
 
-1/Apr/2000                    1.6.3                            10
+
+April  7, 2000                1.6.3                            10
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
        RRRRuuuunnnnaaaassss____SSSSppppeeeecccc
 
-       A Runas_Spec is simply a Runas_List (as defined above)
+       A `Runas_Spec' is simply a `Runas_List' (as defined above)
        enclosed in a set of parentheses.  If you do not specify a
-       Runas_Spec in the user specification, a default Runas_Spec
-       of rrrrooooooootttt will be used.  A Runas_Spec sets the default for
-       commands that follow it.  What this means is that for the
-       entry:
+       `Runas_Spec' in the user specification, a default
+       `Runas_Spec' of rrrrooooooootttt will be used.  A `Runas_Spec' sets
+       the default for commands that follow it.  What this means
+       is that for the entry:
 
         dgb    boulder = (operator) /bin/ls, /bin/kill, /usr/bin/who
 
@@ -680,7 +680,7 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
            sudo -u operator /bin/ls.
 
-       It is also possible to override a Runas_Spec later on in
+       It is also possible to override a `Runas_Spec' later on in
        an entry.  If we modify the entry like so:
 
         dgb    boulder = (operator) /bin/ls, (root) /bin/kill, /usr/bin/lprm
@@ -692,10 +692,10 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
        By default, ssssuuuuddddoooo requires that a user authenticate him or
        herself before running a command.  This behavior can be
-       modified via the NOPASSWD tag.  Like a Runas_Spec, the
-       NOPASSWD tag sets a default for the commands that follow
-       it in the Cmnd_Spec_List.  Conversely, the PASSWD tag can
-       be used to reverse things.  For example:
+       modified via the `NOPASSWD' tag.  Like a `Runas_Spec', the
+       `NOPASSWD' tag sets a default for the commands that follow
+       it in the `Cmnd_Spec_List'.  Conversely, the `PASSWD' tag
+       can be used to reverse things.  For example:
 
         ray    rushmore = NOPASSWD: /bin/kill, /bin/ls, /usr/bin/lprm
 
@@ -707,45 +707,46 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
         ray    rushmore = NOPASSWD: /bin/kill, PASSWD: /bin/ls, /usr/bin/lprm
 
-       Note however, that the PASSWD tag has no effect on users
+       Note however, that the `PASSWD' tag has no effect on users
        who are in the group specified by the exempt_group option.
 
-       By default, if the NOPASSWD tag is applied to any of the
+       By default, if the `NOPASSWD' tag is applied to any of the
        entries for a user on the current host, he or she will be
-       able to run sudo -l without a password.  Additionally, a
-       user may only run sudo -v without a password if the
-       NOPASSWD tag is present for all a user's entries that
-       pertain to the current host.  This behavior may be
-       overridden via the verifypw and listpw options.
+       able to run `sudo -l' without a password.  Additionally, a
+       user may only run `sudo -v' without a password if the
+       `NOPASSWD' tag is present for all a user's entries that
+       pertain to the current host.  This behavior may be over­
+       ridden via the verifypw and listpw options.
 
 
 
 
-1/Apr/2000                    1.6.3                            11
+April  7, 2000                1.6.3                            11
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
        WWWWiiiillllddddccccaaaarrrrddddssss ((((aaaakkkkaaaa mmmmeeeettttaaaa cccchhhhaaaarrrraaaacccctttteeeerrrrssss))))::::
 
        ssssuuuuddddoooo allows shell-style _w_i_l_d_c_a_r_d_s to be used in pathnames
        as well as command line arguments in the _s_u_d_o_e_r_s file.
-       Wildcard matching is done via the PPPPOOOOSSSSIIIIXXXX fnmatch(3)
-       routine.  Note that these are _n_o_t regular expressions.
+       Wildcard matching is done via the PPPPOOOOSSSSIIIIXXXX `fnmatch(3)' rou­
+       tine.  Note that these are _n_o_t regular expressions.
 
-       *       Matches any set of zero or more characters.
+       `*'     Matches any set of zero or more characters.
 
-       ?       Matches any single character.
+       `?'     Matches any single character.
 
-       [...]   Matches any character in the specified range.
+       `[...]' Matches any character in the specified range.
 
-       [!...]  Matches any character nnnnooootttt in the specified range.
+       `[!...]'
+               Matches any character nnnnooootttt in the specified range.
 
-       \x      For any character "x", evaluates to "x".  This is
+       `\x'    For any character "x", evaluates to "x".  This is
                used to escape special characters such as: "*",
                "?", "[", and "}".
 
@@ -756,16 +757,15 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
            /usr/bin/*
 
-       match /usr/bin/who but not /usr/bin/X11/xterm.
+       match `/usr/bin/who' but not `/usr/bin/X11/xterm'.
 
        EEEExxxxcccceeeeppppttttiiiioooonnnnssss ttttoooo wwwwiiiillllddddccccaaaarrrrdddd rrrruuuulllleeeessss::::
 
        The following exceptions apply to the above rules:
 
-       ""      If the empty string "" is the only command line
-               argument in the _s_u_d_o_e_r_s entry it means that
-               command is not allowed to be run with aaaannnnyyyy
-               arguments.
+       `""""'  If the empty string `""' is the only command line
+               argument in the _s_u_d_o_e_r_s entry it means that com­
+               mand is not allowed to be run with aaaannnnyyyy arguments.
 
        OOOOtttthhhheeeerrrr ssssppppeeeecccciiiiaaaallll cccchhhhaaaarrrraaaacccctttteeeerrrrssss aaaannnndddd rrrreeeesssseeeerrrrvvvveeeedddd wwwwoooorrrrddddssss::::
 
@@ -777,31 +777,31 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
        The reserved word AAAALLLLLLLL is a built in _a_l_i_a_s that always
        causes a match to succeed.  It can be used wherever one
-       might otherwise use a Cmnd_Alias, User_Alias, Runas_Alias,
-       or Host_Alias.  You should not try to define your own
-       _a_l_i_a_s called AAAALLLLLLLL as the built in alias will be used in
-       preference to your own.  Please note that using AAAALLLLLLLL can be
-       dangerous since in a command context, it allows the user
-       to run aaaannnnyyyy command on the system.
+       might otherwise use a `Cmnd_Alias', `User_Alias',
+       `Runas_Alias', or `Host_Alias'.  You should not try to
+       define your own _a_l_i_a_s called AAAALLLLLLLL as the built in alias
+       will be used in preference to your own.  Please note that
+       using AAAALLLLLLLL can be dangerous since in a command context, it
+       allows the user to run aaaannnnyyyy command on the system.
 
 
 
 
-1/Apr/2000                    1.6.3                            12
+April  7, 2000                1.6.3                            12
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
        An exclamation point ('!') can be used as a logical _n_o_t
-       operator both in an _a_l_i_a_s and in front of a Cmnd.  This
+       operator both in an _a_l_i_a_s and in front of a `Cmnd'.  This
        allows one to exclude certain values.  Note, however, that
-       using a ! in conjunction with the built in ALL alias to
-       allow a user to run "all but a few" commands rarely works
-       as intended (see SECURITY NOTES below).
+       using a `!' in conjunction with the built in `ALL' alias
+       to allow a user to run "all but a few" commands rarely
+       works as intended (see SECURITY NOTES below).
 
        Long lines can be continued with a backslash ('\') as the
        last character on the line.
@@ -811,8 +811,8 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
        '(', ')') is optional.
 
        The following characters must be escaped with a backslash
-       ('\') when used as part of a word (eg. a username or
-       hostname): '@', '!', '=', ':', ',', '(', ')', '\'.
+       ('\') when used as part of a word (eg. a username or host­
+       name): '@', '!', '=', ':', ',', '(', ')', '\'.
 
 EEEEXXXXAAAAMMMMPPPPLLLLEEEESSSS
        Below are example _s_u_d_o_e_r_s entries.  Admittedly, some of
@@ -853,13 +853,13 @@ EEEEXXXXAAAAMMMMPPPPLLLLEEEESSSS
 
 
 
-1/Apr/2000                    1.6.3                            13
+April  7, 2000                1.6.3                            13
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
        Here we override some of the compiled in default values.
@@ -867,8 +867,8 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
        in all cases.  We don't want to subject the full time
        staff to the ssssuuuuddddoooo lecture, and user mmmmiiiilllllllleeeerrrrtttt need not give
        a password.  In addition, on the machines in the _S_E_R_V_E_R_S
-       Host_Alias, we keep an additional local log file and make
-       sure we log the year in each log line since the log
+       `Host_Alias', we keep an additional local log file and
+       make sure we log the year in each log line since the log
        entries will be kept around for several years.
 
         # Override builtin defaults
@@ -877,8 +877,8 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
         Defaults:millert       !authenticate
         Defaults@SERVERS       log_year, logfile=/var/log/sudo.log
 
-       The _U_s_e_r _s_p_e_c_i_f_i_c_a_t_i_o_n is the part that actually
-       determines who may run what.
+       The _U_s_e_r _s_p_e_c_i_f_i_c_a_t_i_o_n is the part that actually deter­
+       mines who may run what.
 
         root           ALL = (ALL) ALL
         %wheel         ALL = (ALL) ALL
@@ -894,23 +894,23 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
         PARTTIMERS     ALL = ALL
 
        Part time sysadmins (bbbboooossssttttlllleeeeyyyy, jjjjwwwwffffooooxxxx, and ccccrrrraaaawwwwllll) may run
-       any command on any host but they must authenticate
-       themselves first (since the entry lacks the NOPASSWD tag).
+       any command on any host but they must authenticate them­
+       selves first (since the entry lacks the `NOPASSWD' tag).
 
         jack           CSNETS = ALL
 
        The user jjjjaaaacccckkkk may run any command on the machines in the
-       _C_S_N_E_T_S alias (the networks 128.138.243.0, 128.138.204.0,
-       and 128.138.242.0).  Of those networks, only
-       <128.138.204.0> has an explicit netmask (in CIDR notation)
-       indicating it is a class C network.  For the other
-       networks in _C_S_N_E_T_S, the local machine's netmask will be
-       used during matching.
+       _C_S_N_E_T_S alias (the networks `128.138.243.0',
+       `128.138.204.0', and `128.138.242.0').  Of those networks,
+       only <128.138.204.0> has an explicit netmask (in CIDR
+       notation) indicating it is a class C network.  For the
+       other networks in _C_S_N_E_T_S, the local machine's netmask will
+       be used during matching.
 
         lisa           CUNETS = ALL
 
        The user lllliiiissssaaaa may run any command on any host in the
-       _C_U_N_E_T_S alias (the class B network 128.138.0.0).
+       _C_U_N_E_T_S alias (the class B network `128.138.0.0').
 
         operator       ALL = DUMPS, KILL, PRINTING, SHUTDOWN, HALT, REBOOT,\
                        /usr/oper/bin/
@@ -919,13 +919,13 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
 
 
-1/Apr/2000                    1.6.3                            14
+April  7, 2000                1.6.3                            14
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
        maintenance.  Here, those are commands related to backups,
@@ -946,7 +946,7 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
         bob            SPARC = (OP) ALL : SGI = (OP) ALL
 
        The user bbbboooobbbb may run anything on the _S_P_A_R_C and _S_G_I
-       machines as any user listed in the _O_P Runas_Alias (rrrrooooooootttt
+       machines as any user listed in the _O_P `Runas_Alias' (rrrrooooooootttt
        and ooooppppeeeerrrraaaattttoooorrrr).
 
         jim            +biglab = ALL
@@ -964,7 +964,8 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
         fred           ALL = (DB) NOPASSWD: ALL
 
        The user ffffrrrreeeedddd can run commands as any user in the _D_B
-       Runas_Alias (oooorrrraaaacccclllleeee or ssssyyyybbbbaaaasssseeee) without giving a password.
+       `Runas_Alias' (oooorrrraaaacccclllleeee or ssssyyyybbbbaaaasssseeee) without giving a pass­
+       word.
 
         john           ALPHA = /usr/bin/su [!-]*, !/usr/bin/su *root*
 
@@ -974,26 +975,27 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
         jen            ALL, !SERVERS = ALL
 
        The user jjjjeeeennnn may run any command on any machine except for
-       those in the _S_E_R_V_E_R_S Host_Alias (master, mail, www and
+       those in the _S_E_R_V_E_R_S `Host_Alias' (master, mail, www and
        ns).
 
         jill           SERVERS = /usr/bin/, !SU, !SHELLS
 
-       For any machine in the _S_E_R_V_E_R_S Host_Alias, jjjjiiiillllllll may run
+       For any machine in the _S_E_R_V_E_R_S `Host_Alias', jjjjiiiillllllll may run
        any commands in the directory /usr/bin/ except for those
-       commands belonging to the _S_U and _S_H_E_L_L_S Cmnd_Aliases.
 
 
 
-1/Apr/2000                    1.6.3                            15
+April  7, 2000                1.6.3                            15
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
+       commands belonging to the _S_U and _S_H_E_L_L_S `Cmnd_Aliases'.
+
         steve          CSNETS = (operator) /usr/local/op_commands/
 
        The user sssstttteeeevvvveeee may run any command in the directory
@@ -1006,7 +1008,7 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
 
         WEBMASTERS     www = (www) ALL, (root) /usr/bin/su www
 
-       On the host www, any user in the _W_E_B_M_A_S_T_E_R_S User_Alias
+       On the host www, any user in the _W_E_B_M_A_S_T_E_R_S `User_Alias'
        (will, wendy, and wim), may run any command as user www
        (which owns the web pages) or simply _s_u(1) to www.
 
@@ -1014,50 +1016,48 @@ sudoers(4)                 FILE FORMATS                sudoers(4)
                        /sbin/mount -o nosuid\,nodev /dev/cd0a /CDROM
 
        Any user may mount or unmount a CD-ROM on the machines in
-       the CDROM Host_Alias (orion, perseus, hercules) without
+       the CDROM `Host_Alias' (orion, perseus, hercules) without
        entering a password.  This is a bit tedious for users to
        type, so it is a prime candiate for encapsulating in a
        shell script.
 
 SSSSEEEECCCCUUUURRRRIIIITTTTYYYY NNNNOOOOTTTTEEEESSSS
        It is generally not effective to "subtract" commands from
-       ALL using the '!' operator.  A user can trivially
-       circumvent this by copying the desired command to a
-       different name and then executing that.  For example:
+       `ALL' using the '!' operator.  A user can trivially cir­
+       cumvent this by copying the desired command to a different
+       name and then executing that.  For example:
 
            bill        ALL = ALL, !SU, !SHELLS
 
        Doesn't really prevent bbbbiiiillllllll from running the commands
-       listed in _S_U or _S_H_E_L_L_S since he can simply copy those
-       commands to a different name, or use a shell escape from
-       an editor or other program.  Therefore, these kind of
+       listed in _S_U or _S_H_E_L_L_S since he can simply copy those com­
+       mands to a different name, or use a shell escape from an
+       editor or other program.  Therefore, these kind of
        restrictions should be considered advisory at best (and
        reinforced by policy).
 
 CCCCAAAAVVVVEEEEAAAATTTTSSSS
        The _s_u_d_o_e_r_s file should aaaallllwwwwaaaayyyyssss be edited by the vvvviiiissssuuuuddddoooo
-       command which locks the file and does grammatical
-       checking. It is imperative that _s_u_d_o_e_r_s be free of syntax
-       errors since ssssuuuuddddoooo will not run with a syntactically
-       incorrect _s_u_d_o_e_r_s file.
+       command which locks the file and does grammatical check­
+       ing. It is imperative that _s_u_d_o_e_r_s be free of syntax
+       errors since ssssuuuuddddoooo will not run with a syntactically incor­
+       rect _s_u_d_o_e_r_s file.
 
        When using netgroups of machines (as opposed to users), if
        you store fully qualified hostnames in the netgroup (as is
        usually the case), you either need to have the machine's
-       hostname be fully qualified as returned by the hostname
+       hostname be fully qualified as returned by the `hostname'
        command or use the _f_q_d_n option in _s_u_d_o_e_r_s.
 
 
 
-
-
-1/Apr/2000                    1.6.3                            16
+April  7, 2000                1.6.3                            16
 
 
 
 
 
-sudoers(4)                 FILE FORMATS                sudoers(4)
+sudoers(4)             MAINTENANCE COMMANDS            sudoers(4)
 
 
 FFFFIIIILLLLEEEESSSS
@@ -1067,7 +1067,7 @@ FFFFIIIILLLLEEEESSSS
 
 
 SSSSEEEEEEEE AAAALLLLSSSSOOOO
-       _s_u_d_o(1m), _v_i_s_u_d_o(1m), _s_u(1), _f_n_m_a_t_c_h(3).
+       _s_u_d_o(1m), _v_i_s_u_d_o(8), _s_u(1), _f_n_m_a_t_c_h(3).
 
 
 
@@ -1117,72 +1117,6 @@ SSSSEEEEEEEE AAAALLLLSSSSOOOO
 
 
 
-1/Apr/2000                    1.6.3                            17
-
-
-
-
-
-sudoers(4)                 FILE FORMATS                sudoers(4)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1/Apr/2000                    1.6.3                            18
+April  7, 2000                1.6.3                            17
 
 
diff --git a/sudoers.man.in b/sudoers.man.in
index 31d58c67c..5b062860a 100644
--- a/sudoers.man.in
+++ b/sudoers.man.in
@@ -1,18 +1,9 @@
-.rn '' }`
-''' $RCSfile$$Revision$$Date$
-'''
-''' $Log$
-''' Revision 1.6  2000/04/01 21:23:28  millert
-''' Visudo now checks for the existence of an editor and gives a sensible
-''' error if it does not exist.
-'''
-''' The path to the editor for visudo is now a colon-separated list of
-''' allowable editors.  If the user has $EDITOR set and it matches
-''' one of the allowed editors that editor will be used.  If not,
-''' the first editor in the list that actually exists is used.
-'''
-'''
-.de Sh
+.\" Automatically generated by Pod::Man version 1.02
+.\" Fri Apr  7 08:37:06 2000
+.\"
+.\" Standard preamble:
+.\" ======================================================================
+.de Sh \" Subsection heading
 .br
 .if t .Sp
 .ne 5
@@ -20,150 +11,106 @@
 \fB\\$1\fR
 .PP
 ..
-.de Sp
+.de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
 ..
-.de Ip
+.de Ip \" List item
 .br
 .ie \\n(.$>=3 .ne \\$3
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.de Vb
+.de Vb \" Begin verbatim text
 .ft CW
 .nf
 .ne \\$1
 ..
-.de Ve
+.de Ve \" End verbatim text
 .ft R
 
 .fi
 ..
-'''
-'''
-'''     Set up \*(-- to give an unbreakable dash;
-'''     string Tr holds user defined translation string.
-'''     Bell System Logo is used as a dummy character.
-'''
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used
+.\" to do unbreakable dashes and therefore won't be available.  \*(C` and
+.\" \*(C' expand to `' in nroff, nothing in troff, for use with C<>
 .tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
-.ds -- \(*W-
-.ds PI pi
-.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-.ds L" ""
-.ds R" ""
-'''   \*(M", \*(S", \*(N" and \*(T" are the equivalent of
-'''   \*(L" and \*(R", except that they are used on ".xx" lines,
-'''   such as .IP and .SH, which do another additional levels of
-'''   double-quote interpretation
-.ds M" """
-.ds S" """
-.ds N" """""
-.ds T" """""
-.ds L' '
-.ds R' '
-.ds M' '
-.ds S' '
-.ds N' '
-.ds T' '
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` `
+.    ds C' '
 'br\}
 .el\{\
-.ds -- \(em\|
-.tr \*(Tr
-.ds L" ``
-.ds R" ''
-.ds M" ``
-.ds S" ''
-.ds N" ``
-.ds T" ''
-.ds L' `
-.ds R' '
-.ds M' `
-.ds S' '
-.ds N' `
-.ds T' '
-.ds PI \(*p
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
 'br\}
-.\"	If the F register is turned on, we'll generate
-.\"	index entries out stderr for the following things:
-.\"		TH	Title 
-.\"		SH	Header
-.\"		Sh	Subsection 
-.\"		Ip	Item
-.\"		X<>	Xref  (embedded
-.\"	Of course, you have to process the output yourself
-.\"	in some meaninful fashion.
-.if \nF \{
-.de IX
-.tm Index:\\$1\t\\n%\t"\\$2"
-..
-.nr % 0
-.rr F
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr
+.\" for titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and
+.\" index entries marked with X<> in POD.  Of course, you'll have to process
+.\" the output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+.    .
+.    nr % 0
+.    rr F
 .\}
-.TH sudoers @mansectform@ "1.6.3" "1/Apr/2000" "FILE FORMATS"
-.UC
-.if n .hy 0
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it
+.\" makes way too many mistakes in technical documents.
+.hy 0
 .if n .na
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.de CQ          \" put $1 in typewriter font
-.ft CW
-'if n "\c
-'if t \\&\\$1\c
-'if n \\&\\$1\c
-'if n \&"
-\\&\\$2 \\$3 \\$4 \\$5 \\$6 \\$7
-'.ft R
-..
-.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
-.	\" AM - accent mark definitions
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
 .bd B 3
-.	\" fudge factors for nroff and troff
+.    \" fudge factors for nroff and troff
 .if n \{\
-.	ds #H 0
-.	ds #V .8m
-.	ds #F .3m
-.	ds #[ \f1
-.	ds #] \fP
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
 .\}
 .if t \{\
-.	ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.	ds #V .6m
-.	ds #F 0
-.	ds #[ \&
-.	ds #] \&
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
 .\}
-.	\" simple accents for nroff and troff
+.    \" simple accents for nroff and troff
 .if n \{\
-.	ds ' \&
-.	ds ` \&
-.	ds ^ \&
-.	ds , \&
-.	ds ~ ~
-.	ds ? ?
-.	ds ! !
-.	ds /
-.	ds q
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
 .\}
 .if t \{\
-.	ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.	ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.	ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.	ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.	ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.	ds ? \s-2c\h'-\w'c'u*7/10'\u\h'\*(#H'\zi\d\s+2\h'\w'c'u*8/10'
-.	ds ! \s-2\(or\s+2\h'-\w'\(or'u'\v'-.8m'.\v'.8m'
-.	ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.	ds q o\h'-\w'o'u*8/10'\s-4\v'.4m'\z\(*i\v'-.4m'\s+4\h'\w'o'u*8/10'
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
 .\}
-.	\" troff and (daisy-wheel) nroff accents
+.    \" troff and (daisy-wheel) nroff accents
 .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
 .ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#]
-.ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u'
-.ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u'
-.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#]
 .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
 .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
 .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
@@ -171,59 +118,61 @@
 .ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
 .ds ae a\h'-(\w'a'u*4/10)'e
 .ds Ae A\h'-(\w'A'u*4/10)'E
-.ds oe o\h'-(\w'o'u*4/10)'e
-.ds Oe O\h'-(\w'O'u*4/10)'E
-.	\" corrections for vroff
+.    \" corrections for vroff
 .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
 .if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.	\" for low resolution devices (crt and lpr)
+.    \" for low resolution devices (crt and lpr)
 .if \n(.H>23 .if \n(.V>19 \
 \{\
-.	ds : e
-.	ds 8 ss
-.	ds v \h'-1'\o'\(aa\(ga'
-.	ds _ \h'-1'^
-.	ds . \h'-1'.
-.	ds 3 3
-.	ds o a
-.	ds d- d\h'-1'\(ga
-.	ds D- D\h'-1'\(hy
-.	ds th \o'bp'
-.	ds Th \o'LP'
-.	ds ae ae
-.	ds Ae AE
-.	ds oe oe
-.	ds Oe OE
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
 .\}
 .rm #[ #] #H #V #F C
+.\" ======================================================================
+.\"
+.IX Title "sudoers @mansectform@"
+.TH sudoers @mansectform@ "1.6.3" "April  7, 2000" "MAINTENANCE COMMANDS"
+.UC
 .SH "NAME"
 sudoers \- list of which users may execute what
 .SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
 The \fIsudoers\fR file is composed two types of entries:
 aliases (basically variables) and user specifications
 (which specify who may run what).  The grammar of \fIsudoers\fR
 will be described below in Extended Backus-Naur Form (EBNF).
 Don't despair if you don't know what EBNF is, it is fairly
 simple and the definitions below are annotated.
-.Sh "Quick guide to \s-1EBNF\s0"
-\s-1EBNF\s0 is a concise and exact way of describing the grammar of a language.
-Each \s-1EBNF\s0 definition is made up of \fIproduction rules\fR.  Eg.
+.Sh "Quick guide to EBNF"
+.IX Subsection "Quick guide to EBNF"
+EBNF is a concise and exact way of describing the grammar of a language.
+Each EBNF definition is made up of \fIproduction rules\fR.  Eg.
 .PP
 .Vb 1
 \& symbol ::= definition | alternate1 | alternate2 ...
 .Ve
 Each \fIproduction rule\fR references others and thus makes up a
-grammar for the language.  \s-1EBNF\s0 also contains the following
+grammar for the language.  EBNF also contains the following
 operators, which many readers will recognize from regular
 expressions.  Do not, however, confuse them with \*(L"wildcard\*(R"
 characters, which have different meanings.
-.Ip "\f(CW?\fR" 8
+.Ip "\f(CW\*(C`?\*(C'\fR" 8
+.IX Item "?"
 Means that the preceding symbol (or group of symbols) is optional.
 That is, it may appear once or not at all.
-.Ip "\f(CW*\fR" 8
+.Ip "\f(CW\*(C`*\*(C'\fR" 8
+.IX Item "*"
 Means that the preceding symbol (or group of symbols) may appear
 zero or more times.
-.Ip "\f(CW+\fR" 8
+.Ip "\f(CW\*(C`+\*(C'\fR" 8
+.IX Item "+"
 Means that the preceding symbol (or group of symbols) may appear
 one or more times.
 .PP
@@ -231,8 +180,9 @@ Parentheses may be used to group symbols together.  For clarity,
 we will use single quotes ('') to designate what is a verbatim character
 string (as opposed to a symbol name).
 .Sh "Aliases"
-There are four kinds of aliases: the \f(CWUser_Alias\fR, \f(CWRunas_Alias\fR,
-\f(CWHost_Alias\fR and \f(CWCmnd_Alias\fR.
+.IX Subsection "Aliases"
+There are four kinds of aliases: the \f(CW\*(C`User_Alias\*(C'\fR, \f(CW\*(C`Runas_Alias\*(C'\fR,
+\&\f(CW\*(C`Host_Alias\*(C'\fR and \f(CW\*(C`Cmnd_Alias\*(C'\fR.
 .PP
 .Vb 4
 \& Alias ::= 'User_Alias' = User_Alias (':' User_Alias)* |
@@ -260,9 +210,9 @@ Each \fIalias\fR definition is of the form
 .Vb 1
 \& Alias_Type NAME = item1, item2, ...
 .Ve
-where \fIAlias_Type\fR is one of \f(CWUser_Alias\fR, \f(CWRunas_Alias\fR, \f(CWHost_Alias\fR,
-or \f(CWCmnd_Alias\fR.  A \f(CWNAME\fR is a string of upper case letters, numbers,
-and the underscore characters ('_').  A \f(CWNAME\fR \fBmust\fR start with an
+where \fIAlias_Type\fR is one of \f(CW\*(C`User_Alias\*(C'\fR, \f(CW\*(C`Runas_Alias\*(C'\fR, \f(CW\*(C`Host_Alias\*(C'\fR,
+or \f(CW\*(C`Cmnd_Alias\*(C'\fR.  A \f(CW\*(C`NAME\*(C'\fR is a string of upper case letters, numbers,
+and the underscore characters ('_').  A \f(CW\*(C`NAME\*(C'\fR \fBmust\fR start with an
 upper case letter.  It is possible to put several alias definitions
 of the same type on a single line, joined by a semicolon (':').  Eg.
 .PP
@@ -282,11 +232,11 @@ The definitions of what constitutes a valid \fIalias\fR member follow.
 \&          '!'* '+'netgroup |
 \&          '!'* User_Alias
 .Ve
-A \f(CWUser_List\fR is made up of one or more usernames, uids
-(prefixed with \*(L'#'), System groups (prefixed with \*(L'%'),
-netgroups (prefixed with \*(L'+') and other aliases.  Each list
-item may be prefixed with one or more \*(L'!\*(R' operators.  An odd number
-of \*(L'!\*(R' operators negates the value of the item; an even number
+A \f(CW\*(C`User_List\*(C'\fR is made up of one or more usernames, uids
+(prefixed with '#'), System groups (prefixed with '%'),
+netgroups (prefixed with '+') and other aliases.  Each list
+item may be prefixed with one or more '!' operators.  An odd number
+of '!' operators negates the value of the item; an even number
 just cancel each other out.
 .PP
 .Vb 2
@@ -300,9 +250,9 @@ just cancel each other out.
 \&                '!'* +netgroup |
 \&                '!'* Runas_Alias
 .Ve
-Likewise, a \f(CWRunas_List\fR has the same possible elements
-as a \f(CWUser_List\fR, except that it can include a \f(CWRunas_Alias\fR,
-instead of a \f(CWUser_Alias\fR.
+Likewise, a \f(CW\*(C`Runas_List\*(C'\fR has the same possible elements
+as a \f(CW\*(C`User_List\*(C'\fR, except that it can include a \f(CW\*(C`Runas_Alias\*(C'\fR,
+instead of a \f(CW\*(C`User_Alias\*(C'\fR.
 .PP
 .Vb 2
 \& Host_List ::= Host |
@@ -315,15 +265,15 @@ instead of a \f(CWUser_Alias\fR.
 \&          '!'* '+'netgroup |
 \&          '!'* Host_Alias
 .Ve
-A \f(CWHost_List\fR is made up of one or more hostnames, \s-1IP\s0 addresses,
-network numbers, netgroups (prefixed with \*(L'+') and other aliases.
-Again, the value of an item may be negated with the \*(L'!\*(R' operator.
+A \f(CW\*(C`Host_List\*(C'\fR is made up of one or more hostnames, IP addresses,
+network numbers, netgroups (prefixed with '+') and other aliases.
+Again, the value of an item may be negated with the '!' operator.
 If you do not specify a netmask with a network number, the netmask
 of the host's ethernet \fIinterface\fR\|(s) will be used when matching.
 The netmask may be specified either in dotted quad notation (eg.
-255.255.255.0) or \s-1CIDR\s0 notation (number of bits, eg. 24).  A hostname
-may include shell-style wildcards (see `Wildcards\*(R' section below),
-but unless the \f(CWhostname\fR command on your machine returns the fully
+255.255.255.0) or CIDR notation (number of bits, eg. 24).  A hostname
+may include shell-style wildcards (see `Wildcards' section below),
+but unless the \f(CW\*(C`hostname\*(C'\fR command on your machine returns the fully
 qualified hostname, you'll need to use the \fIfqdn\fR option for wildcards
 to be useful.
 .PP
@@ -341,25 +291,26 @@ to be useful.
 \&          '!'* directory |
 \&          '!'* Cmnd_Alias
 .Ve
-A \f(CWCmnd_List\fR is a list of one or more commandnames, directories, and other
+A \f(CW\*(C`Cmnd_List\*(C'\fR is a list of one or more commandnames, directories, and other
 aliases.  A commandname is a fully qualified filename which may include
-shell-style wildcards (see `Wildcards\*(R' section below).  A simple
+shell-style wildcards (see `Wildcards' section below).  A simple
 filename allows the user to run the command with any arguments he/she
 wishes.  However, you may also command line arguments (including wildcards).
-Alternately, you can specify \f(CW""\fR to indicate that the command
+Alternately, you can specify \f(CW\*(C`""\*(C'\fR to indicate that the command
 may only be run \fBwithout\fR command line arguments.  A directory is a
-fully qualified pathname ending in a \*(L'/\*(R'.  When you specify a directory
-in a \f(CWCmnd_List\fR, the user will be able to run any file within that directory
+fully qualified pathname ending in a '/'.  When you specify a directory
+in a \f(CW\*(C`Cmnd_List\*(C'\fR, the user will be able to run any file within that directory
 (but not in any subdirectories therein).
 .PP
-If a \f(CWCmnd\fR has associated command line arguments, then the arguments
-in the \f(CWCmnd\fR must match exactly those given by the user on the command line
+If a \f(CW\*(C`Cmnd\*(C'\fR has associated command line arguments, then the arguments
+in the \f(CW\*(C`Cmnd\*(C'\fR 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 \*(L'\e\*(R' if they are used in command
-arguments: \*(L',\*(R', \*(L':\*(R', \*(L'=\*(R', \*(L'\e\*(R'.
+characters must be escaped with a '\e' if they are used in command
+arguments: ',', ':', '=', '\e'.
 .Sh "Defaults"
+.IX Subsection "Defaults"
 Certain configuration options may be changed from their default
-values at runtime via one or more \f(CWDefault_Entry\fR lines.  These
+values at runtime via one or more \f(CW\*(C`Default_Entry\*(C'\fR lines.  These
 may affect all users on any host, all users on a specific host,
 or just a specific user.  When multiple entries match, they are
 applied in order.  Where there are conflicting values, the last
@@ -378,209 +329,254 @@ value on a matching line takes effect.
 \&               '!'* Parameter ||
 .Ve
 Parameters may be \fBflags\fR, \fBinteger\fR values, or \fBstrings\fR.  Flags
-are implicitly boolean and can be turned off via the \*(L'!\*(R' operator.
+are implicitly boolean and can be turned off via the '!' operator.
 Some integer and string parameters may also be used in a boolean
 context to disable them.  Values may be enclosed in double quotes
-(\f(CW"\fR) when they contain multiple words.  Special characters may
-be escaped with a backslash (\f(CW\e\fR).
+(\f(CW\*(C`"\*(C'\fR) when they contain multiple words.  Special characters may
+be escaped with a backslash (\f(CW\*(C`\e\*(C'\fR).
 .PP
-\fBFlags\fR:
+\&\fBFlags\fR:
 .Ip "long_otp_prompt" 12
-When validating with a One Time Password scheme (\fBS/Key\fR or \fB\s-1OPIE\s0\fR),
+.IX Item "long_otp_prompt"
+When validating with a One Time Password scheme (\fBS/Key\fR or \fBOPIE\fR),
 a two-line prompt is used to make it easier to cut and paste the
 challenge to a local window.  It's not as pretty as the default but
 some people find it more convenient.  This flag is off by default.
 .Ip "ignore_dot" 12
-If set, \fBsudo\fR will ignore \*(L'.\*(R' or \*(L'\*(R' (current dir) in \f(CW$PATH\fR;
-the \f(CW$PATH\fR itself is not modified.  This flag is off by default.
+.IX Item "ignore_dot"
+If set, \fBsudo\fR will ignore '.' or '' (current dir) in \f(CW\*(C`$PATH\*(C'\fR;
+the \f(CW\*(C`$PATH\*(C'\fR itself is not modified.  This flag is off by default.
 .Ip "mail_always" 12
+.IX Item "mail_always"
 Send mail to the \fImailto\fR user every time a users runs \fBsudo\fR.
 This flag is off by default.
 .Ip "mail_no_user" 12
+.IX Item "mail_no_user"
 If set, mail will be sent to the \fImailto\fR user if the invoking
 user is not in the \fIsudoers\fR file.  This flag is on by default.
 .Ip "mail_no_host" 12
+.IX Item "mail_no_host"
 If set, mail will be sent to the \fImailto\fR user if the invoking
 user exists in the \fIsudoers\fR file, but is not allowed to run
 commands on the current host.  This flag is off by default.
 .Ip "mail_no_perms" 12
+.IX Item "mail_no_perms"
 If set, mail will be sent to the \fImailto\fR user if the invoking
 user allowed to use \fBsudo\fR but the command they are trying is not
 listed in their \fIsudoers\fR file entry.  This flag is off by default.
 .Ip "tty_tickets" 12
+.IX Item "tty_tickets"
 If set, users must authenticate on a per-tty basis.  Normally,
-\fBsudo\fR uses a directory in the ticket dir with the same name as
+\&\fBsudo\fR uses a directory in the ticket dir with the same name as
 the user running it.  With this flag enabled, \fBsudo\fR will use a
 file named for the tty the user is logged in on in that directory.
 This flag is off by default.
 .Ip "lecture" 12
+.IX Item "lecture"
 If set, a user will receive a short lecture the first time he/she
 runs \fBsudo\fR.  This flag is on by default.
 .Ip "authenticate" 12
+.IX Item "authenticate"
 If set, users must authenticate themselves via a password (or other
 means of authentication) before they may run commands.  This default
-may be overridden via the \f(CWPASSWD\fR and \f(CWNOPASSWD\fR tags.
+may be overridden via the \f(CW\*(C`PASSWD\*(C'\fR and \f(CW\*(C`NOPASSWD\*(C'\fR tags.
 This flag is on by default.
 .Ip "root_sudo" 12
+.IX Item "root_sudo"
 If set, root is allowed to run \fBsudo\fR too.  Disabling this prevents users
 from \*(L"chaining\*(R" \fBsudo\fR commands to get a root shell by doing something
-like \f(CW"sudo sudo /bin/sh"\fR.
+like \f(CW\*(C`"sudo sudo /bin/sh"\*(C'\fR.
 This flag is on by default.
 .Ip "log_host" 12
+.IX Item "log_host"
 If set, the hostname will be logged in the (non-syslog) \fBsudo\fR log file.
 This flag is off by default.
 .Ip "log_year" 12
+.IX Item "log_year"
 If set, the four-digit year will be logged in the (non-syslog) \fBsudo\fR log file.
 This flag is off by default.
 .Ip "shell_noargs" 12
+.IX Item "shell_noargs"
 If set and \fBsudo\fR is invoked with no arguments it acts as if the
-\f(CW-s\fR flag had been given.  That is, it runs a shell as root (the
-shell is determined by the \f(CWSHELL\fR environment variable if it is
+\&\f(CW\*(C`\-s\*(C'\fR flag had been given.  That is, it runs a shell as root (the
+shell is determined by the \f(CW\*(C`SHELL\*(C'\fR environment variable if it is
 set, falling back on the shell listed in the invoking user's
 /etc/passwd entry if not).  This flag is off by default.
 .Ip "set_home" 12
-If set and \fBsudo\fR is invoked with the \f(CW-s\fR flag the \f(CWHOME\fR
+.IX Item "set_home"
+If set and \fBsudo\fR is invoked with the \f(CW\*(C`\-s\*(C'\fR flag the \f(CW\*(C`HOME\*(C'\fR
 environment variable will be set to the home directory of the target
-user (which is root unless the \f(CW-u\fR option is used).  This effectively
-makes the \f(CW-s\fR flag imply \f(CW-H\fR.  This flag is off by default.
+user (which is root unless the \f(CW\*(C`\-u\*(C'\fR option is used).  This effectively
+makes the \f(CW\*(C`\-s\*(C'\fR flag imply \f(CW\*(C`\-H\*(C'\fR.  This flag is off by default.
 .Ip "path_info" 12
+.IX Item "path_info"
 Normally, \fBsudo\fR will tell the user when a command could not be
-found in their \f(CW$PATH\fR.  Some sites may wish to disable this as
+found in their \f(CW\*(C`$PATH\*(C'\fR.  Some sites may wish to disable this as
 it could be used to gather information on the location of executables
 that the normal user does not have access to.  The disadvantage is
-that if the executable is simply not in the user's \f(CW$PATH\fR, \fBsudo\fR
+that if the executable is simply not in the user's \f(CW\*(C`$PATH\*(C'\fR, \fBsudo\fR
 will tell the user that they are not allowed to run it, which can
 be confusing.  This flag is off by default.
 .Ip "fqdn" 12
+.IX Item "fqdn"
 Set this flag if you want to put fully qualified hostnames in the
-\fIsudoers\fR file.  Ie: instead of myhost you would use myhost.mydomain.edu.
+\&\fIsudoers\fR file.  Ie: instead of myhost you would use myhost.mydomain.edu.
 You may still use the short form if you wish (and even mix the two).
-Beware that turning on \fIfqdn\fR requires \fBsudo\fR to make \s-1DNS\s0 lookups
-which may make \fBsudo\fR unusable if \s-1DNS\s0 stops working (for example
+Beware that turning on \fIfqdn\fR requires \fBsudo\fR to make DNS lookups
+which may make \fBsudo\fR unusable if DNS stops working (for example
 if the machine is not plugged into the network).  Also note that
-you must use the host's official name as \s-1DNS\s0 knows it.  That is,
-you may not use a host alias (\f(CWCNAME\fR entry) due to performance
+you must use the host's official name as DNS knows it.  That is,
+you may not use a host alias (\f(CW\*(C`CNAME\*(C'\fR entry) due to performance
 issues and the fact that there is no way to get all aliases from
-\s-1DNS\s0.  If your machine's hostname (as returned by the \f(CWhostname\fR
+DNS.  If your machine's hostname (as returned by the \f(CW\*(C`hostname\*(C'\fR
 command) is already fully qualified you shouldn't need to set
-\fIfqfn\fR.  This flag is off by default.
+\&\fIfqfn\fR.  This flag is off by default.
 .Ip "insults" 12
+.IX Item "insults"
 If set, \fBsudo\fR will insult users when they enter an incorrect
 password.  This flag is off by default.
 .Ip "requiretty" 12
+.IX Item "requiretty"
 If set, \fBsudo\fR will only run when the user is logged in to a real
-tty.  This will disallow things like \f(CW"rsh somehost sudo ls"\fR since
-\fIrsh\fR\|(1) does not allocate a tty.  Because it is not possible to turn
+tty.  This will disallow things like \f(CW\*(C`"rsh somehost sudo ls"\*(C'\fR since
+\&\fIrsh\fR\|(1) does not allocate a tty.  Because it is not possible to turn
 of echo when there is no tty present, some sites may with to set
 this flag to prevent a user from entering a visible password.  This
 flag is off by default.
 .Ip "env_editor" 12
-If set, \fBvisudo\fR will use the value of the \s-1EDITOR\s0 or \s-1VISUAL\s0
+.IX Item "env_editor"
+If set, \fBvisudo\fR will use the value of the EDITOR or VISUAL
 environment variables before falling back on the default editor list.
 Note that this may create a security hole as it allows the user to
 run any arbitrary command as root without logging.  A safer alternative
-is to place a colon-separated list of editors in the \f(CWeditor\fR
-variable.  \fBvisudo\fR will then only use the \s-1EDITOR\s0 or \s-1VISUAL\s0 if
-they match a value specified in \f(CWeditor\fR.  This flag is off by
+is to place a colon-separated list of editors in the \f(CW\*(C`editor\*(C'\fR
+variable.  \fBvisudo\fR will then only use the EDITOR or VISUAL if
+they match a value specified in \f(CW\*(C`editor\*(C'\fR.  This flag is off by
 default.
 .Ip "rootpw" 12
+.IX Item "rootpw"
 If set, \fBsudo\fR will prompt for the root password instead of the password
 of the invoking user.  This flag is off by default.
 .Ip "runaspw" 12
+.IX Item "runaspw"
 If set, \fBsudo\fR will prompt for the password of the user defined by the
-\fIrunas_default\fR option (defaults to root) instead of the password
+\&\fIrunas_default\fR option (defaults to root) instead of the password
 of the invoking user.  This flag is off by default.
 .Ip "targetpw" 12
+.IX Item "targetpw"
 If set, \fBsudo\fR will prompt for the password of the user specified by
-the \f(CW-u\fR flag (defaults to root) instead of the password of the
+the \f(CW\*(C`\-u\*(C'\fR flag (defaults to root) instead of the password of the
 invoking user.  This flag is off by default.
 .Ip "set_logname" 12
-Normally, \fBsudo\fR will set the \f(CWLOGNAME\fR and \f(CWUSER\fR environment variables
-to the name of the target user (usually root unless the \f(CW-u\fR flag is given).
-However, since some programs (including the \s-1RCS\s0 revision control system)
-use \f(CWLOGNAME\fR to determine the real identity of the user, it may be desirable
+.IX Item "set_logname"
+Normally, \fBsudo\fR will set the \f(CW\*(C`LOGNAME\*(C'\fR and \f(CW\*(C`USER\*(C'\fR environment variables
+to the name of the target user (usually root unless the \f(CW\*(C`\-u\*(C'\fR flag is given).
+However, since some programs (including the RCS revision control system)
+use \f(CW\*(C`LOGNAME\*(C'\fR to determine the real identity of the user, it may be desirable
 to change this behavior.  This can be done by negating the set_logname option.
 .Ip "use_loginclass" 12
+.IX Item "use_loginclass"
 If set, \fBsudo\fR will apply the defaults specified for the target user's
 login class if one exists.  Only available if \fBsudo\fR is configured with
-the --with-logincap option.  This flag is off by default.
+the \-\-with-logincap option.  This flag is off by default.
 .PP
-\fBIntegers\fR:
+\&\fBIntegers\fR:
 .Ip "passwd_tries" 12
+.IX Item "passwd_tries"
 The number of tries a user gets to enter his/her password before
-\fBsudo\fR logs the failure and exits.  The default is 3.
+\&\fBsudo\fR logs the failure and exits.  The default is 3.
 .PP
-\fBIntegers that can be used in a boolean context\fR:
+\&\fBIntegers that can be used in a boolean context\fR:
 .Ip "loglinelen" 12
+.IX Item "loglinelen"
 Number of characters per line for the file log.  This value is used
 to decide when to wrap lines for nicer log files.  This has no
 effect on the syslog log file, only the file log.  The default is
 80 (use 0 or negate to disable word wrap).
 .Ip "timestamp_timeout" 12
+.IX Item "timestamp_timeout"
 Number of minutes that can elapse before \fBsudo\fR will ask for a passwd
 again.  The default is 5, set this to 0 to always prompt for a password.
 .Ip "passwd_timeout" 12
+.IX Item "passwd_timeout"
 Number of minutes before the \fBsudo\fR password prompt times out.
 The default is 5, set this to 0 for no password timeout.
 .Ip "umask" 12
+.IX Item "umask"
 Umask to use when running the root command.  Set this to 0777 to
 not override the user's umask.  The default is 0022.
 .PP
-\fBStrings\fR:
+\&\fBStrings\fR:
 .Ip "mailsub" 12
-Subject of the mail sent to the \fImailto\fR user. The escape \f(CW%h\fR
+.IX Item "mailsub"
+Subject of the mail sent to the \fImailto\fR user. The escape \f(CW\*(C`%h\*(C'\fR
 will expand to the hostname of the machine.
-Default is \*(L"*** \s-1SECURITY\s0 information for \f(CW%h\fR ***\*(R".
+Default is \*(L"*** SECURITY information for \f(CW%h\fR ***\*(R".
 .Ip "badpass_message" 12
+.IX Item "badpass_message"
 Message that is displayed if a user enters an incorrect password.
 The default is \*(L"Sorry, try again.\*(R" unless insults are enabled.
 .Ip "timestampdir" 12
+.IX Item "timestampdir"
 The directory in which \fBsudo\fR stores its timestamp files.
-The default is \fI@\s-1TIMEDIR\s0@\fR.
+The default is \fI@TIMEDIR@\fR.
 .Ip "passprompt" 12
+.IX Item "passprompt"
 The default prompt to use when asking for a password; can be overridden
-via the \f(CW-p\fR option or the \f(CWSUDO_PROMPT\fR environment variable. Supports
+via the \f(CW\*(C`\-p\*(C'\fR option or the \f(CW\*(C`SUDO_PROMPT\*(C'\fR environment variable. Supports
 two escapes: \*(L"%u\*(R" expands to the user's login name and \*(L"%h\*(R" expands
 to the local hostname.  The default value is \*(L"Password:\*(R".
 .Ip "runas_default" 12
-The default user to run commands as if the \f(CW-u\fR flag is not specified
+.IX Item "runas_default"
+The default user to run commands as if the \f(CW\*(C`\-u\*(C'\fR flag is not specified
 on the command line.  This defaults to \*(L"root\*(R".
 .Ip "syslog_goodpri" 12
+.IX Item "syslog_goodpri"
 Syslog priority to use when user authenticates successfully.
 Defaults to \*(L"notice\*(R".
 .Ip "syslog_badpri" 12
+.IX Item "syslog_badpri"
 Syslog priority to use when user authenticates unsuccessfully.
 Defaults to \*(L"alert\*(R".
 .Ip "editor" 12
+.IX Item "editor"
 A colon (':') separated list of editors allowed to be used with
-\fBvisudo\fR.  \fBvisudo\fR will choose the editor that matches the user's
-\s-1USER\s0 environment variable if possible, or the first editor in the
+\&\fBvisudo\fR.  \fBvisudo\fR will choose the editor that matches the user's
+USER environment variable if possible, or the first editor in the
 list that exists and is executable.  The default is the path to vi
 on your system.
 .PP
-\fBStrings that can be used in a boolean context\fR:
+\&\fBStrings that can be used in a boolean context\fR:
 .Ip "logfile" 12
+.IX Item "logfile"
 Path to the \fBsudo\fR log file (not the syslog log file).  Setting a path
 turns on logging to a file, negating this option turns it off.
 .Ip "syslog" 12
+.IX Item "syslog"
 Syslog facility if syslog is being used for logging (negate to
 disable syslog logging).  Defaults to \*(L"local2\*(R".
 .Ip "mailerpath" 12
+.IX Item "mailerpath"
 Path to mail program used to send warning mail.
 Defaults to the path to sendmail found at configure time.
 .Ip "mailerflags" 12
-Flags to use when invoking mailer. Defaults to \f(CW-t\fR.
+.IX Item "mailerflags"
+Flags to use when invoking mailer. Defaults to \f(CW\*(C`\-t\*(C'\fR.
 .Ip "mailto" 12
+.IX Item "mailto"
 Address to send warning and erorr mail to.  Defaults to \*(L"root\*(R".
 .Ip "exempt_group" 12
-Users in this group are exempt from password and \s-1PATH\s0 requirements.
+.IX Item "exempt_group"
+Users in this group are exempt from password and PATH requirements.
 This is not set by default.
 .Ip "secure_path" 12
+.IX Item "secure_path"
 Path used for every command run from \fBsudo\fR.  If you don't trust the
-people running \fBsudo\fR to have a sane \f(CWPATH\fR environment variable you may
+people running \fBsudo\fR to have a sane \f(CW\*(C`PATH\*(C'\fR environment variable you may
 want to use this.  Another use is if you want to have the \*(L"root path\*(R"
 be separate from the \*(L"user path.\*(R"  This is not set by default.
 .Ip "verifypw" 12
+.IX Item "verifypw"
 This option controls when a password will be required when a
 user runs \fBsudo\fR with the \fB\-v\fR.  It has the following possible values:
 .Sp
@@ -603,8 +599,9 @@ user runs \fBsudo\fR with the \fB\-v\fR.  It has the following possible values:
 \&    always      The user must always enter a password to use
 \&                the B<-v> flag.
 .Ve
-The default value is `all\*(R'.
+The default value is `all'.
 .Ip "listpw" 12
+.IX Item "listpw"
 This option controls when a password will be required when a
 user runs \fBsudo\fR with the \fB\-l\fR.  It has the following possible values:
 .Sp
@@ -627,16 +624,16 @@ user runs \fBsudo\fR with the \fB\-l\fR.  It has the following possible values:
 \&    always      The user must always enter a password to use
 \&                the B<-l> flag.
 .Ve
-The default value is `any\*(R'.
+The default value is `any'.
 .PP
 When logging via \fIsyslog\fR\|(3), \fBsudo\fR accepts the following values for the syslog
-facility (the value of the \fBsyslog\fR Parameter): \fBauthpriv\fR (if your \s-1OS\s0
+facility (the value of the \fBsyslog\fR Parameter): \fBauthpriv\fR (if your OS
 supports it), \fBauth\fR, \fBdaemon\fR, \fBuser\fR, \fBlocal0\fR, \fBlocal1\fR, \fBlocal2\fR,
-\fBlocal3\fR, \fBlocal4\fR, \fBlocal5\fR, \fBlocal6\fR, and \fBlocal7\fR.  The following
+\&\fBlocal3\fR, \fBlocal4\fR, \fBlocal5\fR, \fBlocal6\fR, and \fBlocal7\fR.  The following
 syslog priorities are supported: \fBalert\fR, \fBcrit\fR, \fBdebug\fR, \fBemerg\fR,
-\fBerr\fR, \fBinfo\fR, \fBnotice\fR, and \fBwarning\fR.
+\&\fBerr\fR, \fBinfo\fR, \fBnotice\fR, and \fBwarning\fR.
 .Sh "User Specification"
-.PP
+.IX Subsection "User Specification"
 .Vb 2
 \& User_Spec ::= User_list Host_List '=' User_List Cmnd_Spec_List \e
 \&               (':' User_Spec)*
@@ -657,22 +654,23 @@ run as \fBroot\fR but this can be changed on a per-command basis.
 .PP
 Let's break that down into its constituent parts:
 .Sh "Runas_Spec"
-A \f(CWRunas_Spec\fR is simply a \f(CWRunas_List\fR (as defined above)
+.IX Subsection "Runas_Spec"
+A \f(CW\*(C`Runas_Spec\*(C'\fR is simply a \f(CW\*(C`Runas_List\*(C'\fR (as defined above)
 enclosed in a set of parentheses.  If you do not specify a
-\f(CWRunas_Spec\fR in the user specification, a default \f(CWRunas_Spec\fR
-of \fBroot\fR will be used.  A \f(CWRunas_Spec\fR sets the default for
+\&\f(CW\*(C`Runas_Spec\*(C'\fR in the user specification, a default \f(CW\*(C`Runas_Spec\*(C'\fR
+of \fBroot\fR will be used.  A \f(CW\*(C`Runas_Spec\*(C'\fR sets the default for
 commands that follow it.  What this means is that for the entry:
 .PP
 .Vb 1
 \& dgb    boulder = (operator) /bin/ls, /bin/kill, /usr/bin/who
 .Ve
 The user \fBdgb\fR may run \fI/bin/ls\fR, \fI/bin/kill\fR, and
-\fI/usr/bin/lprm\fR -- but only as \fBoperator\fR.  Eg.
+\&\fI/usr/bin/lprm\fR \*(-- but only as \fBoperator\fR.  Eg.
 .PP
 .Vb 1
 \&    sudo -u operator /bin/ls.
 .Ve
-It is also possible to override a \f(CWRunas_Spec\fR later on in an
+It is also possible to override a \f(CW\*(C`Runas_Spec\*(C'\fR later on in an
 entry.  If we modify the entry like so:
 .PP
 .Vb 1
@@ -680,48 +678,55 @@ entry.  If we modify the entry like so:
 .Ve
 Then user \fBdgb\fR is now allowed to run \fI/bin/ls\fR as \fBoperator\fR,
 but  \fI/bin/kill\fR and \fI/usr/bin/lprm\fR as \fBroot\fR.
-.Sh "\s-1NOPASSWD\s0 and \s-1PASSWD\s0"
+.Sh "NOPASSWD and PASSWD"
+.IX Subsection "NOPASSWD and PASSWD"
 By default, \fBsudo\fR requires that a user authenticate him or herself
 before running a command.  This behavior can be modified via the
-\f(CWNOPASSWD\fR tag.  Like a \f(CWRunas_Spec\fR, the \f(CWNOPASSWD\fR tag sets
-a default for the commands that follow it in the \f(CWCmnd_Spec_List\fR.
-Conversely, the \f(CWPASSWD\fR tag can be used to reverse things.
+\&\f(CW\*(C`NOPASSWD\*(C'\fR tag.  Like a \f(CW\*(C`Runas_Spec\*(C'\fR, the \f(CW\*(C`NOPASSWD\*(C'\fR tag sets
+a default for the commands that follow it in the \f(CW\*(C`Cmnd_Spec_List\*(C'\fR.
+Conversely, the \f(CW\*(C`PASSWD\*(C'\fR tag can be used to reverse things.
 For example:
 .PP
 .Vb 1
 \& ray    rushmore = NOPASSWD: /bin/kill, /bin/ls, /usr/bin/lprm
 .Ve
 would allow the user \fBray\fR to run \fI/bin/kill\fR, \fI/bin/ls\fR, and
-\fI/usr/bin/lprm\fR as root on the machine rushmore as \fBroot\fR without
+\&\fI/usr/bin/lprm\fR as root on the machine rushmore as \fBroot\fR without
 authenticating himself.  If we only want \fBray\fR to be able to
 run \fI/bin/kill\fR without a password the entry would be:
 .PP
 .Vb 1
 \& ray    rushmore = NOPASSWD: /bin/kill, PASSWD: /bin/ls, /usr/bin/lprm
 .Ve
-Note however, that the \f(CWPASSWD\fR tag has no effect on users who are
+Note however, that the \f(CW\*(C`PASSWD\*(C'\fR tag has no effect on users who are
 in the group specified by the exempt_group option.
 .PP
-By default, if the \f(CWNOPASSWD\fR tag is applied to any of the entries
+By default, if the \f(CW\*(C`NOPASSWD\*(C'\fR tag is applied to any of the entries
 for a user on the current host, he or she will be able to run
-\f(CWsudo -l\fR without a password.  Additionally, a user may only run
-\f(CWsudo -v\fR without a password if the \f(CWNOPASSWD\fR tag is present
+\&\f(CW\*(C`sudo \-l\*(C'\fR without a password.  Additionally, a user may only run
+\&\f(CW\*(C`sudo \-v\*(C'\fR without a password if the \f(CW\*(C`NOPASSWD\*(C'\fR tag is present
 for all a user's entries that pertain to the current host.
 This behavior may be overridden via the verifypw and listpw options.
 .Sh "Wildcards (aka meta characters):"
-\fBsudo\fR allows shell-style \fIwildcards\fR to be used in pathnames
+.IX Subsection "Wildcards (aka meta characters):"
+\&\fBsudo\fR allows shell-style \fIwildcards\fR to be used in pathnames
 as well as command line arguments in the \fIsudoers\fR file.  Wildcard
-matching is done via the \fB\s-1POSIX\s0\fR \f(CWfnmatch(3)\fR routine.  Note that
+matching is done via the \fBPOSIX\fR \f(CW\*(C`fnmatch(3)\*(C'\fR routine.  Note that
 these are \fInot\fR regular expressions.
-.Ip "\f(CW*\fR" 8
+.Ip "\f(CW\*(C`*\*(C'\fR" 8
+.IX Item "*"
 Matches any set of zero or more characters.
-.Ip "\f(CW?\fR" 8
+.Ip "\f(CW\*(C`?\*(C'\fR" 8
+.IX Item "?"
 Matches any single character.
-.Ip "\f(CW[...]\fR" 8
+.Ip "\f(CW\*(C`[...]\*(C'\fR" 8
+.IX Item "[...]"
 Matches any character in the specified range.
-.Ip "\f(CW[!...]\fR" 8
+.Ip "\f(CW\*(C`[!...]\*(C'\fR" 8
+.IX Item "[!...]"
 Matches any character \fBnot\fR in the specified range.
-.Ip "\f(CW\ex\fR" 8
+.Ip "\f(CW\*(C`\ex\*(C'\fR" 8
+.IX Item "x"
 For any character \*(L"x\*(R", evaluates to \*(L"x\*(R".  This is used to
 escape special characters such as: \*(L"*\*(R", \*(L"?\*(R", \*(L"[\*(R", and \*(L"}\*(R".
 .PP
@@ -733,45 +738,50 @@ wildcards.  This is to make a path like:
 .Vb 1
 \&    /usr/bin/*
 .Ve
-match \f(CW/usr/bin/who\fR but not \f(CW/usr/bin/X11/xterm\fR.
+match \f(CW\*(C`/usr/bin/who\*(C'\fR but not \f(CW\*(C`/usr/bin/X11/xterm\*(C'\fR.
 .Sh "Exceptions to wildcard rules:"
+.IX Subsection "Exceptions to wildcard rules:"
 The following exceptions apply to the above rules:
-.Ip \f(CW""\fR 8
-If the empty string \f(CW""\fR is the only command line argument in the
-\fIsudoers\fR entry it means that command is not allowed to be run
+.if n .Ip "\f(CW\*(C`""""""""\*(C'\fR" 8
+.el .Ip "\f(CW\*(C```''\*(C'\fR" 8
+.IX Item """""
+If the empty string \f(CW\*(C`""\*(C'\fR is the only command line argument in the
+\&\fIsudoers\fR entry it means that command is not allowed to be run
 with \fBany\fR arguments.
 .Sh "Other special characters and reserved words:"
+.IX Subsection "Other special characters and reserved words:"
 The pound sign ('#') is used to indicate a comment (unless it
 occurs in the context of a user name and is followed by one or
 more digits, in which case it is treated as a uid).  Both the
 comment character and any text after it, up to the end of the line,
 are ignored.
 .PP
-The reserved word \fB\s-1ALL\s0\fR is a built in \fIalias\fR that always causes
+The reserved word \fBALL\fR is a built in \fIalias\fR that always causes
 a match to succeed.  It can be used wherever one might otherwise
-use a \f(CWCmnd_Alias\fR, \f(CWUser_Alias\fR, \f(CWRunas_Alias\fR, or \f(CWHost_Alias\fR.
-You should not try to define your own \fIalias\fR called \fB\s-1ALL\s0\fR as the
+use a \f(CW\*(C`Cmnd_Alias\*(C'\fR, \f(CW\*(C`User_Alias\*(C'\fR, \f(CW\*(C`Runas_Alias\*(C'\fR, or \f(CW\*(C`Host_Alias\*(C'\fR.
+You should not try to define your own \fIalias\fR called \fBALL\fR as the
 built in alias will be used in preference to your own.  Please note
-that using \fB\s-1ALL\s0\fR can be dangerous since in a command context, it
+that using \fBALL\fR can be dangerous since in a command context, it
 allows the user to run \fBany\fR command on the system.
 .PP
-An exclamation point (\*(R'!') can be used as a logical \fInot\fR operator
-both in an \fIalias\fR and in front of a \f(CWCmnd\fR.  This allows one to
-exclude certain values.  Note, however, that using a \f(CW!\fR in
-conjunction with the built in \f(CWALL\fR alias to allow a user to
-run \*(L"all but a few\*(R" commands rarely works as intended (see \s-1SECURITY\s0
-\s-1NOTES\s0 below).
+An exclamation point ('!') can be used as a logical \fInot\fR operator
+both in an \fIalias\fR and in front of a \f(CW\*(C`Cmnd\*(C'\fR.  This allows one to
+exclude certain values.  Note, however, that using a \f(CW\*(C`!\*(C'\fR in
+conjunction with the built in \f(CW\*(C`ALL\*(C'\fR alias to allow a user to
+run \*(L"all but a few\*(R" commands rarely works as intended (see SECURITY
+NOTES below).
 .PP
-Long lines can be continued with a backslash (\*(R'\e') as the last
+Long lines can be continued with a backslash ('\e') as the last
 character on the line.
 .PP
 Whitespace between elements in a list as well as specicial syntactic
-characters in a \fIUser Specification\fR ('=\*(R', \*(L':\*(R', \*(L'(\*(R', \*(L')') is optional.
+characters in a \fIUser Specification\fR ('=', ':', '(', ')') is optional.
 .PP
-The following characters must be escaped with a backslash (\*(R'\e') when
+The following characters must be escaped with a backslash ('\e') when
 used as part of a word (eg. a username or hostname):
-\&'@\*(R', \*(L'!\*(R', \*(L'=\*(R', \*(L':\*(R', \*(L',\*(R', \*(L'(\*(R', \*(L')\*(R', \*(L'\e\*(R'.
+\&'@', '!', '=', ':', ',', '(', ')', '\e'.
 .SH "EXAMPLES"
+.IX Header "EXAMPLES"
 Below are example \fIsudoers\fR entries.  Admittedly, some of
 these are a bit contrived.  First, we define our \fIaliases\fR:
 .PP
@@ -812,10 +822,10 @@ these are a bit contrived.  First, we define our \fIaliases\fR:
 \& Cmnd_Alias     SU = /usr/bin/su
 .Ve
 Here we override some of the compiled in default values.  We want
-\fBsudo\fR to log via \fIsyslog\fR\|(3) using the \fIauth\fR facility in all cases.
+\&\fBsudo\fR to log via \fIsyslog\fR\|(3) using the \fIauth\fR facility in all cases.
 We don't want to subject the full time staff to the \fBsudo\fR lecture,
 and user \fBmillert\fR need not give a password.  In addition, on the
-machines in the \fISERVERS\fR \f(CWHost_Alias\fR, we keep an additional
+machines in the \fISERVERS\fR \f(CW\*(C`Host_Alias\*(C'\fR, we keep an additional
 local log file and make sure we log the year in each log line since
 the log entries will be kept around for several years.
 .PP
@@ -847,13 +857,13 @@ command on any host without authenticating themselves.
 .Ve
 Part time sysadmins (\fBbostley\fR, \fBjwfox\fR, and \fBcrawl\fR) may run any
 command on any host but they must authenticate themselves first
-(since the entry lacks the \f(CWNOPASSWD\fR tag).
+(since the entry lacks the \f(CW\*(C`NOPASSWD\*(C'\fR tag).
 .PP
 .Vb 1
 \& jack           CSNETS = ALL
 .Ve
 The user \fBjack\fR may run any command on the machines in the \fICSNETS\fR alias
-(the networks \f(CW128.138.243.0\fR, \f(CW128.138.204.0\fR, and \f(CW128.138.242.0\fR).
+(the networks \f(CW\*(C`128.138.243.0\*(C'\fR, \f(CW\*(C`128.138.204.0\*(C'\fR, and \f(CW\*(C`128.138.242.0\*(C'\fR).
 Of those networks, only <128.138.204.0> has an explicit netmask (in
 CIDR notation) indicating it is a class C network.  For the other
 networks in \fICSNETS\fR, the local machine's netmask will be used
@@ -863,7 +873,7 @@ during matching.
 \& lisa           CUNETS = ALL
 .Ve
 The user \fBlisa\fR may run any command on any host in the \fICUNETS\fR alias
-(the class B network \f(CW128.138.0.0\fR).
+(the class B network \f(CW\*(C`128.138.0.0\*(C'\fR).
 .PP
 .Vb 2
 \& operator       ALL = DUMPS, KILL, PRINTING, SHUTDOWN, HALT, REBOOT,\e
@@ -890,13 +900,13 @@ does not take multiple usernames on the command line.
 \& bob            SPARC = (OP) ALL : SGI = (OP) ALL
 .Ve
 The user \fBbob\fR may run anything on the \fISPARC\fR and \fISGI\fR machines
-as any user listed in the \fIOP\fR \f(CWRunas_Alias\fR (\fBroot\fR and \fBoperator\fR).
+as any user listed in the \fIOP\fR \f(CW\*(C`Runas_Alias\*(C'\fR (\fBroot\fR and \fBoperator\fR).
 .PP
 .Vb 1
 \& jim            +biglab = ALL
 .Ve
 The user \fBjim\fR may run any command on machines in the \fIbiglab\fR netgroup.
-\fBSudo\fR knows that \*(L"biglab\*(R" is a netgroup due to the \*(L'+\*(R' prefix.
+\&\fBSudo\fR knows that \*(L"biglab\*(R" is a netgroup due to the '+' prefix.
 .PP
 .Vb 1
 \& +secretaries   ALL = PRINTING, /usr/bin/adduser, /usr/bin/rmuser
@@ -908,7 +918,7 @@ commands on all machines.
 .Vb 1
 \& fred           ALL = (DB) NOPASSWD: ALL
 .Ve
-The user \fBfred\fR can run commands as any user in the \fIDB\fR \f(CWRunas_Alias\fR
+The user \fBfred\fR can run commands as any user in the \fIDB\fR \f(CW\*(C`Runas_Alias\*(C'\fR
 (\fBoracle\fR or \fBsybase\fR) without giving a password.
 .PP
 .Vb 1
@@ -921,14 +931,14 @@ but he is not allowed to give \fIsu\fR\|(1) any flags.
 \& jen            ALL, !SERVERS = ALL
 .Ve
 The user \fBjen\fR may run any command on any machine except for those
-in the \fISERVERS\fR \f(CWHost_Alias\fR (master, mail, www and ns).
+in the \fISERVERS\fR \f(CW\*(C`Host_Alias\*(C'\fR (master, mail, www and ns).
 .PP
 .Vb 1
 \& jill           SERVERS = /usr/bin/, !SU, !SHELLS
 .Ve
-For any machine in the \fISERVERS\fR \f(CWHost_Alias\fR, \fBjill\fR may run
+For any machine in the \fISERVERS\fR \f(CW\*(C`Host_Alias\*(C'\fR, \fBjill\fR may run
 any commands in the directory /usr/bin/ except for those commands
-belonging to the \fISU\fR and \fISHELLS\fR \f(CWCmnd_Aliases\fR.
+belonging to the \fISU\fR and \fISHELLS\fR \f(CW\*(C`Cmnd_Aliases\*(C'\fR.
 .PP
 .Vb 1
 \& steve          CSNETS = (operator) /usr/local/op_commands/
@@ -945,7 +955,7 @@ kill hung processes.
 .Vb 1
 \& WEBMASTERS     www = (www) ALL, (root) /usr/bin/su www
 .Ve
-On the host www, any user in the \fIWEBMASTERS\fR \f(CWUser_Alias\fR (will,
+On the host www, any user in the \fIWEBMASTERS\fR \f(CW\*(C`User_Alias\*(C'\fR (will,
 wendy, and wim), may run any command as user www (which owns the
 web pages) or simply \fIsu\fR\|(1) to www.
 .PP
@@ -953,13 +963,14 @@ web pages) or simply \fIsu\fR\|(1) to www.
 \& ALL            CDROM = NOPASSWD: /sbin/umount /CDROM,\e
 \&                /sbin/mount -o nosuid\e,nodev /dev/cd0a /CDROM
 .Ve
-Any user may mount or unmount a CD\-ROM on the machines in the CDROM
-\f(CWHost_Alias\fR (orion, perseus, hercules) without entering a password.
+Any user may mount or unmount a CD-ROM on the machines in the CDROM
+\&\f(CW\*(C`Host_Alias\*(C'\fR (orion, perseus, hercules) without entering a password.
 This is a bit tedious for users to type, so it is a prime candiate
 for encapsulating in a shell script.
 .SH "SECURITY NOTES"
-It is generally not effective to \*(L"subtract\*(R" commands from \f(CWALL\fR
-using the \*(L'!\*(R' operator.  A user can trivially circumvent this
+.IX Header "SECURITY NOTES"
+It is generally not effective to \*(L"subtract\*(R" commands from \f(CW\*(C`ALL\*(C'\fR
+using the '!' operator.  A user can trivially circumvent this
 by copying the desired command to a different name and then
 executing that.  For example:
 .PP
@@ -967,11 +978,12 @@ executing that.  For example:
 \&    bill        ALL = ALL, !SU, !SHELLS
 .Ve
 Doesn't really prevent \fBbill\fR from running the commands listed in
-\fISU\fR or \fISHELLS\fR since he can simply copy those commands to a
+\&\fISU\fR or \fISHELLS\fR since he can simply copy those commands to a
 different name, or use a shell escape from an editor or other
 program.  Therefore, these kind of restrictions should be considered
 advisory at best (and reinforced by policy).
 .SH "CAVEATS"
+.IX Header "CAVEATS"
 The \fIsudoers\fR file should \fBalways\fR be edited by the \fBvisudo\fR
 command which locks the file and does grammatical checking. It is
 imperative that \fIsudoers\fR be free of syntax errors since \fBsudo\fR
@@ -980,161 +992,15 @@ will not run with a syntactically incorrect \fIsudoers\fR file.
 When using netgroups of machines (as opposed to users), if you
 store fully qualified hostnames in the netgroup (as is usually the
 case), you either need to have the machine's hostname be fully qualified
-as returned by the \f(CWhostname\fR command or use the \fIfqdn\fR option in
-\fIsudoers\fR.
+as returned by the \f(CW\*(C`hostname\*(C'\fR command or use the \fIfqdn\fR option in
+\&\fIsudoers\fR.
 .SH "FILES"
-.PP
+.IX Header "FILES"
 .Vb 3
 \& @sysconfdir@/sudoers           List of who can run what
 \& /etc/group             Local groups file
 \& /etc/netgroup          List of network groups
 .Ve
 .SH "SEE ALSO"
-\fIsudo\fR\|(@mansectsu@), \fIvisudo\fR\|(@mansectsu@), \fIsu\fR\|(1), \fIfnmatch\fR\|(3).
-
-.rn }` ''
-.IX Title "sudoers @mansectform@"
-.IX Name "sudoers - list of which users may execute what"
-
-.IX Header "NAME"
-
-.IX Header "DESCRIPTION"
-
-.IX Subsection "Quick guide to \s-1EBNF\s0"
-
-.IX Item "\f(CW?\fR"
-
-.IX Item "\f(CW*\fR"
-
-.IX Item "\f(CW+\fR"
-
-.IX Subsection "Aliases"
-
-.IX Subsection "Defaults"
-
-.IX Item "long_otp_prompt"
-
-.IX Item "ignore_dot"
-
-.IX Item "mail_always"
-
-.IX Item "mail_no_user"
-
-.IX Item "mail_no_host"
-
-.IX Item "mail_no_perms"
-
-.IX Item "tty_tickets"
-
-.IX Item "lecture"
-
-.IX Item "authenticate"
-
-.IX Item "root_sudo"
-
-.IX Item "log_host"
-
-.IX Item "log_year"
-
-.IX Item "shell_noargs"
-
-.IX Item "set_home"
-
-.IX Item "path_info"
-
-.IX Item "fqdn"
-
-.IX Item "insults"
-
-.IX Item "requiretty"
-
-.IX Item "env_editor"
-
-.IX Item "rootpw"
-
-.IX Item "runaspw"
-
-.IX Item "targetpw"
-
-.IX Item "set_logname"
-
-.IX Item "use_loginclass"
-
-.IX Item "passwd_tries"
-
-.IX Item "loglinelen"
-
-.IX Item "timestamp_timeout"
-
-.IX Item "passwd_timeout"
-
-.IX Item "umask"
-
-.IX Item "mailsub"
-
-.IX Item "badpass_message"
-
-.IX Item "timestampdir"
-
-.IX Item "passprompt"
-
-.IX Item "runas_default"
-
-.IX Item "syslog_goodpri"
-
-.IX Item "syslog_badpri"
-
-.IX Item "editor"
-
-.IX Item "logfile"
-
-.IX Item "syslog"
-
-.IX Item "mailerpath"
-
-.IX Item "mailerflags"
-
-.IX Item "mailto"
-
-.IX Item "exempt_group"
-
-.IX Item "secure_path"
-
-.IX Item "verifypw"
-
-.IX Item "listpw"
-
-.IX Subsection "User Specification"
-
-.IX Subsection "Runas_Spec"
-
-.IX Subsection "\s-1NOPASSWD\s0 and \s-1PASSWD\s0"
-
-.IX Subsection "Wildcards (aka meta characters):"
-
-.IX Item "\f(CW*\fR"
-
-.IX Item "\f(CW?\fR"
-
-.IX Item "\f(CW[...]\fR"
-
-.IX Item "\f(CW[!...]\fR"
-
-.IX Item "\f(CW\ex\fR"
-
-.IX Subsection "Exceptions to wildcard rules:"
-
-.IX Item \f(CW""\fR
-
-.IX Subsection "Other special characters and reserved words:"
-
-.IX Header "EXAMPLES"
-
-.IX Header "SECURITY NOTES"
-
-.IX Header "CAVEATS"
-
-.IX Header "FILES"
-
 .IX Header "SEE ALSO"
-
+\&\fIsudo\fR\|(@mansectsu@), \fIvisudo\fR\|(8), \fIsu\fR\|(1), \fIfnmatch\fR\|(3).
diff --git a/visudo.cat b/visudo.cat
index 0c262063f..98fe5b419 100644
--- a/visudo.cat
+++ b/visudo.cat
@@ -12,14 +12,14 @@ SSSSYYYYNNNNOOOOPPPPSSSSIIIISSSS
 
 DDDDEEEESSSSCCCCRRRRIIIIPPPPTTTTIIIIOOOONNNN
        vvvviiiissssuuuuddddoooo edits the _s_u_d_o_e_r_s file in a safe fashion, analogous
-       to _v_i_p_w(1m).  vvvviiiissssuuuuddddoooo locks the _s_u_d_o_e_r_s file against
-       multiple simultaneous edits, provides basic sanity checks,
-       and checks for parse errors.  If the _s_u_d_o_e_r_s file is
-       currently being edited you will receive a message to try
-       again later.  In the default configuration, the _v_i(1)
-       editor is used, but there is a compile time option to
-       allow use of whatever editor the environment variables
-       EDITOR or VISUAL are set to.
+       to _v_i_p_w(1m).  vvvviiiissssuuuuddddoooo locks the _s_u_d_o_e_r_s file against multi­
+       ple simultaneous edits, provides basic sanity checks, and
+       checks for parse errors.  If the _s_u_d_o_e_r_s file is currently
+       being edited you will receive a message to try again
+       later.  In the default configuration, the _v_i(1) editor is
+       used, but there is a compile time option to allow use of
+       whatever editor the environment variables `EDITOR' or
+       `VISUAL' are set to.
 
        vvvviiiissssuuuuddddoooo parses the _s_u_d_o_e_r_s file after the edit and will not
        save the changes if there is a syntax error.  Upon finding
@@ -41,14 +41,13 @@ OOOOPPPPTTTTIIIIOOOONNNNSSSS
        vvvviiiissssuuuuddddoooo accepts the following command line option:
 
        -s  Enable ssssttttrrrriiiicccctttt checking of the _s_u_d_o_e_r_s file.  If an
-           alias is used before it is defined, vvvviiiissssuuuuddddoooo will
-           consider this a parse error.  Note that it is not
-           possible to differentiate between an alias and a
-           hostname or username that consists solely of upper
-           case letters, digits, and the underscore ('_')
-           character.
+           alias is used before it is defined, vvvviiiissssuuuuddddoooo will con­
+           sider this a parse error.  Note that it is not possi­
+           ble to differentiate between an alias and a hostname
+           or username that consists solely of upper case let­
+           ters, digits, and the underscore ('_') character.
 
-       -V  The -V (version) option causes vvvviiiissssuuuuddddoooo to print the
+       -V  The `-V' (version) option causes vvvviiiissssuuuuddddoooo to print the
            version number and exit.
 
 EEEERRRRRRRROOOORRRRSSSS
@@ -61,7 +60,8 @@ EEEERRRRRRRROOOORRRRSSSS
 
 
 
-26/Mar/2000                   1.6.3                             1
+
+April  7, 2000                1.6.3                             1
 
 
 
@@ -96,8 +96,8 @@ FFFFIIIILLLLEEEESSSS
 
 
 AAAAUUUUTTTTHHHHOOOORRRR
-       Many people have worked on _s_u_d_o over the years, this
-       version of vvvviiiissssuuuuddddoooo was written by:
+       Many people have worked on _s_u_d_o over the years, this ver­
+       sion of vvvviiiissssuuuuddddoooo was written by:
 
         Todd Miller            <Todd.Miller@courtesan.com>
 
@@ -120,79 +120,13 @@ CCCCAAAAVVVVEEEEAAAATTTTSSSS
        shell if the editor used by vvvviiiissssuuuuddddoooo allows shell escapes.
 
 SSSSEEEEEEEE AAAALLLLSSSSOOOO
-       _s_u_d_o(1m), _v_i_p_w(1m).
+       _s_u_d_o(1m), _v_i_p_w(8).
 
 
 
 
 
 
-26/Mar/2000                   1.6.3                             2
-
-
-
-
-
-visudo(1m)             MAINTENANCE COMMANDS            visudo(1m)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-26/Mar/2000                   1.6.3                             3
+April  7, 2000                1.6.3                             2
 
 
diff --git a/visudo.man.in b/visudo.man.in
index 02cd6e301..715a5adb8 100644
--- a/visudo.man.in
+++ b/visudo.man.in
@@ -1,12 +1,9 @@
-.rn '' }`
-''' $RCSfile$$Revision$$Date$
-'''
-''' $Log$
-''' Revision 1.4  2000/03/27 03:26:24  millert
-''' Use @mansectsu@ and @mansectform@ in the man page bodies as well.
-'''
-'''
-.de Sh
+.\" Automatically generated by Pod::Man version 1.02
+.\" Fri Apr  7 08:37:07 2000
+.\"
+.\" Standard preamble:
+.\" ======================================================================
+.de Sh \" Subsection heading
 .br
 .if t .Sp
 .ne 5
@@ -14,150 +11,106 @@
 \fB\\$1\fR
 .PP
 ..
-.de Sp
+.de Sp \" Vertical space (when we can't use .PP)
 .if t .sp .5v
 .if n .sp
 ..
-.de Ip
+.de Ip \" List item
 .br
 .ie \\n(.$>=3 .ne \\$3
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.de Vb
+.de Vb \" Begin verbatim text
 .ft CW
 .nf
 .ne \\$1
 ..
-.de Ve
+.de Ve \" End verbatim text
 .ft R
 
 .fi
 ..
-'''
-'''
-'''     Set up \*(-- to give an unbreakable dash;
-'''     string Tr holds user defined translation string.
-'''     Bell System Logo is used as a dummy character.
-'''
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used
+.\" to do unbreakable dashes and therefore won't be available.  \*(C` and
+.\" \*(C' expand to `' in nroff, nothing in troff, for use with C<>
 .tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
 .ie n \{\
-.ds -- \(*W-
-.ds PI pi
-.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-.ds L" ""
-.ds R" ""
-'''   \*(M", \*(S", \*(N" and \*(T" are the equivalent of
-'''   \*(L" and \*(R", except that they are used on ".xx" lines,
-'''   such as .IP and .SH, which do another additional levels of
-'''   double-quote interpretation
-.ds M" """
-.ds S" """
-.ds N" """""
-.ds T" """""
-.ds L' '
-.ds R' '
-.ds M' '
-.ds S' '
-.ds N' '
-.ds T' '
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` `
+.    ds C' '
 'br\}
 .el\{\
-.ds -- \(em\|
-.tr \*(Tr
-.ds L" ``
-.ds R" ''
-.ds M" ``
-.ds S" ''
-.ds N" ``
-.ds T" ''
-.ds L' `
-.ds R' '
-.ds M' `
-.ds S' '
-.ds N' `
-.ds T' '
-.ds PI \(*p
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
 'br\}
-.\"	If the F register is turned on, we'll generate
-.\"	index entries out stderr for the following things:
-.\"		TH	Title 
-.\"		SH	Header
-.\"		Sh	Subsection 
-.\"		Ip	Item
-.\"		X<>	Xref  (embedded
-.\"	Of course, you have to process the output yourself
-.\"	in some meaninful fashion.
-.if \nF \{
-.de IX
-.tm Index:\\$1\t\\n%\t"\\$2"
-..
-.nr % 0
-.rr F
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr
+.\" for titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and
+.\" index entries marked with X<> in POD.  Of course, you'll have to process
+.\" the output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+.    .
+.    nr % 0
+.    rr F
 .\}
-.TH visudo @mansectsu@ "1.6.3" "26/Mar/2000" "MAINTENANCE COMMANDS"
-.UC
-.if n .hy 0
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it
+.\" makes way too many mistakes in technical documents.
+.hy 0
 .if n .na
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.de CQ          \" put $1 in typewriter font
-.ft CW
-'if n "\c
-'if t \\&\\$1\c
-'if n \\&\\$1\c
-'if n \&"
-\\&\\$2 \\$3 \\$4 \\$5 \\$6 \\$7
-'.ft R
-..
-.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
-.	\" AM - accent mark definitions
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
 .bd B 3
-.	\" fudge factors for nroff and troff
+.    \" fudge factors for nroff and troff
 .if n \{\
-.	ds #H 0
-.	ds #V .8m
-.	ds #F .3m
-.	ds #[ \f1
-.	ds #] \fP
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
 .\}
 .if t \{\
-.	ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.	ds #V .6m
-.	ds #F 0
-.	ds #[ \&
-.	ds #] \&
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
 .\}
-.	\" simple accents for nroff and troff
+.    \" simple accents for nroff and troff
 .if n \{\
-.	ds ' \&
-.	ds ` \&
-.	ds ^ \&
-.	ds , \&
-.	ds ~ ~
-.	ds ? ?
-.	ds ! !
-.	ds /
-.	ds q
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
 .\}
 .if t \{\
-.	ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.	ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.	ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.	ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.	ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.	ds ? \s-2c\h'-\w'c'u*7/10'\u\h'\*(#H'\zi\d\s+2\h'\w'c'u*8/10'
-.	ds ! \s-2\(or\s+2\h'-\w'\(or'u'\v'-.8m'.\v'.8m'
-.	ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.	ds q o\h'-\w'o'u*8/10'\s-4\v'.4m'\z\(*i\v'-.4m'\s+4\h'\w'o'u*8/10'
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
 .\}
-.	\" troff and (daisy-wheel) nroff accents
+.    \" troff and (daisy-wheel) nroff accents
 .ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
 .ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#]
-.ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u'
-.ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u'
-.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#]
 .ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
 .ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
 .ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
@@ -165,53 +118,52 @@
 .ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
 .ds ae a\h'-(\w'a'u*4/10)'e
 .ds Ae A\h'-(\w'A'u*4/10)'E
-.ds oe o\h'-(\w'o'u*4/10)'e
-.ds Oe O\h'-(\w'O'u*4/10)'E
-.	\" corrections for vroff
+.    \" corrections for vroff
 .if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
 .if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.	\" for low resolution devices (crt and lpr)
+.    \" for low resolution devices (crt and lpr)
 .if \n(.H>23 .if \n(.V>19 \
 \{\
-.	ds : e
-.	ds 8 ss
-.	ds v \h'-1'\o'\(aa\(ga'
-.	ds _ \h'-1'^
-.	ds . \h'-1'.
-.	ds 3 3
-.	ds o a
-.	ds d- d\h'-1'\(ga
-.	ds D- D\h'-1'\(hy
-.	ds th \o'bp'
-.	ds Th \o'LP'
-.	ds ae ae
-.	ds Ae AE
-.	ds oe oe
-.	ds Oe OE
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
 .\}
 .rm #[ #] #H #V #F C
+.\" ======================================================================
+.\"
+.IX Title "visudo @mansectsu@"
+.TH visudo @mansectsu@ "1.6.3" "April  7, 2000" "MAINTENANCE COMMANDS"
+.UC
 .SH "NAME"
 visudo \- edit the sudoers file
 .SH "SYNOPSIS"
-\fBvisudo\fR [ \fB\-s\fR ] [ \fB\-V\fR ]
+.IX Header "SYNOPSIS"
+\&\fBvisudo\fR [ \fB\-s\fR ] [ \fB\-V\fR ]
 .SH "DESCRIPTION"
-\fBvisudo\fR edits the \fIsudoers\fR file in a safe fashion, analogous to
-\fIvipw\fR\|(@mansectsu@).  \fBvisudo\fR locks the \fIsudoers\fR file against multiple
+.IX Header "DESCRIPTION"
+\&\fBvisudo\fR edits the \fIsudoers\fR file in a safe fashion, analogous to
+\&\fIvipw\fR\|(@mansectsu@).  \fBvisudo\fR locks the \fIsudoers\fR file against multiple
 simultaneous edits, provides basic sanity checks, and checks
 for parse errors.  If the \fIsudoers\fR file is currently being
 edited you will receive a message to try again later.  In the
 default configuration, the \fIvi\fR\|(1) editor is used, but there is
 a compile time option to allow use of whatever editor the
-environment variables \f(CWEDITOR\fR or \f(CWVISUAL\fR are set to.
+environment variables \f(CW\*(C`EDITOR\*(C'\fR or \f(CW\*(C`VISUAL\*(C'\fR are set to.
 .PP
-\fBvisudo\fR parses the \fIsudoers\fR file after the edit and will
+\&\fBvisudo\fR parses the \fIsudoers\fR file after the edit and will
 not save the changes if there is a syntax error.  Upon finding
 an error, a message will be printed stating the line \fInumber\fR\|(s)
 that the error occurred on and the user will receive the
-\*(L"What now?\*(R" prompt.  At this point the user may enter \*(L"e\*(R"
+\&\*(L"What now?\*(R" prompt.  At this point the user may enter \*(L"e\*(R"
 to re-edit the \fIsudoers\fR file, enter \*(L"x\*(R" to exit without
 saving the changes, or \*(L"Q\*(R" to quit and save changes.  The
-\*(L"Q\*(R" option should be used with extreme care because if \fBvisudo\fR
+\&\*(L"Q\*(R" option should be used with extreme care because if \fBvisudo\fR
 believes there to be a parse error, so will \fBsudo\fR and no one
 will be able to execute \fBsudo\fR again until the error is fixed.
 Any other command at this prompt will print a short help message.
@@ -219,24 +171,32 @@ When editing the \fIsudoers\fR file after a parse error has been
 detected the cursor will be placed on the line where the error
 occurred (if the editor supports this feature).
 .SH "OPTIONS"
-\fBvisudo\fR accepts the following command line option:
-.Ip "-s" 4
+.IX Header "OPTIONS"
+\&\fBvisudo\fR accepts the following command line option:
+.Ip "\-s" 4
+.IX Item "-s"
 Enable \fBstrict\fR checking of the \fIsudoers\fR file.  If an alias is
 used before it is defined, \fBvisudo\fR will consider this a parse
 error.  Note that it is not possible to differentiate between an
 alias and a hostname or username that consists solely of upper case
 letters, digits, and the underscore ('_') character.
-.Ip "-V" 4
-The \f(CW-V\fR (version) option causes \fBvisudo\fR to print the version number
+.Ip "\-V" 4
+.IX Item "-V"
+The \f(CW\*(C`\-V\*(C'\fR (version) option causes \fBvisudo\fR to print the version number
 and exit.
 .SH "ERRORS"
+.IX Header "ERRORS"
 .Ip "sudoers file busy, try again later." 4
+.IX Item "sudoers file busy, try again later."
 Someone else is currently editing the \fIsudoers\fR file.
 .Ip "@sysconfdir@/sudoers.tmp: Permission denied" 4
+.IX Item "@sysconfdir@/sudoers.tmp: Permission denied"
 You didn't run \fBvisudo\fR as root.
 .Ip "Can't find you in the passwd database" 4
+.IX Item "Can't find you in the passwd database"
 Your userid does not appear in the system passwd file.
 .Ip "Warning: undeclared Alias referenced near ..." 4
+.IX Item "Warning: undeclared Alias referenced near ..."
 Either you are using a {User,Runas,Host,Cmnd}_Alias before
 defining it or you have a user or hostname listed that
 consists solely of upper case letters, digits, and the
@@ -244,78 +204,43 @@ underscore ('_') character.  If the latter, you can ignore
 the warnings (\fBsudo\fR will not complain).  In \fB\-s\fR (strict)
 mode these are errors not warnings.
 .SH "ENVIRONMENT"
+.IX Header "ENVIRONMENT"
 The following environment variables are used only if \fBvisudo\fR
-was configured with the \fI--with-env-editor\fR option:
+was configured with the \fI\*(--with-env-editor\fR option:
 .PP
 .Vb 2
 \& EDITOR                 Used by visudo as the editor to use
 \& VISUAL                 Used by visudo if EDITOR is not set
 .Ve
 .SH "FILES"
-.PP
+.IX Header "FILES"
 .Vb 2
 \& @sysconfdir@/sudoers           List of who can run what
 \& @sysconfdir@/sudoers.tmp       Lock file for visudo
 .Ve
 .SH "AUTHOR"
+.IX Header "AUTHOR"
 Many people have worked on \fIsudo\fR over the years, this version of
-\fBvisudo\fR was written by:
+\&\fBvisudo\fR was written by:
 .PP
 .Vb 1
 \& Todd Miller            <Todd.Miller@courtesan.com>
 .Ve
 See the HISTORY file in the sudo distribution for more details.
 .SH "BUGS"
+.IX Header "BUGS"
 If you feel you have found a bug in sudo, please submit a bug report
 at http://www.courtesan.com/sudo/bugs/
 .SH "DISCLAIMER"
-\fBVisudo\fR is provided ``AS IS'\*(R' and any express or implied warranties,
+.IX Header "DISCLAIMER"
+\&\fBVisudo\fR is provided ``AS IS'' and any express or implied warranties,
 including, but not limited to, the implied warranties of merchantability
 and fitness for a particular purpose are disclaimed.
 See the LICENSE file distributed with \fBsudo\fR for complete details.
 .SH "CAVEATS"
+.IX Header "CAVEATS"
 There is no easy way to prevent a user from gaining a root shell if 
 the editor used by \fBvisudo\fR allows shell escapes.
 .SH "SEE ALSO"
-\fIsudo\fR\|(@mansectsu@), \fIvipw\fR\|(@mansectsu@).
-
-.rn }` ''
-.IX Title "visudo @mansectsu@"
-.IX Name "visudo - edit the sudoers file"
-
-.IX Header "NAME"
-
-.IX Header "SYNOPSIS"
-
-.IX Header "DESCRIPTION"
-
-.IX Header "OPTIONS"
-
-.IX Item "-s"
-
-.IX Item "-V"
-
-.IX Header "ERRORS"
-
-.IX Item "sudoers file busy, try again later."
-
-.IX Item "@sysconfdir@/sudoers.tmp: Permission denied"
-
-.IX Item "Can't find you in the passwd database"
-
-.IX Item "Warning: undeclared Alias referenced near ..."
-
-.IX Header "ENVIRONMENT"
-
-.IX Header "FILES"
-
-.IX Header "AUTHOR"
-
-.IX Header "BUGS"
-
-.IX Header "DISCLAIMER"
-
-.IX Header "CAVEATS"
-
 .IX Header "SEE ALSO"
-
+\&\fIsudo\fR\|(@mansectsu@), \fIvipw\fR\|(8).
