15 files changed, 79 insertions, 57 deletions
diff --git a/man2/listxattr.2 b/man2/listxattr.2
index b23c2ed906..f1580573f2 100644
--- a/man2/listxattr.2
+++ b/man2/listxattr.2
@@ -85,8 +85,9 @@ from the second call.)
 .SS Example
 The
 .I list
-of names is returned as an unordered array of null-terminated character
-strings (attribute names are separated by null bytes (\[aq]\e0\[aq])), like this:
+of names is returned as an unordered array of null-terminated character strings
+(attribute names are separated by null bytes (\[aq]\e0\[aq])),
+like this:
 .PP
 .in +4n
 .EX
diff --git a/man2/perf_event_open.2 b/man2/perf_event_open.2
index 68f68fe31d..4d3469c383 100644
--- a/man2/perf_event_open.2
+++ b/man2/perf_event_open.2
@@ -120,13 +120,13 @@ being set to the file descriptor of the group leader.
 (A single event on its own is created with
 .IR group_fd " = \-1"
 and is considered to be a group with only 1 member.)
-An event group is scheduled onto the CPU as a unit: it will
-be put onto the CPU only if all of the events in the group can be put onto
-the CPU.
-This means that the values of the member events can be
-meaningfully compared\[em]added, divided (to get ratios), and so on\[em]with each
-other, since they have counted events for the same set of executed
-instructions.
+An event group is scheduled onto the CPU as a unit:
+it will be put onto the CPU
+only if all of the events in the group can be put onto the CPU.
+This means that the values of the member events can be meaningfully compared
+\[em]added, divided (to get ratios), and so on\[em]
+with each other,
+since they have counted events for the same set of executed instructions.
 .PP
 The
 .I flags
diff --git a/man3/getopt.3 b/man3/getopt.3
index f5d5fa79a8..f887f2dabd 100644
--- a/man3/getopt.3
+++ b/man3/getopt.3
@@ -299,7 +299,8 @@ If
 encounters an option with a missing argument,
 then the return value depends on the first character in
 .IR optstring :
-if it is \[aq]:\[aq], then \[aq]:\[aq] is returned; otherwise \[aq]?\[aq] is returned.
+if it is \[aq]:\[aq], then \[aq]:\[aq] is returned;
+otherwise \[aq]?\[aq] is returned.
 .PP
 .BR getopt_long ()
 and
diff --git a/man3/iswalnum.3 b/man3/iswalnum.3
index e7dbc7f198..3fd1f3da85 100644
--- a/man3/iswalnum.3
+++ b/man3/iswalnum.3
@@ -51,8 +51,11 @@ The wide-character class "alnum" is the union of the wide-character classes
 As such, it also contains the wide-character class
 "xdigit".
 .PP
-The wide-character class "alnum" always contains at least the letters \[aq]A\[aq]
-to \[aq]Z\[aq], \[aq]a\[aq] to \[aq]z\[aq] and the digits \[aq]0\[aq] to \[aq]9\[aq].
+The wide-character class "alnum"
+always contains at least the letters
+\[aq]A\[aq] to \[aq]Z\[aq],
+\[aq]a\[aq] to \[aq]z\[aq],
+and the digits \[aq]0\[aq] to \[aq]9\[aq].
 .SH RETURN VALUE
 The
 .BR iswalnum ()
diff --git a/man3/iswspace.3 b/man3/iswspace.3
index 1c1e22f5e4..c4ca84c685 100644
--- a/man3/iswspace.3
+++ b/man3/iswspace.3
@@ -41,9 +41,10 @@ The wide-character class "space" is disjoint from the wide-character class
 .PP
 The wide-character class "space" contains the wide-character class "blank".
 .PP
-The wide-character class "space" always contains at least the space character
-and the control
-characters \[aq]\ef\[aq], \[aq]\en\[aq], \[aq]\er\[aq], \[aq]\et\[aq], \[aq]\ev\[aq].
+The wide-character class "space"
+always contains at least the space character
+and the control characters
+\[aq]\ef\[aq], \[aq]\en\[aq], \[aq]\er\[aq], \[aq]\et\[aq], and \[aq]\ev\[aq].
 .SH RETURN VALUE
 The
 .BR iswspace ()
diff --git a/man3/pthread_setname_np.3 b/man3/pthread_setname_np.3
index 93d9e9d27f..b78a2f781f 100644
--- a/man3/pthread_setname_np.3
+++ b/man3/pthread_setname_np.3
@@ -28,8 +28,9 @@ The
 function can be used to set a unique name for a thread,
 which can be useful for debugging
 multithreaded applications.
-The thread name is a meaningful C language string, whose length is
-restricted to 16 characters, including the terminating null byte (\[aq]\e0\[aq]).
+The thread name is a meaningful C language string,
+whose length is restricted to 16 characters,
+including the terminating null byte (\[aq]\e0\[aq]).
 The
 .I thread
 argument specifies the thread whose name is to be changed;
diff --git a/man3type/timespec.3type b/man3type/timespec.3type
index c3c69cfd2f..53a99de726 100644
--- a/man3type/timespec.3type
+++ b/man3type/timespec.3type
@@ -24,7 +24,8 @@ Standard C library
 Describes times in seconds and nanoseconds.
 .PP
 .I tv_nsec
-is of an implementation-defined signed type capable of holding the specified range.
+is of an implementation-defined signed type
+capable of holding the specified range.
 Under glibc, this is usually
 .IR long ,
 and
diff --git a/man4/dsp56k.4 b/man4/dsp56k.4
index 23694dd19e..6e2baeb4e2 100644
--- a/man4/dsp56k.4
+++ b/man4/dsp56k.4
@@ -67,10 +67,10 @@ DSP56001.
 .B DSP56K_SET_RX_WSIZE
 sets the receive word size.
 Allowed values are in the range 1 to 4,
-and is the number of bytes that will be received at a time from the
-DSP56001.
-These data quantities will either truncated, or padded with
-a null byte (\[aq]\e0\[aq]) to fit the native 24-bit data format of the DSP56001.
+and is the number of bytes that will be received at a time from the DSP56001.
+These data quantities will either truncated,
+or padded with a null byte (\[aq]\e0\[aq]),
+to fit the native 24-bit data format of the DSP56001.
 .TP
 .B DSP56K_HOST_FLAGS
 read and write the host flags.
diff --git a/man5/host.conf.5 b/man5/host.conf.5
index 0853a350fe..e0c134e60c 100644
--- a/man5/host.conf.5
+++ b/man5/host.conf.5
@@ -83,14 +83,18 @@ Overrides the
 command.
 .TP
 .B RESOLV_ADD_TRIM_DOMAINS
-A list of domains,  separated by colons (\[aq]:\[aq]), semicolons (\[aq];\[aq]), or
-commas (\[aq],\[aq]), with the leading dot, which will be added to the list of
-domains that should be trimmed.
+A list of domains,
+separated by
+colons (\[aq]:\[aq]), semicolons (\[aq];\[aq]), or commas (\[aq],\[aq]),
+with the leading dot,
+which will be added to the list of domains that should be trimmed.
 .TP
 .B RESOLV_OVERRIDE_TRIM_DOMAINS
-A list of domains,  separated by colons (\[aq]:\[aq]), semicolons (\[aq];\[aq]), or
-commas (\[aq],\[aq]), with the leading dot, which will replace the list of
-domains that should be trimmed.
+A list of domains,
+separated by
+colons (\[aq]:\[aq]), semicolons (\[aq];\[aq]), or commas (\[aq],\[aq]),
+with the leading dot,
+which will replace the list of domains that should be trimmed.
 Overrides the
 .I trim
 command.
diff --git a/man5/termcap.5 b/man5/termcap.5
index b06dfa9902..f2ba89373d 100644
--- a/man5/termcap.5
+++ b/man5/termcap.5
@@ -404,7 +404,8 @@ Do ASCII output of this parameter with a field with of 3
 %
 Print a \[aq]%\[aq]
 .PP
-If you use binary output, then you should avoid the null character (\[aq]\e0\[aq])
+If you use binary output,
+then you should avoid the null character (\[aq]\e0\[aq])
 because it terminates the string.
 You should reset tabulator expansion
 if a tabulator can be the binary output of a parameter.
diff --git a/man7/charsets.7 b/man7/charsets.7
index 8fc04bc8ca..7db4e73c9d 100644
--- a/man7/charsets.7
+++ b/man7/charsets.7
@@ -305,12 +305,14 @@ While there are algorithmic conversions from some character sets
 carrying around conversion tables, which can be quite large for 16-bit
 codes.
 .PP
-Note that UTF-8 is self-synchronizing: 10xxxxxx is a tail, any other
-byte is the head of a code.
-Note that the only way ASCII bytes occur
-in a UTF-8 stream, is as themselves.
-In particular, there are no
-embedded NULs (\[aq]\e0\[aq]) or \[aq]/\[aq]s that form part of some larger code.
+Note that UTF-8 is self-synchronizing:
+10xxxxxx is a tail,
+any other byte is the head of a code.
+Note that the only way ASCII bytes occur in a UTF-8 stream,
+is as themselves.
+In particular,
+there are no embedded NULs (\[aq]\e0\[aq]) or \[aq]/\[aq]s
+that form part of some larger code.
 .PP
 Since ASCII, and, in particular, NUL and \[aq]/\[aq], are unchanged, the
 kernel does not notice that UTF-8 is being used.
diff --git a/man7/glob.7 b/man7/glob.7
index b9d418cfa2..f3aa1c6a8c 100644
--- a/man7/glob.7
+++ b/man7/glob.7
@@ -46,14 +46,15 @@ three characters \[aq][\[aq], \[aq]]\[aq], and \[aq]!\[aq].)
 .PP
 There is one special convention:
 two characters separated by \[aq]\-\[aq] denote a range.
-(Thus, "\fI[A\-Fa\-f0\-9]\fP"
-is equivalent to "\fI[ABCDEFabcdef0123456789]\fP".)
-One may include \[aq]\-\[aq] in its literal meaning by making it the
-first or last character between the brackets.
-(Thus, "\fI[]\-]\fP" matches just the two characters \[aq]]\[aq] and \[aq]\-\[aq],
+(Thus,
+"\fI[A\-Fa\-f0\-9]\fP" is equivalent to "\fI[ABCDEFabcdef0123456789]\fP".)
+One may include \[aq]\-\[aq] in its literal meaning
+by making it the first or last character between the brackets.
+(Thus,
+"\fI[]\-]\fP" matches just the two characters \[aq]]\[aq] and \[aq]\-\[aq],
 and "\fI[\-\-0]\fP" matches the
-three characters \[aq]\-\[aq], \[aq].\[aq], \[aq]0\[aq], since \[aq]/\[aq]
-cannot be matched.)
+three characters \[aq]\-\[aq], \[aq].\[aq], and \[aq]0\[aq],
+since \[aq]/\[aq] cannot be matched.)
 .PP
 .B Complementation
 .PP
@@ -63,9 +64,11 @@ by removing the first \[aq]!\[aq] from it.
 (Thus, "\fI[!]a\-]\fP" matches any
 single character except \[aq]]\[aq], \[aq]a\[aq], and \[aq]\-\[aq].)
 .PP
-One can remove the special meaning of \[aq]?\[aq], \[aq]*\[aq], and \[aq][\[aq] by
-preceding them by a backslash, or, in case this is part of
-a shell command line, enclosing them in quotes.
+One can remove the special meaning of \[aq]?\[aq], \[aq]*\[aq], and \[aq][\[aq]
+by preceding them by a backslash,
+or,
+in case this is part of a shell command line,
+enclosing them in quotes.
 Between brackets these characters stand for themselves.
 Thus, "\fI[[?*\e]\fP" matches the
 four characters \[aq][\[aq], \[aq]?\[aq], \[aq]*\[aq], and \[aq]\e\[aq].
diff --git a/man7/inotify.7 b/man7/inotify.7
index 62112e0528..92f833afac 100644
--- a/man7/inotify.7
+++ b/man7/inotify.7
@@ -126,8 +126,8 @@ field is present only when an event is returned
 for a file inside a watched directory;
 it identifies the filename within the watched directory.
 This filename is null-terminated,
-and may include further null bytes (\[aq]\e0\[aq]) to align subsequent reads to a
-suitable address boundary.
+and may include further null bytes (\[aq]\e0\[aq])
+to align subsequent reads to a suitable address boundary.
 .PP
 The
 .I len
diff --git a/man7/regex.7 b/man7/regex.7
index 27a5cd497f..8083d2a6a4 100644
--- a/man7/regex.7
+++ b/man7/regex.7
@@ -91,18 +91,19 @@ a sequence of \fIi\fR through \fIj\fR (inclusive) matches of the atom.
 An atom is a regular expression enclosed in "\fI()\fP"
 (matching a match for the regular expression),
 an empty set of "\fI()\fP" (matching the null string)\*(dg,
-a \fIbracket expression\fR (see below), \[aq].\[aq]
-(matching any single character), \[aq]\[ha]\[aq] (matching the null string at the
-beginning of a line), \[aq]$\[aq] (matching the null string at the
-end of a line), a \[aq]\e\[aq] followed by one of the characters
-"\fI\[ha].[$()|*+?{\e\fP"
+a \fIbracket expression\fR (see below),
+\[aq].\[aq] (matching any single character),
+\[aq]\[ha]\[aq] (matching the null string at the beginning of a line),
+\[aq]$\[aq] (matching the null string at the end of a line),
+a \[aq]\e\[aq] followed by one of the characters "\fI\[ha].[$()|*+?{\e\fP"
 (matching that character taken as an ordinary character),
 a \[aq]\e\[aq] followed by any other character\*(dg
 (matching that character taken as an ordinary character,
 as if the \[aq]\e\[aq] had not been present\*(dg),
 or a single character with no other significance (matching that character).
-A \[aq]{\[aq] followed by a character other than a digit is an ordinary
-character, not the beginning of a bound\*(dg.
+A \[aq]{\[aq] followed by a character other than a digit
+is an ordinary character,
+not the beginning of a bound\*(dg.
 It is illegal to end an RE with \[aq]\e\[aq].
 .PP
 A \fIbracket expression\fR is a list of characters enclosed in "\fI[]\fP".
diff --git a/man7/uri.7 b/man7/uri.7
index 01e84287d1..19fe70f2f0 100644
--- a/man7/uri.7
+++ b/man7/uri.7
@@ -82,9 +82,12 @@ precede such segments with ./ (e.g., "./this:that").
 Note that descendants of MS-DOS (e.g., Microsoft Windows) replace
 devicename colons with the vertical bar ("|") in URIs, so "C:" becomes "C|".
 .PP
-A fragment identifier, if included, refers to a particular named portion
-(fragment) of a resource; text after a \[aq]#\[aq] identifies the fragment.
-A URI beginning with \[aq]#\[aq] refers to that fragment in the current resource.
+A fragment identifier,
+if included,
+refers to a particular named portion (fragment) of a resource;
+text after a \[aq]#\[aq] identifies the fragment.
+A URI beginning with \[aq]#\[aq]
+refers to that fragment in the current resource.
 .SS Usage
 There are many different URI schemes, each with specific
 additional rules and meanings, but they are intentionally made to be