12 files changed, 31 insertions, 31 deletions
diff --git a/lib/libc/sys/_exit.2 b/lib/libc/sys/_exit.2
index e864a78bef54..17f4d09191ac 100644
--- a/lib/libc/sys/_exit.2
+++ b/lib/libc/sys/_exit.2
@@ -63,7 +63,7 @@ or catches the
 signal,
 it is notified of the calling process's termination and
 the
-.Em status
+.Fa status
 is set as defined by
 .Xr wait 2 .
 .It
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 7e54ac36f15d..19b9f8d447c8 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -158,7 +158,7 @@ These values may be used in changing the effective IDs later (see
 .Xr setuid 2 ) .
 .Pp
 The set-ID bits are not honored if the respective file system has the
-.Ar nosuid
+.Cm nosuid
 option enabled or if the new process file is an interpreter file.  Syscall
 tracing is disabled if effective IDs are changed.
 .Pp
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index 0a2861246fd7..70dfc0b92a02 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -72,7 +72,7 @@ Some file systems may not support these system calls
 with buffers smaller than this size.
 .Pp
 The data in the buffer is a series of
-.Em dirent
+.Vt dirent
 structures each containing the following entries:
 .Bd -literal -offset indent
 u_int32_t d_fileno;
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
index 4ca298ab5a8a..3d556432a746 100644
--- a/lib/libc/sys/getrlimit.2
+++ b/lib/libc/sys/getrlimit.2
@@ -105,7 +105,7 @@ soft limit is exceeded a process may receive a signal (for example, if
 the cpu time or file size is exceeded), but it will be allowed to
 continue execution until it reaches the hard limit (or modifies
 its resource limit).  The
-.Em rlimit
+.Vt rlimit
 structure is used to specify the hard and soft limits on a resource,
 .Bd -literal -offset indent
 struct rlimit {
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index 516bca7d9e78..9208ed728eeb 100644
--- a/lib/libc/sys/ioctl.2
+++ b/lib/libc/sys/ioctl.2
@@ -61,15 +61,15 @@ must be an open file descriptor.
 The third argument to
 .Fn ioctl
 is traditionally named
-.Ar "char *argp" .
+.Va "char *argp" .
 Most uses of
 .Fn ioctl
 in
 .Fx 3.0
 however, require the third argument to be a
-.Ar caddr_t
+.Vt caddr_t
 or an
-.Ar int .
+.Vt int .
 .Pp
 An
 .Fn ioctl
diff --git a/lib/libc/sys/lseek.2 b/lib/libc/sys/lseek.2
index c2a04deec6e4..d394ef9cb310 100644
--- a/lib/libc/sys/lseek.2
+++ b/lib/libc/sys/lseek.2
@@ -120,7 +120,7 @@ system call
 will fail and the file position pointer will remain unchanged if:
 .Bl -tag -width Er
 .It Bq Er EBADF
-.Em Fildes
+.Fa fildes
 is not an open file descriptor.
 .It Bq Er EINVAL
 .Fa Whence
@@ -132,7 +132,7 @@ The resulting file offset would be a value which cannot be represented
 correctly in an object of type
 .Fa off_t .
 .It Bq Er ESPIPE
-.Em Fildes
+.Fa fildes
 is associated with a pipe, socket, or FIFO.
 .El
 .Sh SEE ALSO
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 792215889193..96032d78f5b6 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -54,28 +54,28 @@ The
 system call grafts
 a file system object onto the system file tree
 at the point
-.Ar dir .
+.Fa dir .
 The argument
-.Ar data
+.Fa data
 describes the file system object to be mounted.
 The argument
-.Ar type
+.Fa type
 tells the kernel how to interpret
-.Ar data
+.Fa data
 (See
-.Ar type
+.Fa type
 below).
 The contents of the file system
 become available through the new mount point
-.Ar dir .
+.Fa dir .
 Any files in
-.Ar dir
+.Fa dir
 at the time
 of a successful mount are swept under the carpet so to speak, and
 are unavailable until the file system is unmounted.
 .Pp
 The following
-.Ar flags
+.Fa flags
 may be specified to
 suppress default semantics which affect file system access.
 .Bl -tag -width MNT_SYNCHRONOUS
@@ -188,10 +188,10 @@ A component of
 does not exist.
 .It Bq Er ENOTDIR
 A component of
-.Ar name
+.Fa name
 is not a directory,
 or a path prefix of
-.Ar special
+.Fa special
 is not a directory.
 .It Bq Er EBUSY
 Another process currently holds a reference to
@@ -207,18 +207,18 @@ file system mount:
 .Bl -tag -width Er
 .It Bq Er ENODEV
 A component of ufs_args
-.Ar fspec
+.Fa fspec
 does not exist.
 .It Bq Er ENOTBLK
-.Ar Fspec
+.Fa fspec
 is not a block device.
 .It Bq Er ENXIO
 The major device number of
-.Ar fspec
+.Fa fspec
 is out of range (this indicates no device driver exists
 for the associated hardware).
 .It Bq Er EBUSY
-.Ar Fspec
+.Fa fspec
 is already mounted.
 .It Bq Er EMFILE
 No space remains in the mount table.
@@ -232,7 +232,7 @@ group information for the file system.
 An I/O error occurred while reading the super block or
 cylinder group information.
 .It Bq Er EFAULT
-.Ar Fspec
+.Fa fspec
 points outside the process's allocated address space.
 .El
 .Pp
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index 66339d436122..6ab7952b0ab3 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -67,9 +67,9 @@ The default, causing the system to reboot in its usual fashion.
 Interpreted by the bootstrap program itself, causing it to
 prompt on the console as to what file should be booted.
 Normally, the system is booted from the file
-.Dq Em xx Ns No (0,0)kernel ,
+.Dq Ar xx Ns No (0,0)kernel ,
 where
-.Em xx
+.Ar xx
 is the default disk name,
 without prompting for the file name.
 .It Dv RB_DFLTROOT
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index 1409c84751b1..56572cad0008 100644
--- a/lib/libc/sys/rename.2
+++ b/lib/libc/sys/rename.2
@@ -181,7 +181,7 @@ An I/O error occurred while making or updating a directory entry.
 The requested link requires writing in a directory on a read-only file
 system.
 .It Bq Er EFAULT
-.Em Path
+Path
 points outside the process's allocated address space.
 .It Bq Er EINVAL
 .Fa From
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index b084cdd72224..a302cee5c19f 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -177,7 +177,7 @@ current and pending instances
 of the signal are ignored and discarded.
 .Pp
 Options may be specified by setting
-.Em sa_flags .
+.Va sa_flags .
 The meaning of the various bits is as follows:
 .Bl -tag -offset indent -width SA_RESETHANDXX
 .It Dv SA_NOCLDSTOP
@@ -238,7 +238,7 @@ Restart of pending calls is requested
 by setting the
 .Dv SA_RESTART
 bit in
-.Ar sa_flags .
+.Va sa_flags .
 The affected system calls include
 .Xr open 2 ,
 .Xr read 2 ,
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libc/sys/sigprocmask.2
index c1af81b7a573..c8866fc363c6 100644
--- a/lib/libc/sys/sigprocmask.2
+++ b/lib/libc/sys/sigprocmask.2
@@ -89,7 +89,7 @@ When
 .Fa set
 is null,
 the value of
-.Ar how
+.Fa how
 is insignificant and the mask remains unset
 providing a way to examine the signal mask without modification.
 .Pp
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 49d24f7f6165..fbdbb5b1c0bc 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -225,7 +225,7 @@ Search permission is denied for a component of the path prefix.
 .It Bq Er EFAULT
 .Fa sb
 or
-.Em name
+.Fa path
 points to an invalid address.
 .It Bq Er EIO
 An I/O error occurred while reading from or writing to the file system.