From c23155a43a8fbd8404b4d7bca71c292e92fb4870 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Wed, 22 Nov 2000 16:02:00 +0000
Subject: [PATCH] mdoc(7) police: Er macro usage cleanup.

---
 lib/libc/compat-43/sigpause.2      |  2 +-
 lib/libc/compat-43/sigvec.2        |  2 +-
 lib/libc/gen/glob.3                |  4 ++--
 lib/libc/gen/sem_destroy.3         |  4 +++-
 lib/libc/gen/sem_init.3            |  4 +++-
 lib/libc/gen/siginterrupt.3        |  2 +-
 lib/libc/gen/sysctl.3              |  9 ++++++---
 lib/libc/locale/rune.3             | 10 +++++-----
 lib/libc/net/rcmd.3                |  2 +-
 lib/libc/posix1e/cap_set_flag.3    |  2 +-
 lib/libc/posix1e/cap_to_text.3     |  2 +-
 lib/libc/stdlib/strtod.3           |  4 ++--
 lib/libc/sys/aio_cancel.2          |  2 +-
 lib/libc/sys/aio_error.2           |  2 +-
 lib/libc/sys/aio_return.2          |  2 +-
 lib/libc/sys/chmod.2               |  5 ++++-
 lib/libc/sys/chroot.2              |  8 ++++++--
 lib/libc/sys/connect.2             |  2 +-
 lib/libc/sys/getfh.2               | 14 +++++++-------
 lib/libc/sys/getfsstat.2           |  4 ++--
 lib/libc/sys/kldnext.2             |  4 +++-
 lib/libc/sys/kqueue.2              |  2 +-
 lib/libc/sys/mkfifo.2              |  2 +-
 lib/libc/sys/modnext.2             |  4 +++-
 lib/libc/sys/mount.2               |  8 ++++----
 lib/libc/sys/nfssvc.2              | 13 ++++++++++---
 lib/libc/sys/pathconf.2            |  5 +++--
 lib/libc/sys/semop.2               |  6 ++++--
 lib/libc/sys/setresuid.2           |  2 +-
 lib/libc/sys/sigaction.2           |  4 ++--
 lib/libc/sys/sigaltstack.2         |  2 +-
 lib/libc/sys/sigsuspend.2          |  2 +-
 lib/libc/sys/socket.2              |  2 +-
 lib/libc/sys/socketpair.2          |  2 +-
 lib/libc/sys/stat.2                |  6 +++---
 lib/libc/sys/statfs.2              |  2 +-
 lib/libc/sys/truncate.2            |  2 +-
 lib/libc/sys/wait.2                |  2 +-
 lib/libc_r/man/sem_destroy.3       |  4 +++-
 lib/libc_r/man/sem_init.3          |  4 +++-
 lib/libm/common_source/acos.3      |  2 +-
 lib/libm/common_source/ieee.3      |  4 ++--
 lib/libm/common_source/infnan.3    | 17 +++++++++--------
 lib/libm/common_source/lgamma.3    |  2 +-
 lib/libm/common_source/sqrt.3      |  2 +-
 lib/libposix1e/cap_set_flag.3      |  2 +-
 lib/libposix1e/cap_to_text.3       |  2 +-
 lib/libpthread/man/sem_destroy.3   |  4 +++-
 lib/libpthread/man/sem_init.3      |  4 +++-
 lib/libutil/fparseln.3             |  2 +-
 lib/msun/man/acos.3                |  2 +-
 lib/msun/man/lgamma.3              |  2 +-
 lib/msun/man/sqrt.3                |  2 +-
 sbin/mount_union/mount_union.8     | 13 +++++++------
 sbin/mount_unionfs/mount_unionfs.8 | 13 +++++++------
 55 files changed, 138 insertions(+), 99 deletions(-)

diff --git a/lib/libc/compat-43/sigpause.2 b/lib/libc/compat-43/sigpause.2
index 619406b29269..6aa52522cd47 100644
--- a/lib/libc/compat-43/sigpause.2
+++ b/lib/libc/compat-43/sigpause.2
@@ -61,7 +61,7 @@ signals are to be blocked.
 always terminates by being interrupted, returning -1 with
 .Va errno
 set to
-.Dv EINTR
+.Er EINTR
 .Sh SEE ALSO
 .Xr kill 2 ,
 .Xr sigaction 2 ,
diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index 4296d0355e14..1ec52ae59d65 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -204,7 +204,7 @@ of the signal are ignored and discarded.
 If a signal is caught during the system calls listed below,
 the call is normally restarted.
 The call can be forced to terminate prematurely with an
-.Dv EINTR
+.Er EINTR
 error return by setting the
 .Dv SV_INTERRUPT
 bit in
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 11606f83261e..b2f2b80e0136 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -281,9 +281,9 @@ is not a directory, resulting in a
 call to
 .Fa errfunc .
 The error routine can suppress this action by testing for
-.Dv ENOENT
+.Er ENOENT
 and
-.Dv ENOTDIR ;
+.Er ENOTDIR ;
 however, the
 .Dv GLOB_ERR
 flag will still cause an immediate
diff --git a/lib/libc/gen/sem_destroy.3 b/lib/libc/gen/sem_destroy.3
index 56e92047fb66..bc66ffd1cb1c 100644
--- a/lib/libc/gen/sem_destroy.3
+++ b/lib/libc/gen/sem_destroy.3
@@ -81,5 +81,7 @@ if called while there are threads blocked on
 .Fa sem ,
 but this implementation is guaranteed to return -1 and set
 .Va errno
-to EBUSY if there are threads blocked on
+to
+.Er EBUSY
+if there are threads blocked on
 .Fa sem .
diff --git a/lib/libc/gen/sem_init.3 b/lib/libc/gen/sem_init.3
index 2449ce0d7295..ae791ba5de20 100644
--- a/lib/libc/gen/sem_init.3
+++ b/lib/libc/gen/sem_init.3
@@ -95,7 +95,9 @@ Std 1003.1 1996 Edition.
 This implementation does not support shared semaphores, and reports this fact
 by setting
 .Va errno
-to EPERM.  This is perhaps a stretch of the intention of POSIX, but is
+to
+.Er EPERM .
+This is perhaps a stretch of the intention of POSIX, but is
 compliant, with the caveat that
 .Fn sem_init
 always reports a permissions error when an attempt to create a shared semaphore
diff --git a/lib/libc/gen/siginterrupt.3 b/lib/libc/gen/siginterrupt.3
index 17dfb9e5f4ee..102c04e93b1e 100644
--- a/lib/libc/gen/siginterrupt.3
+++ b/lib/libc/gen/siginterrupt.3
@@ -67,7 +67,7 @@ and no data has been transferred,
 the system call will return \-1 with the global variable
 .Va errno
 set to
-.Dv EINTR .
+.Er EINTR .
 Interrupted system calls that have started transferring
 data will return the amount of data actually transferred.
 System call interrupt is the signal behavior found on
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 4a663ce1ffb0..96eb9ec670a8 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -91,11 +91,13 @@ The size of the buffer is given by the location specified by
 .Fa oldlenp
 before the call,
 and that location gives the amount of data copied after a successful call
-and after a call that returns with the error code ENOMEM.
+and after a call that returns with the error code
+.Er ENOMEM .
 If the amount of data available is greater
 than the size of the buffer supplied,
 the call supplies as much data as fits in the buffer provided
-and returns with the error code ENOMEM.
+and returns with the error code
+.Er ENOMEM .
 If the old value is not desired,
 .Fa oldp
 and
@@ -391,7 +393,8 @@ It is also possible for a process to set its own process title this way.
 Return profiling information about the kernel.
 If the kernel is not compiled for profiling,
 attempts to retrieve any of the KERN_PROF values will
-fail with EOPNOTSUPP.
+fail with
+.Er EOPNOTSUPP .
 The third level names for the string and integer profiling information
 is detailed below.
 The changeable column shows whether a process with appropriate
diff --git a/lib/libc/locale/rune.3 b/lib/libc/locale/rune.3
index d1e9fef180c4..087ef4ca896e 100644
--- a/lib/libc/locale/rune.3
+++ b/lib/libc/locale/rune.3
@@ -214,18 +214,18 @@ The
 .Fn setrunelocale
 function returns one of the following values:
 .Bl -tag -width Er
-.It Dv 0
+.It Er 0
 .Fn setrunelocale
 was successful.
-.It Er EFAULT
+.It Bq Er EFAULT
 .Fa locale
 was
 .Dv NULL .
-.It Er ENOENT
+.It Bq Er ENOENT
 The locale could not be found.
-.It Er EFTYPE
+.It Bq Er EFTYPE
 The file found was not a valid file.
-.It Er EINVAL
+.It Bq Er EINVAL
 The encoding indicated by the locale was unknown.
 .El
 .Pp
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index 63f7fb549358..899bd9e55d75 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -258,7 +258,7 @@ It returns -1 on error with the global value
 .Va errno
 set according to the reason for failure.
 The error code
-.Dv EAGAIN
+.Er EAGAIN
 is overloaded to mean ``All network ports in use.''
 .Sh SEE ALSO
 .Xr rlogin 1 ,
diff --git a/lib/libc/posix1e/cap_set_flag.3 b/lib/libc/posix1e/cap_set_flag.3
index b8c634533d55..ea06f469f52a 100644
--- a/lib/libc/posix1e/cap_set_flag.3
+++ b/lib/libc/posix1e/cap_set_flag.3
@@ -70,7 +70,7 @@ function shall return -1 and set
 .Ar errno
 to the corresponding value:
 .Bl -tag -width Er
-.It Bq er EINVAL
+.It Bq Er EINVAL
 At least one of the values of
 .Ar cap_p ,
 .Ar ncap ,
diff --git a/lib/libc/posix1e/cap_to_text.3 b/lib/libc/posix1e/cap_to_text.3
index d91d27438983..b3717ea52a99 100644
--- a/lib/libc/posix1e/cap_to_text.3
+++ b/lib/libc/posix1e/cap_to_text.3
@@ -119,5 +119,5 @@ and development continues.
 uses a bounded size (1024 byte) buffer in which to assemble the resulting
 text string.
 If the string requires more space than that buffer provides,
-.Va ENOMEM
+.Er ENOMEM
 will be returned.
diff --git a/lib/libc/stdlib/strtod.3 b/lib/libc/stdlib/strtod.3
index c9a60192f0ec..6a2dc52b1577 100644
--- a/lib/libc/stdlib/strtod.3
+++ b/lib/libc/stdlib/strtod.3
@@ -90,12 +90,12 @@ is stored in the location referenced by
 If the correct value would cause overflow, plus or minus
 .Dv HUGE_VAL
 is returned (according to the sign of the value), and
-.Dv ERANGE
+.Er ERANGE
 is stored in
 .Va errno .
 If the correct value would cause underflow, zero is
 returned and
-.Dv ERANGE
+.Er ERANGE
 is stored in 
 .Va errno .
 .Sh ERRORS
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libc/sys/aio_cancel.2
index 06e9025cdde2..e16d386d5129 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 10ab6c342749..e27c973da812 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 35550ba012b1..3477288bccee 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 e8edf5900e8e..f2e1d08e5a73 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 11a144a339be..6d9f7642af8c 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 bb2ab8c8ef9b..7e4880a9993c 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 d3f78886d85a..d0ec2ede2d0f 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 c9d1bd530261..de2bb80d2d55 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 20984d21f573..cef9d0aae385 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 fb1ce1ff3be2..5c9e5f8cbef6 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 bf0e84d308bd..aeed3d97db98 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 2e301f82e8ad..399836a6eb21 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 5685646e67bd..b6682a9b101f 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 17f4a9974a5c..a852365fb2f8 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 3f5e1cbe04ac..25d30b32f4c0 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 19a91a842498..80498c9df387 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 deb99788591a..d73f7264f102 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 17a0e5e07024..4fec42130dd4 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 33830149bb30..b7f8d3a810c7 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 85ace2ec8a08..b3984bef60c7 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 b6e5a65877bf..5e37c55627dc 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 7b97170a68d0..c06d7edc1bce 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 ef3a858958da..e611913cc4c9 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 82cd9810f8cd..faafea05bbce 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 b9a494e39882..7456adce6993 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 ff6b8478cf29..c1c0ed09959c 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
diff --git a/lib/libc_r/man/sem_destroy.3 b/lib/libc_r/man/sem_destroy.3
index 56e92047fb66..bc66ffd1cb1c 100644
--- a/lib/libc_r/man/sem_destroy.3
+++ b/lib/libc_r/man/sem_destroy.3
@@ -81,5 +81,7 @@ if called while there are threads blocked on
 .Fa sem ,
 but this implementation is guaranteed to return -1 and set
 .Va errno
-to EBUSY if there are threads blocked on
+to
+.Er EBUSY
+if there are threads blocked on
 .Fa sem .
diff --git a/lib/libc_r/man/sem_init.3 b/lib/libc_r/man/sem_init.3
index 2449ce0d7295..ae791ba5de20 100644
--- a/lib/libc_r/man/sem_init.3
+++ b/lib/libc_r/man/sem_init.3
@@ -95,7 +95,9 @@ Std 1003.1 1996 Edition.
 This implementation does not support shared semaphores, and reports this fact
 by setting
 .Va errno
-to EPERM.  This is perhaps a stretch of the intention of POSIX, but is
+to
+.Er EPERM .
+This is perhaps a stretch of the intention of POSIX, but is
 compliant, with the caveat that
 .Fn sem_init
 always reports a permissions error when an attempt to create a shared semaphore
diff --git a/lib/libm/common_source/acos.3 b/lib/libm/common_source/acos.3
index 75f293657bb9..d6d5d7b40e8a 100644
--- a/lib/libm/common_source/acos.3
+++ b/lib/libm/common_source/acos.3
@@ -71,7 +71,7 @@ if:
 sets the global variable
 .Va errno
 to
-.Dv EDOM
+.Er EDOM
 and a reserved operand fault is generated.
 .Sh SEE ALSO
 .Xr asin 3 ,
diff --git a/lib/libm/common_source/ieee.3 b/lib/libm/common_source/ieee.3
index c47334c3251f..466a9a68bd0b 100644
--- a/lib/libm/common_source/ieee.3
+++ b/lib/libm/common_source/ieee.3
@@ -192,7 +192,7 @@ would overflow on a
 it generates a reserved operand fault and sets the global variable
 .Va errno
 to
-.Dv ERANGE . 
+.Er ERANGE . 
 .Sh SEE ALSO
 .Xr floor 3 ,
 .Xr infnan 3 ,
@@ -211,7 +211,7 @@ on a
 .Tn VAX
 signal invalidity 
 by setting
-.Va errno No = Dv EDOM ?
+.Va errno No = Er EDOM ?
 Should
 .Fn logb 0
 return  \-1.7e38?
diff --git a/lib/libm/common_source/infnan.3 b/lib/libm/common_source/infnan.3
index 274ba3170695..7a2d6d3bbcf3 100644
--- a/lib/libm/common_source/infnan.3
+++ b/lib/libm/common_source/infnan.3
@@ -129,17 +129,18 @@ to return.  And a C program to
 implement that suggestion follows. 
 .sp 0.5
 .Bd -filled -offset indent
-.Bl -column "IEEE Signal" "IEEE Default" XXERANGE ERANGEXXorXXEDOM
+.Bl -column "IEEE Signal" "IEEE Default" XXERANGE ERANGEXXorXXEDOM XXXXXX
 .It IEEE Signal	IEEE Default Ta
 .Fa iarg Ta
 .Va errno Ta
 .Fn infnan
 .It Invalid	\*(Na Ta
-.Dv EDOM	EDOM	0
+.Er EDOM	EDOM	0
 .It Overflow	\(+-\*(If Ta
-.Dv ERANGE	ERANGE	HUGE
+.Er ERANGE	ERANGE Ta
+.Dv HUGE
 .It Div\-by\-0	\(+-Infinity Ta
-.Dv \(+-ERANGE	ERANGE or EDOM	\(+-HUGE
+.Er \(+-ERANGE	ERANGE or EDOM	\(+-HUGE
 .It 	( Ns Dv HUGE No "= 1.7e38 ... nearly  2.0**127)"
 .El
 .Ed
@@ -165,17 +166,17 @@ int	iarg ;
 .Xr math 3 ,
 .Xr signal 3 .
 .Pp
-.Dv ERANGE
+.Er ERANGE
 and
-.Dv EDOM
+.Er EDOM
 are defined in
 .Aq Pa errno.h .
 (See
 .Xr intro 2
 for explanation of
-.Dv EDOM
+.Er EDOM
 and
-.Dv ERANGE . )
+.Er ERANGE . )
 .Sh HISTORY
 The
 .Fn infnan
diff --git a/lib/libm/common_source/lgamma.3 b/lib/libm/common_source/lgamma.3
index 936ca46af76d..cd55003ba88a 100644
--- a/lib/libm/common_source/lgamma.3
+++ b/lib/libm/common_source/lgamma.3
@@ -103,7 +103,7 @@ the reserved operator is returned,
 and
 .Va errno
 is set to
-.Er ERANGE
+.Er ERANGE .
 For large non-integer negative values,
 .Fn gamma
 will underflow.
diff --git a/lib/libm/common_source/sqrt.3 b/lib/libm/common_source/sqrt.3
index 2c4e893a7405..0a2d74be7bb4 100644
--- a/lib/libm/common_source/sqrt.3
+++ b/lib/libm/common_source/sqrt.3
@@ -78,7 +78,7 @@ causes an error; in this event,
 the global variable
 .Va errno
 is set to
-.Dv EDOM
+.Er EDOM
 and a reserved operand fault is generated.
 .Sh ERROR (due to Roundoff etc.)
 The
diff --git a/lib/libposix1e/cap_set_flag.3 b/lib/libposix1e/cap_set_flag.3
index b8c634533d55..ea06f469f52a 100644
--- a/lib/libposix1e/cap_set_flag.3
+++ b/lib/libposix1e/cap_set_flag.3
@@ -70,7 +70,7 @@ function shall return -1 and set
 .Ar errno
 to the corresponding value:
 .Bl -tag -width Er
-.It Bq er EINVAL
+.It Bq Er EINVAL
 At least one of the values of
 .Ar cap_p ,
 .Ar ncap ,
diff --git a/lib/libposix1e/cap_to_text.3 b/lib/libposix1e/cap_to_text.3
index d91d27438983..b3717ea52a99 100644
--- a/lib/libposix1e/cap_to_text.3
+++ b/lib/libposix1e/cap_to_text.3
@@ -119,5 +119,5 @@ and development continues.
 uses a bounded size (1024 byte) buffer in which to assemble the resulting
 text string.
 If the string requires more space than that buffer provides,
-.Va ENOMEM
+.Er ENOMEM
 will be returned.
diff --git a/lib/libpthread/man/sem_destroy.3 b/lib/libpthread/man/sem_destroy.3
index 56e92047fb66..bc66ffd1cb1c 100644
--- a/lib/libpthread/man/sem_destroy.3
+++ b/lib/libpthread/man/sem_destroy.3
@@ -81,5 +81,7 @@ if called while there are threads blocked on
 .Fa sem ,
 but this implementation is guaranteed to return -1 and set
 .Va errno
-to EBUSY if there are threads blocked on
+to
+.Er EBUSY
+if there are threads blocked on
 .Fa sem .
diff --git a/lib/libpthread/man/sem_init.3 b/lib/libpthread/man/sem_init.3
index 2449ce0d7295..ae791ba5de20 100644
--- a/lib/libpthread/man/sem_init.3
+++ b/lib/libpthread/man/sem_init.3
@@ -95,7 +95,9 @@ Std 1003.1 1996 Edition.
 This implementation does not support shared semaphores, and reports this fact
 by setting
 .Va errno
-to EPERM.  This is perhaps a stretch of the intention of POSIX, but is
+to
+.Er EPERM .
+This is perhaps a stretch of the intention of POSIX, but is
 compliant, with the caveat that
 .Fn sem_init
 always reports a permissions error when an attempt to create a shared semaphore
diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3
index 562c63ed8ae7..e52a650faf61 100644
--- a/lib/libutil/fparseln.3
+++ b/lib/libutil/fparseln.3
@@ -143,7 +143,7 @@ In addition
 may set
 .Va errno
 to
-.Bq Er ENOMEM
+.Er ENOMEM
 and return
 .Dv NULL
 if it runs out of memory.
diff --git a/lib/msun/man/acos.3 b/lib/msun/man/acos.3
index 71418b84be5f..8b91db750021 100644
--- a/lib/msun/man/acos.3
+++ b/lib/msun/man/acos.3
@@ -76,7 +76,7 @@ if:
 sets the global variable
 .Va errno
 to
-.Dv EDOM
+.Er EDOM
 and a reserved operand fault is generated.
 .Sh SEE ALSO
 .Xr asin 3 ,
diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3
index 149644ae87c1..333bf77e7081 100644
--- a/lib/msun/man/lgamma.3
+++ b/lib/msun/man/lgamma.3
@@ -117,7 +117,7 @@ the reserved operator is returned,
 and
 .Va errno
 is set to
-.Er ERANGE
+.Er ERANGE .
 For large non-integer negative values,
 .Fn gamma
 will underflow.
diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3
index 619e84f10dc5..ae5514aafe3d 100644
--- a/lib/msun/man/sqrt.3
+++ b/lib/msun/man/sqrt.3
@@ -90,7 +90,7 @@ causes an error; in this event,
 the global variable
 .Va errno
 is set to
-.Dv EDOM
+.Er EDOM
 and a reserved operand fault is generated.
 .Sh ERROR (due to Roundoff etc.)
 The
diff --git a/sbin/mount_union/mount_union.8 b/sbin/mount_union/mount_union.8
index 8294b8a63900..163839ed3b6a 100644
--- a/sbin/mount_union/mount_union.8
+++ b/sbin/mount_union/mount_union.8
@@ -127,7 +127,7 @@ Similarly, an attempt to truncate a lower layer file to zero length
 causes an empty file to be created in the upper layer.
 Any other operation which would ultimately require modification to
 the lower layer fails with
-.Dv EROFS .
+.Er EROFS .
 .Pp
 The union filesystem manipulates the namespace, rather than
 individual filesystems.
@@ -183,19 +183,20 @@ accessible via
 .Xr mount 8 ,
 .Xr mount_null 8
 .Sh BUGS
-
 THIS FILESYSTEM TYPE IS NOT YET FULLY SUPPORTED (READ: IT DOESN'T WORK)
 AND USING IT MAY, IN FACT, DESTROY DATA ON YOUR SYSTEM.  USE AT YOUR
 OWN RISK.  BEWARE OF DOG.  SLIPPERY WHEN WET.
-
+.Pp
 This code also needs an owner in order to be less dangerous - serious
-hackers can apply by sending mail to hackers@freebsd.org and announcing
+hackers can apply by sending mail to
+.Aq hackers@FreeBSD.org
+and announcing
 their intent to take it over.
-
+.Pp
 Without whiteout support from the filesystem backing the upper layer,
 there is no way that delete and rename operations on lower layer
 objects can be done.
-.Dv EROFS
+.Er EROFS
 is returned for this kind of operations along with any others
 which would make modifications to the lower layer, such as
 .Xr chmod 1 .
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index 8294b8a63900..163839ed3b6a 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -127,7 +127,7 @@ Similarly, an attempt to truncate a lower layer file to zero length
 causes an empty file to be created in the upper layer.
 Any other operation which would ultimately require modification to
 the lower layer fails with
-.Dv EROFS .
+.Er EROFS .
 .Pp
 The union filesystem manipulates the namespace, rather than
 individual filesystems.
@@ -183,19 +183,20 @@ accessible via
 .Xr mount 8 ,
 .Xr mount_null 8
 .Sh BUGS
-
 THIS FILESYSTEM TYPE IS NOT YET FULLY SUPPORTED (READ: IT DOESN'T WORK)
 AND USING IT MAY, IN FACT, DESTROY DATA ON YOUR SYSTEM.  USE AT YOUR
 OWN RISK.  BEWARE OF DOG.  SLIPPERY WHEN WET.
-
+.Pp
 This code also needs an owner in order to be less dangerous - serious
-hackers can apply by sending mail to hackers@freebsd.org and announcing
+hackers can apply by sending mail to
+.Aq hackers@FreeBSD.org
+and announcing
 their intent to take it over.
-
+.Pp
 Without whiteout support from the filesystem backing the upper layer,
 there is no way that delete and rename operations on lower layer
 objects can be done.
-.Dv EROFS
+.Er EROFS
 is returned for this kind of operations along with any others
 which would make modifications to the lower layer, such as
 .Xr chmod 1 .