diff --git a/man2/brk.2 b/man2/brk.2
index 645075c6f..56099e1a6 100644
--- a/man2/brk.2
+++ b/man2/brk.2
@@ -75,12 +75,12 @@ POSIX.1 standard (see paragraphs B.1.1.1.3 and B.8.3.3).
 .SH NOTES
 Various systems use various types for the parameter of
 .BR sbrk ().
-Common are \fBint\fP, \fBssize_t\fP, \fBptrdiff_t\fP, \fBintptr_t\fP.
+Common are \fIint\fP, \fIssize_t\fP, \fIptrdiff_t\fP, \fIintptr_t\fP.
 .\" One sees
-.\" \fBint\fP (e.g. XPGv4, DU 4.0, HP-UX 11, FreeBSD 4.0, OpenBSD 3.2),
-.\" \fBssize_t\fP (OSF1 2.0, Irix 5.3, 6.5),
-.\" \fBptrdiff_t\fP (libc4, libc5, ulibc, glibc2.0, 2.1),
-.\" \fBintptr_t\fP (e.g. XPGv5, AIX, SunOS 5.8, 5.9, FreeBSD 4.7, NetBSD 1.6,
+.\" \fIint\fP (e.g. XPGv4, DU 4.0, HP-UX 11, FreeBSD 4.0, OpenBSD 3.2),
+.\" \fIssize_t\fP (OSF1 2.0, Irix 5.3, 6.5),
+.\" \fIptrdiff_t\fP (libc4, libc5, ulibc, glibc2.0, 2.1),
+.\" \fIintptr_t\fP (e.g. XPGv5, AIX, SunOS 5.8, 5.9, FreeBSD 4.7, NetBSD 1.6,
 .\" Tru64 5.1, glibc2.2).
 XPGv6 obsoletes this function.
 .SH "SEE ALSO"
diff --git a/man2/lseek.2 b/man2/lseek.2
index 1f9bf62dd..fa39dfa45 100644
--- a/man2/lseek.2
+++ b/man2/lseek.2
@@ -139,7 +139,7 @@ L_INCR	SEEK_CUR
 L_XTND	SEEK_END
 .TE
 .PP
-SVR1-3 returns \fBlong\fP instead of \fBoff_t\fP, BSD returns \fBint\fP.
+SVR1-3 returns \fIlong\fP instead of \fIoff_t\fP, BSD returns \fIint\fP.
 .PP
 Note that file descriptors created by
 .BR dup (2)
diff --git a/man2/readv.2 b/man2/readv.2
index e99e3bf9e..3a8d87f1c 100644
--- a/man2/readv.2
+++ b/man2/readv.2
@@ -113,8 +113,8 @@ permitted maximum.
 and
 .BR writev ()
 functions first appeared in 4.2BSD), Unix98, POSIX 1003.1-2001.
-Linux libc5 used \fBsize_t\fR as the type of the \fIcount\fR parameter,
-and \fBint\fP as return type for these functions.
+Linux libc5 used \fIsize_t\fR as the type of the \fIcount\fR parameter,
+and \fIint\fP as return type for these functions.
 .\" The readv/writev system calls were buggy before Linux 1.3.40.
 .\" (Says release.libc.)
 .SH "LINUX NOTES"
diff --git a/man2/statfs.2 b/man2/statfs.2
index d2777f35a..8abfa8be4 100644
--- a/man2/statfs.2
+++ b/man2/statfs.2
@@ -188,7 +188,7 @@ that returns a
 (defined in
 .IR "<sys/statvfs.h>" )
 containing an
-.B "unsigned long"
+.I "unsigned long"
 .IR f_fsid .
 Linux, SunOS, HPUX, 4.4BSD have a system call
 .BR statfs ()
@@ -197,7 +197,7 @@ that returns a
 (defined in
 .IR "<sys/vfs.h>" )
 containing a
-.B fsid_t
+.I fsid_t
 .IR f_fsid ,
 where
 .I fsid_t
diff --git a/man2/statvfs.2 b/man2/statvfs.2
index cfc90f28a..ea2203748 100644
--- a/man2/statvfs.2
+++ b/man2/statvfs.2
@@ -68,7 +68,7 @@ and
 are defined in
 .IR <sys/types.h> .
 Both used to be
-.BR "unsigned long" .
+.IR "unsigned long" .
 
 The field
 .I f_flag
diff --git a/man3/assert.3 b/man3/assert.3
index c33dbded6..0cc667bf9 100644
--- a/man3/assert.3
+++ b/man3/assert.3
@@ -57,7 +57,7 @@ No value is returned.
 ISO9899 (ANSI C).  In the 1990 standard,
 .I expression
 is required to be of type
-.B int
+.I int
 and undefined behavior results if it is not, but in the 1999 standard
 it may have any scalar type.
 .\" See Defect Report 107 for more details.
diff --git a/man3/dlopen.3 b/man3/dlopen.3
index 092262264..78c630303 100644
--- a/man3/dlopen.3
+++ b/man3/dlopen.3
@@ -347,10 +347,11 @@ does the same as
 but takes a version string as an additional argument.
 
 .SH EXAMPLE
-.B Load the math library, and print the cosine of 2.0:
+Load the math library, and print the cosine of 2.0:
 .RS
 .nf
 .if t .ft CW
+
 #include <stdio.h>
 #include <dlfcn.h>
 
diff --git a/man3/errno.3 b/man3/errno.3
index 924404ea2..3d151f903 100644
--- a/man3/errno.3
+++ b/man3/errno.3
@@ -52,7 +52,7 @@ one has to zero
 before the call in order to detect possible errors.
 
 \fBerrno\fR is defined by the ISO C standard to be a modifiable lvalue
-of type \fBint\fR, and must not be explicitly declared; \fBerrno\fR
+of type \fIint\fR, and must not be explicitly declared; \fBerrno\fR
 may be a macro.  \fBerrno\fR is thread-local; setting it in one thread
 does not affect its value in any other thread.
 
diff --git a/man3/fseeko.3 b/man3/fseeko.3
index 6fe40466c..8be20ae33 100644
--- a/man3/fseeko.3
+++ b/man3/fseeko.3
@@ -37,17 +37,17 @@ The \fBfseeko\fP() and \fBftello\fP() functions are identical to
 \fBfseek\fP() and \fBftell\fP() (see
 .BR fseek (3)),
 respectively, except that the \fIoffset\fP argument of \fBfseeko\fP()
-and the return value of \fBftello\fP() is of type \fBoff_t\fP
-instead of \fBlong\fP.
+and the return value of \fBftello\fP() is of type \fIoff_t\fP
+instead of \fIlong\fP.
 .LP
-On many architectures both \fBoff_t\fP and \fBlong\fP are 32-bit types,
+On many architectures both \fIoff_t\fP and \fIlong\fP are 32-bit types,
 but compilation with
 .RS
 .nf
 #define _FILE_OFFSET_BITS 64
 .fi
 .RE
-will turn \fBoff_t\fP into a 64-bit type.
+will turn \fIoff_t\fP into a 64-bit type.
 .SH RETURN VALUE
 On successful completion,
 .BR fseeko ()
diff --git a/man3/ftok.3 b/man3/ftok.3
index 1e079d177..4f19d4ac4 100644
--- a/man3/ftok.3
+++ b/man3/ftok.3
@@ -75,7 +75,7 @@ Under libc4 and libc5 (and under SunOS 4.x) the prototype was
 Today
 .I proj_id
 is an
-.BR int ,
+.IR int ,
 but still only 8 bits are used. Typical usage has an ASCII character
 .IR proj_id ,
 that is why the behaviour is said to be undefined when
diff --git a/man3/gets.3 b/man3/gets.3
index 6fcfc12ce..bdb56cd61 100644
--- a/man3/gets.3
+++ b/man3/gets.3
@@ -45,9 +45,9 @@ fgetc, fgets, getc, getchar, gets, ungetc \- input of characters and strings
 reads the next character from
 .I stream 
 and returns it as an
-.B unsigned char
+.I unsigned char
 cast to an
-.BR int ,
+.IR int ,
 or
 .B EOF
 on end of file or error.
@@ -95,7 +95,7 @@ pushes
 back to
 .IR stream ,
 cast to
-.BR "unsigned char" ,
+.IR "unsigned char" ,
 where it is available for subsequent read operations.  Pushed-back characters
 will be returned in reverse order; only one pushback is guaranteed.
 .PP
@@ -112,9 +112,9 @@ For non-locking counterparts, see
 and 
 .BR getchar ()
 return the character read as an
-.B unsigned char
+.I unsigned char
 cast to an
-.B int
+.I int
 or
 .B EOF
 on end of file or error.
diff --git a/man3/getspnam.3 b/man3/getspnam.3
index eef261a84..fb5f3cfd7 100644
--- a/man3/getspnam.3
+++ b/man3/getspnam.3
@@ -195,7 +195,7 @@ struct spwd {
 .SH "RETURN VALUE"
 The functions that return a pointer return NULL if no more entries
 are available or if an error occurs during processing.
-The functions which have \fBint\fR as the return value return 0 for
+The functions which have \fIint\fR as the return value return 0 for
 success and \-1 for failure.
 .LP
 For the non-reentrant functions, the return value may point to static area,
diff --git a/man3/getw.3 b/man3/getw.3
index 904698dff..4721f2a80 100644
--- a/man3/getw.3
+++ b/man3/getw.3
@@ -32,11 +32,11 @@ getw, putw \- input and output of words (ints)
 .BI "int putw(int " w ", FILE *" stream );
 .nl
 .SH DESCRIPTION
-\fBgetw\fP() reads a word (that is, an \fBint\fP) from \fIstream\fP. It's
+\fBgetw\fP() reads a word (that is, an \fIint\fP) from \fIstream\fP. It's
 provided for compatibility with SVID.  We recommend you use
 \fBfread\fP(3) instead.
 .P
-\fBputw\fP() writes the word \fIw\fP (that is, an \fBint\fP) to \fIstream\fP.  It
+\fBputw\fP() writes the word \fIw\fP (that is, an \fIint\fP) to \fIstream\fP.  It
 is provided for compatibility with SVID, but we recommend you use
 \fBfwrite\fP(3) instead.
 .SH "RETURN VALUE"
diff --git a/man3/glob.3 b/man3/glob.3
index 026cec8bd..6120952d2 100644
--- a/man3/glob.3
+++ b/man3/glob.3
@@ -241,7 +241,7 @@ are declared as
 .BR size_t
 in glibc 2.1, as they should according to POSIX.2,
 but are declared as
-.B int
+.I int
 in libc4, libc5 and glibc 2.0.
 .SH "SEE ALSO"
 .BR ls (1),
diff --git a/man3/isalpha.3 b/man3/isalpha.3
index 233bc20e5..01c367061 100644
--- a/man3/isalpha.3
+++ b/man3/isalpha.3
@@ -65,7 +65,7 @@ classification routines
 These functions check whether
 .IR c ,
 which must have the value of an
-.B unsigned char
+.I unsigned char
 or
 .BR EOF ,
 falls into a certain character class according to the current locale.
diff --git a/man3/puts.3 b/man3/puts.3
index 4852c0607..c9adc7447 100644
--- a/man3/puts.3
+++ b/man3/puts.3
@@ -42,7 +42,7 @@ fputc, fputs, putc, putchar, puts \- output of characters and strings
 writes the character
 .IR c ,
 cast to an
-.BR "unsigned char" ,
+.IR "unsigned char" ,
 to
 .IR stream .
 .PP
@@ -85,9 +85,9 @@ For non-locking counterparts, see
 and
 .BR putchar ()
 return the character written as an
-.B unsigned char
+.I unsigned char
 cast to an
-.B int
+.I int
 or
 .B EOF
 on error.
diff --git a/man3/qecvt.3 b/man3/qecvt.3
index f34897d1c..aa8f696fe 100644
--- a/man3/qecvt.3
+++ b/man3/qecvt.3
@@ -48,7 +48,7 @@ are identical to
 and
 .BR gcvt
 respectively, except that they use a
-.B "long double"
+.I "long double"
 argument
 .IR number .
 See
diff --git a/man3/strtod.3 b/man3/strtod.3
index 0aba65157..1e53861aa 100644
--- a/man3/strtod.3
+++ b/man3/strtod.3
@@ -64,10 +64,10 @@ and
 functions convert the initial portion of the string pointed to by
 .I nptr
 to
-.BR double ,
-.BR float ,
+.IR double ,
+.IR float ,
 and
-.B long double 
+.I long double 
 representation, respectively.
 
 The expected form of the (initial portion of the) string is
diff --git a/man3/toascii.3 b/man3/toascii.3
index 5180bc70d..1accfa7bd 100644
--- a/man3/toascii.3
+++ b/man3/toascii.3
@@ -34,7 +34,7 @@ toascii \- convert character to ASCII
 .BI "int toascii(int " "c" );
 .fi
 .SH DESCRIPTION
-\fBtoascii\fP() converts \fIc\fP to a 7-bit \fBunsigned char\fP value
+\fBtoascii\fP() converts \fIc\fP to a 7-bit \fIunsigned char\fP value
 that fits into the ASCII character set, by clearing the
 high-order bits.
 .SH "RETURN VALUE"
diff --git a/man3/ualarm.3 b/man3/ualarm.3
index 827cb91e0..32106bec9 100644
--- a/man3/ualarm.3
+++ b/man3/ualarm.3
@@ -28,9 +28,7 @@ ualarm \- schedule signal after given number of microseconds
 /* BSD version */
 .B "#include <unistd.h>"
 .sp
-.BI "unsigned int"
-.br
-.BI "ualarm(unsigned int " usecs ", unsigned int " interval );
+.BI "unsigned int ualarm(unsigned int " usecs ", unsigned int " interval );
 .sp
 /* SUSv2 version */
 .B "#define _XOPEN_SOURCE 500"
diff --git a/man3/wcstoimax.3 b/man3/wcstoimax.3
index 1ba0bc507..f2d1cc686 100644
--- a/man3/wcstoimax.3
+++ b/man3/wcstoimax.3
@@ -39,9 +39,9 @@ These functions are just like
 and
 .BR wcstoul (),
 except that they return a value of type
-.B intmax_t
+.I intmax_t
 and
-.BR uintmax_t ,
+.IR uintmax_t ,
 respectively.
 .SH "CONFORMING TO"
 C99, POSIX 1003.1-2003.
diff --git a/man3/wprintf.3 b/man3/wprintf.3
index 4db806fec..cc06b4644 100644
--- a/man3/wprintf.3
+++ b/man3/wprintf.3
@@ -134,7 +134,7 @@ If the \fIformat\fP string contains non-ASCII wide characters, the program
 will only work correctly if the LC_CTYPE category of the current locale at
 run time is the same as the LC_CTYPE category of the current locale at
 compile time. This is because the
-.B wchar_t
+.I wchar_t
 representation is platform and locale dependent. (The GNU libc represents
 wide characters using their Unicode (ISO-10646) code point, but other
 platforms don't do this. Also, the use of ISO C99 universal character names
diff --git a/man3/xdr.3 b/man3/xdr.3
index a3e2c92b1..8b4b77779 100644
--- a/man3/xdr.3
+++ b/man3/xdr.3
@@ -139,7 +139,7 @@ double *dp;
 .ft R
 .IP
 A filter primitive that translates between C
-.B double
+.I double
 precision numbers and their external representations.
 This routine returns one if it succeeds, zero otherwise.
 .br
@@ -246,7 +246,7 @@ to a contiguous piece of the stream's buffer;
 .I len
 is the byte length of the desired buffer.
 Note: pointer is cast to
-.BR "long *" .
+.IR "long *" .
 .IP
 Warning:
 .BR xdr_inline ()
@@ -284,7 +284,7 @@ long *lp;
 .ft R
 .IP
 A filter primitive that translates between C
-.B long
+.I long
 integers and their external representations.
 This routine returns one if it succeeds, zero otherwise.
 .br
@@ -635,7 +635,7 @@ unsigned char *ucp;
 .ft R
 .IP
 A filter primitive that translates between
-.B unsigned
+.I unsigned
 C characters and their external representations.
 This routine returns one if it succeeds, zero otherwise.
 .br
@@ -651,7 +651,7 @@ unsigned *up;
 .ft R
 .IP
 A filter primitive that translates between C
-.B unsigned
+.I unsigned
 integers and their external representations.
 This routine returns one if it succeeds, zero otherwise.
 .br
@@ -667,7 +667,7 @@ unsigned long *ulp;
 .ft R
 .IP
 A filter primitive that translates between C
-.B "unsigned long"
+.I "unsigned long"
 integers and their external representations.
 This routine returns one if it succeeds, zero otherwise.
 .br
@@ -683,7 +683,7 @@ unsigned short *usp;
 .ft R
 .IP
 A filter primitive that translates between C
-.B "unsigned short"
+.I "unsigned short"
 integers and their external representations.
 This routine returns one if it succeeds, zero otherwise.
 .br
diff --git a/man4/sd.4 b/man4/sd.4
index 57969e9a3..afd443e4c 100644
--- a/man4/sd.4
+++ b/man4/sd.4
@@ -108,16 +108,16 @@ BLKGETSIZE
 Returns the device size in sectors.  The
 .BR ioctl (2)
 parameter should be a pointer to a
-.BR long .
+.IR long .
 .TP
 BLKRRPART
 Forces a re-read of the SCSI disk partition tables.  No parameter is needed.
 
 The
 .BR scsi (4)
-.IR ioctl s
-are also supported.  If the
 .BR ioctl (2)
+operations are also supported.  If the
+.BR ioctl ()
 parameter is required, and it is NULL, then
 .BR ioctl ()
 will return \-EINVAL.
diff --git a/man5/ipc.5 b/man5/ipc.5
index 22fd1f8d4..30bfdf2f9 100644
--- a/man5/ipc.5
+++ b/man5/ipc.5
@@ -131,7 +131,7 @@ is a
 .B key_t
 type, while all the other symbolic constants are flag fields and can
 be OR'ed into an
-.B int
+.I int
 type variable.
 .SS Message Queues
 A message queue is uniquely identified by a positive integer
diff --git a/man5/tzfile.5 b/man5/tzfile.5
index a0e5ee7f1..2f26efea5 100644
--- a/man5/tzfile.5
+++ b/man5/tzfile.5
@@ -44,7 +44,7 @@ stored in the file.
 The above header is followed by
 .I tzh_timecnt
 four-byte values of type
-.BR long ,
+.IR long ,
 sorted in ascending order.
 These values are written in ``standard'' byte order.
 Each is used as a transition time (as returned by
@@ -53,7 +53,7 @@ at which the rules for computing local time change.
 Next come
 .I tzh_timecnt
 one-byte values of type
-.BR "unsigned char" ;
+.IR "unsigned char" ;
 each one tells which of the different types of ``local time'' types
 described in the file is associated with the same-indexed transition time.
 These values serve as indices into an array of
@@ -75,7 +75,7 @@ struct ttinfo {
 Each structure is written as a four-byte value for
 .I tt_gmtoff
 of type
-.BR long ,
+.IR long ,
 in a standard byte order, followed by a one-byte value for
 .I tt_isdst
 and a one-byte value for
diff --git a/man7/unicode.7 b/man7/unicode.7
index 89607cc15..8e6dd818a 100644
--- a/man7/unicode.7
+++ b/man7/unicode.7
@@ -191,7 +191,7 @@ such as
 and
 .BR mbsrtowcs (3)
 can be used to transform the internal
-.B wchar_t
+.I wchar_t
 characters and strings into the system character encoding and back
 and
 .BR wcwidth (3)