diff --git a/doc/sudo.conf.man.in b/doc/sudo.conf.man.in
index 048dcafe0..16a08b11f 100644
--- a/doc/sudo.conf.man.in
+++ b/doc/sudo.conf.man.in
@@ -22,13 +22,13 @@
 .if n .ad l
 .SH "NAME"
 \fBsudo.conf\fR
-\- configuration for sudo front end
+\- configuration for sudo front-end
 .SH "DESCRIPTION"
 The
 \fBsudo.conf\fR
 file is used to configure the
 \fBsudo\fR
-front end.
+front-end.
 It specifies the security policy and I/O logging plugins, debug flags
 as well as plugin-agnostic path names and settings.
 .PP
@@ -43,7 +43,7 @@ Path
 a plugin-agnostic path
 .TP 10n
 Set
-a front end setting, such as
+a front-end setting, such as
 \fIdisable_coredump\fR
 or
 \fIgroup_source\fR
@@ -89,7 +89,7 @@ logging.
 Third parties can develop and distribute their own policy and I/O
 logging plugins to work seamlessly with the
 \fBsudo\fR
-front end.
+front-end.
 Plugins are dynamically loaded based on the contents of
 \fBsudo.conf\fR.
 .PP
@@ -357,7 +357,7 @@ The default value is
 .SS "Other settings"
 The
 \fBsudo.conf\fR
-file also supports the following front end settings:
+file also supports the following front-end settings:
 .TP 10n
 disable_coredump
 Core dumps of
@@ -634,7 +634,7 @@ plugin shared the same
 \fRDebug\fR
 entry as the
 \fBsudo\fR
-front end and could not be configured separately.
+front-end and could not be configured separately.
 .PP
 The following priorities are supported, in order of decreasing severity:
 \fIcrit\fR, \fIerr\fR, \fIwarn\fR, \fInotice\fR, \fIdiag\fR, \fIinfo\fR, \fItrace\fR
@@ -728,7 +728,7 @@ plugin includes support for additional subsystems.
 .TP 26n
 \fI@sysconfdir@/sudo.conf\fR
 \fBsudo\fR
-front end configuration
+front-end configuration
 .SH "EXAMPLES"
 .nf
 .RS 0n
diff --git a/doc/sudo.conf.mdoc.in b/doc/sudo.conf.mdoc.in
index d75f9ccff..dd17336ab 100644
--- a/doc/sudo.conf.mdoc.in
+++ b/doc/sudo.conf.mdoc.in
@@ -21,13 +21,13 @@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
 .Nm sudo.conf
-.Nd configuration for sudo front end
+.Nd configuration for sudo front-end
 .Sh DESCRIPTION
 The
 .Nm sudo.conf
 file is used to configure the
 .Nm sudo
-front end.
+front-end.
 It specifies the security policy and I/O logging plugins, debug flags
 as well as plugin-agnostic path names and settings.
 .Pp
@@ -40,7 +40,7 @@ an approval, audit, I/O logging or security policy plugin
 .It Path
 a plugin-agnostic path
 .It Set
-a front end setting, such as
+a front-end setting, such as
 .Em disable_coredump
 or
 .Em group_source
@@ -86,7 +86,7 @@ logging.
 Third parties can develop and distribute their own policy and I/O
 logging plugins to work seamlessly with the
 .Nm sudo
-front end.
+front-end.
 Plugins are dynamically loaded based on the contents of
 .Nm .
 .Pp
@@ -330,7 +330,7 @@ The default value is
 .Ss Other settings
 The
 .Nm
-file also supports the following front end settings:
+file also supports the following front-end settings:
 .Bl -tag -width 8n
 .It disable_coredump
 Core dumps of
@@ -579,7 +579,7 @@ plugin shared the same
 .Li Debug
 entry as the
 .Nm sudo
-front end and could not be configured separately.
+front-end and could not be configured separately.
 .Pp
 The following priorities are supported, in order of decreasing severity:
 .Em crit , err , warn , notice , diag , info , trace
@@ -658,7 +658,7 @@ plugin includes support for additional subsystems.
 .Bl -tag -width 24n
 .It Pa @sysconfdir@/sudo.conf
 .Nm sudo
-front end configuration
+front-end configuration
 .El
 .Sh EXAMPLES
 .Bd -literal
diff --git a/doc/sudo.man.in b/doc/sudo.man.in
index 661471953..a2f139a9d 100644
--- a/doc/sudo.man.in
+++ b/doc/sudo.man.in
@@ -25,7 +25,7 @@
 .nr BA @BAMAN@
 .nr LC @LCMAN@
 .nr PS @PSMAN@
-.TH "SUDO" "@mansectsu@" "August 16, 2021" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
+.TH "SUDO" "@mansectsu@" "September 17, 2021" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -113,7 +113,7 @@ logging.
 Third parties can develop and distribute their own policy and I/O
 logging plugins to work seamlessly with the
 \fBsudo\fR
-front end.
+front-end.
 The default security policy is
 \fIsudoers\fR,
 which is configured via the file
@@ -1226,7 +1226,7 @@ is not set.
 .TP 26n
 \fI@sysconfdir@/sudo.conf\fR
 \fBsudo\fR
-front end configuration
+front-end configuration
 .SH "EXAMPLES"
 Note: the following examples assume a properly configured security
 policy.
diff --git a/doc/sudo.mdoc.in b/doc/sudo.mdoc.in
index 7b6215627..1cd9fa7d2 100644
--- a/doc/sudo.mdoc.in
+++ b/doc/sudo.mdoc.in
@@ -24,7 +24,7 @@
 .nr BA @BAMAN@
 .nr LC @LCMAN@
 .nr PS @PSMAN@
-.Dd August 16, 2021
+.Dd September 17, 2021
 .Dt SUDO @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -117,7 +117,7 @@ logging.
 Third parties can develop and distribute their own policy and I/O
 logging plugins to work seamlessly with the
 .Nm
-front end.
+front-end.
 The default security policy is
 .Em sudoers ,
 which is configured via the file
@@ -1150,7 +1150,7 @@ is not set.
 .Bl -tag -width 24n
 .It Pa @sysconfdir@/sudo.conf
 .Nm
-front end configuration
+front-end configuration
 .El
 .Sh EXAMPLES
 Note: the following examples assume a properly configured security
diff --git a/doc/sudo_logsrvd.man.in b/doc/sudo_logsrvd.man.in
index cd4f95aab..f3273036a 100644
--- a/doc/sudo_logsrvd.man.in
+++ b/doc/sudo_logsrvd.man.in
@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.TH "SUDO_LOGSRVD" "@mansectsu@" "April 29, 2021" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
+.TH "SUDO_LOGSRVD" "@mansectsu@" "September 17, 2021" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -128,7 +128,7 @@ please refer to its manual.
 .SH "FILES"
 .TP 26n
 \fI@sysconfdir@/sudo.conf\fR
-Sudo front end configuration
+Sudo front-end configuration
 .TP 26n
 \fI@sysconfdir@/sudo_logsrvd.conf\fR
 Sudo log server configuration file
diff --git a/doc/sudo_logsrvd.mdoc.in b/doc/sudo_logsrvd.mdoc.in
index 7fa3acb8f..e018a6e87 100644
--- a/doc/sudo_logsrvd.mdoc.in
+++ b/doc/sudo_logsrvd.mdoc.in
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd April 29, 2021
+.Dd September 17, 2021
 .Dt SUDO_LOGSRVD @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -123,7 +123,7 @@ please refer to its manual.
 .Sh FILES
 .Bl -tag -width 24n
 .It Pa @sysconfdir@/sudo.conf
-Sudo front end configuration
+Sudo front-end configuration
 .It Pa @sysconfdir@/sudo_logsrvd.conf
 Sudo log server configuration file
 .It Pa @relay_dir@/incoming
diff --git a/doc/sudo_plugin.man.in b/doc/sudo_plugin.man.in
index 712a714a2..b02627535 100644
--- a/doc/sudo_plugin.man.in
+++ b/doc/sudo_plugin.man.in
@@ -2,7 +2,7 @@
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
-.\" Copyright (c) 2009-2020 Todd C. Miller <Todd.Miller@sudo.ws>
+.\" Copyright (c) 2009-2021 Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.TH "SUDO_PLUGIN" "5" "November 17, 2020" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDO_PLUGIN" "5" "September 17, 2021" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -257,7 +257,7 @@ Prior to
 \fIdebug_flags\fR
 so the value was always the same as that used by the
 \fBsudo\fR
-front end and did not include a path name, only the flags themselves.
+front-end and did not include a path name, only the flags themselves.
 As of version 1.7 of the plugin interface,
 \fBsudo\fR
 will only pass
@@ -336,7 +336,7 @@ interaction is required.
 plugin_dir=string
 The default plugin directory used by the
 \fBsudo\fR
-front end.
+front-end.
 This is the default directory set at compile time and may not
 correspond to the directory the running plugin was loaded from.
 It may be used by a plugin to locate support files.
@@ -344,7 +344,7 @@ It may be used by a plugin to locate support files.
 plugin_path=string
 The path name of plugin loaded by the
 \fBsudo\fR
-front end.
+front-end.
 The path name will be a fully-qualified unless the plugin was
 statically compiled into
 \fBsudo\fR.
@@ -383,7 +383,7 @@ Support for running the command on a remote host is meant to be implemented
 via a helper program that is executed in place of the user-specified command.
 The
 \fBsudo\fR
-front end is only capable of executing commands on the local host.
+front-end is only capable of executing commands on the local host.
 Only available starting with API version 1.4.
 .TP 6n
 run_shell=bool
@@ -699,7 +699,7 @@ A plugin
 check the API version specified
 by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIplugin_options\fR.
 Failure to do so may result in a crash.
 .TP 6n
@@ -711,7 +711,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -726,7 +726,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -801,7 +801,7 @@ options are set in the
 \fRcommand_info\fR
 list, the
 \fBsudo\fR
-front end may execute the command directly instead of running
+front-end may execute the command directly instead of running
 it as a child process.
 .RE
 .TP 6n
@@ -1334,7 +1334,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -1349,7 +1349,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -1422,7 +1422,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -1437,7 +1437,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -1492,7 +1492,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -1507,7 +1507,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -1590,7 +1590,7 @@ run in, in the form of a
 vector of
 \(lqname=value\(rq
 strings.
-This is the same string passed back to the front end via
+This is the same string passed back to the front-end via
 the Policy Plugin's
 \fIuser_env_out\fR
 parameter.
@@ -1611,7 +1611,7 @@ A plugin
 check the API
 version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIuser_env_out\fR.
 Failure to do so may result in a crash.
 .sp
@@ -1637,7 +1637,7 @@ void (*register_hooks)(int version,
 .sp
 The
 \fBregister_hooks\fR()
-function is called by the sudo front end to
+function is called by the sudo front-end to
 register any hooks the plugin needs.
 If the plugin does not support hooks,
 \fRregister_hooks\fR
@@ -1650,7 +1650,7 @@ The
 argument describes the version of the hooks API
 supported by the
 \fBsudo\fR
-front end.
+front-end.
 .sp
 The
 \fBregister_hook\fR()
@@ -1659,7 +1659,7 @@ hooks the plugin needs.
 It returns 0 on success, 1 if the hook type is not supported and \-1
 if the major version in
 \fRstruct hook\fR
-does not match the front end's major hook API version.
+does not match the front-end's major hook API version.
 .sp
 See the
 \fIHook function API\fR
@@ -1672,7 +1672,7 @@ function is only available starting
 with API version 1.2.
 If the
 \fBsudo\fR
-front end doesn't support API
+front-end doesn't support API
 version 1.2 or higher,
 \fRregister_hooks\fR
 will not be called.
@@ -1689,7 +1689,7 @@ void (*deregister_hooks)(int version,
 .sp
 The
 \fBderegister_hooks\fR()
-function is called by the sudo front end
+function is called by the sudo front-end
 to deregister any hooks the plugin has registered.
 If the plugin does not support hooks,
 \fRderegister_hooks\fR
@@ -1702,7 +1702,7 @@ The
 argument describes the version of the hooks API
 supported by the
 \fBsudo\fR
-front end.
+front-end.
 .sp
 The
 \fBderegister_hook\fR()
@@ -1710,7 +1710,7 @@ function should be used to deregister any
 hooks that were put in place by the
 \fBregister_hook\fR()
 function.
-If the plugin tries to deregister a hook that the front end does not support,
+If the plugin tries to deregister a hook that the front-end does not support,
 \fRderegister_hook\fR
 will return an error.
 .sp
@@ -1725,7 +1725,7 @@ function is only available starting
 with API version 1.2.
 If the
 \fBsudo\fR
-front end doesn't support API
+front-end doesn't support API
 version 1.2 or higher,
 \fRderegister_hooks\fR
 will not be called.
@@ -1750,7 +1750,7 @@ Unlike the other fields, the
 \fBevent_alloc\fR()
 pointer is filled in by the
 \fBsudo\fR
-front end, not by the plugin.
+front-end, not by the plugin.
 .sp
 See the
 \fIEvent API\fR
@@ -1763,7 +1763,7 @@ function is only available starting
 with API version 1.15.
 If the
 \fBsudo\fR
-front end doesn't support API
+front-end doesn't support API
 version 1.15 or higher,
 \fBevent_alloc\fR()
 will not be set.
@@ -1777,7 +1777,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -1792,7 +1792,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PP
@@ -2139,7 +2139,7 @@ A plugin
 check the API version specified
 by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIplugin_options\fR.
 Failure to do so may result in a crash.
 .TP 6n
@@ -2151,7 +2151,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -2166,7 +2166,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -2281,7 +2281,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -2296,7 +2296,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -2340,7 +2340,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -2355,7 +2355,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -2401,7 +2401,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -2416,7 +2416,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -2462,7 +2462,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -2477,7 +2477,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -2523,7 +2523,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -2538,7 +2538,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -2594,7 +2594,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -2609,7 +2609,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .PD 0
@@ -2650,7 +2650,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -2665,7 +2665,7 @@ A plugin
 \fBmust\fR
 check the API version specified by the
 \fBsudo\fR
-front end before using
+front-end before using
 \fIerrstr\fR.
 Failure to do so may result in a crash.
 .TP 6n
@@ -2688,7 +2688,7 @@ Unlike the other fields, the
 \fBevent_alloc\fR()
 pointer is filled in by the
 \fBsudo\fR
-front end, not by the plugin.
+front-end, not by the plugin.
 .sp
 See the
 \fIEvent API\fR
@@ -2701,7 +2701,7 @@ function is only available starting
 with API version 1.15.
 If the
 \fBsudo\fR
-front end doesn't support API
+front-end doesn't support API
 version 1.15 or higher,
 \fBevent_alloc\fR()
 will not be set.
@@ -2965,7 +2965,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -3016,7 +3016,7 @@ system call, or the value of
 \fRerrno\fR
 resulting from an error in the
 \fBsudo\fR
-front end.
+front-end.
 .PD 0
 .PP
 .RE
@@ -3135,7 +3135,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -3222,7 +3222,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -3307,7 +3307,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -3378,7 +3378,7 @@ Unlike the other fields, the
 \fBevent_alloc\fR()
 pointer is filled in by the
 \fBsudo\fR
-front end, not by the plugin.
+front-end, not by the plugin.
 .sp
 See the
 \fIEvent API\fR
@@ -3391,7 +3391,7 @@ function is only available starting
 with API version 1.17.
 If the
 \fBsudo\fR
-front end doesn't support API
+front-end doesn't support API
 version 1.17 or higher,
 \fBevent_alloc\fR()
 will not be set.
@@ -3628,7 +3628,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -3760,7 +3760,7 @@ store a message describing the failure or error in
 \fIerrstr\fR.
 The
 \fBsudo\fR
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 \fIerrstr\fR
 must remain valid until the plugin's
@@ -3802,7 +3802,7 @@ ignored.
 .SS "Signal handlers"
 The
 \fBsudo\fR
-front end installs default signal handlers to trap common signals
+front-end installs default signal handlers to trap common signals
 while the plugin functions are run.
 The following signals are trapped by default before the command is
 executed:
@@ -3856,7 +3856,7 @@ restore the original handler before the plugin function returns.
 Beginning with plugin API version 1.2, it is possible to install
 hooks for certain functions called by the
 \fBsudo\fR
-front end.
+front-end.
 .PP
 Currently, the only supported hooks relate to the handling of
 environment variables.
@@ -3865,7 +3865,7 @@ environment variables so that these changes can be reflected in
 the version of the environment that is used to execute a command.
 A future version of the API will support hooking internal
 \fBsudo\fR
-front end functions as well.
+front-end functions as well.
 .PP
 \fIHook structure\fR
 .PP
@@ -4389,7 +4389,7 @@ from the event loop and frees the memory associated with it.
 .SS "Remote command execution"
 The
 \fBsudo\fR
-front end does not support running remote commands.
+front-end does not support running remote commands.
 However, starting with
 \fBsudo\fR
 1.8.8, the
@@ -4407,7 +4407,7 @@ It is anticipated that remote commands will be supported by executing a
 program.
 The policy plugin should setup the execution environment such that the
 \fBsudo\fR
-front end will run the helper which, in turn, will connect to the
+front-end will run the helper which, in turn, will connect to the
 remote host and run the command.
 .PP
 For example, the policy plugin could utilize
@@ -4424,7 +4424,7 @@ Note that remote
 \fBsudoedit\fR
 functionality must be handled by the policy plugin, not
 \fBsudo\fR
-itself as the front end has no knowledge that a remote command is
+itself as the front-end has no knowledge that a remote command is
 being executed.
 This may be addressed in a future revision of the plugin API.
 .SS "Conversation API"
@@ -4939,12 +4939,12 @@ function is defined, a default
 \fBclose\fR()
 function will be provided by the
 \fBsudo\fR
-front end that displays a warning if the command could not be
+front-end that displays a warning if the command could not be
 executed.
 .sp
 The
 \fBsudo\fR
-front end now installs default signal handlers to trap common signals
+front-end now installs default signal handlers to trap common signals
 while the plugin functions are run.
 .TP 6n
 Version 1.4 (sudo 1.8.8)
@@ -4967,7 +4967,7 @@ The behavior when an I/O logging plugin returns an error
 has changed.
 Previously, the
 \fBsudo\fR
-front end took no action when the
+front-end took no action when the
 \fBlog_ttyin\fR(),
 \fBlog_ttyout\fR(),
 \fBlog_stdin\fR(),
diff --git a/doc/sudo_plugin.mdoc.in b/doc/sudo_plugin.mdoc.in
index feb265c0e..cadaa73b6 100644
--- a/doc/sudo_plugin.mdoc.in
+++ b/doc/sudo_plugin.mdoc.in
@@ -1,7 +1,7 @@
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
-.\" Copyright (c) 2009-2020 Todd C. Miller <Todd.Miller@sudo.ws>
+.\" Copyright (c) 2009-2021 Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd November 17, 2020
+.Dd September 17, 2021
 .Dt SUDO_PLUGIN @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -237,7 +237,7 @@ Prior to
 .Em debug_flags
 so the value was always the same as that used by the
 .Nm sudo
-front end and did not include a path name, only the flags themselves.
+front-end and did not include a path name, only the flags themselves.
 As of version 1.7 of the plugin interface,
 .Nm sudo
 will only pass
@@ -308,14 +308,14 @@ interaction is required.
 .It plugin_dir=string
 The default plugin directory used by the
 .Nm sudo
-front end.
+front-end.
 This is the default directory set at compile time and may not
 correspond to the directory the running plugin was loaded from.
 It may be used by a plugin to locate support files.
 .It plugin_path=string
 The path name of plugin loaded by the
 .Nm sudo
-front end.
+front-end.
 The path name will be a fully-qualified unless the plugin was
 statically compiled into
 .Nm sudo .
@@ -349,7 +349,7 @@ Support for running the command on a remote host is meant to be implemented
 via a helper program that is executed in place of the user-specified command.
 The
 .Nm sudo
-front end is only capable of executing commands on the local host.
+front-end is only capable of executing commands on the local host.
 Only available starting with API version 1.4.
 .It run_shell=bool
 Set to true if the user specified the
@@ -620,7 +620,7 @@ A plugin
 check the API version specified
 by the
 .Nm sudo
-front end before using
+front-end before using
 .Em plugin_options .
 Failure to do so may result in a crash.
 .It errstr
@@ -631,7 +631,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -646,7 +646,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -712,7 +712,7 @@ options are set in the
 .Li command_info
 list, the
 .Nm sudo
-front end may execute the command directly instead of running
+front-end may execute the command directly instead of running
 it as a child process.
 .It show_version
 .Bd -literal -compact
@@ -1186,7 +1186,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -1201,7 +1201,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -1263,7 +1263,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -1278,7 +1278,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -1326,7 +1326,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -1341,7 +1341,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -1412,7 +1412,7 @@ run in, in the form of a
 vector of
 .Dq name=value
 strings.
-This is the same string passed back to the front end via
+This is the same string passed back to the front-end via
 the Policy Plugin's
 .Em user_env_out
 parameter.
@@ -1433,7 +1433,7 @@ A plugin
 check the API
 version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Em user_env_out .
 Failure to do so may result in a crash.
 .Pp
@@ -1454,7 +1454,7 @@ void (*register_hooks)(int version,
 .Pp
 The
 .Fn register_hooks
-function is called by the sudo front end to
+function is called by the sudo front-end to
 register any hooks the plugin needs.
 If the plugin does not support hooks,
 .Li register_hooks
@@ -1467,7 +1467,7 @@ The
 argument describes the version of the hooks API
 supported by the
 .Nm sudo
-front end.
+front-end.
 .Pp
 The
 .Fn register_hook
@@ -1476,7 +1476,7 @@ hooks the plugin needs.
 It returns 0 on success, 1 if the hook type is not supported and \-1
 if the major version in
 .Li struct hook
-does not match the front end's major hook API version.
+does not match the front-end's major hook API version.
 .Pp
 See the
 .Sx Hook function API
@@ -1489,7 +1489,7 @@ function is only available starting
 with API version 1.2.
 If the
 .Nm sudo
-front end doesn't support API
+front-end doesn't support API
 version 1.2 or higher,
 .Li register_hooks
 will not be called.
@@ -1501,7 +1501,7 @@ void (*deregister_hooks)(int version,
 .Pp
 The
 .Fn deregister_hooks
-function is called by the sudo front end
+function is called by the sudo front-end
 to deregister any hooks the plugin has registered.
 If the plugin does not support hooks,
 .Li deregister_hooks
@@ -1514,7 +1514,7 @@ The
 argument describes the version of the hooks API
 supported by the
 .Nm sudo
-front end.
+front-end.
 .Pp
 The
 .Fn deregister_hook
@@ -1522,7 +1522,7 @@ function should be used to deregister any
 hooks that were put in place by the
 .Fn register_hook
 function.
-If the plugin tries to deregister a hook that the front end does not support,
+If the plugin tries to deregister a hook that the front-end does not support,
 .Li deregister_hook
 will return an error.
 .Pp
@@ -1537,7 +1537,7 @@ function is only available starting
 with API version 1.2.
 If the
 .Nm sudo
-front end doesn't support API
+front-end doesn't support API
 version 1.2 or higher,
 .Li deregister_hooks
 will not be called.
@@ -1557,7 +1557,7 @@ Unlike the other fields, the
 .Fn event_alloc
 pointer is filled in by the
 .Nm sudo
-front end, not by the plugin.
+front-end, not by the plugin.
 .Pp
 See the
 .Sx Event API
@@ -1570,7 +1570,7 @@ function is only available starting
 with API version 1.15.
 If the
 .Nm sudo
-front end doesn't support API
+front-end doesn't support API
 version 1.15 or higher,
 .Fn event_alloc
 will not be set.
@@ -1582,7 +1582,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -1597,7 +1597,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -1926,7 +1926,7 @@ A plugin
 check the API version specified
 by the
 .Nm sudo
-front end before using
+front-end before using
 .Em plugin_options .
 Failure to do so may result in a crash.
 .It errstr
@@ -1937,7 +1937,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -1952,7 +1952,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -2043,7 +2043,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -2058,7 +2058,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -2093,7 +2093,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -2108,7 +2108,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -2145,7 +2145,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -2160,7 +2160,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -2197,7 +2197,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -2212,7 +2212,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -2249,7 +2249,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -2264,7 +2264,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -2308,7 +2308,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -2323,7 +2323,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .El
@@ -2355,7 +2355,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -2370,7 +2370,7 @@ A plugin
 .Sy must
 check the API version specified by the
 .Nm sudo
-front end before using
+front-end before using
 .Fa errstr .
 Failure to do so may result in a crash.
 .It event_alloc
@@ -2389,7 +2389,7 @@ Unlike the other fields, the
 .Fn event_alloc
 pointer is filled in by the
 .Nm sudo
-front end, not by the plugin.
+front-end, not by the plugin.
 .Pp
 See the
 .Sx Event API
@@ -2402,7 +2402,7 @@ function is only available starting
 with API version 1.15.
 If the
 .Nm sudo
-front end doesn't support API
+front-end doesn't support API
 version 1.15 or higher,
 .Fn event_alloc
 will not be set.
@@ -2650,7 +2650,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -2692,7 +2692,7 @@ system call, or the value of
 .Li errno
 resulting from an error in the
 .Nm sudo
-front end.
+front-end.
 .El
 .It accept
 .Bd -literal -compact
@@ -2799,7 +2799,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -2875,7 +2875,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -2948,7 +2948,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -3005,7 +3005,7 @@ Unlike the other fields, the
 .Fn event_alloc
 pointer is filled in by the
 .Nm sudo
-front end, not by the plugin.
+front-end, not by the plugin.
 .Pp
 See the
 .Sx Event API
@@ -3018,7 +3018,7 @@ function is only available starting
 with API version 1.17.
 If the
 .Nm sudo
-front end doesn't support API
+front-end doesn't support API
 version 1.17 or higher,
 .Fn event_alloc
 will not be set.
@@ -3239,7 +3239,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -3354,7 +3354,7 @@ store a message describing the failure or error in
 .Fa errstr .
 The
 .Nm sudo
-front end will then pass this value to any registered audit plugins.
+front-end will then pass this value to any registered audit plugins.
 The string stored in
 .Fa errstr
 must remain valid until the plugin's
@@ -3389,7 +3389,7 @@ ignored.
 .Ss Signal handlers
 The
 .Nm sudo
-front end installs default signal handlers to trap common signals
+front-end installs default signal handlers to trap common signals
 while the plugin functions are run.
 The following signals are trapped by default before the command is
 executed:
@@ -3435,7 +3435,7 @@ restore the original handler before the plugin function returns.
 Beginning with plugin API version 1.2, it is possible to install
 hooks for certain functions called by the
 .Nm sudo
-front end.
+front-end.
 .Pp
 Currently, the only supported hooks relate to the handling of
 environment variables.
@@ -3444,7 +3444,7 @@ environment variables so that these changes can be reflected in
 the version of the environment that is used to execute a command.
 A future version of the API will support hooking internal
 .Nm sudo
-front end functions as well.
+front-end functions as well.
 .Pp
 .Em Hook structure
 .Pp
@@ -3860,7 +3860,7 @@ from the event loop and frees the memory associated with it.
 .Ss Remote command execution
 The
 .Nm sudo
-front end does not support running remote commands.
+front-end does not support running remote commands.
 However, starting with
 .Nm sudo
 1.8.8, the
@@ -3878,7 +3878,7 @@ It is anticipated that remote commands will be supported by executing a
 program.
 The policy plugin should setup the execution environment such that the
 .Nm sudo
-front end will run the helper which, in turn, will connect to the
+front-end will run the helper which, in turn, will connect to the
 remote host and run the command.
 .Pp
 For example, the policy plugin could utilize
@@ -3895,7 +3895,7 @@ Note that remote
 .Nm sudoedit
 functionality must be handled by the policy plugin, not
 .Nm sudo
-itself as the front end has no knowledge that a remote command is
+itself as the front-end has no knowledge that a remote command is
 being executed.
 This may be addressed in a future revision of the plugin API.
 .Ss Conversation API
@@ -4359,12 +4359,12 @@ function is defined, a default
 .Fn close
 function will be provided by the
 .Nm sudo
-front end that displays a warning if the command could not be
+front-end that displays a warning if the command could not be
 executed.
 .Pp
 The
 .Nm sudo
-front end now installs default signal handlers to trap common signals
+front-end now installs default signal handlers to trap common signals
 while the plugin functions are run.
 .It Version 1.4 (sudo 1.8.8)
 The
@@ -4384,7 +4384,7 @@ The behavior when an I/O logging plugin returns an error
 has changed.
 Previously, the
 .Nm sudo
-front end took no action when the
+front-end took no action when the
 .Fn log_ttyin ,
 .Fn log_ttyout ,
 .Fn log_stdin ,
diff --git a/doc/sudo_plugin_python.man.in b/doc/sudo_plugin_python.man.in
index 919ecd941..ebeee54b0 100644
--- a/doc/sudo_plugin_python.man.in
+++ b/doc/sudo_plugin_python.man.in
@@ -2,7 +2,7 @@
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
-.\" Copyright (c) 2019-2020 Robert Manner <robert.manner@oneidentity.com>
+.\" Copyright (c) 2019-2021 Robert Manner <robert.manner@oneidentity.com>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.TH "SUDO_PLUGIN_PYTHON" "5" "February 19, 2020" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDO_PLUGIN_PYTHON" "5" "September 17, 2021" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -968,7 +968,7 @@ system call, or the value of
 \fRerrno\fR
 resulting from an error in the
 \fBsudo\fR
-front end.
+front-end.
 .PD 0
 .PP
 .RE
diff --git a/doc/sudo_plugin_python.mdoc.in b/doc/sudo_plugin_python.mdoc.in
index ba87971e5..ca803e428 100644
--- a/doc/sudo_plugin_python.mdoc.in
+++ b/doc/sudo_plugin_python.mdoc.in
@@ -1,7 +1,7 @@
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
-.\" Copyright (c) 2019-2020 Robert Manner <robert.manner@oneidentity.com>
+.\" Copyright (c) 2019-2021 Robert Manner <robert.manner@oneidentity.com>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd February 19, 2020
+.Dd September 17, 2021
 .Dt SUDO_PLUGIN_PYTHON @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -778,7 +778,7 @@ system call, or the value of
 .Li errno
 resulting from an error in the
 .Nm sudo
-front end.
+front-end.
 .El
 .It Sy show_version
 .Bd -literal -compact
diff --git a/doc/sudo_sendlog.man.in b/doc/sudo_sendlog.man.in
index 61d518de6..6a80d69f6 100644
--- a/doc/sudo_sendlog.man.in
+++ b/doc/sudo_sendlog.man.in
@@ -16,7 +16,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.TH "SUDO_SENDLOG" "@mansectsu@" "May 4, 2021" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
+.TH "SUDO_SENDLOG" "@mansectsu@" "September 17, 2021" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -165,7 +165,7 @@ please refer to its manual.
 .SH "FILES"
 .TP 26n
 \fI@sysconfdir@/sudo.conf\fR
-Sudo front end configuration
+Sudo front-end configuration
 .SH "SEE ALSO"
 sudo.conf(@mansectform@),
 sudo(@mansectsu@),
diff --git a/doc/sudo_sendlog.mdoc.in b/doc/sudo_sendlog.mdoc.in
index 62edb3acd..adf4499d0 100644
--- a/doc/sudo_sendlog.mdoc.in
+++ b/doc/sudo_sendlog.mdoc.in
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd May 4, 2021
+.Dd September 17, 2021
 .Dt SUDO_SENDLOG @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -150,7 +150,7 @@ please refer to its manual.
 .Sh FILES
 .Bl -tag -width 24n
 .It Pa @sysconfdir@/sudo.conf
-Sudo front end configuration
+Sudo front-end configuration
 .El
 .Sh SEE ALSO
 .Xr sudo.conf @mansectform@ ,
diff --git a/doc/sudoers.man.in b/doc/sudoers.man.in
index fa386e0dc..15d58bd52 100644
--- a/doc/sudoers.man.in
+++ b/doc/sudoers.man.in
@@ -25,7 +25,7 @@
 .nr BA @BAMAN@
 .nr LC @LCMAN@
 .nr PS @PSMAN@
-.TH "SUDOERS" "@mansectform@" "September 7, 2021" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
+.TH "SUDOERS" "@mansectform@" "September 17, 2021" "Sudo @PACKAGE_VERSION@" "File Formats Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -5744,7 +5744,7 @@ will truncate and re-use any existing I/O logs.
 .SH "FILES"
 .TP 26n
 \fI@sysconfdir@/sudo.conf\fR
-Sudo front end configuration
+Sudo front-end configuration
 .TP 26n
 \fI@sysconfdir@/sudoers\fR
 List of who can run what
diff --git a/doc/sudoers.mdoc.in b/doc/sudoers.mdoc.in
index a6456e908..70e2731f8 100644
--- a/doc/sudoers.mdoc.in
+++ b/doc/sudoers.mdoc.in
@@ -24,7 +24,7 @@
 .nr BA @BAMAN@
 .nr LC @LCMAN@
 .nr PS @PSMAN@
-.Dd September 7, 2021
+.Dd September 17, 2021
 .Dt SUDOERS @mansectform@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -5338,7 +5338,7 @@ will truncate and re-use any existing I/O logs.
 .Sh FILES
 .Bl -tag -width 24n
 .It Pa @sysconfdir@/sudo.conf
-Sudo front end configuration
+Sudo front-end configuration
 .It Pa @sysconfdir@/sudoers
 List of who can run what
 .It Pa /etc/group
diff --git a/doc/visudo.man.in b/doc/visudo.man.in
index d068e83e9..5c8a77cb2 100644
--- a/doc/visudo.man.in
+++ b/doc/visudo.man.in
@@ -2,7 +2,7 @@
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
-.\" Copyright (c) 1996,1998-2005, 2007-2020
+.\" Copyright (c) 1996,1998-2005, 2007-2021
 .\"	Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -21,7 +21,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.TH "VISUDO" "@mansectsu@" "August 27, 2020" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
+.TH "VISUDO" "@mansectsu@" "September 17, 2021" "Sudo @PACKAGE_VERSION@" "System Manager's Manual"
 .nh
 .if n .ad l
 .SH "NAME"
@@ -354,7 +354,7 @@ is set
 .SH "FILES"
 .TP 26n
 \fI@sysconfdir@/sudo.conf\fR
-Sudo front end configuration
+Sudo front-end configuration
 .TP 26n
 \fI@sysconfdir@/sudoers\fR
 List of who can run what
diff --git a/doc/visudo.mdoc.in b/doc/visudo.mdoc.in
index 278040bed..42808732b 100644
--- a/doc/visudo.mdoc.in
+++ b/doc/visudo.mdoc.in
@@ -1,7 +1,7 @@
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
-.\" Copyright (c) 1996,1998-2005, 2007-2020
+.\" Copyright (c) 1996,1998-2005, 2007-2021
 .\"	Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -20,7 +20,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd August 27, 2020
+.Dd September 17, 2021
 .Dt VISUDO @mansectsu@
 .Os Sudo @PACKAGE_VERSION@
 .Sh NAME
@@ -342,7 +342,7 @@ is set
 .Sh FILES
 .Bl -tag -width 24n
 .It Pa @sysconfdir@/sudo.conf
-Sudo front end configuration
+Sudo front-end configuration
 .It Pa @sysconfdir@/sudoers
 List of who can run what
 .It Pa @sysconfdir@/sudoers.tmp