Various pages: tfix (Oxford comma)

Found using:

    git grep -lE '^[^.].*,.*,.*[^,] (and|or)\>'

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>

diff --git a/man1/intro.1 b/man1/intro.1
index 57023b65224a5a6df706cacbb1f5729f666cf0eb..9bf7190dfe1994e4697004cc776ce214ab427cfa 100644 (file)
--- a/man1/intro.1
+++ b/man1/intro.1
@@ -220,7 +220,7 @@ and
 .I pwd
 commands and explore
 .I cd
-usage: "cd", "cd .", "cd ..", "cd /" and "cd \(ti".
+usage: "cd", "cd .", "cd ..", "cd /", and "cd \(ti".
 .SS Directories
 The command
 .I mkdir

diff --git a/man2/fanotify_init.2 b/man2/fanotify_init.2
index f0ad402bee0dcc036b1855a274ad4912bef668b6..ff656f43816e8140a3790ecf7e41048b6c9549c8 100644 (file)
--- a/man2/fanotify_init.2
+++ b/man2/fanotify_init.2
@@ -41,7 +41,7 @@ queue associated with the group.
 .PP
 The file descriptor is used in calls to
 .BR fanotify_mark (2)
-to specify the files, directories, mounts or filesystems for which fanotify
+to specify the files, directories, mounts, or filesystems for which fanotify
 events shall be created.
 These events are received by reading from the file descriptor.
 Some events are only informative, indicating that a file has been accessed.

diff --git a/man2/ioctl_iflags.2 b/man2/ioctl_iflags.2
index 413903355ce245568566bc46587768c4018fd9ae..bc665e08035d88c6b8c314f0d07f2b59862c574a 100644 (file)
--- a/man2/ioctl_iflags.2
+++ b/man2/ioctl_iflags.2
@@ -91,7 +91,7 @@ This flag can be applied only to directories.
 .BR FS_IMMUTABLE_FL " \(aqi\(aq"
 The file is immutable:
 no changes are permitted to the file contents or metadata
-(permissions, timestamps, ownership, link count and so on).
+(permissions, timestamps, ownership, link count, and so on).
 (This restriction applies even to the superuser.)
 Only a privileged process
 .RB ( CAP_LINUX_IMMUTABLE )

diff --git a/man3/circleq.3 b/man3/circleq.3
index 2b98edaa78edbe52b5b4d77ea28b1f409ce22b6c..6b6b9aa1430118860c3a408274ff2abd4d7c7da8 100644 (file)
--- a/man3/circleq.3
+++ b/man3/circleq.3
@@ -241,7 +241,7 @@ and zero if the queue contains at least one entry.
 .BR CIRCLEQ_PREV (),
 and
 .BR CIRCLEQ_NEXT ()
-return a pointer to the first, last, previous or next
+return a pointer to the first, last, previous, or next
 .I TYPE
 structure, respectively.
 .PP

diff --git a/man3/tailq.3 b/man3/tailq.3
index df1a5c6ec462a1336ef97d3ce21b501e99c3c77c..00fef1ce441f293af21882ec065cecdcdcaa9115 100644 (file)
--- a/man3/tailq.3
+++ b/man3/tailq.3
@@ -328,7 +328,7 @@ and zero if the queue contains at least one entry.
 .BR TAILQ_PREV (),
 and
 .BR TAILQ_NEXT ()
-return a pointer to the first, last, previous or next
+return a pointer to the first, last, previous, or next
 .I TYPE
 structure, respectively.
 .PP

diff --git a/man4/mouse.4 b/man4/mouse.4
index 78d7d68840741e294a8f5242f67bc52723b445dd..351df7f07613eed27af56f2830b18c1e801d792a 100644 (file)
--- a/man4/mouse.4
+++ b/man4/mouse.4
@@ -158,7 +158,7 @@ Mousesystems protocol: the last two bytes are not sent.
 .SS MM protocol
 The
 .B MM
-protocol uses 1 start bit, 8 data bits, odd parity and one
+protocol uses 1 start bit, 8 data bits, odd parity, and one
 stop bit at the speed of 1200 bits/sec.
 Data is sent to RxD in 3-byte
 packets.

diff --git a/man5/host.conf.5 b/man5/host.conf.5
index b3d1c8ce2eba3ec76f6aceb252d73da5a9a7208b..fb9398e77f7b59a95e301d4748c03e50854f8178 100644 (file)
--- a/man5/host.conf.5
+++ b/man5/host.conf.5
@@ -102,12 +102,12 @@ Overrides the
 command.
 .TP
 .B RESOLV_ADD_TRIM_DOMAINS
-A list of domains,  separated by colons (\(aq:\(aq), semicolons (\(aq;\(aq) or
+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
+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

diff --git a/man5/tmpfs.5 b/man5/tmpfs.5
index a23876079123434a89072380283b770d06f858b2..8d0afd1f1441d5b6faa23a27133e9b4f65705102 100644 (file)
--- a/man5/tmpfs.5
+++ b/man5/tmpfs.5
@@ -77,7 +77,7 @@ The size may have a
 .BR m ,
 or
 .B g
-suffix for Ki, Mi, Gi (binary kilo (kibi), binary mega (mebi) and binary giga
+suffix for Ki, Mi, Gi (binary kilo (kibi), binary mega (mebi), and binary giga
 (gibi)).
 .IP
 The size may also have a % suffix to limit this instance to a percentage of

diff --git a/man7/bootparam.7 b/man7/bootparam.7
index 4bf6c77695a08b70d0105f0cbd6d2e1e1c348e36..1c019b190d05e1e469a774c85c56a4e88bc4fcdf 100644 (file)
--- a/man7/bootparam.7
+++ b/man7/bootparam.7
@@ -431,7 +431,7 @@ handle more than one disk at a time.
 Each CD is addressed as a
 \&'Logical Unit Number' (LUN) of that particular device.
 But most
-devices, such as hard disks, tape drives and such are only one device,
+devices, such as hard disks, tape drives, and such are only one device,
 and will be assigned to LUN zero.
 .IP
 Some poorly designed SCSI devices cannot handle being probed for

diff --git a/man7/netlink.7 b/man7/netlink.7
index 6559d4d961e09bf60af67b539030af02459d0aa0..b14e981d1dce6ee15b008332cee6e1b656d5a06a 100644 (file)
--- a/man7/netlink.7
+++ b/man7/netlink.7
@@ -45,7 +45,7 @@ The currently assigned netlink families are:
 .BR NETLINK_ROUTE
 Receives routing and link updates and may be used to modify the routing
 tables (both IPv4 and IPv6), IP addresses, link parameters,
-neighbor setups, queueing disciplines, traffic classes and
+neighbor setups, queueing disciplines, traffic classes, and
 packet classifiers (see
 .BR rtnetlink (7)).
 .TP

diff --git a/man7/packet.7 b/man7/packet.7
index 05a34dbebba3cba702223748cc992f1473fb3122..a3992b8e71603025aae24081ac2477b09cba1dbb 100644 (file)
--- a/man7/packet.7
+++ b/man7/packet.7
@@ -281,7 +281,7 @@ A socket selects a group by encoding the ID in the first 16 bits of
 the integer option value.
 The first packet socket to join a group implicitly creates it.
 To successfully join an existing group, subsequent packet sockets
-must have the same protocol, device settings, fanout mode and
+must have the same protocol, device settings, fanout mode, and
 flags (see below).
 Packet sockets can leave a fanout group only by closing the socket.
 The group is deleted when the last socket is closed.