use .Tn instead of .Em for logical/bitwise OR + AND

15 files changed, 234 insertions, 129 deletions

diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index b97141b868f..4fdc9cd6786 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: btree.3,v 1.8 1999/05/27 16:20:59 aaron Exp $
+.\"	$OpenBSD: btree.3,v 1.9 1999/06/05 04:47:41 aaron Exp $
 .\"	$NetBSD: btree.3,v 1.6 1996/05/03 21:26:48 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -92,7 +92,7 @@ The elements of this structure are as follows:
 .Bl -tag -width "XXXXXX"
 .It flags
 The flag value is specified by
-.Em OR Ns 'ing
+.Tn OR Ns 'ing
 any of the following values:
 .Bl -tag -width XXXXX
 .It Dv R_DUP
diff --git a/lib/libc/db/man/mpool.3 b/lib/libc/db/man/mpool.3
index dc6d9ccda69..23986d5efe0 100644
--- a/lib/libc/db/man/mpool.3
+++ b/lib/libc/db/man/mpool.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mpool.3,v 1.6 1999/05/27 16:20:59 aaron Exp $
+.\"	$OpenBSD: mpool.3,v 1.7 1999/06/05 04:47:41 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -124,7 +124,7 @@ address.
 Otherwise,
 .Dv NULL
 is returned and errno is set.  The flags value is formed by
-.Em OR Ns 'ing
+.Tn OR Ns 'ing
 the following values:
 .Bl -tag -width Ds
 .It MPOOL_PAGE_REQUEST
@@ -157,7 +157,7 @@ must be an address previously returned by
 or
 .Fn mpool_new .
 The flags value is formed by
-.Em OR Ns 'ing
+.Tn OR Ns 'ing
 the following values:
 .Bl -tag -width Ds
 .It MPOOL_DIRTY
diff --git a/lib/libc/db/man/recno.3 b/lib/libc/db/man/recno.3
index 48ccfbeb7ca..992f71d5c54 100644
--- a/lib/libc/db/man/recno.3
+++ b/lib/libc/db/man/recno.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: recno.3,v 1.5 1999/05/27 16:20:59 aaron Exp $
+.\"	$OpenBSD: recno.3,v 1.6 1999/06/05 04:47:41 aaron Exp $
 .\"	$NetBSD: recno.3,v 1.6 1996/05/03 21:26:51 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -97,7 +97,7 @@ The elements of this structure are defined as follows:
 .Bl -tag -width XXXXXX
 .It flags
 The flag value is specified by
-.Em OR Ns 'ing
+.Tn OR Ns 'ing
 any of the following values:
 .Bl -tag -width XXXXXX
 .It R_FIXEDLEN
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index 3fa08fcde77..d4efe72e18e 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fnmatch.3,v 1.6 1999/05/29 16:08:55 aaron Exp $
+.\"	$OpenBSD: fnmatch.3,v 1.7 1999/06/05 04:47:41 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -64,7 +64,8 @@ and
 .Fa string .
 The value of
 .Fa flags
-is the bitwise inclusive OR
+is the bitwise inclusive
+.Tn OR
 of any of the following
 constants, which are defined in the include file
 .Aq Pa fnmatch.h .
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index 1fc7a82e3f9..39dc19de6bc 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: regex.3,v 1.8 1999/05/23 14:11:02 aaron Exp $
+.\"	$OpenBSD: regex.3,v 1.9 1999/06/05 04:47:41 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
 .\"
@@ -70,7 +70,8 @@
 .Fa "regex_t *preg"
 .Fc
 .Sh DESCRIPTION
-These routines implement POSIX 1003.2 regular expressions (``RE''s);
+These routines implement POSIX 1003.2 regular expressions
+.Pq Dq REs ;
 see
 .Xr re_format 7 .
 .Fn regcomp
@@ -84,16 +85,17 @@ frees any dynamically allocated storage used by the internal form
 of an RE.
 .Pp
 The header
-.Em <regex.h>
+.Aq Pa regex.h
 declares two structure types,
-.Em regex_t
+.Li regex_t
 and
-.Em regmatch_t ,
+.Li regmatch_t ,
 the former for compiled internal forms and the latter for match reporting.
 It also declares the four functions,
 a type
-.Em regoff_t ,
-and a number of constants with names starting with ``REG_''.
+.Li regoff_t ,
+and a number of constants with names starting with
+.Dv REG_ .
 .Pp
 .Fn regcomp
 compiles the regular expression contained in the
@@ -102,48 +104,64 @@ string,
 subject to the flags in
 .Fa cflags ,
 and places the results in the
-.Em regex_t
+.Li regex_t
 structure pointed to by
 .Fa preg .
 .Fa cflags
-is the bitwise OR of zero or more of the following flags:
+is the bitwise
+.Tn OR
+of zero or more of the following flags:
 .Bl -tag -width XREG_EXTENDEDX
-.It REG_EXTENDED
-Compile modern (``extended'') REs,
-rather than the obsolete (``basic'') REs that
-are the default.
-.It REG_BASIC
+.It Dv REG_EXTENDED
+Compile modern
+.Pq Dq extended
+REs,
+rather than the obsolete
+.Pq Dq basic
+REs that are the default.
+.It Dv REG_BASIC
 This is a synonym for 0,
-provided as a counterpart to REG_EXTENDED to improve readability.
-.It REG_NOSPEC
+provided as a counterpart to
+.Dv REG_EXTENDED
+to improve readability.
+.It Dv REG_NOSPEC
 Compile with recognition of all special characters turned off.
 All characters are thus considered ordinary,
-so the ``RE'' is a literal string.
+so the RE is a literal string.
 This is an extension,
 compatible with but not specified by POSIX 1003.2,
 and should be used with
 caution in software intended to be portable to other systems.
-REG_EXTENDED and REG_NOSPEC may not be used
-in the same call to
+.Dv REG_EXTENDED
+and
+.Dv REG_NOSPEC
+may not be used in the same call to
 .Fn regcomp .
-.It REG_ICASE
+.It Dv REG_ICASE
 Compile for matching that ignores upper/lower case distinctions.
 See
 .Xr re_format 7 .
-.It REG_NOSUB
+.It Dv REG_NOSUB
 Compile for matching that need only report success or failure,
 not what was matched.
-.It REG_NEWLINE
+.It Dv REG_NEWLINE
 Compile for newline-sensitive matching.
 By default, newline is a completely ordinary character with no special
 meaning in either REs or strings.
 With this flag,
-`[^' bracket expressions and `.' never match newline,
-a `^' anchor matches the null string after any newline in the string
+.Ql \&[^
+bracket expressions and
+.Ql \&.
+never match newline,
+a
+.Ql ^
+anchor matches the null string after any newline in the string
 in addition to its normal function,
-and the `$' anchor matches the null string before any newline in the
+and the
+.Ql $
+anchor matches the null string before any newline in the
 string in addition to its normal function.
-.It REG_PEND
+.It Dv REG_PEND
 The regular expression ends,
 not at the first NUL,
 but just before the character pointed to by the
@@ -175,7 +193,8 @@ of type
 .Fa size_t ,
 contains the number of parenthesized subexpressions within the RE
 (except that the value of this member is undefined if the
-REG_NOSUB flag was used).
+.Dv REG_NOSUB
+flag was used).
 If
 .Fn regcomp
 fails, it returns a non-zero error code;
@@ -199,25 +218,33 @@ The compiled form is not altered during execution of
 so a single compiled RE can be used simultaneously by multiple threads.
 .Pp
 By default,
-the NUL-terminated string pointed to by
+the null-terminated string pointed to by
 .Fa string
 is considered to be the text of an entire line, minus any terminating
 newline.
 The
 .Fa eflags
-argument is the bitwise OR of zero or more of the following flags:
+argument is the bitwise
+.Tn OR
+of zero or more of the following flags:
 .Bl -tag -width XREG_STARTENDX
-.It REG_NOTBOL
+.It Dv REG_NOTBOL
 The first character of
 the string
-is not the beginning of a line, so the `^' anchor should not match before it.
-This does not affect the behavior of newlines under REG_NEWLINE.
-.It REG_NOTEOL
+is not the beginning of a line, so the
+.Ql ^
+anchor should not match before it.
+This does not affect the behavior of newlines under
+.Dv REG_NEWLINE .
+.It Dv REG_NOTEOL
 The NUL terminating
 the string
-does not end a line, so the `$' anchor should not match before it.
-This does not affect the behavior of newlines under REG_NEWLINE.
-.It REG_STARTEND
+does not end a line, so the
+.Ql $
+anchor should not match before it.
+This does not affect the behavior of newlines under
+.Dv REG_NEWLINE .
+.It Dv REG_STARTEND
 The string is considered to start at
 \fIstring\fR\ + \fIpmatch\fR[0].\fIrm_so\fR
 and to have a terminating NUL located at
@@ -233,8 +260,10 @@ This is an extension,
 compatible with but not specified by POSIX 1003.2,
 and should be used with
 caution in software intended to be portable to other systems.
-Note that a non-zero \fIrm_so\fR does not imply REG_NOTBOL;
-REG_STARTEND affects only the location of the string,
+Note that a non-zero \fIrm_so\fR does not imply
+.Dv REG_NOTBOL ;
+.Dv REG_STARTEND
+affects only the location of the string,
 not how it is matched.
 .El
 .Pp
@@ -246,24 +275,30 @@ portion thereof could match any of several substrings of
 .Pp
 Normally,
 .Fn regexec
-returns 0 for success and the non-zero code REG_NOMATCH for failure.
+returns 0 for success and the non-zero code
+.Dv REG_NOMATCH
+for failure.
 Other non-zero error codes may be returned in exceptional situations;
 see DIAGNOSTICS.
 .Pp
-If REG_NOSUB was specified in the compilation of the RE,
+If
+.Dv REG_NOSUB
+was specified in the compilation of the RE,
 or if
 .Fa nmatch
 is 0,
 .Fn regexec
 ignores the
 .Fa pmatch
-argument (but see below for the case where REG_STARTEND is specified).
+argument (but see below for the case where
+.Dv REG_STARTEND
+is specified).
 Otherwise,
 .Fa pmatch
 points to an array of
 .Fa nmatch
 structures of type
-.Em regmatch_t .
+.Li regmatch_t .
 Such a structure has at least the members
 .Fa rm_so
 and
@@ -273,7 +308,7 @@ both of type
 (a signed arithmetic type at least as large as an
 .I off_t
 and a
-.Em ssize_t ),
+.Li ssize_t ),
 containing respectively the offset of the first character of a substring
 and the offset of the first character after the end of the substring.
 Offsets are measured from the beginning of the
@@ -305,24 +340,37 @@ and
 set to \-1.
 If a subexpression participated in the match several times,
 the reported substring is the last one it matched.
-(Note, as an example in particular, that when the RE `(b*)+' matches `bbb',
-the parenthesized subexpression matches each of the three `b's and then
-an infinite number of empty strings following the last `b',
+(Note, as an example in particular, that when the RE
+.Dq (b*)+
+matches
+.Dq bbb ,
+the parenthesized subexpression matches each of the three
+.Sq b Ns s
+and then
+an infinite number of empty strings following the last
+.Sq b ,
 so the reported substring is one of the empties.)
 .Pp
-If REG_STARTEND is specified,
+If
+.Dv REG_STARTEND
+is specified,
 .Fa pmatch
 must point to at least one
-.Em regmatch_t
+.Li regmatch_t
 (even if
 .Fa nmatch
-is 0 or REG_NOSUB was specified),
-to hold the input offsets for REG_STARTEND.
+is 0 or
+.Dv REG_NOSUB
+was specified),
+to hold the input offsets for
+.Dv REG_STARTEND .
 Use for output is still entirely controlled by
 .Fa nmatch ;
 if
 .Fa nmatch
-is 0 or REG_NOSUB was specified,
+is 0 or
+.Dv REG_NOSUB
+was specified,
 the value of
 .Fa pmatch[0]
 will not be changed by a successful
@@ -341,7 +389,7 @@ If
 is non-NULL,
 the error code should have arisen from use of
 the
-.Em regex_t
+.Li regex_t
 pointed to by
 .Fa preg ,
 and if the error code came from
@@ -349,13 +397,13 @@ and if the error code came from
 it should have been the result from the most recent
 .Fn regcomp
 using that
-.Em regex_t . (
+.Li regex_t . (
 .Fn regerror
 may be able to supply a more detailed message using information
 from the
-.Em regex_t . )
+.Li regex_t . )
 .Fn regerror
-places the NUL-terminated message into the buffer pointed to by
+places the null-terminated message into the buffer pointed to by
 .Fa errbuf ,
 limiting the length (including the NUL) to at most
 .Fa errbuf_size
@@ -364,7 +412,7 @@ If the whole message won't fit,
 as much of it as will fit before the terminating NUL is supplied.
 In any case,
 the returned value is the size of buffer needed to hold the whole
-message (including terminating NUL).
+message (including the terminating NUL).
 If
 .Fa errbuf_size
 is 0,
@@ -375,16 +423,23 @@ If the
 .Fa errcode
 given to
 .Fn regerror
-is first ORed with REG_ITOA,
-the ``message'' that results is the printable name of the error code,
-e.g. ``REG_NOMATCH'',
+is first
+.Tn OR Ns 'ed
+with
+.Dv REG_ITOA ,
+the
+.Dq message
+that results is the printable name of the error code,
+e.g.,
+.Dq REG_NOMATCH ,
 rather than an explanation thereof.
 If
 .Fa errcode
-is REG_ATOI,
+is
+.Dv REG_ATOI ,
 then
 .Fa preg
-shall be non-NULL and the
+shall be non-null and the
 .Fa re_endp
 member of the structure it points to
 must point to the printable name of an error code;
@@ -393,7 +448,10 @@ in this case, the result in
 is the decimal digits of
 the numeric value of the error code
 (0 if the name is not recognized).
-REG_ITOA and REG_ATOI are intended primarily as debugging facilities;
+.Dv REG_ITOA
+and
+.Dv REG_ATOI
+are intended primarily as debugging facilities;
 they are extensions,
 compatible with but not specified by POSIX 1003.2,
 and should be used with
@@ -405,7 +463,7 @@ frees any dynamically allocated storage associated with the compiled RE
 pointed to by
 .Fa preg .
 The remaining
-.Em regex_t
+.Li regex_t
 is no longer a valid compiled RE
 and the effect of supplying it to
 .Fn regexec
@@ -418,7 +476,9 @@ of constants;
 all are safe for use from multiple threads if the arguments are safe.
 .Sh IMPLEMENTATION CHOICES
 There are a number of decisions that 1003.2 leaves up to the implementor,
-either by explicitly saying ``undefined'' or by virtue of them being
+either by explicitly saying
+.Dq undefined
+or by virtue of them being
 forbidden by the RE grammar.
 This implementation treats them as follows.
 .Pp
@@ -436,10 +496,14 @@ for one short RE using them
 that will run almost any system out of memory.
 .Pp
 A backslashed character other than one specifically given a magic meaning
-by 1003.2 (such magic meanings occur only in obsolete [``basic''] REs)
+by 1003.2 (such magic meanings occur only in obsolete REs)
 is taken as an ordinary character.
 .Pp
-Any unmatched `[' is a REG_EBRACK error.
+Any unmatched
+.Ql \&[
+is a
+.Dv REG_EBRACK
+error.
 .Pp
 Equivalence classes cannot begin or end bracket-expression ranges.
 The endpoint of one range cannot begin another.
@@ -449,19 +513,38 @@ RE_DUP_MAX, the limit on repetition counts in bounded repetitions, is 255.
 A repetition operator (?, *, +, or bounds) cannot follow another
 repetition operator.
 A repetition operator cannot begin an expression or subexpression
-or follow `^' or `|'.
-.Pp
-`|' cannot appear first or last in a (sub)expression or after another `|',
-i.e. an operand of `|' cannot be an empty subexpression.
-An empty parenthesized subexpression, `()', is legal and matches an
+or follow
+.Ql ^
+or
+.Ql | .
+.Pp
+A
+.Ql |
+cannot appear first or last in a (sub)expression, or after another
+.Ql | ,
+i.e., an operand of
+.Ql |
+cannot be an empty subexpression.
+An empty parenthesized subexpression,
+.Ql \&(\&) ,
+is legal and matches an
 empty (sub)string.
 An empty string is not a legal RE.
 .Pp
-A `{' followed by a digit is considered the beginning of bounds for a
+A
+.Ql {
+followed by a digit is considered the beginning of bounds for a
 bounded repetition, which must then follow the syntax for bounds.
-A `{' \fInot\fR followed by a digit is considered an ordinary character.
+A
+.Ql {
+.Em not
+followed by a digit is considered an ordinary character.
 .Pp
-`^' and `$' beginning and ending subexpressions in obsolete (``basic'')
+.Ql ^
+and
+.Ql $
+beginning and ending subexpressions in obsolete
+.Pq Dq basic
 REs are anchors, not ordinary characters.
 .Sh SEE ALSO
 .Xr grep 1 ,
@@ -507,7 +590,8 @@ ran out of memory
 .It Er REG_EMPTY
 empty (sub)expression
 .It Er REG_ASSERT
-``can't happen''\(emyou found a bug
+.Dq can't happen
+\(emyou found a bug
 .It Er REG_INVARG
 invalid argument, e.g. negative-length string
 .El
@@ -547,8 +631,8 @@ with most special characters counting roughly double.
 implements bounded repetitions by macro expansion,
 which is costly in time and space if counts are large
 or bounded repetitions are nested.
-An RE like, say,
-`((((a{1,100}){1,100}){1,100}){1,100}){1,100}'
+A RE like, say,
+.Dq ((((a{1,100}){1,100}){1,100}){1,100}){1,100}
 will (eventually) run almost any existing machine out of swap space.
 .Pp
 There are suspected problems with response to obscure error conditions.
@@ -557,13 +641,20 @@ certain kinds of internal overflow,
 produced only by truly enormous REs or by multiply nested bounded repetitions,
 are probably not handled well.
 .Pp
-Due to a mistake in 1003.2, things like `a)b' are legal REs because `)' is
-a special character only in the presence of a previous unmatched `('.
+Due to a mistake in 1003.2, things like
+.Ql a)b
+are legal REs because
+.Ql \&)
+is
+a special character only in the presence of a previous unmatched
+.Ql \&( .
 This can't be fixed until the spec is fixed.
 .Pp
 The standard's definition of back references is vague.
 For example, does
-`a\e(\e(b\e)*\e2\e)*d' match `abbbd'?
+.Dq a\e(\e(b\e)*\e2\e)*d
+match
+.Dq abbbd ?
 Until the standard is clarified,
 behavior in such cases should not be relied on.
 .Pp
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index 2eeaa6321f3..4f774189ce5 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: access.2,v 1.5 1999/05/23 14:10:50 aaron Exp $
+.\"	$OpenBSD: access.2,v 1.6 1999/06/05 04:47:41 aaron Exp $
 .\"	$NetBSD: access.2,v 1.7 1995/02/27 12:31:44 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -54,8 +54,9 @@ for the access permissions indicated by
 .Fa mode .
 The value of
 .Fa mode
-is the bitwise inclusive OR of the access permissions to be
-checked
+is the bitwise inclusive
+.Tn OR
+of the access permissions to be checked
 .Pf ( Dv R_OK
 for read permission,
 .Dv W_OK
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index d02ff7cd6f2..fcd8f03cb9d 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chflags.2,v 1.10 1999/05/27 16:20:59 aaron Exp $
+.\"	$OpenBSD: chflags.2,v 1.11 1999/06/05 04:47:42 aaron Exp $
 .\"	$NetBSD: chflags.2,v 1.6 1995/02/27 12:32:03 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1993
@@ -58,7 +58,7 @@ has its flags changed to
 .Fa flags .
 .Pp
 The flags specified are formed by
-.Em OR Ns 'ing
+.Tn OR Ns 'ing
 the following values
 .Pp
 .Bl -tag -width "SF_IMMUTABLE" -compact -offset indent
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 267e04856f6..f97259a8cea 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mmap.2,v 1.14 1999/05/30 02:26:09 pjanzen Exp $
+.\"	$OpenBSD: mmap.2,v 1.15 1999/06/05 04:47:42 aaron Exp $
 .\"	$NetBSD: mmap.2,v 1.5 1995/06/24 10:48:59 cgd Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -79,7 +79,7 @@ deletes any previous mapping in the allocated address range.
 The protections (region accessibility) are specified in the
 .Fa prot
 argument by
-.Em OR Ns 'ing
+.Tn OR Ns 'ing
 the following values:
 .Pp
 .Bl -tag -width MAP_FIXEDX
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index ca1a3859ddc..b687ae3f077 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msync.2,v 1.13 1999/05/27 20:49:36 aaron Exp $
+.\"	$OpenBSD: msync.2,v 1.14 1999/06/05 04:47:42 aaron Exp $
 .\"	$NetBSD: msync.2,v 1.8 1995/10/12 15:41:09 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -74,7 +74,7 @@ are unpredictable except after an
 The
 .Fa flags
 argument is formed by
-.Em OR Ns 'ing
+.Tn OR Ns 'ing
 the following values
 .Pp
 .Bd -literal -offset indent -compact
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index be8fa078376..74106b46461 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: open.2,v 1.11 1999/05/27 16:21:00 aaron Exp $
+.\"	$OpenBSD: open.2,v 1.12 1999/06/05 04:47:42 aaron Exp $
 .\"	$NetBSD: open.2,v 1.8 1995/02/27 12:35:14 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -65,7 +65,7 @@ and modified by the process' umask value (see
 .Xr umask 2 ) .
 .Pp
 The flags specified are formed by
-.Em OR Ns 'ing
+.Tn OR Ns 'ing
 the following values
 .Pp
 .Bd -literal -offset indent -compact
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index ec2274930ef..e79b568bfe5 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: recv.2,v 1.17 1999/05/27 16:21:00 aaron Exp $
+.\"	$OpenBSD: recv.2,v 1.18 1999/06/05 04:47:42 aaron Exp $
 .\"	$NetBSD: recv.2,v 1.6 1995/02/27 12:36:08 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -115,7 +115,7 @@ call may be used to determine when more data arrive.
 The
 .Fa flags
 argument to a recv call is formed by 
-.Em OR Ns ing
+.Tn OR Ns ing
 one or more of the values:
 .Bl -column MSG_WAITALL -offset indent
 .It Dv MSG_OOB Ta process out-of-band data
diff --git a/lib/libc/sys/rfork.2 b/lib/libc/sys/rfork.2
index 332f4dedae9..0b2a0062086 100644
--- a/lib/libc/sys/rfork.2
+++ b/lib/libc/sys/rfork.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rfork.2,v 1.11 1999/05/16 19:55:35 alex Exp $
+.\"	$OpenBSD: rfork.2,v 1.12 1999/06/05 04:47:42 aaron Exp $
 .\"
 .\" This manual page is taken directly from Plan9, and modified to
 .\" describe the actual OpenBSD implementation.  Permission for
@@ -30,29 +30,33 @@ the open file descriptor table (which, when shared, permits processes
 to open and close files for other processes),
 and open files.
 .Fa flags
-is the logical OR of some subset of
+is the logical
+.Tn OR
+of some subset of
 .Bl -tag -width "RFCNAMEG" -compact -offset indent
-.It RFPROC
+.It Dv RFPROC
 If set a new process is created; otherwise changes affect the
 current process.
 The current implementation requires this flag to always be set.
-.It RFNOWAIT
+.It Dv RFNOWAIT
 If set, the child process will be dissociated from the parent. Upon
 exit the child will not leave a status for the parent to collect.
 See 
 .Xr wait 2 .
-.It RFNAMEG, RFCNAMEG, RFENVG, RFCENVG, RFNOTEG
+.It Xo Dv RFNAMEG , Dv RFCNAMEG ,
+.Dv RFENVG , Dv RFCENVG , Dv RFNOTEG
+.Xc
 These are Plan 9 specific flags, and not implemented.
-.It RFFDG
+.It Dv RFFDG
 If set, the invoker's file descriptor table (see
-.Xr intro 2
-) is copied; otherwise the two processes share a
+.Xr intro 2 )
+is copied; otherwise the two processes share a
 single table.
-.It RFCFDG
+.It Dv RFCFDG
 If set, the new process starts with a clean file descriptor table.
 Is mutually exclusive with
 .Dv RFFDG .
-.It RFMEM
+.It Dv RFMEM
 If set, the kernel will force sharing of the entire address space.
 The child
 will then inherit all the shared segments the parent process owns. Other segment
@@ -70,13 +74,13 @@ If
 .Dv RFPROC
 is set, the
 value returned in the parent process
-is the process id
+is the process ID
 of the child process; the value returned in the child is zero.
 Without
 .Dv RFPROC ,
 the return value is zero.
 Process ids range from 1 to the maximum integer
-.Ft ( int )
+.Li int
 value.
 .Fn rfork
 will sleep, if necessary, until required process resources are available.
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index ed08ec7c308..b8646815175 100644
--- a/lib/libc/sys/semget.2
+++ b/lib/libc/sys/semget.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: semget.2,v 1.8 1999/05/27 16:21:00 aaron Exp $
+.\"	$OpenBSD: semget.2,v 1.9 1999/06/05 04:47:42 aaron Exp $
 .\"	$NetBSD: semget.2,v 1.2 1997/03/27 08:20:41 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -64,7 +64,7 @@ bit is set in
 The access modes of the created semaphores is specified in
 .Fa semflg
 by
-.Em OR Ns 'ing
+.Tn OR Ns 'ing
 the following values:
 .Pp
 .Bd -literal -offset indent -compact
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index 937da89176f..cc250fec7eb 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wait.2,v 1.7 1999/05/23 14:10:57 aaron Exp $
+.\"	$OpenBSD: wait.2,v 1.8 1999/06/05 04:47:42 aaron Exp $
 .\"	$NetBSD: wait.2,v 1.6 1995/02/27 12:39:37 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -104,7 +104,9 @@ The
 .Fa status
 parameter is defined below.  The
 .Fa options
-parameter contains the bitwise OR of any of the following options.
+parameter contains the bitwise
+.Tn OR
+of any of the following options.
 The
 .Dv WNOHANG
 option
diff --git a/lib/libc/termios/tcsetattr.3 b/lib/libc/termios/tcsetattr.3
index 80729b49899..44cae7dbe1a 100644
--- a/lib/libc/termios/tcsetattr.3
+++ b/lib/libc/termios/tcsetattr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcsetattr.3,v 1.6 1999/05/27 16:21:00 aaron Exp $
+.\"	$OpenBSD: tcsetattr.3,v 1.7 1999/06/05 04:47:42 aaron Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -167,9 +167,15 @@ terminal interface.
 Unless otherwise noted for a specific command, these functions are restricted
 from use by background processes.
 Attempts to perform these operations shall cause the process group to be sent
-a SIGTTOU signal.
-If the calling process is blocking or ignoring SIGTTOU signals, the process
-is allowed to perform the operation and the SIGTTOU signal is not sent.
+a
+.Dv SIGTTOU
+signal.
+If the calling process is blocking or ignoring
+.Dv SIGTTOU
+signals, the process
+is allowed to perform the operation and the
+.Dv SIGTTOU
+signal is not sent.
 .Pp
 In all the functions, although
 .Fa fd
@@ -213,27 +219,27 @@ termios structure referenced by
 The
 .Fa action
 field is created by
-.Em OR Ns 'ing
+.Tn OR Ns 'ing
 the following values, as specified in the include file
 .Aq Pa termios.h .
 .Bl -tag -width "TCSADRAIN"
-.It Fa TCSANOW
+.It Dv TCSANOW
 The change occurs immediately.
-.It Fa TCSADRAIN
+.It Dv TCSADRAIN
 The change occurs after all output written to
 .Fa fd
 has been transmitted to the terminal.
 This value of
 .Fa action
 should be used when changing parameters that affect output.
-.It Fa TCSAFLUSH
+.It Dv TCSAFLUSH
 The change occurs after all output written to
 .Fa fd
 has been transmitted to the terminal
 Additionally, any input that has been received but not read is discarded.
-.It Fa TCSASOFT
+.It Dv TCSASOFT
 If this value is
-.Em OR Ns 'ed
+.Tn OR Ns 'ed
 into the
 .Fa action
 value, the values of the
@@ -323,7 +329,7 @@ and
 .Nm cfsetspeed
 functions,
 as well as the
-.Li TCSASOFT
+.Dv TCSASOFT
 option to the
 .Nm tcsetattr
 function are extensions to the