5 files changed, 27 insertions, 9 deletions
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