11 files changed, 63 insertions, 21 deletions
diff --git a/man/man2/perf_event_open.2 b/man/man2/perf_event_open.2
index 2f345ff5b2..15411027d7 100644
--- a/man/man2/perf_event_open.2
+++ b/man/man2/perf_event_open.2
@@ -357,7 +357,9 @@ For instance,
 .I /sys/bus/event_source/devices/cpu/type
 contains the value for the core CPU PMU, which is usually 4.
 .TP
-.BR kprobe " and " uprobe " (since Linux 4.17)"
+.B kprobe
+.TQ
+.BR uprobe " (both since Linux 4.17)"
 .\" commit 65074d43fc77bcae32776724b7fa2696923c78e4
 .\" commit e12f03d7031a977356e3d7b75a68c2185ff8d155
 .\" commit 33ea4b24277b06dbc55d7f5772a46f029600255e
diff --git a/man/man2/statx.2 b/man/man2/statx.2
index c35738cd18..a91458c8f7 100644
--- a/man/man2/statx.2
+++ b/man/man2/statx.2
@@ -400,10 +400,14 @@ The file's last status change timestamp.
 .I stx_mtime
 The file's last modification timestamp.
 .TP
-.IR stx_dev_major " and "  stx_dev_minor
+.I stx_dev_major
+.TQ
+.I stx_dev_minor
 The device on which this file (inode) resides.
 .TP
-.IR stx_rdev_major " and "  stx_rdev_minor
+.I stx_rdev_major
+.TQ
+.I stx_rdev_minor
 The device that this file (inode) represents if the file is of block or
 character device type.
 .TP
diff --git a/man/man4/fuse.4 b/man/man4/fuse.4
index 1e2dd7ae5d..9ea28af2df 100644
--- a/man/man4/fuse.4
+++ b/man/man4/fuse.4
@@ -242,7 +242,9 @@ field in the reply header (in particular, access denied errors
 may be indicated by returning
 .BR \-EACCES ).
 .TP
-.BR FUSE_OPEN " and " FUSE_OPENDIR
+.B FUSE_OPEN
+.TQ
+.B FUSE_OPENDIR
 .in +4n
 .EX
 struct fuse_open_in {
@@ -293,7 +295,9 @@ Don't invalidate the data cache on open.
 The file is not seekable.
 .RE
 .TP
-.BR FUSE_READ " and " FUSE_READDIR
+.B FUSE_READ
+.TQ
+.B FUSE_READDIR
 .IP
 .in +4n
 .EX
@@ -387,7 +391,9 @@ No reply data is expected.
 However, an empty reply message
 still needs to be issued once the flush operation is complete.
 .TP
-.BR FUSE_RELEASE " and " FUSE_RELEASEDIR
+.B FUSE_RELEASE
+.TQ
+.B FUSE_RELEASEDIR
 .in +4n
 .EX
 struct fuse_release_in {
diff --git a/man/man4/random.4 b/man/man4/random.4
index 1d463254d4..880c9fc961 100644
--- a/man/man4/random.4
+++ b/man/man4/random.4
@@ -263,7 +263,9 @@ for write access to
 .IR /dev/random .
 These values can be changed by writing to the files.
 .TP
-.IR uuid " and " boot_id
+.I uuid
+.TQ
+.I boot_id
 These read-only files
 contain random strings like 6fd5a44b\-35f4\-4ad4\-a9b9\-6b9be13e1fe9.
 The former is generated afresh for each read, the latter was
diff --git a/man/man5/proc_sys_fs.5 b/man/man5/proc_sys_fs.5
index e745a64fdd..ea2981bdab 100644
--- a/man/man5/proc_sys_fs.5
+++ b/man/man5/proc_sys_fs.5
@@ -14,7 +14,9 @@
 This directory contains the files and subdirectories for kernel variables
 related to filesystems.
 .TP
-.IR /proc/sys/fs/aio\-max\-nr " and " /proc/sys/fs/aio\-nr " (since Linux 2.6.4)"
+.I /proc/sys/fs/aio\-max\-nr
+.TQ
+.IR /proc/sys/fs/aio\-nr " (both since Linux 2.6.4)"
 .I aio\-nr
 is the running total of the number of events specified by
 .BR io_setup (2)
@@ -239,7 +241,9 @@ The default value in this file is 1048576.
 .B RLIMIT_NOFILE
 was hard-coded to the same value.)
 .TP
-.IR /proc/sys/fs/overflowgid " and " /proc/sys/fs/overflowuid
+.I /proc/sys/fs/overflowgid
+.TQ
+.I /proc/sys/fs/overflowuid
 These files
 allow you to change the value of the fixed UID and GID.
 The default is 65534.
diff --git a/man/man5/proc_sys_kernel.5 b/man/man5/proc_sys_kernel.5
index 3cf664cb4a..1687d33fb7 100644
--- a/man/man5/proc_sys_kernel.5
+++ b/man/man5/proc_sys_kernel.5
@@ -119,7 +119,9 @@ only users with the
 .B CAP_SYS_ADMIN
 capability may change the value in this file.
 .TP
-.IR /proc/sys/kernel/domainname " and " /proc/sys/kernel/hostname
+.I /proc/sys/kernel/domainname
+.TQ
+.I /proc/sys/kernel/hostname
 can be used to set the NIS/YP domainname and the
 hostname of your box in exactly the same way as the commands
 .BR domainname (1)
@@ -261,12 +263,16 @@ number of a process's group memberships.
 See
 .BR pid_namespaces (7).
 .TP
-.IR /proc/sys/kernel/ostype " and " /proc/sys/kernel/osrelease
+.I /proc/sys/kernel/ostype
+.TQ
+.I /proc/sys/kernel/osrelease
 These files
 give substrings of
 .IR /proc/version .
 .TP
-.IR /proc/sys/kernel/overflowgid " and " /proc/sys/kernel/overflowuid
+.I /proc/sys/kernel/overflowgid
+.TQ
+.I /proc/sys/kernel/overflowuid
 These files duplicate the files
 .I /proc/sys/fs/overflowgid
 and
diff --git a/man/man7/bootparam.7 b/man/man7/bootparam.7
index 98a5d65fd9..8b6a6b7a95 100644
--- a/man/man7/bootparam.7
+++ b/man/man7/bootparam.7
@@ -151,7 +151,9 @@ mount an ext3 filesystem as ext2 and then remove the journal in the root
 filesystem, in fact reverting its format from ext3 to ext2 without the
 need to boot the box from alternate media.
 .TP
-.BR 'ro' " and " 'rw'
+.B 'ro'
+.TQ
+.B 'rw'
 The 'ro' option tells the kernel to mount the root filesystem
 as 'read-only' so that filesystem consistency check programs (fsck)
 can do their work on a quiescent filesystem.
@@ -233,7 +235,9 @@ of motherboard where that doesn't work.
 The option 'reboot=bios' will
 instead jump through the BIOS.
 .TP
-.BR 'nosmp' " and " 'maxcpus=N'
+.B 'nosmp'
+.TQ
+.B 'maxcpus=N'
 (Only when __SMP__ is defined.)
 A command-line option of 'nosmp' or 'maxcpus=0' will disable SMP
 activation entirely; an option 'maxcpus=N' limits the maximum number
diff --git a/man/man7/ddp.7 b/man/man7/ddp.7
index e52cd442b5..c77315f03b 100644
--- a/man/man7/ddp.7
+++ b/man/man7/ddp.7
@@ -187,13 +187,17 @@ Network device not available or not capable of sending IP.
 .B SIOCGSTAMP
 was called on a socket where no packet arrived.
 .TP
-.BR ENOMEM " and " ENOBUFS
+.B ENOMEM
+.TQ
+.B ENOBUFS
 Not enough memory available.
 .TP
 .B ENOPKG
 A kernel subsystem was not configured.
 .TP
-.BR ENOPROTOOPT " and " EOPNOTSUPP
+.B ENOPROTOOPT
+.TQ
+.B EOPNOTSUPP
 Invalid socket option passed.
 .TP
 .B ENOTCONN
diff --git a/man/man7/ip.7 b/man/man7/ip.7
index 4fc9bde274..e75aa7ca40 100644
--- a/man/man7/ip.7
+++ b/man/man7/ip.7
@@ -1394,7 +1394,9 @@ was called on a socket where no packet arrived.
 .B ENOPKG
 A kernel subsystem was not configured.
 .TP
-.BR ENOPROTOOPT " and " EOPNOTSUPP
+.B ENOPROTOOPT
+.TQ
+.B EOPNOTSUPP
 Invalid socket option passed.
 .TP
 .B ENOTCONN
diff --git a/man/man7/keyrings.7 b/man/man7/keyrings.7
index 07d7bc297b..588ffcfa56 100644
--- a/man/man7/keyrings.7
+++ b/man/man7/keyrings.7
@@ -723,7 +723,9 @@ field provides some further information about the key.
 The information that appears here depends on the key type, as follows:
 .RS
 .TP
-.IR \[dq]user\[dq] " and " \[dq]logon\[dq]
+.I \[dq]user\[dq]
+.TQ
+.I \[dq]logon\[dq]
 The size in bytes of the key payload (expressed in decimal).
 .TP
 .I \[dq]keyring\[dq]
diff --git a/man/man7/socket.7 b/man/man7/socket.7
index 3ebfc770b1..5b45e4cdf3 100644
--- a/man/man7/socket.7
+++ b/man/man7/socket.7
@@ -777,7 +777,9 @@ but the
 .I rmem_max
 limit can be overridden.
 .TP
-.BR SO_RCVLOWAT " and " SO_SNDLOWAT
+.B SO_RCVLOWAT
+.TQ
+.B SO_SNDLOWAT
 Specify the minimum number of bytes in the buffer until the socket layer
 will pass the data to the protocol
 .RB ( SO_SNDLOWAT )
@@ -817,7 +819,9 @@ indicate a socket as readable only if at least
 .B SO_RCVLOWAT
 bytes are available.
 .TP
-.BR SO_RCVTIMEO " and " SO_SNDTIMEO
+.B SO_RCVTIMEO
+.TQ
+.B SO_SNDTIMEO
 .\" Not implemented in Linux 2.0.
 .\" Implemented in Linux 2.1.11 for getsockopt: always return a zero struct.
 .\" Implemented in Linux 2.3.41 for setsockopt, and actually used.
@@ -1118,7 +1122,9 @@ set by using the
 .B SO_SNDBUF
 socket option.
 .TP
-.IR message_cost " and " message_burst
+.I message_cost
+.TQ
+.I message_burst
 configure the token bucket filter used to load limit warning messages
 caused by external network events.
 .TP