26 files changed, 65 insertions, 44 deletions
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libc/sys/aio_cancel.2
index 06e9025..e16d386 100644
--- a/lib/libc/sys/aio_cancel.2
+++ b/lib/libc/sys/aio_cancel.2
@@ -48,7 +48,7 @@ is specified, only that specific asynchronous I/O request is cancelled.
 .Pp
 Normal asynchronous notification occurs for cancelled requests.  Requests
 complete with an error result of
-.Dv ECANCELED .
+.Er ECANCELED .
 .Sh RESTRICTIONS
 The
 .Fn aio_cancel
diff --git a/lib/libc/sys/aio_error.2 b/lib/libc/sys/aio_error.2
index 10ab6c3..e27c973 100644
--- a/lib/libc/sys/aio_error.2
+++ b/lib/libc/sys/aio_error.2
@@ -46,7 +46,7 @@ associated with the structure pointed to by
 If the asynchronous I/O request has completed successfully,
 .Fn aio_error
 returns 0.  If the request has not yet completed,
-.Dv EINPROGRESS 
+.Er EINPROGRESS 
 is returned.  If the request has completed unsuccessfully the error
 status is returned as described in
 .Xr read 2 ,
diff --git a/lib/libc/sys/aio_return.2 b/lib/libc/sys/aio_return.2
index 35550ba..3477288 100644
--- a/lib/libc/sys/aio_return.2
+++ b/lib/libc/sys/aio_return.2
@@ -48,7 +48,7 @@ should only be called once, to obtain the final status of an asynchronous
 I/O operation once 
 .Xr aio_error 2
 returns something other than
-.Dv EINPROGRESS .
+.Er EINPROGRESS .
 .Sh RETURN VALUES
 If the asynchronous I/O request has completed, the status is returned
 as described in
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index e8edf59..f2e1d08 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -213,7 +213,10 @@ The
 .Fn chmod
 function call is expected to conform to 
 .St -p1003.1-90 ,
-except for the return of EFTYPE and the use of S_ISTXT.
+except for the return of
+.Er EFTYPE
+and the use of
+.Dv S_ISTXT .
 .Sh HISTORY
 A
 .Fn chmod
diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2
index 11a144a..6d9f764 100644
--- a/lib/libc/sys/chroot.2
+++ b/lib/libc/sys/chroot.2
@@ -75,13 +75,17 @@ If
 .Ql kern.chroot_allow_open_directories
 is set to zero, 
 .Fn chroot
-will always fail with EPERM if there are any directories open.
+will always fail with
+.Er EPERM
+if there are any directories open.
 .Pp
 If 
 .Ql kern.chroot_allow_open_directories
 is set to one (the default), 
 .Fn chroot
-will fail with EPERM if there are any directories open and the
+will fail with
+.Er EPERM
+if there are any directories open and the
 process is already subject to a 
 .Fn chroot
 call.
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
index bb2ab8c..7e4880a 100644
--- a/lib/libc/sys/connect.2
+++ b/lib/libc/sys/connect.2
@@ -146,7 +146,7 @@ has not yet been completed.
 .Pp
 The following errors are specific to connecting names in the UNIX domain.
 These errors may not apply in future versions of the UNIX IPC domain.
-.Bl -tag -width EADDRNOTAVAILABB
+.Bl -tag -width Er
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2
index d3f7888..d0ec2ed 100644
--- a/lib/libc/sys/getfh.2
+++ b/lib/libc/sys/getfh.2
@@ -60,31 +60,31 @@ is set to indicate the error.
 .Fn Getfh
 fails if one or more of the following are true:
 .Bl -tag -width Er
-.It Bq ENOTDIR
+.It Bq Er ENOTDIR
 A component of the path prefix of
 .Fa path
 is not a directory.
-.It Bq ENAMETOOLONG
+.It Bq Er ENAMETOOLONG
 The length of a component of
 .Fa path
 exceeds 255 characters,
 or the length of
 .Fa path
 exceeds 1023 characters.
-.It Bq ENOENT
+.It Bq Er ENOENT
 The file referred to by
 .Fa path
 does not exist.
-.It Bq EACCES
+.It Bq Er EACCES
 Search permission is denied for a component of the path prefix of
 .Fa path .
-.It Bq ELOOP
+.It Bq Er ELOOP
 Too many symbolic links were encountered in translating
 .Fa path .
-.It Bq EFAULT
+.It Bq Er EFAULT
 .Fa Fhp
 points to an invalid address.
-.It Bq EIO
+.It Bq Er EIO
 An
 .Tn I/O
 error occurred while reading from or writing to the file system.
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libc/sys/getfsstat.2
index c9d1bd5..de2bb80 100644
--- a/lib/libc/sys/getfsstat.2
+++ b/lib/libc/sys/getfsstat.2
@@ -155,10 +155,10 @@ is set to indicate the error.
 .Fn Getfsstat
 fails if one or more of the following are true:
 .Bl -tag -width Er
-.It EFAULT
+.It Bq Er EFAULT
 .Fa Buf
 points to an invalid address.
-.It EIO
+.It Bq Er EIO
 An
 .Tn I/O
 error occurred while reading from or writing to the filesystem.
diff --git a/lib/libc/sys/kldnext.2 b/lib/libc/sys/kldnext.2
index 20984d2..cef9d0a 100644
--- a/lib/libc/sys/kldnext.2
+++ b/lib/libc/sys/kldnext.2
@@ -55,7 +55,9 @@ is set to indicate the error.
 .Sh ERRORS
 The only error set by
 .Fn kldnext
-is ENOENT, which is set when
+is
+.Er ENOENT ,
+which is set when
 .Va fileid
 refers to a kld file that does not exist (isn't loaded).
 .Sh SEE ALSO
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index fb1ce1f..5c9e5f8 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -390,7 +390,7 @@ The
 .Fn kevent
 function fails if:
 .Bl -tag -width Er
-.It Bq Er EACCESS
+.It Bq Er EACCES
 The process does not have permission to register a filter.
 .It Bq Er EFAULT
 There was an error reading or writing the 
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libc/sys/mkfifo.2
index bf0e84d..aeed3d9 100644
--- a/lib/libc/sys/mkfifo.2
+++ b/lib/libc/sys/mkfifo.2
@@ -67,7 +67,7 @@ indicates an error, and an error code is stored in
 .Fn Mkfifo
 will fail and no fifo will be created if:
 .Bl -tag -width Er
-.It Bq Er ENOTSUPP
+.It Bq Er ENOTSUP
 The kernel has not been configured to support fifo's.
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
diff --git a/lib/libc/sys/modnext.2 b/lib/libc/sys/modnext.2
index 2e301f8..399836a 100644
--- a/lib/libc/sys/modnext.2
+++ b/lib/libc/sys/modnext.2
@@ -65,7 +65,9 @@ is set to indicate the error.
 .Sh ERRORS
 The only error set by
 .Fn modnext
-is ENOENT, which is set when
+is
+.Er ENOENT ,
+which is set when
 .Va modid
 refers to a kernel module that does not exist (isn't loaded).
 .Sh SEE ALSO
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 5685646..b6682a9 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -216,7 +216,7 @@ points outside the process's allocated address space.
 The following errors can occur for a
 .Em ufs
 filesystem mount:
-.Bl -tag -width [ENOTBLK]
+.Bl -tag -width Er
 .It Bq Er ENODEV
 A component of ufs_args
 .Ar fspec
@@ -251,7 +251,7 @@ points outside the process's allocated address space.
 The following errors can occur for a
 .Em nfs
 filesystem mount:
-.Bl -tag -width [ENOTBLK]
+.Bl -tag -width Er
 .It Bq Er ETIMEDOUT
 .Em Nfs
 timed out trying to contact the server.
@@ -263,7 +263,7 @@ points outside the process's allocated address space.
 The following errors can occur for a
 .Em mfs
 filesystem mount:
-.Bl -tag -width [ENOTBLK]
+.Bl -tag -width Er
 .It Bq Er EMFILE
 No space remains in the mount table.
 .It Bq Er EINVAL
@@ -283,7 +283,7 @@ points outside the process's allocated address space.
 The
 .Fn unmount
 function may fail with one of the following errors:
-.Bl -tag -width [ENOTBLK]
+.Bl -tag -width Er
 .It Bq Er EPERM
 The caller is not the super-user.
 .It Bq Er ENOTDIR
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index 17f4a99..a852365 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -108,7 +108,11 @@ If the mount point is using Kerberos, then the
 .Xr mount_nfs 8
 daemon will return from
 .Fn nfssvc
-with errno == ENEEDAUTH whenever the client side requires an ``rcmd''
+with
+.Va errno
+==
+.Er ENEEDAUTH
+whenever the client side requires an ``rcmd''
 authentication ticket for the user.
 .Xr Mount_nfs 8
 will attempt to get the Kerberos ticket, and if successful will call
@@ -161,7 +165,10 @@ Whenever an
 .Xr nfsd 8
 daemon receives a Kerberos authentication ticket, it will return from
 .Fn nfssvc
-with errno == ENEEDAUTH.
+with
+.Va errno
+==
+.Er ENEEDAUTH .
 The
 .Xr nfsd 8
 will attempt to authenticate the ticket and generate a set of credentials
@@ -246,7 +253,7 @@ system call is designed specifically for the
 support daemons and as such is specific to their requirements.
 It should really return values to indicate the need for authentication
 support, since
-.Dv ENEEDAUTH
+.Er ENEEDAUTH
 is not really an error.
 Several fields of the argument structures are assumed to be valid and
 sometimes to be unchanged from a previous call, such that
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
index 3f5e1cb..25d30b3 100644
--- a/lib/libc/sys/pathconf.2
+++ b/lib/libc/sys/pathconf.2
@@ -129,9 +129,10 @@ argument is invalid.
 The implementation does not support an association of the variable
 name with the associated file.
 .El
+.Pp
 .Fn Pathconf
 will fail if:
-.Bl -tag -width ENAMETOOLONGAA
+.Bl -tag -width Er
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
@@ -147,7 +148,7 @@ Too many symbolic links were encountered in translating the pathname.
 An I/O error occurred while reading from or writing to the file system.
 .El
 .Pp
-.Bl -tag -width [EFAULT]
+.Bl -tag -width Er
 .Fn Fpathconf
 will fail if:
 .It Bq Er EBADF
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index 19a91a8..80498c9 100644
--- a/lib/libc/sys/semop.2
+++ b/lib/libc/sys/semop.2
@@ -118,14 +118,16 @@ value, one of the following happens:
 .It
 If IPC_NOWAIT was specified, then
 .Fn semop
-returns immediately with a return value of EAGAIN.
+returns immediately with a return value of
+.Er EAGAIN .
 .It
 If some other process has removed the semaphore with the IPC_RMID
 option of
 .Fn semctl ,
 then
 .Fn semop
-returns immediately with a return value of EINVAL.
+returns immediately with a return value of
+.Er EINVAL .
 .It
 Otherwise, the calling process is put to sleep until the semaphore's
 value is greater than or equal to the absolute value of
diff --git a/lib/libc/sys/setresuid.2 b/lib/libc/sys/setresuid.2
index deb9978..d73f726 100644
--- a/lib/libc/sys/setresuid.2
+++ b/lib/libc/sys/setresuid.2
@@ -59,7 +59,7 @@ and the global variable
 is set to indicate the error.
 .Sh ERRORS
 .Bl -tag -width Er
-.It Er EPERM
+.It Bq Er EPERM
 The calling process was not privileged
 and tried to change one or more IDs to a value
 which was not the current real ID, the current effective ID
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 17a0e5e..4fec421 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -192,7 +192,7 @@ a
 .Xr wait 2
 (or equivalent), it blocks until all of the calling process's child
 processes terminate, and then returns a value of -1 with errno set to
-.Dv ECHILD .
+.Er ECHILD .
 .It Dv SA_ONSTACK
 If this bit is set, the system will deliver the signal to the process
 on a
@@ -220,7 +220,7 @@ or
 If a signal is caught during the system calls listed below,
 the call may be forced to terminate
 with the error
-.Dv EINTR ,
+.Er EINTR ,
 the call may return with a data transfer shorter than requested,
 or the call may be restarted.
 Restart of pending calls is requested
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index 3383014..b7f8d3a 100644
--- a/lib/libc/sys/sigaltstack.2
+++ b/lib/libc/sys/sigaltstack.2
@@ -85,7 +85,7 @@ Trying to disable an active stack will cause
 to return -1 with
 .Va errno
 set to
-.Dv EINVAL .
+.Er EINVAL .
 A disabled stack will cause all signals to be
 taken on the regular user stack.
 If the stack is later re-enabled then all signals that were specified
diff --git a/lib/libc/sys/sigsuspend.2 b/lib/libc/sys/sigsuspend.2
index 85ace2e..b3984be 100644
--- a/lib/libc/sys/sigsuspend.2
+++ b/lib/libc/sys/sigsuspend.2
@@ -70,7 +70,7 @@ function
 always terminates by being interrupted, returning -1 with
 .Va errno
 set to
-.Dv EINTR .
+.Er EINTR .
 .Sh SEE ALSO
 .Xr sigaction 2 ,
 .Xr sigprocmask 2 ,
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index b6e5a65..5e37c55 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -188,7 +188,7 @@ within a reasonable length of time, then
 the connection is considered broken and calls
 will indicate an error with
 -1 returns and with
-.Dv ETIMEDOUT
+.Er ETIMEDOUT
 as the specific code
 in the global variable
 .Va errno .
diff --git a/lib/libc/sys/socketpair.2 b/lib/libc/sys/socketpair.2
index 7b97170..c06d7ed 100644
--- a/lib/libc/sys/socketpair.2
+++ b/lib/libc/sys/socketpair.2
@@ -72,7 +72,7 @@ Too many descriptors are in use by this process.
 The specified address family is not supported on this machine.
 .It Bq Er EPROTONOSUPPORT
 The specified protocol is not supported on this machine.
-.It Bq Er EOPNOSUPPORT
+.It Bq Er EOPNOTSUPP
 The specified protocol does not support creation of socket pairs.
 .It Bq Er EFAULT
 The address
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index ef3a858..e611913 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -233,7 +233,7 @@ Search permission is denied for a component of the path prefix.
 .It Bq Er ELOOP
 Too many symbolic links were encountered in translating the pathname.
 .It Bq Er EFAULT
-.Fa Sb
+.Fa sb
 or
 .Em name
 points to an invalid address.
@@ -241,14 +241,14 @@ points to an invalid address.
 An I/O error occurred while reading from or writing to the file system.
 .El
 .Pp
-.Bl -tag -width [EFAULT]
+.Bl -tag -width Er
 .Fn Fstat
 will fail if:
 .It Bq Er EBADF
 .Fa fd
 is not a valid open file descriptor.
 .It Bq Er EFAULT
-.Fa Sb
+.Fa sb
 points to an invalid address.
 .It Bq Er EIO
 An I/O error occurred while reading from or writing to the file system.
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index 82cd981..faafea0 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -166,7 +166,7 @@ error occurred while reading from or writing to the file system.
 .Pp
 .Fn Fstatfs
 fails if one or more of the following are true:
-.Bl -tag -width ENAMETOOLONGA
+.Bl -tag -width Er
 .It Bq Er EBADF
 .Fa Fd
 is not a valid open file descriptor.
diff --git a/lib/libc/sys/truncate.2 b/lib/libc/sys/truncate.2
index b9a494e..7456adc 100644
--- a/lib/libc/sys/truncate.2
+++ b/lib/libc/sys/truncate.2
@@ -101,7 +101,7 @@ points outside the process's allocated address space.
 .Pp
 .Fn Ftruncate
 succeeds unless:
-.Bl -tag -width [ENOTDIR]
+.Bl -tag -width Er
 .It Bq Er EBADF
 The
 .Fa fd
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index ff6b847..c1c0ed0 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -242,7 +242,7 @@ If there are no children not previously awaited,
 -1 is returned with
 .Va errno
 set to
-.Bq Er ECHILD .
+.Er ECHILD .
 Otherwise, if
 .Dv WNOHANG
 is specified and there are