diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index a272073f67e4..e46edc69c2a0 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -209,7 +209,8 @@ value.
 The syntax is the same as for the
 .Fl l
 argument of
-.Xr cpuset 1 or the word
+.Xr cpuset 1
+or the word
 .Ql default .
 If set to
 .Ql default
diff --git a/sbin/hastd/hast.conf.5 b/sbin/hastd/hast.conf.5
index 0a0921adeb5a..d78f539500c8 100644
--- a/sbin/hastd/hast.conf.5
+++ b/sbin/hastd/hast.conf.5
@@ -37,7 +37,7 @@
 .Xr hastd 8
 daemon and the
 .Xr hastctl 8
-utility.
+utility
 .Sh DESCRIPTION
 The
 .Nm
@@ -439,7 +439,7 @@ resource tank {
 .Xr gethostname 3 ,
 .Xr geom 4 ,
 .Xr hastctl 8 ,
-.Xr hastd 8 .
+.Xr hastd 8
 .Sh AUTHORS
 The
 .Nm
diff --git a/sbin/iscontrol/iscsi.conf.5 b/sbin/iscontrol/iscsi.conf.5
index 751a594c52ee..1e2c7f027a26 100644
--- a/sbin/iscontrol/iscsi.conf.5
+++ b/sbin/iscontrol/iscsi.conf.5
@@ -76,7 +76,7 @@ currently only 1.
 is the name by which the target is known, not to be confused with
 target address, either obtained via the target administrator, or
 from a
-.Em discovery session.
+.Em discovery session .
 .It Cm InitiatorName
 if not specified, defaults to
 .Sy iqn.2005-01.il.ac.huji.cs:
@@ -146,7 +146,7 @@ see
 This value can only be reduced.
 .It Cm sockbufsize
 sets the receiver and transmitter socket buffer size to
-.Em size,
+.Em size ,
 in kilobytes.
 The default is 128.
 .El
diff --git a/share/man/man5/device.hints.5 b/share/man/man5/device.hints.5
index 9dcaccd71beb..16d462738e2c 100644
--- a/share/man/man5/device.hints.5
+++ b/share/man/man5/device.hints.5
@@ -162,7 +162,7 @@ hint.acpi.0.disabled="1"
 .Xr kenv 1 ,
 .Xr loader.conf 5 ,
 .Xr loader 8 ,
-.Xr resource_int_value 9 .
+.Xr resource_int_value 9
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 00512d6777b4..9723f4c232d6 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -575,7 +575,7 @@ files at build time.
 The value should include the full path to the
 .Pa .mc
 file(s), e.g.,
-.Pa /etc/mail/foo.mc
+.Pa /etc/mail/foo.mc ,
 .Pa /etc/mail/bar.mc .
 .It Va SENDMAIL_ALIASES
 .Pq Vt str
diff --git a/share/man/man5/nsmb.conf.5 b/share/man/man5/nsmb.conf.5
index 2548a05f8c92..30fbecd7cc39 100644
--- a/share/man/man5/nsmb.conf.5
+++ b/share/man/man5/nsmb.conf.5
@@ -96,7 +96,6 @@ Possible keywords may include:
 .Bl -tag -width ".Pa /etc/nsmb.conf"
 .It Pa /etc/nsmb.conf
 The default remote mount-point configuration file.
-.Pa "~/nsmb.conf"
 .It Pa ~/nsmb.conf
 The user specific remote mount-point configuration file.
 .El
diff --git a/share/man/man5/portsnap.conf.5 b/share/man/man5/portsnap.conf.5
index b936d98038b6..90225b293820 100644
--- a/share/man/man5/portsnap.conf.5
+++ b/share/man/man5/portsnap.conf.5
@@ -47,7 +47,8 @@ specifies the source from which snapshots should be fetched.
 This is equivalent to the
 .Fl s Ar server
 option to
-.Xr portsnap 8 , and will be ignored if the command-line
+.Xr portsnap 8 ,
+and will be ignored if the command-line
 option is used.
 .Pp
 A line of the form
@@ -58,7 +59,8 @@ belonging to an RSA keypair which is trusted to sign updates.
 This is equivalent to the
 .Fl k Ar KEY
 option to
-.Xr portsnap 8 , and will be ignored if the command-line
+.Xr portsnap 8 ,
+and will be ignored if the command-line
 option is used.
 .Pp
 A line of the form
@@ -68,7 +70,8 @@ snapshot of the ports tree.
 This is equivalent to the
 .Fl d Ar workdir
 option to
-.Xr portsnap 8 , and will be ignored if the command-line option
+.Xr portsnap 8 ,
+and will be ignored if the command-line option
 is used.
 .Pp
 A line of the form
@@ -82,7 +85,8 @@ commands.
 This is equivalent to the
 .Fl p Ar portsdir
 option to
-.Xr portsnap 8 , and will be ignored if the command-line option
+.Xr portsnap 8 ,
+and will be ignored if the command-line option
 is used.
 .Pp
 If more than one line of any of the above forms is included in
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 2ed4a56e2236..f41933586a56 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -386,7 +386,7 @@ is used to set the hostname via DHCP,
 this variable should be set to an empty string.
 If this value remains unset when the system is done booting
 your console login will display the default hostname of
-.Dq Amnesiac.
+.Dq Amnesiac .
 .It Va nisdomainname
 .Pq Vt str
 The NIS domain name of this host, or
@@ -1299,6 +1299,7 @@ ifconfig_ed0_name="net0"
 ifconfig_net0="inet 192.0.2.1 netmask 0xffffff00"
 .Ed
 .It Va ipv6_enable
+.Pq Vt bool
 This variable is deprecated.
 Use
 .Va ifconfig_ Ns Ao Ar interface Ac Ns _ipv6
@@ -1306,7 +1307,6 @@ and
 .Va ipv6_activate_all_interfaces
 if necessary.
 .Pp
-.Pq Vt bool
 If the variable is
 .Dq Li YES ,
 .Dq Li inet6 accept_rtadv
@@ -1317,12 +1317,12 @@ and the
 is defined as
 .Dq Li YES .
 .It Va ipv6_prefer
+.Pq Vt bool
 This variable is deprecated.
 Use
 .Va ip6addrctl_policy
 instead.
 .Pp
-.Pq Vt bool
 If the variable is
 .Dq Li YES ,
 the default address selection policy table set by
@@ -3286,9 +3286,10 @@ is enabled, and a
 daemon is started for a non-default port, the
 .Va "moused_" Ns Ar XXX Ns Va "_flags"
 set of options has precedence over and replaces the default
-.Va moused_flags (where
+.Va moused_flags
+(where
 .Ar XXX
-is the name of the non-default port, i.e.\&
+is the name of the non-default port, i.e.,\&
 .Ar ums0 ) .
 By setting
 .Va "moused_" Ns Ar XXX Ns Va "_flags"
diff --git a/share/termcap/termcap.5 b/share/termcap/termcap.5
index 1fae963c3472..1f9c7eabe940 100644
--- a/share/termcap/termcap.5
+++ b/share/termcap/termcap.5
@@ -1821,7 +1821,7 @@ from the status line can be given as
 .Sy \&ts
 and
 .Sy \&fs .
-.Pf ( Xr \&fs
+.Pf ( Sy \&fs
 must leave the cursor position in the same place that it was before
 .Sy \&ts .
 If necessary, the
@@ -2067,7 +2067,7 @@ for ^C.
 .Pp
 Other specific terminal problems may be corrected by adding more
 capabilities of the form
-.Sy x Em x .
+.Sy x Ns Em x .
 .Ss Similar Terminals
 If there are two very similar terminals,
 one can be defined as being just like the other with certain exceptions.
diff --git a/usr.sbin/jail/jail.conf.5 b/usr.sbin/jail/jail.conf.5
index ed2cf33e4b97..fc5ecf1962be 100644
--- a/usr.sbin/jail/jail.conf.5
+++ b/usr.sbin/jail/jail.conf.5
@@ -37,7 +37,7 @@ A
 configuration file consists of one or more jail definitions statements,
 and parameter or variable statements within those jail definitions.
 A jail definition statement looks something like a C compound statement.
-A parameter statement looks like a C assigment,
+A parameter statement looks like a C assignment,
 including a terminating semicolon.
 .Pp
 The general syntax of a jail definition is:
@@ -100,17 +100,17 @@ A token is any sequence of characters that aren't considered special in
 the syntax of the configuration file (such as a semicolon or
 whitespace).
 If a value contains anything more than letters, numbers, dots, dashes
-and undescores, it is advisable to put quote marks around that value.
+and underscores, it is advisable to put quote marks around that value.
 Either single or double quotes may be used.
 .Pp
-Special characters may be quoted by preceeding them with a backslash.
+Special characters may be quoted by preceding them with a backslash.
 Common C-style backslash character codes are also supported, including
 control characters and octal or hex ASCII codes.
 A backslash at the end of a line will ignore the subsequent newline and
 continue the string at the start of the next line.
 .Ss Variables
 A string may use shell-style variable substitution.
-A parameter or variable name preceeded by a dollar sign, and possibly
+A parameter or variable name preceded by a dollar sign, and possibly
 enclosed in braces, will be replaced with the value of that parameter or
 variable.
 For example, a jail's path may be defined in terms of its name or
@@ -121,7 +121,7 @@ path = "/var/jail/$name";
 path = "/var/jail/${host.hostname}";
 .Ed
 .Pp
-Variable substition occurs in unquoted tokens or in double-quoted
+Variable substitution occurs in unquoted tokens or in double-quoted
 strings, but not in single-quote strings.
 .Pp
 A variable is defined in the same way a parameter is, except that the
diff --git a/usr.sbin/ntp/doc/ntp.conf.5 b/usr.sbin/ntp/doc/ntp.conf.5
index c19bc29bb66e..1aeed3356e2e 100644
--- a/usr.sbin/ntp/doc/ntp.conf.5
+++ b/usr.sbin/ntp/doc/ntp.conf.5
@@ -268,7 +268,7 @@ Options:
 All packets sent to and received from the server or peer are to
 include authentication fields encrypted using the autokey scheme
 described in
-.Sx Authentication Options .
+.Sx Authentication Commands .
 .It Cm burst
 when the server is reachable, send a burst of eight packets
 instead of the usual one.
@@ -305,7 +305,7 @@ default is to include no encryption field.
 .It Cm minpoll Ar minpoll
 .It Cm maxpoll Ar maxpoll
 These options specify the minimum and maximum poll intervals
-for NTP messages, as a power of 2 in seconds
+for NTP messages, as a power of 2 in seconds.
 The maximum poll
 interval defaults to 10 (1,024 s), but can be increased by the
 .Cm maxpoll
@@ -363,7 +363,7 @@ Note that, in order
 to avoid accidental or malicious disruption in this mode, both the
 server and client should operate using symmetric-key or public-key
 authentication as described in
-.Sx Authentication Options .
+.Sx Authentication Commands .
 .It Ic manycastserver Ar address ...
 This command enables reception of manycast client messages to
 the multicast group address(es) (type m) specified.
@@ -376,7 +376,7 @@ Note that, in order to avoid
 accidental or malicious disruption in this mode, both the server
 and client should operate using symmetric-key or public-key
 authentication as described in
-.Sx Authentication Options .
+.Sx Authentication Commands .
 .It Ic multicastclient Ar address ...
 This command enables reception of multicast server messages to
 the multicast group address(es) (type m) specified.
@@ -389,7 +389,7 @@ Note that,
 in order to avoid accidental or malicious disruption in this mode,
 both the server and client should operate using symmetric-key or
 public-key authentication as described in
-.Sx Authentication Options .
+.Sx Authentication Commands .
 .El
 .Sh Authentication Support
 Authentication support allows the NTP client to verify that the
@@ -466,7 +466,7 @@ of these checks and be discarded.
 Furthermore, the Autokey scheme requires a
 preliminary protocol exchange to obtain
 the server certificate, verify its
-credentials and initialize the protocol
+credentials and initialize the protocol.
 .Pp
 The
 .Cm auth
@@ -669,7 +669,7 @@ using the host name, network address and public keys,
 all of which are bound together by the protocol specifically
 to deflect masquerade attacks.
 For this reason Autokey
-includes the source and destinatino IP addresses in message digest
+includes the source and destination IP addresses in message digest
 computations and so the same addresses must be available
 at both the server and client.
 For this reason operation
@@ -796,7 +796,7 @@ The certificate extension fields must not contain either
 a subject key identifier or a issuer key identifier field;
 however, an extended key usage field for a trusted host must
 contain the value
-.Cm trustRoot ; .
+.Cm trustRoot .
 Other extension fields are ignored.
 .Ss Authentication Commands
 .Bl -tag -width indent
@@ -1068,10 +1068,11 @@ following form to the file generation set named
 The first two fields show the date (Modified Julian Day) and time
 (seconds and fraction past UTC midnight).
 The next field shows the peer
-address in dotted-quad notation, The final message field includes the
+address in dotted-quad notation.
+The final message field includes the
 message type and certain ancillary information.
 See the
-.Sx Authentication Options
+.Sx Authentication Commands
 section for further information.
 .It Cm loopstats
 Enables recording of loop filter statistics information.
@@ -1155,7 +1156,7 @@ Time in hours since the system was last rebooted.
 .It Packets received Cm 81965
 Total number of packets received.
 .It Packets processed Cm 0
-Number of packets received in response to previous packets sent
+Number of packets received in response to previous packets sent.
 .It Current version Cm 9546
 Number of packets matching the current NTP version.
 .It Previous version Cm 56
@@ -1461,7 +1462,7 @@ subcommand specifies the minimum average packet
 spacing, while the
 .Cm minimum
 subcommand specifies the minimum packet spacing.
-Packets that violate these minima are discarded
+Packets that violate these minimum are discarded
 and a kiss-o'-death packet returned if enabled.
 The default
 minimum average and minimum are 5 and 2, respectively.
@@ -1775,7 +1776,7 @@ It is often useful to narrow the range of acceptable
 servers which can be found by manycast client associations.
 Because manycast servers respond only when the client
 stratum is equal to or greater than the server stratum,
-primary (stratum 1) servers fill find only primary servers
+primary (stratum 1) servers will find only primary servers
 in TTL range, which is probably the most common objective.
 However, unless configured otherwise, all manycast clients
 in TTL range will eventually find all primary servers
@@ -1955,7 +1956,7 @@ peers remaining.
 This value defaults to 1, but can be changed
 to any number from 1 to 15.
 .It Cm minclock Ar minclock
-The clustering algorithm repeatedly casts out outlyer
+The clustering algorithm repeatedly casts out outerlayer
 associations until no more than
 .Cm minclock
 associations remain.
@@ -1965,7 +1966,7 @@ configured sources.
 .It Cm minsane Ar minsane
 This is the minimum number of candidates available
 to the clock selection algorithm in order to produce
-one or more truechimers for the clustering algorithm.
+one or more true chimers for the clustering algorithm.
 If fewer than this number are available, the clock is
 undisciplined and allowed to run free.
 The default is 1
diff --git a/usr.sbin/wpa/hostapd/hostapd.conf.5 b/usr.sbin/wpa/hostapd/hostapd.conf.5
index 3316627a84f6..fd91289f39d3 100644
--- a/usr.sbin/wpa/hostapd/hostapd.conf.5
+++ b/usr.sbin/wpa/hostapd/hostapd.conf.5
@@ -173,7 +173,7 @@ This conversion uses SSID so the PSK changes when ASCII passphrase is
 used and the SSID is changed.
 .It Va wpa_psk_file
 Optionally, WPA PSKs can be read from a separate text file (containing a
-list of (PSK,MAC address) pairs.
+list of PSK,MAC address pairs).
 .It Va wpa_key_mgmt
 Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both).
 .It Va wpa_pairwise
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
index d37847e6c2ce..5d6914fccb9d 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
@@ -316,7 +316,7 @@ This can be used to achieve forward secrecy.
 If the
 .Va dh_file
 is in DSA parameters format, it will be automatically converted
-into DH params.
+into DH parameters.
 .It Va subject_match
 Substring to be matched against the subject of the
 authentication server certificate.
@@ -370,7 +370,7 @@ TLS Message Length field in all TLS messages even if they are not
 fragmented.
 .It Li sim_min_num_chal=3
 can be used to configure EAP-SIM to require three
-challenges (by default, it accepts 2 or 3)
+challenges (by default, it accepts 2 or 3).
 .It Li fast_provisioning=1
 option enables in-line provisioning of EAP-FAST
 credentials (PAC).