21 files changed, 93 insertions, 42 deletions
diff --git a/man3/dbopen.3 b/man3/dbopen.3
index d28e236384..cecbd4ab8e 100644
--- a/man3/dbopen.3
+++ b/man3/dbopen.3
@@ -73,11 +73,20 @@ and
 .I mode
 arguments are as specified to the
 .BR open (2)
-routine, however, only the O_CREAT, O_EXCL, O_EXLOCK, O_NONBLOCK,
-O_RDONLY, O_RDWR, O_SHLOCK and
+routine, however, only the
+.BR O_CREAT ,
+.BR O_EXCL ,
+.BR O_EXLOCK ,
+.BR O_NONBLOCK ,
+.BR O_RDONLY ,
+.BR O_RDWR ,
+.BR O_SHLOCK ,
+and
 .B O_TRUNC
 flags are meaningful.
-(Note, opening a database file O_WRONLY is not possible.)
+(Note, opening a database file
+.B O_WRONLY
+is not possible.)
 .\"Three additional options may be specified by
 .\".IR or 'ing
 .\"them into the
@@ -101,7 +110,9 @@ flags are meaningful.
 .PP
 The
 .I type
-argument is of type DBTYPE (as defined in the
+argument is of type
+.I DBTYPE
+(as defined in the
 .I <db.h>
 include file) and
 may be set to DB_BTREE, DB_HASH or DB_RECNO.
diff --git a/man3/ether_aton.3 b/man3/ether_aton.3
index ac8afb62a5..9687d41945 100644
--- a/man3/ether_aton.3
+++ b/man3/ether_aton.3
@@ -123,6 +123,8 @@ struct ether_addr {
 .SH "CONFORMING TO"
 4.3BSD, SunOS
 .SH BUGS
-The glibc 2.2.5 implementation of ether_line() is broken.
+The glibc 2.2.5 implementation of
+.BR ether_line ()
+is broken.
 .SH "SEE ALSO"
 .BR ethers (5)
diff --git a/man3/fmax.3 b/man3/fmax.3
index 40af8fc842..fa33d49369 100644
--- a/man3/fmax.3
+++ b/man3/fmax.3
@@ -15,7 +15,10 @@ fmax, fmaxf, fmaxl \- find maximum value
 .sp
 Compile with \fI\-std=c99\fP; link with \fI\-lm\fP.
 .SH DESCRIPTION
-Find the larger value of x and y.
+Find the larger value of
+.I x
+and
+.IR y .
 .SH "CONFORMING TO"
 C99
 .SH "SEE ALSO"
diff --git a/man3/getdate.3 b/man3/getdate.3
index 9e53353fa8..ecf6ce53f1 100644
--- a/man3/getdate.3
+++ b/man3/getdate.3
@@ -43,8 +43,12 @@ The function
 .BR getdate ()
 converts a string pointed to by
 .I string
-into the tm structure that it returns.
-This tm structure may be found in static storage, so that
+into the
+.I tm
+structure that it returns.
+This
+.I tm
+structure may be found in static storage, so that
 it will be overwritten by the next call.
 
 In contrast to
diff --git a/man3/getopt.3 b/man3/getopt.3
index 57dc3e29f9..79c7f64b00 100644
--- a/man3/getopt.3
+++ b/man3/getopt.3
@@ -131,8 +131,9 @@ permutes the contents of \fIargv\fP as it
 scans, so that eventually all the non-options are at the end.
 Two other modes are also implemented.
 If the first character of
-\fIoptstring\fP is '+' or the environment variable POSIXLY_CORRECT is
-set, then option processing stops as soon as a non-option argument is
+\fIoptstring\fP is '+' or the environment variable
+.B POSIXLY_CORRECT
+is set, then option processing stops as soon as a non-option argument is
 encountered.
 If the first character of \fIoptstring\fP is '\-', then
 each non-option \fIargv\fP-element is handled as if it were the argument of
@@ -296,7 +297,9 @@ version 2.01, but the support remains in glibc.
 .TP
 .BR getopt ():
 POSIX.2 and POSIX.1-2001,
-provided the environment variable POSIXLY_CORRECT is set.
+provided the environment variable
+.B POSIXLY_CORRECT
+is set.
 Otherwise, the elements of \fIargv\fP aren't really const, because we
 permute them.
 We pretend they're const in the prototype to be
diff --git a/man3/getpwent.3 b/man3/getpwent.3
index 8ed2a16ddd..631fee4ef8 100644
--- a/man3/getpwent.3
+++ b/man3/getpwent.3
@@ -122,7 +122,9 @@ The maximum number of files was open already in the system.
 .TP
 .B ENOMEM
 .\" not in POSIX
-Insufficient memory to allocate passwd structure.
+Insufficient memory to allocate
+.I passwd
+structure.
 .\" to allocate the passwd structure, or to allocate buffers
 .TP
 .B ERANGE
diff --git a/man3/gsignal.3 b/man3/gsignal.3
index 5e7762f80f..3caff0544a 100644
--- a/man3/gsignal.3
+++ b/man3/gsignal.3
@@ -55,7 +55,10 @@ respectively.
 .LP
 Elsewhere, on System V-like systems, these functions implement
 software signaling, entirely independent of the classical
-signal and kill functions.
+.BR signal (2)
+and
+.BR kill (2)
+functions.
 The function
 .BR ssignal ()
 defines the action to take when the software signal with
diff --git a/man3/hsearch.3 b/man3/hsearch.3
index 524db5bbc6..2dea7283e3 100644
--- a/man3/hsearch.3
+++ b/man3/hsearch.3
@@ -156,7 +156,7 @@ The functions
 are GNU extensions.
 .SH BUGS
 SVr4 and POSIX.1-2001 specify that \fIaction\fP
-is significant only for unsuccessful searches, so that an ENTER
+is significant only for unsuccessful searches, so that an \fBENTER\fP
 should not do anything for a successful search.
 The libc and glibc
 implementations update the \fIdata\fP for the given \fIkey\fP
diff --git a/man3/login.3 b/man3/login.3
index 067ebc1ee5..18aadabf78 100644
--- a/man3/login.3
+++ b/man3/login.3
@@ -42,7 +42,7 @@ The function
 .BR login ()
 takes the supplied \fIstruct utmp\fP,
 .IR ut ,
-and writes it to both utmp and wtmp file.
+and writes it to both the utmp and the wtmp file.
 .LP
 The function
 .BR logout ()
diff --git a/man3/mbrlen.3 b/man3/mbrlen.3
index b322f01077..243fbdf4b5 100644
--- a/man3/mbrlen.3
+++ b/man3/mbrlen.3
@@ -49,7 +49,8 @@ In this case,
 the effects on \fI*ps\fP are undefined.
 .PP
 If \fIps\fP is a NULL pointer, a static anonymous state only known to the
-mbrlen function is used instead.
+.BR mbrlen ()
+function is used instead.
 .SH "RETURN VALUE"
 The
 .BR mbrlen ()
diff --git a/man3/mbrtowc.3 b/man3/mbrtowc.3
index eedba2d4d0..7be4d78375 100644
--- a/man3/mbrtowc.3
+++ b/man3/mbrtowc.3
@@ -76,8 +76,8 @@ puts \fI*ps\fP in the initial state and returns 0.
 .PP
 In all of the above cases, if \fIps\fP is a NULL pointer, a static anonymous
 state only known to the mbrtowc function is used instead.
-Otherwise, \fI*ps\fP must be a valid \fBmbstate_t\fP object.
-An \fBmbstate_t\fP object \fIa\fP can be initialized to the initial state
+Otherwise, \fI*ps\fP must be a valid \fImbstate_t\fP object.
+An \fImbstate_t\fP object \fIa\fP can be initialized to the initial state
 by zeroing it, for example using
 .sp
 .RS
diff --git a/man3/mbsrtowcs.3 b/man3/mbsrtowcs.3
index e3d9a69748..7bc3297e61 100644
--- a/man3/mbsrtowcs.3
+++ b/man3/mbsrtowcs.3
@@ -46,22 +46,28 @@ and \fIerrno\fP is set to \fBEILSEQ\fP.
 .PP
 2. \fIlen\fP non-L'\\0' wide characters have been stored at \fIdest\fP.
 In this
-case \fI*src\fP is left pointing to the next multibyte sequence to be converted,
+case \fI*src\fP is left pointing to the next
+multibyte sequence to be converted,
 and the number of wide characters written to \fIdest\fP is returned.
 .PP
 3. The multibyte string has been completely converted, including the
-terminating '\\0' (which has the side effect of bringing back \fI*ps\fP to the
+terminating '\\0' (which has the side
+effect of bringing back \fI*ps\fP to the
 initial state).
 In this case \fI*src\fP is set to NULL, and the number of wide
-characters written to \fIdest\fP, excluding the terminating L'\\0' character,
-is returned.
+characters written to \fIdest\fP,
+excluding the terminating L'\\0' character, is returned.
 .PP
-If \fIdest\fP is NULL, \fIlen\fP is ignored, and the conversion proceeds as
-above, except that the converted wide characters are not written out to memory,
+If \fIdest\fP is NULL, \fIlen\fP is ignored,
+and the conversion proceeds as above,
+except that the converted wide characters are not written out to memory,
 and that no length limit exists.
 .PP
-In both of the above cases, if \fIps\fP is a NULL pointer, a static anonymous
-state only known to the mbsrtowcs function is used instead.
+In both of the above cases,
+if \fIps\fP is a NULL pointer, a static anonymous
+state only known to the
+.BR mbsrtowcs ()
+function is used instead.
 .PP
 The programmer must ensure that there is room for at least \fIlen\fP wide
 characters at \fIdest\fP.
diff --git a/man3/posix_memalign.3 b/man3/posix_memalign.3
index c0ab29f358..450f8ad457 100644
--- a/man3/posix_memalign.3
+++ b/man3/posix_memalign.3
@@ -134,7 +134,8 @@ is declared in \fI<stdlib.h>\fP instead of \fI<malloc.h>\fP.
 According to SUSv2,
 .BR valloc ()
 is declared in \fI<stdlib.h>\fP.
-Libc4,5 and glibc declare it in \fI<malloc.h>\fP and perhaps also in <stdlib.h>
+Libc4,5 and glibc declare it in \fI<malloc.h>\fP and perhaps also in
+\fI<stdlib.h>\fP
 (namely, if
 .B _GNU_SOURCE
 is defined, or
diff --git a/man3/rand.3 b/man3/rand.3
index 9a11b14db9..12c0792ddb 100644
--- a/man3/rand.3
+++ b/man3/rand.3
@@ -88,7 +88,9 @@ In order to get reproducible behavior in a threaded
 application, this state must be made explicit.
 The function
 .BR rand_r ()
-is supplied with a pointer to an unsigned int, to be used as state.
+is supplied with a pointer to an
+.IR "unsigned int" ,
+to be used as state.
 This is a very small amount of state, so this function will be a weak
 pseudo-random generator.
 Try
diff --git a/man3/realpath.3 b/man3/realpath.3
index 8313815cdf..358849a947 100644
--- a/man3/realpath.3
+++ b/man3/realpath.3
@@ -194,7 +194,9 @@ is not bounded.
 .LP
 The libc4 and libc5 implementation contains a buffer overflow
 (fixed in libc-5.4.13).
-Thus, set-user-ID programs like mount need a private version.
+Thus, set-user-ID programs like
+.BR mount (8)
+need a private version.
 .SH "SEE ALSO"
 .BR readlink (2),
 .BR canonicalize_file_name (3),
diff --git a/man3/rpc.3 b/man3/rpc.3
index a9d7dd21c8..77bfa9c46d 100644
--- a/man3/rpc.3
+++ b/man3/rpc.3
@@ -685,7 +685,7 @@ then this routine opens a new one and sets
 The
 .SM UDP
 transport resends the call message in intervals of
-.B wait
+.I wait
 time until a response is received or until the call times
 out.
 The total time for the call to time out is specified by
@@ -742,7 +742,7 @@ then this routine opens a new one and sets
 The
 .SM UDP
 transport resends the call message in intervals of
-.B wait
+.I wait
 time until a response is received or until the call times
 out.
 The total time for the call to time out is specified by
diff --git a/man3/strptime.3 b/man3/strptime.3
index fd5d1b9baf..bd1ea71107 100644
--- a/man3/strptime.3
+++ b/man3/strptime.3
@@ -288,9 +288,9 @@ returns NULL.
 SUSv2, POSIX.1-2001.
 .SH NOTES
 .LP
-In principle, this function does not initialize \fBtm\fP but
+In principle, this function does not initialize \fItm\fP but
 only stores the values specified.
-This means that \fBtm\fP should be initialized before the call.
+This means that \fItm\fP should be initialized before the call.
 Details differ a bit between different Unix systems.
 The glibc implementation does not touch those fields which are not
 explicitly specified, except that it recomputes the
diff --git a/man3/strtoul.3 b/man3/strtoul.3
index 04d850b165..f011d8fdb9 100644
--- a/man3/strtoul.3
+++ b/man3/strtoul.3
@@ -56,7 +56,9 @@ XOPEN_SOURCE >= 600 || _BSD_SOURCE || _SVID_SOURCE || _ISOC99_SOURCE; or
 The
 .BR strtoul ()
 function converts the initial part of the string
-in \fInptr\fP to an unsigned long integer value according to the
+in \fInptr\fP to an
+.I "unsigned long int"
+value according to the
 given \fIbase\fP, which must be between 2 and 36 inclusive, or be
 the special value 0.
 .PP
@@ -70,8 +72,10 @@ If \fIbase\fP is zero or 16, the string may then include a
 zero \fIbase\fP is taken as 10 (decimal) unless the next character
 is '0', in which case it is taken as 8 (octal).
 .PP
-The remainder of the string is converted to an unsigned long int value
-in the obvious manner, stopping at the first character which is not a
+The remainder of the string is converted to an
+.I "unsigned long int"
+value in the obvious manner,
+stopping at the first character which is not a
 valid digit in the given base.
 (In bases above 10, the letter 'A' in
 either upper or lower case represents 10, 'B' represents 11, and so
@@ -93,7 +97,9 @@ The
 .BR strtoull ()
 function works just like the
 .BR strtoul ()
-function but returns an unsigned long long integer value.
+function but returns an
+.I "unsigned long long int"
+value.
 .SH "RETURN VALUE"
 The
 .BR strtoul ()
@@ -167,7 +173,9 @@ or to
 .BR strtoul ().
 
 Negative values are considered valid input and are
-silently converted to the equivalent unsigned long value.
+silently converted to the equivalent
+.I "unsigned long int"
+value.
 .SH EXAMPLE
 See the example on the
 .BR strtol (3)
diff --git a/man3/toupper.3 b/man3/toupper.3
index 29d5a554ed..8823089054 100644
--- a/man3/toupper.3
+++ b/man3/toupper.3
@@ -46,7 +46,9 @@ to lower case, if possible.
 .PP
 If
 .I c
-is not an unsigned char value, or
+is not an
+.I "unsigned char"
+value, or
 .BR EOF ,
 the behavior of these functions
 is undefined.
diff --git a/man3/wctob.3 b/man3/wctob.3
index 4b46d01161..8e16e827d7 100644
--- a/man3/wctob.3
+++ b/man3/wctob.3
@@ -27,7 +27,8 @@ function tests whether
 the multi-byte representation of the
 wide character \fIc\fP, starting in the initial state, consists of a single
 byte.
-If so, it is returned as an unsigned char.
+If so, it is returned as an
+.IR "unsigned char" .
 .PP
 Never use this function.
 It cannot help you in writing internationalized
diff --git a/man3/wctrans.3 b/man3/wctrans.3
index 2fcf37bcd7..5ad9dc0071 100644
--- a/man3/wctrans.3
+++ b/man3/wctrans.3
@@ -21,12 +21,12 @@ wctrans \- wide-character translation mapping
 .BI "wctrans_t wctrans(const char *" name );
 .fi
 .SH DESCRIPTION
-The \fBwctrans_t\fP type represents a mapping
+The \fIwctrans_t\fP type represents a mapping
 which can map a wide character to
 another wide character.
 Its nature is implementation dependent, but the special
 value \fI(wctrans_t)\ 0\fP denotes an invalid mapping.
-Nonzero \fBwctrans_t\fP
+Nonzero \fIwctrans_t\fP
 values can be passed to the
 .BR towctrans (3)
 function to actually perform