diff --git a/docs/cvtsudoers.man.in b/docs/cvtsudoers.man.in
index 11b9d5f98..c0eabe7cf 100644
--- a/docs/cvtsudoers.man.in
+++ b/docs/cvtsudoers.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the cvtsudoers.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
diff --git a/docs/sudo.conf.man.in b/docs/sudo.conf.man.in
index 5c4354ea5..ed62ed6c1 100644
--- a/docs/sudo.conf.man.in
+++ b/docs/sudo.conf.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudo.conf.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
diff --git a/docs/sudo.man.in b/docs/sudo.man.in
index fe104a02b..7b20b43da 100644
--- a/docs/sudo.man.in
+++ b/docs/sudo.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudo.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
diff --git a/docs/sudo_logsrv.proto.man.in b/docs/sudo_logsrv.proto.man.in
index fadb8b6ec..38382d6da 100644
--- a/docs/sudo_logsrv.proto.man.in
+++ b/docs/sudo_logsrv.proto.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudo_logsrv.proto.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
diff --git a/docs/sudo_logsrvd.conf.man.in b/docs/sudo_logsrvd.conf.man.in
index c0ed26d5a..d66105f44 100644
--- a/docs/sudo_logsrvd.conf.man.in
+++ b/docs/sudo_logsrvd.conf.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudo_logsrvd.conf.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
diff --git a/docs/sudo_logsrvd.man.in b/docs/sudo_logsrvd.man.in
index eb9363699..e28aa48e1 100644
--- a/docs/sudo_logsrvd.man.in
+++ b/docs/sudo_logsrvd.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudo_logsrvd.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
@@ -277,7 +277,7 @@ If you enter '.', the field will be left blank.
 Country Name (2 letter code) [AU]:US
 State or Province Name (full name) [Some-State]:Colorado
 Locality Name (eg, city) []:
-Organization Name (eg, company) [Internet Widgits Pty Ltd]:sudo
+Organization Name (eg, company) [Internet Widgets Pty Ltd]:sudo
 Organizational Unit Name (eg, section) []:sudo Certificate Authority
 Common Name (e.g., server FQDN or YOUR name) []:sudo Root CA
 Email Address []:
@@ -335,7 +335,7 @@ If you enter '.', the field will be left blank.
 Country Name (2 letter code) [AU]:US
 State or Province Name (full name) [Some-State]:Colorado
 Locality Name (eg, city) []:
-Organization Name (eg, company) [Internet Widgits Pty Ltd]:sudo
+Organization Name (eg, company) [Internet Widgets Pty Ltd]:sudo
 Organizational Unit Name (eg, section) []:sudo log server
 Common Name (e.g., server FQDN or YOUR name) []:logserver.example.com
 Email Address []:
diff --git a/docs/sudo_plugin.man.in b/docs/sudo_plugin.man.in
index e61c142e1..55e3193a3 100644
--- a/docs/sudo_plugin.man.in
+++ b/docs/sudo_plugin.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudo_plugin.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
@@ -1559,7 +1559,7 @@ front-end to determine which elements of the
 vector are files to be edited.
 The
 \(oq--\(cq
-element must immediately precede the first file to be editied.
+element must immediately precede the first file to be edited.
 If
 \fIsudoedit_nfiles\fR
 is not specified, the
diff --git a/docs/sudo_plugin_python.man.in b/docs/sudo_plugin_python.man.in
index e77e96cb2..661bd519f 100644
--- a/docs/sudo_plugin_python.man.in
+++ b/docs/sudo_plugin_python.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudo_plugin_python.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
diff --git a/docs/sudo_sendlog.man.in b/docs/sudo_sendlog.man.in
index 1bccdc487..d73f0d259 100644
--- a/docs/sudo_sendlog.man.in
+++ b/docs/sudo_sendlog.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudo_sendlog.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
diff --git a/docs/sudoers.ldap.man.in b/docs/sudoers.ldap.man.in
index ed88296de..50b52ea36 100644
--- a/docs/sudoers.ldap.man.in
+++ b/docs/sudoers.ldap.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudoers.ldap.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
diff --git a/docs/sudoers.man.in b/docs/sudoers.man.in
index 8797a0844..5bccdb296 100644
--- a/docs/sudoers.man.in
+++ b/docs/sudoers.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudoers.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
@@ -4420,7 +4420,7 @@ it will
 \(lqroll over\(rq
 to zero, after which
 \fBsudoers\fR
-will truncate and re-use any existing I/O log path names.
+will truncate and reuse any existing I/O log path names.
 .sp
 This setting is only supported by version 1.8.7 or higher.
 .TP 18n
@@ -6829,7 +6829,7 @@ Once the I/O log sequence number reaches
 \fImaxseq\fR,
 it will be reset to zero and
 \fBsudoers\fR
-will truncate and re-use any existing I/O logs.
+will truncate and reuse any existing I/O logs.
 .SH "FILES"
 .TP 26n
 \fI@sysconfdir@/sudo.conf\fR
@@ -7906,7 +7906,7 @@ If no terminal is present or the
 option is set to
 \(lqppid\(rq,
 the start time of the parent process is used instead.
-In most cases this will prevent a time stamp record from being re-used
+In most cases this will prevent a time stamp record from being reused
 without the user entering a password when logging out and back in again.
 .SH "DEBUGGING"
 Versions 1.8.4 and higher of the
diff --git a/docs/sudoers_timestamp.man.in b/docs/sudoers_timestamp.man.in
index 36ab46d92..85d7f9eab 100644
--- a/docs/sudoers_timestamp.man.in
+++ b/docs/sudoers_timestamp.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudoers_timestamp.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
@@ -138,7 +138,7 @@ or of the parent process for records of type
 \fRTS_PPID\fR.
 The
 \fIstart_time\fR
-is used to help prevent re-use of a time stamp record after a
+is used to help prevent reuse of a time stamp record after a
 user has logged out.
 Not all systems support a method to easily retrieve a process's
 start time.
@@ -257,13 +257,13 @@ Information about the terminal device was stored in
 tty-based time stamp files for validity checks.
 This included the terminal device numbers, inode number and, on systems
 where it was not updated when the device was written to, the inode change time.
-This helped prevent re-use of the time stamp file after logout.
+This helped prevent reuse of the time stamp file after logout.
 .TP 6n
 1.8.6p7
 The terminal session ID was added to tty-based time stamp files to
-prevent re-use of the time stamp by the same user in a different
+prevent reuse of the time stamp by the same user in a different
 terminal session.
-It also helped prevent re-use of the time stamp file on systems where
+It also helped prevent reuse of the time stamp file on systems where
 the terminal device's inode change time was updated by writing.
 .TP 6n
 1.8.10
@@ -280,7 +280,7 @@ entire file and the lock is held until authentication is complete.
 1.8.22
 The start time of the terminal session leader or parent process is
 now stored in non-global time stamp records.
-This prevents re-use of the time stamp file after logout in most cases.
+This prevents reuse of the time stamp file after logout in most cases.
 .sp
 Support was added for the kernel-based tty time stamps available in
 OpenBSD
diff --git a/docs/sudoreplay.man.in b/docs/sudoreplay.man.in
index 01e5c0909..debd36599 100644
--- a/docs/sudoreplay.man.in
+++ b/docs/sudoreplay.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the sudoreplay.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"
diff --git a/docs/visudo.man.in b/docs/visudo.man.in
index 0bad13635..594de6eee 100644
--- a/docs/visudo.man.in
+++ b/docs/visudo.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated from an mdoc input file.  Do not edit.
+.\" Automatically generated from the visudo.mdoc.in file.  Do not edit.
 .\"
 .\" SPDX-License-Identifier: ISC
 .\"