diff --git a/doc/cvtsudoers.cat b/doc/cvtsudoers.cat
index 0c4aae238..e612c6c4e 100644
--- a/doc/cvtsudoers.cat
+++ b/doc/cvtsudoers.cat
@@ -40,7 +40,7 @@ DDEESSCCRRIIPPTTIIOONN
 
                  all       All Defaults entries.
 
-                 global    Gobal Defaults entries that are applied regardless
+                 global    Global Defaults entries that are applied regardless
                            of user, runas, host or command.
 
                  user      Per-user Defaults entries.
diff --git a/doc/cvtsudoers.man.in b/doc/cvtsudoers.man.in
index f50a2e478..74be920fd 100644
--- a/doc/cvtsudoers.man.in
+++ b/doc/cvtsudoers.man.in
@@ -1,5 +1,4 @@
-.\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!
-.\" IT IS GENERATED AUTOMATICALLY FROM cvtsudoers.mdoc.in
+.\" Automatically generated from an mdoc input file.  Do not edit.
 .\"
 .\" Copyright (c) 2018 Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
@@ -92,7 +91,7 @@ All Defaults entries.
 .PD
 .TP 10n
 global
-Gobal Defaults entries that are applied regardless of
+Global Defaults entries that are applied regardless of
 user, runas, host or command.
 .TP 10n
 user
diff --git a/doc/cvtsudoers.mdoc.in b/doc/cvtsudoers.mdoc.in
index 1ab474e41..045c96089 100644
--- a/doc/cvtsudoers.mdoc.in
+++ b/doc/cvtsudoers.mdoc.in
@@ -82,7 +82,7 @@ The supported types are:
 .It all
 All Defaults entries.
 .It global
-Gobal Defaults entries that are applied regardless of
+Global Defaults entries that are applied regardless of
 user, runas, host or command.
 .It user
 Per-user Defaults entries.
diff --git a/doc/sudo.conf.cat b/doc/sudo.conf.cat
index 12fe42d19..444d6155f 100644
--- a/doc/sudo.conf.cat
+++ b/doc/sudo.conf.cat
@@ -110,9 +110,9 @@ DDEESSCCRRIIPPTTIIOONN
                An ordered, colon-separated search path of directories to look
                in for device nodes.  This is used when mapping the process's
                tty device number to a device name on systems that do not
-               provide such a mechanism.  Sudo will _n_o_t recurse into
-               subdirectories.  If terminal devices may be located in a
-               subdirectory of _/_d_e_v, that path must be explicitly listed in
+               provide such a mechanism.  Sudo will _n_o_t recurse into sub-
+               directories.  If terminal devices may be located in a sub-
+               directory of _/_d_e_v, that path must be explicitly listed in
                _d_e_v_s_e_a_r_c_h.  The default value is:
                /dev/pts:/dev/vt:/dev/term:/dev/zcons:/dev/pty:/dev
 
diff --git a/doc/sudo.conf.man.in b/doc/sudo.conf.man.in
index 5d58a9356..c72c9d27f 100644
--- a/doc/sudo.conf.man.in
+++ b/doc/sudo.conf.man.in
@@ -1,5 +1,4 @@
-.\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!
-.\" IT IS GENERATED AUTOMATICALLY FROM sudo.conf.mdoc.in
+.\" Automatically generated from an mdoc input file.  Do not edit.
 .\"
 .\" Copyright (c) 2010-2017 Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
@@ -246,8 +245,8 @@ This is used when mapping the process's tty device number to a device name
 on systems that do not provide such a mechanism.
 Sudo will
 \fInot\fR
-recurse into subdirectories.
-If terminal devices may be located in a subdirectory of
+recurse into sub-directories.
+If terminal devices may be located in a sub-directory of
 \fI/dev\fR,
 that path must be explicitly listed in
 \fIdevsearch\fR.
diff --git a/doc/sudo.conf.mdoc.in b/doc/sudo.conf.mdoc.in
index a547762f7..afc95b9c3 100644
--- a/doc/sudo.conf.mdoc.in
+++ b/doc/sudo.conf.mdoc.in
@@ -222,8 +222,8 @@ This is used when mapping the process's tty device number to a device name
 on systems that do not provide such a mechanism.
 Sudo will
 .Em not
-recurse into subdirectories.
-If terminal devices may be located in a subdirectory of
+recurse into sub-directories.
+If terminal devices may be located in a sub-directory of
 .Pa /dev ,
 that path must be explicitly listed in
 .Em devsearch .
diff --git a/doc/sudo_plugin.cat b/doc/sudo_plugin.cat
index 82b2ba7a4..aab7b6bb7 100644
--- a/doc/sudo_plugin.cat
+++ b/doc/sudo_plugin.cat
@@ -525,7 +525,7 @@ DDEESSCCRRIIPPTTIIOONN
                        which may choose to ignore it.
 
                  iolog_mode=octal
-                       The file permision mode to use when creating I/O log
+                       The file permission mode to use when creating I/O log
                        files and directories.  This is a hint to the I/O
                        logging plugin which may choose to ignore it.
 
diff --git a/doc/sudo_plugin.man.in b/doc/sudo_plugin.man.in
index 030d25d75..06f10409c 100644
--- a/doc/sudo_plugin.man.in
+++ b/doc/sudo_plugin.man.in
@@ -1,5 +1,4 @@
-.\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!
-.\" IT IS GENERATED AUTOMATICALLY FROM sudo_plugin.mdoc.in
+.\" Automatically generated from an mdoc input file.  Do not edit.
 .\"
 .\" Copyright (c) 2009-2018 Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
@@ -912,7 +911,7 @@ The group that will own newly created I/O log files and directories.
 This is a hint to the I/O logging plugin which may choose to ignore it.
 .TP 6n
 iolog_mode=octal
-The file permision mode to use when creating I/O log files and directories.
+The file permission mode to use when creating I/O log files and directories.
 This is a hint to the I/O logging plugin which may choose to ignore it.
 .TP 6n
 iolog_user=string
diff --git a/doc/sudo_plugin.mdoc.in b/doc/sudo_plugin.mdoc.in
index c368c92af..d38bbd092 100644
--- a/doc/sudo_plugin.mdoc.in
+++ b/doc/sudo_plugin.mdoc.in
@@ -810,7 +810,7 @@ This is a hint to the I/O logging plugin which may choose to ignore it.
 The group that will own newly created I/O log files and directories.
 This is a hint to the I/O logging plugin which may choose to ignore it.
 .It iolog_mode=octal
-The file permision mode to use when creating I/O log files and directories.
+The file permission mode to use when creating I/O log files and directories.
 This is a hint to the I/O logging plugin which may choose to ignore it.
 .It iolog_user=string
 The user that will own newly created I/O log files and directories.
diff --git a/doc/sudoers.ldap.cat b/doc/sudoers.ldap.cat
index b499288a3..6e7050e08 100644
--- a/doc/sudoers.ldap.cat
+++ b/doc/sudoers.ldap.cat
@@ -450,7 +450,7 @@ DDEESSCCRRIIPPTTIIOONN
            This option can be used to query a user's netgroups directly via
            LDAP which is usually faster than fetching every sudoRole object
            containing a sudoUser that begins with a `+' prefix.  The NIS
-           schema used by some LDAP servers need a modificaton to support
+           schema used by some LDAP servers need a modification to support
            querying the nisNetgroup object by its nisNetgroupTriple member.
            OpenLDAP's ssllaappdd requires the following change to the
            nisNetgroupTriple attribute:
diff --git a/doc/sudoers.ldap.man.in b/doc/sudoers.ldap.man.in
index 4ce0eb4a0..a3d0496b9 100644
--- a/doc/sudoers.ldap.man.in
+++ b/doc/sudoers.ldap.man.in
@@ -1,5 +1,4 @@
-.\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!
-.\" IT IS GENERATED AUTOMATICALLY FROM sudoers.ldap.mdoc.in
+.\" Automatically generated from an mdoc input file.  Do not edit.
 .\"
 .\" Copyright (c) 2003-2018 Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
@@ -793,7 +792,7 @@ object containing a
 that begins with a
 \(oq+\(cq
 prefix.
-The NIS schema used by some LDAP servers need a modificaton to
+The NIS schema used by some LDAP servers need a modification to
 support querying the
 \fRnisNetgroup\fR
 object by its
diff --git a/doc/sudoers.ldap.mdoc.in b/doc/sudoers.ldap.mdoc.in
index bb16bff02..c3afa1a3f 100644
--- a/doc/sudoers.ldap.mdoc.in
+++ b/doc/sudoers.ldap.mdoc.in
@@ -741,7 +741,7 @@ object containing a
 that begins with a
 .Ql +
 prefix.
-The NIS schema used by some LDAP servers need a modificaton to
+The NIS schema used by some LDAP servers need a modification to
 support querying the
 .Li nisNetgroup
 object by its
diff --git a/doc/sudoreplay.cat b/doc/sudoreplay.cat
index e939626c8..0dc74dabc 100644
--- a/doc/sudoreplay.cat
+++ b/doc/sudoreplay.cat
@@ -124,12 +124,12 @@ DDEESSCCRRIIPPTTIIOONN
                  eliminate the pauses entirely.
 
      --nn, ----nnoonn--iinntteerraaccttiivvee
-                 Do not prompt for user input or attempt to resize the
+                 Do not prompt for user input or attempt to re-size the
                  terminal.  The session is written to the standard output, not
                  directly to the user's terminal.
 
      --RR, ----nnoo--rreessiizzee
-                 Do not attempt to resize the terminal to match the terminal
+                 Do not attempt to re-size the terminal to match the terminal
                  size of the session.
 
      --ss, ----ssppeeeedd _s_p_e_e_d___f_a_c_t_o_r
diff --git a/doc/sudoreplay.man.in b/doc/sudoreplay.man.in
index a2a0bdb06..71203ee03 100644
--- a/doc/sudoreplay.man.in
+++ b/doc/sudoreplay.man.in
@@ -1,5 +1,4 @@
-.\" DO NOT EDIT THIS FILE, IT IS NOT THE MASTER!
-.\" IT IS GENERATED AUTOMATICALLY FROM sudoreplay.mdoc.in
+.\" Automatically generated from an mdoc input file.  Do not edit.
 .\"
 .\" Copyright (c) 2009-2018 Todd C. Miller <Todd.Miller@sudo.ws>
 .\"
@@ -245,12 +244,12 @@ A
 of zero or less will eliminate the pauses entirely.
 .TP 12n
 \fB\-n\fR, \fB\--non-interactive\fR
-Do not prompt for user input or attempt to resize the terminal.
+Do not prompt for user input or attempt to re-size the terminal.
 The session is written to the standard output, not directly to
 the user's terminal.
 .TP 12n
 \fB\-R\fR, \fB\--no-resize\fR
-Do not attempt to resize the terminal to match the terminal size
+Do not attempt to re-size the terminal to match the terminal size
 of the session.
 .TP 12n
 \fB\-s\fR, \fB\--speed\fR \fIspeed_factor\fR
diff --git a/doc/sudoreplay.mdoc.in b/doc/sudoreplay.mdoc.in
index e9e530ba3..fdd5f72af 100644
--- a/doc/sudoreplay.mdoc.in
+++ b/doc/sudoreplay.mdoc.in
@@ -224,11 +224,11 @@ A
 .Em max_wait
 of zero or less will eliminate the pauses entirely.
 .It Fl n , -non-interactive
-Do not prompt for user input or attempt to resize the terminal.
+Do not prompt for user input or attempt to re-size the terminal.
 The session is written to the standard output, not directly to
 the user's terminal.
 .It Fl R , -no-resize
-Do not attempt to resize the terminal to match the terminal size
+Do not attempt to re-size the terminal to match the terminal size
 of the session.
 .It Fl s , -speed Ar speed_factor
 This option causes
