diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index aacc783b825e..7db20964d881 100644
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -1,4 +1,4 @@
-.\" $NetBSD: acpi.4,v 1.83 2018/01/13 17:35:33 uwe Exp $
+.\" $NetBSD: acpi.4,v 1.84 2018/01/13 23:43:46 wiz Exp $
 .\"
 .\" Copyright (c) 2002, 2004, 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -43,32 +43,16 @@
 .Sh DESCRIPTION
 .Nx
 provides machine-independent bus support for
-Advanced Configuration and Power Interface
-.Pq Tn ACPI
-devices and includes several
-.Tn ACPI
-device drivers.
+Advanced Configuration and Power Interface (ACPI)
+devices and includes several ACPI device drivers.
 .Pp
 The
 .Nx
-implementation of
-.Tn ACPI
-integrates Intel's ACPI Component Architecture
-.Pq Tn ACPI-CA
-for the OS-independent part.
-The
-.Tn ACPI-CA
-provides OS-neutral
-.Tn ACPI
-functionalities such as
-.Tn ACPI
-.Tn BIOS
+implementation of ACPI integrates Intel's ACPI Component Architecture
+(ACPI-CA) for the OS-independent part.
+The ACPI-CA provides OS-neutral ACPI functionalities such as ACPI BIOS
 table support,
-an
-.Tn ACPI
-event framework and an ACPI Machine Language
-.Pq Tn AML
-interpreter.
+an ACPI event framework and an ACPI Machine Language (AML) interpreter.
 .Pp
 Options:
 .Bl -tag -width ACPI_DSDT_FILE__filename_XX -offset 3n
@@ -77,19 +61,14 @@ Enable various debug facilities.
 .It Dv ACPIVERBOSE
 Enable verbose debug messages.
 .It Dv ACPI_ACTIVATE_DEV
-Determine if the
-.Tn ACPI
-driver should attempt to activate inactive devices.
+Determine if the ACPI driver should attempt to activate inactive devices.
 The default is off.
 .It Dv ACPI_DSDT_OVERRIDE
-Force a given Differentiated System Description Table
-.Pq Tn DSDT
-instead of the version supplied by the
-.Tn BIOS .
+Force a given Differentiated System Description Table (DSDT)
+instead of the version supplied by the BIOS.
 Use
 .Dv ACPI_DSDT_FILE
-to specify a
-.Tn DSDT .
+to specify a DSDT.
 .It Dv ACPI_DSDT_FILE="filename"
 If
 .Dv ACPI_DSDT_FILE
@@ -109,13 +88,10 @@ having it fail gracefully.
 .Sh SYSCTL SUPPORT
 Few
 .Xr sysctl 8
-variables are directly relevant for
-.Tn ACPI .
+variables are directly relevant for ACPI.
 .Bl -tag -width "123456" -offset indent
 .It Ic hw.acpi.root
-The address of the
-.Tn ACPI
-root pointer in system memory.
+The address of the ACPI root pointer in system memory.
 .It Ic hw.acpi.sleep.state
 The system sleep state.
 .It Ic hw.acpi.sleep.states
@@ -138,8 +114,7 @@ suspend-to-disk (not supported on
 power off
 .El
 .It Ic hw.acpi.sleep.beep
-A boolean variable that controls whether the
-.Tn PC
+A boolean variable that controls whether the PC
 speaker beeps upon resume.
 Only available on i386 and amd64 architectures.
 .It Ic hw.acpi.sleep.vbios
@@ -147,14 +122,9 @@ Defines the handling of the graphics card on i386 and amd64 architectures.
 The supported values are:
 .Bl -tag -width '2' -offset 2n
 .It 0
-No attempt to reset the
-.Tn VGA
-controller will be made.
+No attempt to reset the VGA controller will be made.
 .It 1
-Call the
-.Tn VGA
-.Tn BIOS
-when still in real mode.
+Call the VGA BIOS when still in real mode.
 This can result in direct reboots.
 In that case, use
 .Sq 2
@@ -164,50 +134,32 @@ from the
 .Pa pkgsrc/sysutils/vbetool
 package.
 .It 2
-Call the
-.Tn VGA
-.Tn BIOS
-using the in-kernel x86 emulator.
+Call the VGA BIOS using the in-kernel x86 emulator.
 .El
 .Pp
-If the system has problems in resuming from the
-.Tn S3
+If the system has problems in resuming from the S3
 state, experimenting with different values may provide a solution.
 .It Ic hw.acpi.stat.gpe
-The number of dispatched General Purpose Events
-.Pq Tn GPEs .
+The number of dispatched General Purpose Events (GPEs).
 .It Ic hw.acpi.stat.sci
-The number of System Control Interrupts
-.Pq Tn SCIs .
+The number of System Control Interrupts (SCIs).
 See
 .Xr acpiec 4
-for a brief description of both
-.Tn GPEs
-and
-.Tn SCIs .
+for a brief description of both GPEs and SCIs.
 .It Ic hw.acpi.stat.fixed
 The number of
 .Dq fixed events .
 .It Ic hw.acpi.stat.method
-The number of
-.Tn AML
-methods executed by the interpreter.
+The number of AML methods executed by the interpreter.
 .It Ic hw.acpi.power
-This read-only node describes the
-.Tn ACPI
-power state of devices.
-The values range from
-.Tn D0
+This read-only node describes the ACPI power state of devices.
+The values range from D0
 .Pq Dq on
-to
-.Tn D3
+to D3
 .Pq Dq off .
 .It Ic hw.acpi.wake
-This node represents devices that can wake the system from the
-.Tn S3
-or
-.Tn S4
-sleep state.
+This node represents devices that can wake the system from the S3 or
+S4 sleep state.
 By default,
 .Xr acpibut 4 ,
 .Xr acpilid 4 ,
@@ -218,60 +170,40 @@ the firmware supports wake-up capabilities for the devices.
 .El
 .Sh SUPPORTED DEVICES
 .Nx
-.Tn ACPI
-supports several machine-dependent and machine-independent devices,
-some specific to
-.Tn ACPI
-and some configured via it.
+ACPI supports several machine-dependent and machine-independent devices,
+some specific to ACPI and some configured via it.
 .Ss Machine-independent devices
 .Bl -tag -width "thinkpad(4) " -offset indent -compact
 .It Xr acpiacad 4
-.Tn ACPI
-AC adapters.
+ACPI AC adapters.
 .It Xr acpibat 4
-.Tn ACPI
-batteries.
+ACPI batteries.
 .It Xr acpibut 4
-.Tn ACPI
-power and sleep buttons.
+ACPI power and sleep buttons.
 .It Xr acpicpu 4
-.Tn ACPI
-processors.
+ACPI processors.
 .It Xr acpidalb 4
-.Tn ACPI
-direction application launch buttons.
+ACPI direction application launch buttons.
 .It Xr acpiec 4
-.Tn ACPI
-embedded controllers.
+ACPI embedded controllers.
 .It Xr acpiecdt 4
-.Tn ACPI
-Embedded Controller Boot Resource Table
-.Pq Tn ECDT .
+ACPI Embedded Controller Boot Resource Table (ECDT).
 .It Xr acpifan 4
-.Tn ACPI
-fans.
+ACPI fans.
 .It Xr acpilid 4
-.Tn ACPI
-lid switches.
+ACPI lid switches.
 .It Xr acpipmtr 4
-.Tn ACPI
-power meters.
+ACPI power meters.
 .It Xr acpismbus 4
-.Tn ACPI
-SMBus via control method interface
-.Pq Tn CMI .
+ACPI SMBus via control method interface (CMI).
 .It Xr acpitz 4
-.Tn ACPI
-thermal zones.
+ACPI thermal zones.
 .It Xr acpivga 4
-.Tn ACPI
-display adapter and output devices.
+ACPI display adapter and output devices.
 .It Xr acpiwmi 4
-.Tn ACPI
-support for Windows Management Instrumentation.
+ACPI support for Windows Management Instrumentation.
 .It Xr acpiwdrt 4
-.Tn ACPI
-watchdogs.
+ACPI watchdogs.
 .It Xr aibs 4
 ASUSTeK voltage, temperature and fan sensors.
 .It Xr asus 4
@@ -289,8 +221,7 @@ Fujitsu hotkeys.
 .It Xr hpacel 4
 HP 3D DriveGuard accelerometer.
 .It Xr hpet 4
-High Precision Event Timer
-.Pq Tn HPET .
+High Precision Event Timer (HPET).
 .It Xr hpqlb 4
 HP Quick Launch Buttons.
 .It Xr joy 4
@@ -329,16 +260,13 @@ Sony programmable I/O controller.
 .El
 .Sh DEBUGGING
 Although the situation has become better over the years,
-.Tn ACPI
-is typically prone to various errors,
+ACPI is typically prone to various errors,
 ranging from blatant flaws in the firmware to bugs in the implementation.
-Before anything else, it is a good practice to upgrade the
-.Tn BIOS
+Before anything else, it is a good practice to upgrade the BIOS
 to the latest version available from the vendor.
 .Pp
 To ease the task of diagnosing and fixing different problems, the
-.Tn ACPICA
-reference implementation provides a rich
+ACPICA reference implementation provides a rich
 facility of different debugging methods.
 In
 .Nx
@@ -364,34 +292,19 @@ the
 module using the option
 .Fl b Cm dump=true .
 .Ss Custom DSDT
-.Tn ACPI
-interprets bytecode known as
-.Tn ACPI
-Machine Language
-.Pq Tn AML ,
-provided by the
-.Tn BIOS
-as a memory image during the system bootstrap.
-Most of the
-.Tn AML
-relevant to
+ACPI interprets bytecode known as ACPI Machine Language (AML),
+provided by the BIOS as a memory image during the system bootstrap.
+Most of the AML relevant to
 .Nm
 is implemented in the so-called
-Differentiated System Descriptor Table
-.Pq Tn DSDT .
+Differentiated System Descriptor Table (DSDT).
 .Nx
-provides support for overriding the default
-.Tn DSDT
-supplied by the
-.Tn BIOS .
+provides support for overriding the default DSDT supplied by the BIOS.
 .Pp
-The following steps can be used to override the
-.Tn DSDT :
+The following steps can be used to override the DSDT:
 .Bl -enum -offset indent
 .It
-Dump the raw
-.Tn DSDT
-with
+Dump the raw DSDT with
 .Xr acpidump 8 .
 .It
 Disassemble the table with
@@ -423,9 +336,7 @@ Define
 in the kernel configuration file and rebuild.
 .El
 .Ss Debugger
-The
-.Tn ACPICA
-interpreter provides its own debugger for low-level debugging.
+The ACPICA interpreter provides its own debugger for low-level debugging.
 It can be used to display internal data structures and namespace objects,
 and to debug the execution of control methods.
 Single step and breakpoint functionality are available.
@@ -433,9 +344,7 @@ In
 .Nx
 this is integrated to the in-kernel
 .Xr ddb 4 .
-In order to enter the
-.Tn ACPICA
-debugger from
+In order to enter the ACPICA debugger from
 .Xr ddb 4 ,
 use the command
 .Ic call
@@ -448,9 +357,7 @@ provides three
 variables that control the debug output at runtime.
 The
 .Ic hw.acpi.debug.layer
-variable limits the output to a specific
-.Tn ACPI
-layer and the
+variable limits the output to a specific ACPI layer and the
 .Ic hw.acpi.debug.level
 variable controls the debug level.
 Both
@@ -459,8 +366,7 @@ variables are string literals.
 The third variable is
 .Ic hw.acpi.debug.object .
 This is a boolean that controls whether debug messages internal to the
-.Tn AML
-are enabled.
+AML are enabled.
 .Pp
 For the first two variables, the possible values are:
 .Bl -column -offset indent \
@@ -510,19 +416,15 @@ For the first two variables, the possible values are:
 .Pp
 In addition, there is
 .Dv ACPI_DEBUG_DEFAULT
-that is used by
-.Tn ACPICA
-as the default debug level.
+that is used by ACPICA as the default debug level.
 It includes
 .Dv ACPI_LV_INIT
 and
 .Dv ACPI_LV_DEBUG_OBJECT .
 .Pp
 The debug layer can be divided into two groups:
-the first one is specific to the
-.Tn ACPICA
-interpreter and the second one contains the internal
-.Tn ACPI
+the first one is specific to the ACPICA
+interpreter and the second one contains the internal ACPI
 components of
 .Nx .
 The constant
@@ -531,9 +433,7 @@ includes all
 .Nx
 specific parts.
 .Pp
-The
-.Tn ACPICA
-interpreter uses several debug levels internally,
+The ACPICA interpreter uses several debug levels internally,
 but the
 .Nx
 specific parts are typically limited to
@@ -568,9 +468,7 @@ or a compound constant including it, and
 is
 .Dv ACPI_LV_INFO
 or some constant that includes it.
-Finally, it can be noted that the
-.Tn ACPI
-implementation uses the prefix
+Finally, it can be noted that the ACPI implementation uses the prefix
 .Dv ACPI_DB ,
 whereas the debug level
 .Xr sysctl 8
@@ -579,9 +477,7 @@ variable is always specified with the prefix
 .Pp
 Another example can be mentioned for the use of
 .Ic hw.acpi.debug.object .
-The following could appear in an
-.Tn ASL
-code:
+The following could appear in an ASL code:
 .Bd -literal -offset indent
 Method(_Q19, 0, NotSerialized)
 {
@@ -665,9 +561,7 @@ and
 .An Jukka Ruohonen ,
 among others.
 .Sh BUGS
-Most of the
-.Tn ACPI
-power management functionalities are not implemented.
+Most of the ACPI power management functionalities are not implemented.
 .Pp
 The
 .Dv ACPI__DIS_IS_BROKEN
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 8a48d996f228..044c655f5f9a 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\"
-.\"	$NetBSD: bpf.4,v 1.59 2018/01/13 12:20:49 uwe Exp $
+.\"	$NetBSD: bpf.4,v 1.60 2018/01/13 23:43:46 wiz Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1992, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -100,11 +100,11 @@ The (third) argument to the
 .Xr ioctl 2
 should be a pointer to the type indicated.
 .Bl -tag -width indent -offset indent
-.It Dv "BIOCGBLEN (u_int)"
+.It Dv BIOCGBLEN ( u_int )
 Returns the required buffer length for reads on
 .Nm
 files.
-.It Dv "BIOCSBLEN (u_int)"
+.It Dv BIOCSBLEN ( u_int )
 Sets the buffer length for reads on
 .Nm
 files.
@@ -115,7 +115,7 @@ allowable size will be set and returned in the argument.
 A read call will result in
 .Er EINVAL
 if it is passed a buffer that is not this size.
-.It Dv BIOCGDLT (u_int)
+.It Dv BIOCGDLT ( u_int )
 Returns the type of the data link layer underlying the attached interface.
 .Er EINVAL
 is returned if no interface has been specified.
@@ -123,7 +123,7 @@ The device types, prefixed with
 .Dq DLT_ ,
 are defined in
 .In net/bpf.h .
-.It Dv BIOCGDLTLIST (struct bpf_dltlist)
+.It Dv BIOCGDLTLIST ( struct bpf_dltlist )
 Returns an array of the available types of the data link layer
 underlying the attached interface:
 .Bd -literal -offset indent
@@ -153,7 +153,7 @@ is
 the
 .Va bfl_len
 field is set to indicate the required length of an array in u_int.
-.It Dv BIOCSDLT (u_int)
+.It Dv BIOCSDLT ( u_int )
 Changes the type of the data link layer underlying the attached interface.
 .Er EINVAL
 is returned if no interface has been specified or the specified
@@ -172,12 +172,12 @@ promiscuously are closed.
 Flushes the buffer of incoming packets,
 and resets the statistics that are returned by
 .Dv BIOCGSTATS .
-.It Dv BIOCGETIF (struct ifreq)
+.It Dv BIOCGETIF ( struct ifreq )
 Returns the name of the hardware interface that the file is listening on.
 The name is returned in the ifr_name field of
 .Fa ifr .
 All other fields are undefined.
-.It Dv BIOCSETIF (struct ifreq)
+.It Dv BIOCSETIF ( struct ifreq )
 Sets the hardware interface associated with the file.
 This command must be performed before any packets can be read.
 The device is indicated by name using the
@@ -186,7 +186,7 @@ field of the
 .Fa ifreq .
 Additionally, performs the actions of
 .Dv BIOCFLUSH .
-.It Dv BIOCSRTIMEOUT, BIOCGRTIMEOUT (struct timeval)
+.It Dv BIOCSRTIMEOUT , BIOCGRTIMEOUT ( struct timeval )
 Sets or gets the read timeout parameter.
 The
 .Fa timeval
@@ -195,7 +195,7 @@ out on a read request.
 This parameter is initialized to zero by
 .Xr open 2 ,
 indicating no timeout.
-.It Dv BIOCGSTATS (struct bpf_stat)
+.It Dv BIOCGSTATS ( struct bpf_stat )
 Returns the following structure of packet statistics:
 .Bd -literal -offset indent
 struct bpf_stat {
@@ -219,7 +219,7 @@ traffic); and
 .It Va bs_capt
 the number of packets accepted by the filter.
 .El
-.It Dv BIOCIMMEDIATE (u_int)
+.It Dv BIOCIMMEDIATE ( u_int )
 Enables or disables
 .Dq immediate mode ,
 based on the truth value of the argument.
@@ -231,7 +231,7 @@ This is useful for programs like
 .Xr rarpd 8 ,
 which must respond to messages in real time.
 The default for a new file is off.
-.It Dv BIOCSETF (struct bpf_program)
+.It Dv BIOCSETF ( struct bpf_program )
 Sets the filter program used by the kernel to discard uninteresting
 packets.
 An array of instructions and its length are passed in using the following structure:
@@ -256,7 +256,7 @@ are performed.
 See section
 .Sy FILTER MACHINE
 for an explanation of the filter language.
-.It Dv BIOCVERSION (struct bpf_version)
+.It Dv BIOCVERSION ( struct bpf_version )
 Returns the major and minor version numbers of the filter language currently
 recognized by the kernel.
 Before installing a filter, applications must check
@@ -281,13 +281,13 @@ An incompatible filter
 may result in undefined behavior (most likely, an error returned by
 .Xr ioctl 2
 or haphazard packet matching).
-.It Dv BIOCSRSIG BIOCGRSIG (u_int)
+.It Dv BIOCSRSIG , BIOCGRSIG ( u_int )
 Sets or gets the receive signal.
 This signal will be sent to the process or process group specified by
 .Dv FIOSETOWN .
 It defaults to
 .Dv SIGIO .
-.It Dv BIOCGHDRCMPLT BIOCSHDRCMPLT (u_int)
+.It Dv BIOCGHDRCMPLT , BIOCSHDRCMPLT ( u_int )
 Sets or gets the status of the
 .Dq header complete
 flag.
@@ -296,7 +296,7 @@ automatically by the interface output routine.
 Set to one if the link level source address will be written,
 as provided, to the wire.
 This flag is initialized to zero by default.
-.It Dv BIOCGSEESENT BIOCSSEESENT (u_int)
+.It Dv BIOCGSEESENT , BIOCSSEESENT ( u_int )
 Enable/disable or get the
 .Dq see sent
 flag status.
@@ -304,7 +304,7 @@ If enabled, packets sent by the host (not from
 .Nm )
 will be passed to the filter.
 By default, the flag is enabled (value is 1).
-.It Dv BIOCFEEDBACK BIOCSFEEDBACK BIOCGFEEDBACK (u_int)
+.It Dv BIOCFEEDBACK , BIOCSFEEDBACK , BIOCGFEEDBACK ( u_int )
 Set (or get)
 .Dq packet feedback mode .
 This allows injected packets to be fed back as input to the interface when
@@ -328,9 +328,9 @@ which allow the user to do async and/or non-blocking I/O to an open
 .Nm bpf
 file descriptor.
 .Bl -tag -width indent -offset indent
-.It Dv FIONREAD (int)
+.It Dv FIONREAD ( int )
 Returns the number of bytes that are immediately available for reading.
-.It Dv FIONBIO (int)
+.It Dv FIONBIO ( int )
 Set or clear non-blocking I/O.
 If arg is non-zero, then doing a
 .Xr read 2
@@ -342,7 +342,7 @@ If arg is zero, non-blocking I/O is disabled.
 Note: setting this
 overrides the timeout set by
 .Dv BIOCSRTIMEOUT .
-.It Dv FIOASYNC (int)
+.It Dv FIOASYNC ( int )
 Enable or disable async I/O.
 When enabled (arg is non-zero), the process or process group specified by
 .Dv FIOSETOWN
@@ -354,7 +354,7 @@ in order for this to take effect, as
 the system will not default this for you.
 The signal may be changed via
 .Dv BIOCSRSIG .
-.It Dv FIOSETOWN FIOGETOWN (int)
+.It Dv FIOSETOWN , FIOGETOWN ( int )
 Set or get the process or process group (if negative) that should receive SIGIO
 when packets are available.
 The signal may be changed using
@@ -653,7 +653,6 @@ array initializers:
 The following sysctls are available when
 .Nm
 is enabled:
-.Pp
 .Bl -tag -width "XnetXbpfXmaxbufsizeXX"
 .It Li net.bpf.maxbufsize
 Sets the maximum buffer size available for
@@ -678,7 +677,6 @@ utility.
 On architectures with
 .Xr bpfjit 4
 support, the additional sysctl is available:
-.Pp
 .Bl -tag -width "XnetXbpfXjitXX"
 .It Li net.bpf.jit
 Toggle
diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4
index b5fc4afce7f7..516e172b87be 100644
--- a/share/man/man4/isp.4
+++ b/share/man/man4/isp.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: isp.4,v 1.13 2018/01/13 18:57:48 uwe Exp $
+.\"	$NetBSD: isp.4,v 1.14 2018/01/13 23:43:46 wiz Exp $
 .\"
 .\" Copyright (c) 1998, 1999
 .\" 	Matthew Jacob, for NASA/Ames Research Center
@@ -37,23 +37,16 @@
 .Cd "isp* at sbus? slot ? offset ?" Pq SBus
 .Cd scsibus* at isp?
 .Sh DESCRIPTION
-This driver provides access to
-.Tn SCSI
-or
-.Tn FibreChannel
-devices.
+This driver provides access to SCSI or FibreChannel devices.
 .Pp
 SCSI features include support for Ultra SCSI and wide mode transactions for
-.Tn SCSI ,
-and LVD (for the ISP1080 and ISP1280),
+SCSI, and LVD (for the ISP1080 and ISP1280),
 .Pp
 Fibre Channel support uses FCP SCSI profile for
-.Tn FibreChannel .
-and uses Class 3 connections only.
+FibreChannel and uses Class 3 connections only.
 Support is available for Public and Private loops.
 Command tagging is supported for all (in fact,
-.Tn FibreChannel
-requires tagging).
+FibreChannel requires tagging).
 .Sh CONFIGURATION
 An optional
 .Cd flags 0x80
@@ -74,7 +67,6 @@ is in case NVRAM is just wrong and you have the card in a platform where
 it is inconvenient to change NVRAM settings on the card).
 .Sh HARDWARE
 Supported cards include:
-.Pp
 .Bl -tag -width xxxxxx -offset indent
 .It ISP1000
 SBus Fast Wide, Ultra Fast Wide cards, Single Ended or Differential cards.
@@ -124,7 +116,9 @@ Qlogic 2500 8-Gigabit Optical Fibre Channel PCI cards.
 .Sh AUTHORS
 The
 .Nm
-driver was written by Matthew Jacob for NASA/Ames Research Center.
+driver was written by
+.An Matthew Jacob
+for NASA/Ames Research Center.
 .Sh BUGS
 The driver currently ignores some NVRAM settings.
 .Pp
diff --git a/share/man/man4/njata.4 b/share/man/man4/njata.4
index 319e459b6ed2..767fe18639d6 100644
--- a/share/man/man4/njata.4
+++ b/share/man/man4/njata.4
@@ -1,4 +1,4 @@
-.\"	$NetBSD: njata.4,v 1.8 2018/01/13 19:01:59 uwe Exp $
+.\"	$NetBSD: njata.4,v 1.9 2018/01/13 23:43:46 wiz Exp $
 .\"
 .\" Copyright (c) 2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -41,7 +41,6 @@ The
 .Nm
 driver provides support for the following
 Workbit Bus-Master CardBus IDE controller chips:
-.Pp
 .Bl -tag -width "NinjaATA-32Bi" -offset indent
 .It NinjaATA-32Bi
 CardBus / PCMCIA dual mode IDE controller
diff --git a/share/man/man4/wscons.4 b/share/man/man4/wscons.4
index ba7da689657b..61a95de717b4 100644
--- a/share/man/man4/wscons.4
+++ b/share/man/man4/wscons.4
@@ -1,4 +1,4 @@
-.\" $NetBSD: wscons.4,v 1.36 2018/01/13 14:47:58 uwe Exp $
+.\" $NetBSD: wscons.4,v 1.37 2018/01/13 23:43:46 wiz Exp $
 .\"
 .\" Copyright (c) 1999, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -109,28 +109,21 @@ The
 console emulation is available if
 .Cd options WSEMUL_SUN
 was specified at kernel build time.
-It supports the control sequences of
-.Tn SUN
+It supports the control sequences of SUN
 machine consoles and delivers its keyboard codes for function and
 keypad keys in use.
 This emulation is sufficient for full-screen applications.
 .It vt100
 is available with the kernel compile option
 .Cd options WSEMUL_VT100 .
-It provides the most commonly used functions of
-.Tn DEC VT100
-terminals with some extensions introduced by the
-.Tn DEC VT220
-and
-.Tn DEC VT320
-models.
-The features of the original
-.Tn VT100
+It provides the most commonly used functions of DEC VT100
+terminals with some extensions introduced by the DEC VT220
+and DEC VT320 models.
+The features of the original VT100
 which are not or not completely implemented are:
 .Bl -bullet
 .It
-.Tn VT52
-support, 132-column-mode, smooth scroll, light background, keyboard
+VT52 support, 132-column-mode, smooth scroll, light background, keyboard
 autorepeat control, external printer support, keyboard locking,
 newline/linefeed switching: Escape sequences related
 to these features are ignored or answered with standard replies.
@@ -155,24 +148,18 @@ substituted by more or less fitting replacements.
 Depending on the keyboard used, not all function keys might be available.
 .El
 .Pp
-In addition to the plain
-.Tn VT100
-functions are supported:
+In addition to the plain VT100 functions are supported:
 .Bl -bullet
 .It
 ANSI colors.
 .It
-Some
-.Tn VT220
--like presentation state settings and -reports (DECRSPS), especially
+Some VT220-like presentation state settings and -reports (DECRSPS), especially
 tabulator settings.
 .El
 .Pp
 In most applications,
 .Nm
-will work sufficiently as a
-.Tn VT220
-emulator.
+will work sufficiently as a VT220 emulator.
 .El
 .Pp
 The
diff --git a/share/man/man4/wsdisplay.4 b/share/man/man4/wsdisplay.4
index 7660f2560b65..db942f3c4c5b 100644
--- a/share/man/man4/wsdisplay.4
+++ b/share/man/man4/wsdisplay.4
@@ -1,4 +1,4 @@
-.\" $NetBSD: wsdisplay.4,v 1.45 2018/01/13 19:50:52 uwe Exp $
+.\" $NetBSD: wsdisplay.4,v 1.46 2018/01/13 23:43:46 wiz Exp $
 .\"
 .\" Copyright (c) 1999 Matthias Drochner.
 .\" Copyright (c) 2002 Ben Harris.
@@ -107,8 +107,7 @@ If the underlying device driver supports it, multiple screens can
 be used on one display.
 (As of this writing, only the
 .Xr vga 4
-and the
-.Tn VAX
+and the VAX
 .Dq smg
 display drivers provide this ability.)
 Screens have different minor device numbers and separate tty instances.
@@ -449,12 +448,10 @@ The display is in mapped (graphics) mode.
 .It Dv WSDISPLAYIO_MODE_DUMBFB
 The display is in mapped (frame buffer) mode.
 .El
-.Pp
 .It Dv WSDISPLAYIO_SMODE Pq Li u_int
 Set the current mode of the display.
 For possible arguments, see
 .Dv WSDISPLAYIO_GMODE .
-.Pp
 .It Dv WSDISPLAYIO_LINEBYTES Pq Li u_int
 Get the number of bytes per row, which may be the same as the number of pixels.
 .It Dv WSDISPLAYIO_GMSGATTRS Pq Li struct wsdisplay_msgattrs