12 files changed, 53 insertions, 41 deletions
diff --git a/man7/boot.7 b/man7/boot.7
index 57c5bc7c70..9fbb29b57a 100644
--- a/man7/boot.7
+++ b/man7/boot.7
@@ -53,8 +53,8 @@ The hardware boot stage loads the OS loader from a fixed position on
 the boot device, and then transfers control to it.
 .TP
 Note:
-The device from which the OS loader is read may be attached via a network, in which
-case the details of booting are further specified by protocols such as
+The device from which the OS loader is read may be attached via a network,
+in which case the details of booting are further specified by protocols such as
 DHCP, TFTP, PXE, Etherboot, etc.
 .SS OS loader
 The main job of the OS loader is to locate the kernel
diff --git a/man7/bootparam.7 b/man7/bootparam.7
index 00b7a4e9a2..3be144131c 100644
--- a/man7/bootparam.7
+++ b/man7/bootparam.7
@@ -165,7 +165,9 @@ The 'rw' option tells the kernel to mount the root filesystem read/write.
 This is the default.
 .TP
 .B "'resume=...'"
-This tells the kernel the location of the suspend-to-disk data that you want the machine to resume from after hibernation.
+This tells the kernel the location of
+the suspend-to-disk data that you want the machine to resume from
+after hibernation.
 Usually, it is the same as your swap partition or file.
 Example:
 .IP
diff --git a/man7/charsets.7 b/man7/charsets.7
index 53094fdf53..f938c39cd3 100644
--- a/man7/charsets.7
+++ b/man7/charsets.7
@@ -64,14 +64,18 @@ Here are brief descriptions of each set:
 Latin-1 covers many West European languages such as Albanian, Basque,
 Danish, English, Faroese, Galician, Icelandic, Irish, Italian,
 Norwegian, Portuguese, Spanish, and Swedish.
-The lack of the ligatures Dutch Ĳ/ĳ, French œ, and old-style „German“
-quotation marks was considered tolerable.
+The lack of the ligatures
+Dutch Ĳ/ĳ,
+French œ,
+and old-style „German“ quotation marks
+was considered tolerable.
 .TP
 8859-2 (Latin-2)
 Latin-2 supports many Latin-written Central and East European
 languages such as Bosnian, Croatian, Czech, German, Hungarian, Polish,
 Slovak, and Slovene.
-Replacing Romanian ș/ț with ş/ţ was considered tolerable.
+Replacing Romanian ș/ț with ş/ţ
+was considered tolerable.
 .TP
 8859-3 (Latin-3)
 Latin-3 was designed to cover of Esperanto, Maltese, and Turkish, but
diff --git a/man7/hier.7 b/man7/hier.7
index 5aac34ed9c..dbe68a6d4f 100644
--- a/man7/hier.7
+++ b/man7/hier.7
@@ -142,7 +142,8 @@ This pseudo-filesystem is described in more detail in
 This directory is usually the home directory for the root user (optional).
 .TP
 .I /run
-This directory contains information which describes the system since it was booted.
+This directory contains information which
+describes the system since it was booted.
 Once this purpose was served by
 .I /var/run
 and programs may continue to use it.
@@ -640,8 +641,8 @@ The Filesystem Hierarchy Standard (FHS), Version 3.0, published March 19, 2015
 .UR https://refspecs.linuxfoundation.org/fhs.shtml
 .UE .
 .SH BUGS
-This list is not exhaustive; different distributions and systems may be configured
-differently.
+This list is not exhaustive;
+different distributions and systems may be configured differently.
 .SH SEE ALSO
 .BR find (1),
 .BR ln (1),
diff --git a/man7/mailaddr.7 b/man7/mailaddr.7
index 94eeb6eb01..f8b1fa45b4 100644
--- a/man7/mailaddr.7
+++ b/man7/mailaddr.7
@@ -34,16 +34,22 @@ This manual page gives a brief introduction to SMTP mail addresses,
 as used on the Internet.
 These addresses are in the general format
 .PP
-	user@domain
+.in +4n
+.EX
+user@domain
+.EE
+.in
 .PP
 where a domain is a hierarchical dot-separated list of subdomains.
 These examples are valid forms of the same address:
 .PP
-	john.doe@monet.example.com
-.br
-	John Doe <john.doe@monet.example.com>
-.br
-	john.doe@monet.example.com (John Doe)
+.in +4n
+.EX
+john.doe@monet.example.com
+John Doe <john.doe@monet.example.com>
+john.doe@monet.example.com (John Doe)
+.EE
+.in
 .PP
 The domain part ("monet.example.com") is a mail-accepting domain.
 It can be a host and in the past it usually was, but it doesn't have to be.
@@ -57,13 +63,14 @@ If you see a local-part that looks like garbage,
 it is usually because of a gateway between an internal e-mail
 system and the net, here are some examples:
 .PP
-	"surname/admd=telemail/c=us/o=hp/prmd=hp"@some.where
-.br
-	USER%SOMETHING@some.where
-.br
-	machine!machine!name@some.where
-.br
-	I2461572@some.where
+.in +4n
+.EX
+"surname/admd=telemail/c=us/o=hp/prmd=hp"@some.where
+USER%SOMETHING@some.where
+machine!machine!name@some.where
+I2461572@some.where
+.EE
+.in
 .PP
 (These are, respectively, an X.400 gateway, a gateway to an arbitrary
 internal mail system that lacks proper internet support, an UUCP
@@ -75,13 +82,17 @@ The real-name part ("John Doe") can either be placed before
 but the difference is beyond the scope of this page.)
 The name may have to be quoted using "", for example, if it contains ".":
 .PP
-	"John Q. Doe" <john.doe@monet.example.com>
+.in +4n
+.EX
+"John Q. Doe" <john.doe@monet.example.com>
+.EE
+.in
 .SS Abbreviation
 Some mail systems let users abbreviate the domain name.
 For instance,
 users at example.com may get away with "john.doe@monet" to
 send mail to John Doe.
-.I "This behavior is deprecated."
+.I This behavior is deprecated.
 Sometimes it works, but you should not depend on it.
 .SS Route-addrs
 In the past, sometimes one had to route a message through
@@ -89,7 +100,11 @@ several hosts to get it to its final destination.
 Addresses which show these relays are termed "route-addrs".
 These use the syntax:
 .PP
-	<@hosta,@hostb:user@hostc>
+.in +4n
+.EX
+<@hosta,@hostb:user@hostc>
+.EE
+.in
 .PP
 This specifies that the message should be sent to hosta,
 from there to hostb, and finally to hostc.
diff --git a/man7/man-pages.7 b/man7/man-pages.7
index 93ef90d002..547ed660ae 100644
--- a/man7/man-pages.7
+++ b/man7/man-pages.7
@@ -681,7 +681,9 @@ be specified in italics.
 Again, the use of nonbreaking spaces may be appropriate
 if the expression is inlined with normal text.
 .PP
-When showing example shell sessions, user input should be formatted in bold, for example
+When showing example shell sessions,
+user input should be formatted in bold,
+for example
 .PP
 .in +4n
 .EX
diff --git a/man7/mount_namespaces.7 b/man7/mount_namespaces.7
index aea0a237dd..c402eb8c19 100644
--- a/man7/mount_namespaces.7
+++ b/man7/mount_namespaces.7
@@ -1056,7 +1056,6 @@ In this context, "may not be separated" means that the mounts
 are locked so that they may not be individually unmounted.
 Consider the following example:
 .IP
-.RS
 .in +4n
 .EX
 $ \fBsudo sh\fP
@@ -1064,7 +1063,6 @@ $ \fBsudo sh\fP
 # \fBcat /etc/shadow\fP       # Produces no output
 .EE
 .in
-.RE
 .IP
 The above steps, performed in a more privileged mount namespace,
 have created a bind mount that
@@ -1084,7 +1082,6 @@ is less privileged.
 Consequently, an attempt to unmount the mount fails as show
 in the following step:
 .IP
-.RS
 .in +4n
 .EX
 # \fBunshare \-\-user \-\-map\-root\-user \-\-mount \e\fP
@@ -1095,7 +1092,6 @@ umount: /etc/shadow: not mounted.
 umount2("/etc/shadow", 0)     = \-1 EINVAL (Invalid argument)
 .EE
 .in
-.RE
 .IP
 The error message from
 .BR mount (8)
@@ -1270,7 +1266,6 @@ For security reasons,
 it should not be possible to make the mount writable in
 a less privileged mount namespace, and indeed the kernel prevents this:
 .IP
-.RS
 .in +4n
 .EX
 $ \fBsudo mkdir /mnt/dir\fP
@@ -1280,7 +1275,6 @@ $ \fBsudo unshare \-\-user \-\-map\-root\-user \-\-mount \e\fP
 mount: /mnt/dir: permission denied.
 .EE
 .in
-.RE
 .IP [6]
 .\" (As of 3.18-rc1 (in Al Viro's 2014-08-30 vfs.git#for-next tree))
 A file or directory that is a mount point in one namespace that is not
diff --git a/man7/packet.7 b/man7/packet.7
index 83237c560f..3ce5fadca3 100644
--- a/man7/packet.7
+++ b/man7/packet.7
@@ -630,7 +630,6 @@ This structure is obsolete and should not be used in new code.
 .SH BUGS
 .SS LLC header handling
 The IEEE 802.2/803.3 LLC handling could be considered as a bug.
-.PP
 .SS MSG_TRUNC issues
 The
 .B MSG_TRUNC
@@ -639,7 +638,6 @@ extension is an ugly hack and should be replaced by a control message.
 There is currently no way to get the original destination address of
 packets via
 .BR SOCK_DGRAM .
-.PP
 .SS spkt_device device name truncation
 The
 .I spkt_device
@@ -669,7 +667,6 @@ or to rename the interface to a name of at most 13 bytes,
 for example using the
 .BR ip (8)
 tool.
-.PP
 .SS Documentation issues
 Socket filters are not documented.
 .\" .SH CREDITS
diff --git a/man7/pipe.7 b/man7/pipe.7
index 88d37accd9..d461db5e08 100644
--- a/man7/pipe.7
+++ b/man7/pipe.7
@@ -356,7 +356,6 @@ are performed only when increasing a pipe's capacity;
 an unprivileged user can always decrease a pipe's capacity.
 .IP (3)
 The accounting and checking against the limits were done as follows:
-.IP
 .RS
 .PD 0
 .IP (a) 4
diff --git a/man7/raw.7 b/man7/raw.7
index 910b414642..9e20430eb7 100644
--- a/man7/raw.7
+++ b/man7/raw.7
@@ -66,7 +66,6 @@ Total Length:Always filled in
 .TE
 .RE
 .PP
-.PP
 If
 .B IP_HDRINCL
 is specified and the IP header has a nonzero destination address, then
diff --git a/man7/utf-8.7 b/man7/utf-8.7
index d29f299bae..181208fc57 100644
--- a/man7/utf-8.7
+++ b/man7/utf-8.7
@@ -119,9 +119,9 @@ Only the shortest possible multibyte sequence
 which can represent the code number of the character can be used.
 .PP
 The UCS code values 0xd800\(en0xdfff (UTF-16 surrogates) as well as 0xfffe and
-0xffff (UCS noncharacters) should not appear in conforming UTF-8 streams. According
-to RFC 3629 no point above U+10FFFF should be used, which limits characters to four
-bytes.
+0xffff (UCS noncharacters) should not appear in conforming UTF-8 streams.
+According to RFC 3629 no point above U+10FFFF should be used,
+which limits characters to four bytes.
 .SS Example
 The Unicode character 0xa9 = 1010 1001 (the copyright sign) is encoded
 in UTF-8 as
diff --git a/man7/uts_namespaces.7 b/man7/uts_namespaces.7
index 5b1262404a..7b8736493f 100644
--- a/man7/uts_namespaces.7
+++ b/man7/uts_namespaces.7
@@ -22,7 +22,6 @@ Changes made to these identifiers are visible to all other
 processes in the same UTS namespace,
 but are not visible to processes in other UTS namespaces.
 .PP
-.PP
 When a process creates a new UTS namespace using
 .BR clone (2)
 or