diff options
author | Michael Kerrisk <mtk.manpages@gmail.com> | 2021-01-09 11:14:08 +0100 |
---|---|---|
committer | Michael Kerrisk <mtk.manpages@gmail.com> | 2021-01-09 11:15:26 +0100 |
commit | 3ded684c1a4b6104e1d4b7400015f8bf76dc75b9 (patch) | |
tree | 2296d105d865d16b523458f6464503be32b1df1a | |
parent | 12325c385653da4fbf640a998b6e34c38a888e3c (diff) | |
download | man-pages-3ded684c1a4b6104e1d4b7400015f8bf76dc75b9.tar.gz |
Various pages: tfix (Oxford comma)
Found using:
git grep -lE '^[^.].*,.*,.*[^,] (and|or)\>'
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r-- | man1/intro.1 | 2 | ||||
-rw-r--r-- | man2/fanotify_init.2 | 2 | ||||
-rw-r--r-- | man2/ioctl_iflags.2 | 2 | ||||
-rw-r--r-- | man3/circleq.3 | 2 | ||||
-rw-r--r-- | man3/tailq.3 | 2 | ||||
-rw-r--r-- | man4/mouse.4 | 2 | ||||
-rw-r--r-- | man5/host.conf.5 | 4 | ||||
-rw-r--r-- | man5/tmpfs.5 | 2 | ||||
-rw-r--r-- | man7/bootparam.7 | 2 | ||||
-rw-r--r-- | man7/netlink.7 | 2 | ||||
-rw-r--r-- | man7/packet.7 | 2 |
11 files changed, 12 insertions, 12 deletions
diff --git a/man1/intro.1 b/man1/intro.1 index 57023b6522..9bf7190dfe 100644 --- 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 f0ad402bee..ff656f4381 100644 --- 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 413903355c..bc665e0803 100644 --- 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 2b98edaa78..6b6b9aa143 100644 --- 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 df1a5c6ec4..00fef1ce44 100644 --- 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 78d7d68840..351df7f076 100644 --- 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 b3d1c8ce2e..fb9398e77f 100644 --- 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 a238760791..8d0afd1f14 100644 --- 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 4bf6c77695..1c019b190d 100644 --- 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 6559d4d961..b14e981d1d 100644 --- 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 05a34dbebb..a3992b8e71 100644 --- 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. |