diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 152c1a2aae87..a97531e9e693 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -317,7 +317,6 @@ password -- see below) will be silently discarded.
 .Pp
 Exception: the super-user on the NIS master server is permitted to
 change any field.
-.Pp
 .It
 .Em "Password authentication is required" .
 The
@@ -433,7 +432,6 @@ option can be used in conjunction with the
 .Fl d
 option, in which case the user-specified hostname will override
 the default.
-.Pp
 .It Fl o
 Force the use of RPC-based updates when communicating with
 .Xr rpc.yppasswdd 8
diff --git a/usr.bin/grep/grep.1 b/usr.bin/grep/grep.1
index b3ba21a8f9f1..9e8633f0d2d9 100644
--- a/usr.bin/grep/grep.1
+++ b/usr.bin/grep/grep.1
@@ -398,8 +398,8 @@ The default is 2.
 Force output to be line buffered.
 By default, output is line buffered when standard output is a terminal
 and block buffered otherwise.
-.Pp
 .El
+.Pp
 If no file arguments are specified, the standard input is used.
 .Sh EXIT STATUS
 The
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index fe8f1aedabbc..e4df76df3d1c 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -184,7 +184,6 @@ if (...) {
   code
 }
 .Ed
-.Pp
 .It Fl c Ns Ar n
 The column in which comments on code start.
 The default is 33.
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index 1389adf007fa..d4b1bfc6177e 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -328,7 +328,6 @@ Contrary to some systems, in
 this option is needed to generate
 servers that can be invoked through portmonitors and
 .Xr inetd 8 .
-.Pp
 .It Fl K Ar seconds
 By default, services created using
 .Nm
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 287a42e5bff9..0f0f17739937 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -62,7 +62,6 @@ nor by
 .Tn ARIN
 whois database end with
 .Qq Li -ARIN . )
-.Pp
 .It Fl A
 Use the Asia/Pacific Network Information Center
 .Pq Tn APNIC
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index f3dabc11c209..934d6ed4dd0d 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -164,7 +164,6 @@ directory to
 .Pa destdir :
 .Pp
 .Dl /bin/ls -1d [A-Z]* | xargs -J % cp -Rp % destdir
-.Pp
 .It Fl L Ar number
 Call
 .Ar utility
diff --git a/usr.sbin/bluetooth/btpand/btpand.8 b/usr.sbin/bluetooth/btpand/btpand.8
index 97a0d13fce21..b89bf95348e3 100644
--- a/usr.sbin/bluetooth/btpand/btpand.8
+++ b/usr.sbin/bluetooth/btpand/btpand.8
@@ -159,7 +159,6 @@ Network Access Point.
 .It PANU
 Personal Area Networking User.
 .El
-.Pp
 .It Fl S Ar service
 As per
 .Fl s
diff --git a/usr.sbin/ifmcstat/ifmcstat.8 b/usr.sbin/ifmcstat/ifmcstat.8
index 015184a0274d..70b9791b8a6b 100644
--- a/usr.sbin/ifmcstat/ifmcstat.8
+++ b/usr.sbin/ifmcstat/ifmcstat.8
@@ -54,7 +54,6 @@ The following options are supported:
 .Bl -tag -width Fl
 .It Fl i Ar interface
 specifies the interface to be displayed.
-.Pp
 .It Fl f Ar address-family
 specifies the address family to be displayed;
 .Ar inet ,
diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8
index 7358a480a8eb..c4ebe501c725 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -1188,7 +1188,6 @@ Use Hardware Handshake (CTS/RTS) for flow control.
 .It
 Modem should be set to NO echo back (ATE0) and NO results string (ATQ1).
 .El
-.Pp
 .It
 Edit
 .Pa /etc/ttys
@@ -1796,7 +1795,6 @@ If no timeout is given, the default timeout (set using
 .Ic set timeout
 and defaulting to 180 seconds) is used.
 .El
-.Pp
 .It
 Each filter can hold up to 40 rules, starting from rule 0.
 The entire rule set is not effective until rule 0 is defined,
@@ -2207,7 +2205,6 @@ ISPs IP number would be:
 .Bd -literal -offset indent
 set ifaddr 10.0.0.1/0 10.0.0.2/0 0.0.0.0 0.0.0.0
 .Ed
-.Pp
 .It
 In most cases, your ISP will also be your default router.
 If this is the case, add the line
@@ -3241,7 +3238,6 @@ not to make any utmp or wtmp entries.
 This is usually only necessary if
 you require the user to both login and authenticate themselves.
 .El
-.Pp
 .It add Ns Xo
 .Op !\&
 .Ar dest Ns Op / Ns Ar nn
@@ -3395,7 +3391,6 @@ When running in multi-link mode, a section can be loaded if it allows
 .Em any
 of the currently existing line modes.
 .El
-.Pp
 .It nat Ar command Op Ar args
 This command allows the control of the network address translation (also
 known as masquerading or IP aliasing) facilities that are built into
@@ -3584,7 +3579,6 @@ are 10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16.
 These commands are also discussed in the file
 .Pa README.nat
 which comes with the source distribution.
-.Pp
 .It Oo !\& Oc Ns Xo
 .No bg Ar command
 .Xc
@@ -3890,7 +3884,6 @@ mode, all interface addresses are deleted.
 .Pp
 If the INET or INET6 arguments are used, only addresses for that address
 family are cleared.
-.Pp
 .It iface delete Ns Xo
 .Op !\& Ns
 .No |rm Ns Op !\&
@@ -4392,7 +4385,6 @@ the connection.
 This is required (in addition to one or more other callback
 options) if you wish callback to be optional.
 .El
-.Pp
 .It set cbcp Oo
 .No *| Ns Ar number Ns Oo
 .No , Ns Ar number Ns ...\& Oc
@@ -5441,7 +5433,6 @@ This also applies for RADIUS routes that do not {include} the
 or
 .Dv HISADDR
 keywords.
-.Pp
 .It RAD_FRAMED_IPV6_PREFIX
 If this attribute is supplied, the value is substituted for IPV6PREFIX
 in a command.
@@ -5493,7 +5484,6 @@ also applies for RADIUS IPv6 routes that do not {include} the
 or
 .Dv HISADDR6
 keywords.
-.Pp
 .It RAD_SESSION_TIMEOUT
 If supplied, the client connection is closed after the given number of
 seconds.
@@ -5853,7 +5843,6 @@ and
 .Ar 16
 inclusive.
 .El
-.Pp
 .It shell|! Op Ar command
 If
 .Ar command
@@ -5933,7 +5922,6 @@ Show the active alarm timers.
 Show the current version number of
 .Nm .
 .El
-.Pp
 .It term
 Go into terminal mode.
 Characters typed at the keyboard are sent to the device.
@@ -5966,7 +5954,6 @@ http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/ppp.html
 .It
 http://www.FreeBSD.org/doc/handbook/userppp.html
 .El
-.Pp
 .El
 .Sh FILES
 .Nm
diff --git a/usr.sbin/watchdogd/watchdogd.8 b/usr.sbin/watchdogd/watchdogd.8
index 6176a2066741..d50a964cb994 100644
--- a/usr.sbin/watchdogd/watchdogd.8
+++ b/usr.sbin/watchdogd/watchdogd.8
@@ -125,42 +125,35 @@ Do not fork.
 When this option is specified,
 .Nm
 will not fork into the background at startup.
-.Pp
 .It Fl S
 Do not send a message to the system logger when the watchdog command takes
 longer than expected to execute.
 The default behaviour is to log a warning via the system logger with the
 LOG_DAEMON facility, and to output a warning to standard error.
-.Pp
 .It Fl w
 Complain when the watchdog script takes too long.
 This flag will cause watchdogd to complain when the amount of time to
 execute the watchdog script exceeds the threshold of 'sleep' option.
-.Pp
 .It Fl -pretimeout Ar timeout
 Set a "pretimeout" watchdog.
 At "timeout" seconds before the watchdog will fire attempt an action.
 The action is set by the --pretimeout-action flag.
 The default is just to log a message (WD_SOFT_LOG) via
 .Xr log 9 .
-.Pp
 .It Fl -pretimeout-action Ar action
 Set the timeout action for the pretimeout.
 See the section
 .Sx Timeout Actions .
-.Pp
 .It Fl -softtimeout
 Instead of arming the various hardware watchdogs, only use a basic software
 watchdog.
 The default action is just to
 .Xr log 9
 a message (WD_SOFT_LOG).
-.Pp
 .It Fl -softtimeout-action Ar action
 Set the timeout action for the softtimeout.
 See the section
 .Sx Timeout Actions .
-.Pp
 .El
 .Sh Timeout Actions
 The following timeout actions are available via the
@@ -173,25 +166,22 @@ flags:
 Call
 .Xr panic 9
 when the timeout is reached.
-.Pp
 .It Ar ddb
 Enter the kernel debugger via
 .Xr kdb_enter 9
 when the timeout is reached.
-.Pp
 .It Ar log
 Log a message using
 .Xr log 9
 when the timeout is reached.
-.Pp
 .It Ar printf
 call the kernel
 .Xr printf 9
 to display a message to the console and
 .Xr dmesg 8
 buffer.
-.Pp
 .El
+.Pp
 Actions can be combined in a comma separated list as so:
 .Ar log,printf
 which would both