diff --git a/lib/libc/gen/arc4random.3 b/lib/libc/gen/arc4random.3
index d6844b430869..334bb7b132ad 100644
--- a/lib/libc/gen/arc4random.3
+++ b/lib/libc/gen/arc4random.3
@@ -34,8 +34,8 @@
 .Dt ARC4RANDOM 3
 .Os
 .Sh NAME
-.Nm arc4random,
-.Nm arc4random_stir,
+.Nm arc4random ,
+.Nm arc4random_stir ,
 .Nm arc4random_addrandom
 .Nd arc4 random number generator.
 .Sh SYNOPSIS
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index 1231c75f48c9..8b556b59fcfe 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -92,14 +92,20 @@ must be explicitly matched by periods in
 .Fa pattern .
 If this flag is not set, then leading periods are treated as regular
 characters.
-The definition of ``leading'' is related to the specification of
-.Dv FNM_PATHNAME.
-A period is always ``leading'' if it is the first character in
+The definition of
+.Dq leading
+is related to the specification of
+.Dv FNM_PATHNAME .
+A period is always
+.Dq leading
+if it is the first character in
 .Ar string .
 Additionally, if
 .Dv FNM_PATHNAME
 is set,
-a period is ``leading'' if it immediately follows a slash.
+a period is
+leading
+if it immediately follows a slash.
 .It Dv FNM_LEADING_DIR
 Ignore
 .Nm /*
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index 6eacb38d928f..5ffaf9e91df0 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -60,7 +60,9 @@ functions are provided for traversing
 file hierarchies.
 A simple overview is that the
 .Fn fts_open
-function returns a ``handle'' on a file hierarchy, which is then supplied to
+function returns a
+.Dq handle
+on a file hierarchy, which is then supplied to
 the other
 .Nm fts
 functions.
@@ -76,7 +78,9 @@ In general, directories are visited two distinguishable times; in pre-order
 (before any of their descendants are visited) and in post-order (after all
 of their descendants have been visited).
 Files are visited once.
-It is possible to walk the hierarchy ``logically'' (ignoring symbolic links)
+It is possible to walk the hierarchy
+.Dq logically
+(ignoring symbolic links)
 or physically (visiting symbolic links), order the walk of the hierarchy or
 prune and/or re-visit portions of the hierarchy.
 .Pp
@@ -93,7 +97,9 @@ Normally, an
 .Fa FTSENT
 structure is returned for every file in the file
 hierarchy.
-In this manual page, ``file'' and
+In this manual page,
+.Dq file
+and
 .Dq Fa FTSENT No structure
 are generally
 interchangeable.
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 3d908182ed4e..0195b2690643 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -70,7 +70,7 @@ Reads from these files return the next group of packets
 that have matched the filter. 
 To improve performance, the buffer passed to read must be
 the same size as the buffers used internally by
-.Nm
+.Nm bpf .
 This size is returned by the
 .Dv BIOCGBLEN
 ioctl (see below), and 
@@ -101,7 +101,9 @@ links are supported.
 .Sh IOCTLS
 The
 .Xr ioctl 2
-command codes below are defined in <net/bpf.h>.  All commands require
+command codes below are defined in
+.Aq Pa net/bpf.h .
+All commands require
 these includes:
 .Bd -literal
 	#include <sys/types.h>
@@ -219,7 +221,9 @@ kernel because of buffer overflows
 .El
 .It Dv BIOCIMMEDIATE
 .Pq Li u_int
-Enable or disable ``immediate mode'', based on the truth value of the argument.
+Enable or disable
+.Dq immediate mode ,
+based on the truth value of the argument.
 When immediate mode is enabled, reads return immediately upon packet
 reception.  Otherwise, a read will block until either the kernel buffer
 becomes full or a timeout occurs.
@@ -279,7 +283,9 @@ or haphazard packet matching).
 .It Dv BIOCSHDRCMPLT
 .It Dv BIOCGHDRCMPLT
 .Pq Li u_int
-Set or get the status of the ``header complete'' flag.
+Set or get the status of the
+.Dq header complete
+flag.
 Set to zero if the link level source address should be filled in automatically
 by the the interface output routine.  Set to one if the link level source
 address will be written, as provided, to the wire.  This flag is initialized
@@ -408,7 +414,9 @@ Below are the semantics for each defined
 instruction.
 We use the convention that A is the accumulator, X is the index register,
 P[] packet data, and M[] scratch memory store.
-P[i:n] gives the data at byte offset ``i'' in the packet,
+P[i:n] gives the data at byte offset
+.Dq i
+in the packet,
 interpreted as a word (n=4),
 unsigned halfword (n=2), or unsigned byte (n=1).
 M[i] gives the i'th word in the scratch memory store, which is only
@@ -420,13 +428,16 @@ addressed in word units.  The memory store is indexed from 0 to
 and
 .Li jf
 are the corresponding fields in the
-instruction definition.  ``len'' refers to the length of the packet.
+instruction definition.
+.Dq len
+refers to the length of the packet.
 .Pp
 .Bl -tag -width BPF_STXx -compact
 .It Dv BPF_LD
 These instructions copy a value into the accumulator.  The type of the
-source operand is specified by an ``addressing mode'' and can be 
-a constant
+source operand is specified by an
+.Dq addressing mode
+and can be a constant
 .Pq Dv BPF_IMM ,
 packet data at a fixed offset
 .Pq Dv BPF_ABS ,
diff --git a/share/man/man4/update.4 b/share/man/man4/update.4
index 76eaed1f91f6..8a16a248287e 100644
--- a/share/man/man4/update.4
+++ b/share/man/man4/update.4
@@ -68,7 +68,7 @@ function call to do the task.
 .Xr sysctl 8
 .Sh BUGS
 It is possible on some systems that a
-.Xr sync
+.Xr sync 2
 occurring simultaneously with a crash may cause
 file system damage.  See
 .Xr fsck 8 .
@@ -77,7 +77,9 @@ An
 .Nm update
 command appeared in
 .At v6 ,
-and was usually started by /etc/rc when the system went multi-user.
+and was usually started by
+.Pa /etc/rc
+when the system went multi-user.
 A kernel initiated
 .Nm update
 process first appeared in
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9
index a90a5f4448d2..aa3f0913700b 100644
--- a/share/man/man9/namei.9
+++ b/share/man/man9/namei.9
@@ -156,7 +156,7 @@ the implementation of stacking layers that do full namespace escapes.
 .Sh SEE ALSO
 .Xr VFS 9 ,
 .Xr vnode 9 ,
-src/sys/kern/vfs_lookup.c
+.Pa src/sys/kern/vfs_lookup.c
 .Sh AUTHORS
 This man page was written by
 .An Eivind Eklund .
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index e0978b655e1a..763f6bdd2639 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -63,7 +63,9 @@ The super-user is allowed to directly supply a user database
 entry, in the format specified by
 .Xr passwd 5 ,
 as an argument.
-This argument must be a colon (``:'') separated list of all the
+This argument must be a colon
+.Pq Dq :
+separated list of all the
 user database fields, although they may be empty.
 .It Fl p
 The super-user is allowed to directly supply an encrypted password field,
@@ -163,7 +165,9 @@ Both the
 .Ar change
 and
 .Ar expire
-fields should be entered in the form ``month day year'' where
+fields should be entered in the form
+.Dq month day year
+where
 .Ar month
 is the month name (the first three characters are sufficient),
 .Ar day
@@ -250,14 +254,15 @@ updates to the NIS maps, but editing the map source files by hand can
 be cumbersome.
 .Pp
 Note: these exceptions only apply when the NIS master server is a
-FreeBSD system.)
+.Fx
+system).
 .Pp
 Consequently, except where noted, the following restrictions apply when
 .Nm chpass
 is used with NIS:
 .Bl -enum -offset indent
 .It
-.Pa Only the shell and GECOS information may be changed.
+.Em "Only the shell and GECOS information may be changed" .
 All other
 fields are restricted, even when
 .Nm chpass
@@ -273,7 +278,7 @@ Exception: the super-user on the NIS master server is permitted to
 change any field.
 .Pp
 .It
-.Pa Password authentication is required.
+.Em "Password authentication is required" .
 .Nm Chpass
 will prompt for the user's NIS password before effecting
 any changes. If the password is invalid, all changes will be
@@ -285,8 +290,7 @@ choose to turn off this feature using the
 .Fl o
 flag, described below.)
 .It
-.Pa Adding new records to the local
-.Pa password database is discouraged.
+.Em "Adding new records to the local password database is discouraged" .
 .Nm Chpass
 will allow the administrator to add new records to the
 local password database while NIS is enabled, but this can lead to
@@ -309,13 +313,15 @@ NIS maps instead, invoke chpass with the
 .Fl y
 flag.
 .It
-.Pa Password changes are not permitted.
+.Em "Password changes are not permitted".
 Users should use
 .Xr passwd 1
 or
 .Xr yppasswd 1
 to change their NIS passwords. The super-user is allowed to specify
-a new password (even though the ``Password:'' field does not show
+a new password (even though the
+.Dq Password:
+field does not show
 up in the editor template, the super-user may add it back by hand),
 but even the super-user must supply the user's original password
 otherwise
@@ -369,7 +375,9 @@ slave, in a given NIS domain will do.
 .Pp
 When using the
 .Fl d
-option, the hostname defaults to ``localhost.'' The
+option, the hostname defaults to 
+.Dq localhost .
+The
 .Fl h
 option can be used in conjunction with the
 .Fl d
@@ -379,7 +387,7 @@ the default.
 .It Fl o
 Force the use of RPC-based updates when communicating with
 .Xr rpc.yppasswdd 8
-(``old-mode'').
+.Pq Dq old-mode .
 When invoked by the super-user on the NIS master server,
 .Nm chpass
 allows unrestricted changes to the NIS passwd maps using dedicated,
@@ -431,6 +439,6 @@ commands are really only links to
 User information should (and eventually will) be stored elsewhere.
 .Sh HISTORY
 The
-.Nm
+.Nm chpass
 command appeared in 
 .Bx 4.3 Reno .
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index 7c9abed8f8b2..ff2da0be622e 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -502,15 +502,12 @@ by
 tcp,
 use:
 .Dl example% rpcgen -n tcp -o prot_svc.c prot.x
-.Sh "SEE ALSO"
+.Sh SEE ALSO
 .Xr cc 1 ,
 .Xr rpc 3 ,
 .Xr syslog 3 ,
 .Xr inetd 8
 .\" .BR rpc_svc_calls (3)
-.Pp
-The
-.Nm
-chapter in the
-.Tn NETP
-manual.
+.Rs
+.%T The Nm rpcgen No chapter in the NETP manual
+.Re
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 836d830d63d8..be348c47cfdb 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -51,7 +51,7 @@
 executes
 .Ar command
 on
-.Ar host  .
+.Ar host .
 .Pp
 .Nm Rsh
 copies its standard input to the remote command, the standard
@@ -67,7 +67,7 @@ The options are as follows:
 Turn off all Kerberos authentication.
 .It Fl d
 Turn on socket debugging (using
-.Xr setsockopt  2  )
+.Xr setsockopt 2 )
 on the
 .Tn TCP
 sockets used for communication with the remote host.
@@ -77,7 +77,7 @@ Cause
 to obtain tickets for the remote host in
 .Ar realm
 instead of the remote host's realm as determined by
-.Xr krb_realmofhost  3  .
+.Xr krb_realmofhost 3 .
 .It Fl l
 By default, the remote username is the same as the local username.
 The
@@ -85,7 +85,7 @@ The
 option allows the remote name to be specified.
 Kerberos authentication is used, and authorization is determined
 as in
-.Xr rlogin  1  .
+.Xr rlogin 1 .
 .It Fl n
 Redirect input from the special device
 .Pa /dev/null
@@ -105,7 +105,7 @@ data is sent or received in this time, rsh will exit.
 If no
 .Ar command
 is specified, you will be logged in on the remote host using
-.Xr rlogin  1  .
+.Xr rlogin 1 .
 .Pp
 Shell metacharacters which are not quoted are interpreted on local machine,
 while quoted metacharacters are interpreted on the remote machine.
@@ -168,9 +168,9 @@ option.
 .Pp
 You cannot run an interactive command
 (like
-.Xr rogue  6
+.Xr rogue 6
 or
-.Xr vi  1  )
+.Xr vi 1 )
 using
 .Nm rsh ;
 use
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index e06845996c2d..7326592c5bb3 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -92,7 +92,6 @@ back to the kernel later by the
 .Fl l
 option above.
 .It Fl f Ar # Ar string
-.\".BI "\-f\ " #\ string
 Set function key number
 .Ar #
 to send
@@ -129,6 +128,7 @@ of little use under normal circumstances.
 .Sh KEYBOARD CONFIGURATION
 .Ss Boot Time Configuration
 You may set variables in
+.Pa /etc/defaults/rc.conf ,
 .Pa /etc/rc.conf
 or
 .Pa /etc/rc.conf.local