Various pages: tfix (Oxford comma)

Discovered using:

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

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

diff --git a/man2/getresuid.2 b/man2/getresuid.2
index 7ecc4fea5a8f697d243089d91c210c75458720c2..b6eceb76964c05d01383c29fa3ec8e9ef2ccd82d 100644 (file)
--- a/man2/getresuid.2
+++ b/man2/getresuid.2
@@ -27,7 +27,7 @@
 .\"
 .TH GETRESUID 2 2017-09-15 "Linux" "Linux Programmer's Manual"
 .SH NAME
-getresuid, getresgid \- get real, effective and saved user/group IDs
+getresuid, getresgid \- get real, effective, and saved user/group IDs
 .SH SYNOPSIS
 .nf
 .BR "#define _GNU_SOURCE" "         /* See feature_test_macros(7) */"

diff --git a/man2/ioctl_console.2 b/man2/ioctl_console.2
index 8ce70a6507683135b5ea6bc3d409532a9715927f..68d6815f6f13058b6b8d55823d533612b4a4f7fe 100644 (file)
--- a/man2/ioctl_console.2
+++ b/man2/ioctl_console.2
@@ -264,7 +264,7 @@ This call also invalidates the Unicode mapping.
 (Since Linux 1.3.1.)
 .TP
 .B PIO_FONTRESET
-Resets the screen font, size and Unicode mapping to the bootup
+Resets the screen font, size, and Unicode mapping to the bootup
 defaults.
 .I argp
 is unused, but should be set to NULL to

diff --git a/man2/mlock.2 b/man2/mlock.2
index 95bf500ed89fdfb4a15c1bfe285b324208c93311..69e379f8a39445d97dd81da8552174d8b7a29a38 100644 (file)
--- a/man2/mlock.2
+++ b/man2/mlock.2
@@ -108,7 +108,7 @@ memory range can be moved to external swap space again by the kernel.
 .BR mlockall ()
 locks all pages mapped into the address space of the
 calling process.
-This includes the pages of the code, data and stack
+This includes the pages of the code, data, and stack
 segment, as well as shared libraries, user space kernel data, shared
 memory, and memory-mapped files.
 All mapped pages are guaranteed

diff --git a/man2/semget.2 b/man2/semget.2
index a86ed8421d7aacf9c31883f2e664fc02283e81c2..a8fed15e681bdc4674d94f2d00a6a2fe2c2c52cb 100644 (file)
--- a/man2/semget.2
+++ b/man2/semget.2
@@ -96,7 +96,7 @@ for
 .PP
 Upon creation, the least significant 9 bits of the argument
 .I semflg
-define the permissions (for owner, group and others)
+define the permissions (for owner, group, and others)
 for the semaphore set.
 These bits have the same format, and the same
 meaning, as the

diff --git a/man2/setresuid.2 b/man2/setresuid.2
index 7d1a2af5774ee090312b65a6bf070085bd1d6c30..775c6242bad26ea993d5618667259900deda2f6b 100644 (file)
--- a/man2/setresuid.2
+++ b/man2/setresuid.2
@@ -26,7 +26,7 @@
 .\" Modified, 2003-05-26, Michael Kerrisk, <mtk.manpages@gmail.com>
 .TH SETRESUID 2 2017-09-15 "Linux" "Linux Programmer's Manual"
 .SH NAME
-setresuid, setresgid \- set real, effective and saved user or group ID
+setresuid, setresgid \- set real, effective, and saved user or group ID
 .SH SYNOPSIS
 .nf
 .BR "#define _GNU_SOURCE" "         /* See feature_test_macros(7) */"

diff --git a/man2/statfs.2 b/man2/statfs.2
index 83d0847fb5cc7b763fb32ea2191b0a181126d377..8a7c54c88dfcef577d669da4a1b7a4aaa6c3cf4c 100644 (file)
--- a/man2/statfs.2
+++ b/man2/statfs.2
@@ -340,7 +340,7 @@ and
 .BR fstatvfs (3)
 instead.
 .SS The f_fsid field
-Solaris, Irix and POSIX have a system call
+Solaris, Irix, and POSIX have a system call
 .BR statvfs (2)
 that returns a
 .I "struct statvfs"

diff --git a/man2/uname.2 b/man2/uname.2
index 9491a29699fadb735c08c9b3555eb6d3573710d6..6850df9b4ce6760926dab82308027f6ea2a35348 100644 (file)
--- a/man2/uname.2
+++ b/man2/uname.2
@@ -84,7 +84,7 @@ The
 member (the NIS or YP domain name) is a GNU extension.
 .SH NOTES
 This is a system call, and the operating system presumably knows
-its name, release and version.
+its name, release, and version.
 It also knows what hardware it runs on.
 So, four of the fields of the struct are meaningful.
 On the other hand, the field

diff --git a/man3/dbopen.3 b/man3/dbopen.3
index 2ea5ad3cf70606bb7824cfbbb69c8ab4655676a1..06200e26efae43ef290a780605dfd94a79eace66 100644 (file)
--- a/man3/dbopen.3
+++ b/man3/dbopen.3
@@ -58,7 +58,7 @@ library instead.
 .PP
 .BR dbopen ()
 is the library interface to database files.
-The supported file formats are btree, hashed and UNIX file oriented.
+The supported file formats are btree, hashed, and UNIX file oriented.
 The btree format is a representation of a sorted, balanced tree structure.
 The hashed format is an extensible, dynamic hashing scheme.
 The flat-file format is a byte stream file with fixed or variable length

diff --git a/man3/des_crypt.3 b/man3/des_crypt.3
index 7fad5f228cb2339569d547c18db1f3d37fc47dbe..7f13005367e83708b66926c3ecbc705bb0d87df6 100644 (file)
--- a/man3/des_crypt.3
+++ b/man3/des_crypt.3
@@ -55,7 +55,7 @@ CBC
 mode, which chains together
 successive blocks.
 CBC
-mode protects against insertions, deletions and
+mode protects against insertions, deletions, and
 substitutions of blocks.
 Also, regularities in the clear text will
 not appear in the cipher text.

diff --git a/man3/fmtmsg.3 b/man3/fmtmsg.3
index 7323f2e3bb66b47867a031a8c943e6d32aa1715a..726678970157f8b7ea63a64ae87801fa37b717b6 100644 (file)
--- a/man3/fmtmsg.3
+++ b/man3/fmtmsg.3
@@ -171,7 +171,7 @@ the output to
 When this variable is defined, is non-NULL, and is a colon-separated
 list of valid keywords, then only the parts of the message corresponding
 to these keywords is printed.
-Valid keywords are "label", "severity", "text", "action" and "tag".
+Valid keywords are "label", "severity", "text", "action", and "tag".
 .PP
 The environment variable
 .B SEV_LEVEL

diff --git a/man3/getdate.3 b/man3/getdate.3
index cc1365c8997d599c3a7dbb131f079311c97605f8..e4fba9a033072dda048df86110f4b909b08482d8 100644 (file)
--- a/man3/getdate.3
+++ b/man3/getdate.3
@@ -119,8 +119,8 @@ When only the month is given (and no year), the month is taken to
 be the first such month equal to or after the current month.
 If no day is given, it is the first day of the month.
 .PP
-When no hour, minute and second are given, the current
-hour, minute and second are taken.
+When no hour, minute, and second are given, the current
+hour, minute, and second are taken.
 .PP
 If no date is given, but we know the hour, then that hour is taken
 to be the first such hour equal to or after the current hour.

diff --git a/man3/getgrent_r.3 b/man3/getgrent_r.3
index 1c8749d46f4e0a088d47a285aae5abfe5f73fca5..d7bd5c0b7be99def859ccdd8dcc418019bf11eee 100644 (file)
--- a/man3/getgrent_r.3
+++ b/man3/getgrent_r.3
@@ -85,7 +85,7 @@ For more information about the fields of this structure, see
 .PP
 The nonreentrant functions return a pointer to static storage,
 where this static storage contains further pointers to group
-name, password and members.
+name, password, and members.
 The reentrant functions described here return all of that in
 caller-provided buffers.
 First of all there is the buffer

diff --git a/man3/iswlower.3 b/man3/iswlower.3
index 6e0db9794f8303ac61df8c3feeb3511fa3596a5a..8fc92f704f1dd5469d6145f510b0dbac3ca3cf58 100644 (file)
--- a/man3/iswlower.3
+++ b/man3/iswlower.3
@@ -101,7 +101,7 @@ category of the
 current locale.
 .PP
 This function is not very appropriate for dealing with Unicode characters,
-because Unicode knows about three cases: upper, lower and title case.
+because Unicode knows about three cases: upper, lower, and title case.
 .SH SEE ALSO
 .BR islower (3),
 .BR iswctype (3),

diff --git a/man3/iswupper.3 b/man3/iswupper.3
index 05f5cb0b9b917f71ef6397c965fa5c291a96a4eb..e87cbf9f05b73c99bc929aea44f59a6db7772357 100644 (file)
--- a/man3/iswupper.3
+++ b/man3/iswupper.3
@@ -95,7 +95,7 @@ category of the
 current locale.
 .PP
 This function is not very appropriate for dealing with Unicode characters,
-because Unicode knows about three cases: upper, lower and title case.
+because Unicode knows about three cases: upper, lower, and title case.
 .SH SEE ALSO
 .BR isupper (3),
 .BR iswctype (3),

diff --git a/man3/lockf.3 b/man3/lockf.3
index 5e8caa4e6d1f9656b9e2ebe5334dfd430a3e5efe..64a097aba8360ae8edab374042779187d6985dfc 100644 (file)
--- a/man3/lockf.3
+++ b/man3/lockf.3
@@ -48,7 +48,7 @@ Feature Test Macro Requirements for glibc (see
         || /* Glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE
 .fi
 .SH DESCRIPTION
-Apply, test or remove a POSIX lock on a section of an open file.
+Apply, test, or remove a POSIX lock on a section of an open file.
 The file is specified by
 .IR fd ,
 a file descriptor open for writing, the action by

diff --git a/man3/mbsinit.3 b/man3/mbsinit.3
index d4d4dea6ca6461d555bae0da034932aeaa18946a..bcd7a9d561989daf6ea1cae02216926e1d2cf65f 100644 (file)
--- a/man3/mbsinit.3
+++ b/man3/mbsinit.3
@@ -45,7 +45,7 @@ and they both have the same
 representation for an initial state.
 .PP
 For 8-bit encodings, all states are equivalent to the initial state.
-For multibyte encodings like UTF-8, EUC-*, BIG5 or SJIS, the wide character
+For multibyte encodings like UTF-8, EUC-*, BIG5, or SJIS, the wide character
 to multibyte conversion functions never produce non-initial states, but the
 multibyte to wide-character conversion functions like
 .BR mbrtowc (3)

diff --git a/man3/stdio.3 b/man3/stdio.3
index 2086887331f10ef585f0caf4c7070a5cef312327..0d119dd584d10a3bdadad25587a61df6b57ae03c 100644 (file)
--- a/man3/stdio.3
+++ b/man3/stdio.3
@@ -70,7 +70,7 @@ If append mode is used,
 it is unspecified whether the position indicator will be placed at the
 start or the end of the file.
 The position indicator is maintained by
-subsequent reads, writes and positioning requests.
+subsequent reads, writes, and positioning requests.
 All input occurs as if the characters were read by successive calls to the
 .BR fgetc (3)
 function; all output takes place as if all characters were written by

diff --git a/man3/tailq.3 b/man3/tailq.3
index 549d15627c31ad1220e006ec666df44701a29db3..8c1d9a66c9432f6f89c19b592ed13b3f4f624ff2 100644 (file)
--- a/man3/tailq.3
+++ b/man3/tailq.3
@@ -338,7 +338,7 @@ structure, respectively.
 returns an initializer that can be assigned to the queue
 .IR head .
 .SH CONFORMING TO
-Not in POSIX.1, POSIX.1-2001 or POSIX.1-2008.
+Not in POSIX.1, POSIX.1-2001, or POSIX.1-2008.
 Present on the BSDs.
 (TAILQ functions first appeared in 4.4BSD).
 .SH BUGS

diff --git a/man3/towlower.3 b/man3/towlower.3
index 9467daaf2bf39734c0236d744dbe84ac6f0faf3f..b885e8418f0a680e9230c85bfa1d6b852989a221 100644 (file)
--- a/man3/towlower.3
+++ b/man3/towlower.3
@@ -120,7 +120,7 @@ The behavior of these functions depends on the
 category of the locale.
 .PP
 These functions are not very appropriate for dealing with Unicode characters,
-because Unicode knows about three cases: upper, lower and title case.
+because Unicode knows about three cases: upper, lower, and title case.
 .SH SEE ALSO
 .BR iswlower (3),
 .BR towctrans (3),

diff --git a/man3/towupper.3 b/man3/towupper.3
index a41adaab1d02661215f1e77b8ab80e73392a42d8..6097357248ed0bf0d26a8a6ac4d5681f1017edce 100644 (file)
--- a/man3/towupper.3
+++ b/man3/towupper.3
@@ -119,7 +119,7 @@ The behavior of these functions depends on the
 category of the locale.
 .PP
 These functions are not very appropriate for dealing with Unicode characters,
-because Unicode knows about three cases: upper, lower and title case.
+because Unicode knows about three cases: upper, lower, and title case.
 .SH SEE ALSO
 .BR iswupper (3),
 .BR towctrans (3),

diff --git a/man3/ttyslot.3 b/man3/ttyslot.3
index d328d0f96b892ff899a03b68a060fce0d2a1a611..1e65901cb133a8e97cdccc74200ddbf915c287ac 100644 (file)
--- a/man3/ttyslot.3
+++ b/man3/ttyslot.3
@@ -117,7 +117,7 @@ Thus, on such systems the documentation says that
 returns the current user's index in the user accounting data base.
 .SH RETURN VALUE
 If successful, this function returns the slot number.
-On error (e.g., if none of the file descriptors 0, 1 or 2 is
+On error (e.g., if none of the file descriptors 0, 1, or 2 is
 associated with a terminal that occurs in this data base)
 it returns 0 on UNIX\ V6 and V7 and BSD-like systems,
 but \-1 on System V-like systems.

diff --git a/man3/tzset.3 b/man3/tzset.3
index 3754672bc745c568172c0443e7807b32711422c2..ff0ea14942dfe91e123d67d81d2e60f665a66b7d 100644 (file)
--- a/man3/tzset.3
+++ b/man3/tzset.3
@@ -77,7 +77,7 @@ other time conversion functions that depend on the timezone.
 In a System-V-like environment, it will also set the variables \fItimezone\fP
 (seconds West of UTC) and \fIdaylight\fP (to 0 if this timezone does not
 have any daylight saving time rules, or to nonzero if there is a time,
-past, present or future when daylight saving time applies).
+past, present, or future when daylight saving time applies).
 .PP
 If the
 .B TZ

diff --git a/man3/wordexp.3 b/man3/wordexp.3
index 497bb134496df6771e4699cd7e2edb76709fe4c6..b1d78cf2f92d9637d935237412f2092274efc374 100644 (file)
--- a/man3/wordexp.3
+++ b/man3/wordexp.3
@@ -112,7 +112,7 @@ The result of expansion of special parameters
 ($@, $*, $#, $?, $\-, $$, $!, $0) is unspecified.
 .PP
 Field splitting is done using the environment variable $IFS.
-If it is not set, the field separators are space, tab and newline.
+If it is not set, the field separators are space, tab, and newline.
 .SS The output array
 The array
 .I we_wordv

diff --git a/man4/console_codes.4 b/man4/console_codes.4
index a768912567b004ac83ab4c1f13803838b012b105..cf6cea2d2d7ae58200183b0a76040506dd52b901 100644 (file)
--- a/man4/console_codes.4
+++ b/man4/console_codes.4
@@ -100,7 +100,7 @@ BS (0x08, \fB\(haH\fP) backspaces one column
 HT (0x09, \fB\(haI\fP) goes to the next tab stop or to the end of the line
 if there is no earlier tab stop;
 .HP
-LF (0x0A, \fB\(haJ\fP), VT (0x0B, \fB\(haK\fP) and
+LF (0x0A, \fB\(haJ\fP), VT (0x0B, \fB\(haK\fP), and
 FF (0x0C, \fB\(haL\fP) all give a linefeed,
 and if LF/NL (new-line mode) is set also a carriage return;
 .HP
@@ -405,7 +405,7 @@ ESC [ 4 h
 DECIM (default off): Set insert mode.
 .TP
 ESC [ 20 h
-LF/NL (default off): Automatically follow echo of LF, VT or FF with CR.
+LF/NL (default off): Automatically follow echo of LF, VT, or FF with CR.
 .\"
 .PP
 .B ECMA-48 Status Report Commands
@@ -529,9 +529,9 @@ These variables G0 and G1 point at a translation table, and can be
 changed by the user.
 Initially they point at tables a) and b), respectively.
 The sequences ESC ( B and ESC ( 0 and ESC ( U and ESC ( K cause G0 to
-point at translation table a), b), c) and d), respectively.
+point at translation table a), b), c), and d), respectively.
 The sequences ESC ) B and ESC ) 0 and ESC ) U and ESC ) K cause G1 to
-point at translation table a), b), c) and d), respectively.
+point at translation table a), b), c), and d), respectively.
 .PP
 The sequence ESC c causes a terminal reset, which is what you want if the
 screen is all garbled.

diff --git a/man4/hpsa.4 b/man4/hpsa.4
index 8dc236f73fb6fed3a27f9a61851fcd12cf75d90f..ad6e33e284544a736f5f285de662ca4109e81e7a 100644 (file)
--- a/man4/hpsa.4
+++ b/man4/hpsa.4
@@ -194,7 +194,7 @@ This does exactly the same thing as writing to the
 hpsa-specific host "rescan" attribute.
 .TP
 .B CCISS_GETPCIINFO
-Returns PCI domain, bus, device and function and "board ID" (PCI subsystem ID).
+Returns PCI domain, bus, device, and function and "board ID" (PCI subsystem ID).
 .TP
 .B CCISS_GETDRIVVER
 Returns driver version in three bytes encoded as:

diff --git a/man4/wavelan.4 b/man4/wavelan.4
index 70906a90e96efbed38dcd735f1571f2a5f90d4e0..7715800c41f6aac16fa91b735d1d819f418d00af 100644 (file)
--- a/man4/wavelan.4
+++ b/man4/wavelan.4
@@ -36,7 +36,7 @@ in both forms (up to 4) and allocates the next available ethernet
 device (eth0..eth#) for each card found, unless a device name is
 explicitly specified (see below).
 This device name will be reported
-in the kernel log file with the MAC address, NWID and frequency used
+in the kernel log file with the MAC address, NWID, and frequency used
 by the card.
 .SS Parameters
 This section applies to the module form (parameters passed on the

diff --git a/man5/elf.5 b/man5/elf.5
index 8425f66148c46ec387bbe4ba97aaea3c41e44f86..38bf1c63dc573328b34c2be756aa3b7c19b26d48 100644 (file)
--- a/man5/elf.5
+++ b/man5/elf.5
@@ -2146,7 +2146,7 @@ and
 .IR e_shstrndx
 respectively are
 Linux extensions.
-Sun, BSD and AMD64 also support them; for further information,
+Sun, BSD, and AMD64 also support them; for further information,
 look under SEE ALSO.
 .\" .SH AUTHORS
 .\" The original version of this manual page was written by

diff --git a/man5/networks.5 b/man5/networks.5
index 75ad20fc995fb5e30c830c1970913834b2c04c70..d7f7a4ffc9e919c778a1d974bab8ab14bc35ba0d 100644 (file)
--- a/man5/networks.5
+++ b/man5/networks.5
@@ -65,7 +65,7 @@ This file is read by the
 and
 .BR netstat (8)
 utilities.
-Only Class A, B or C networks are supported, partitioned networks
+Only Class A, B, or C networks are supported, partitioned networks
 (i.e., network/26 or network/28) are not supported by this file.
 .SH FILES
 .TP

diff --git a/man5/nsswitch.conf.5 b/man5/nsswitch.conf.5
index 11ff91207745f3e0b355af175d88db1399b74a6c..ae49223b0e5f723daad46ec0454cdf040042c74a 100644 (file)
--- a/man5/nsswitch.conf.5
+++ b/man5/nsswitch.conf.5
@@ -163,7 +163,7 @@ The version number
 .B X
 may be 1 for glibc 2.0, or 2 for glibc 2.1 and later.
 On systems with additional libraries installed, you may have access to
-further services such as "hesiod", "ldap", "winbind" and "wins".
+further services such as "hesiod", "ldap", "winbind", and "wins".
 .PP
 An action may also be specified following a service specification.
 The action modifies the behavior following a result obtained

diff --git a/man5/proc.5 b/man5/proc.5
index d6234a3eac5d73f27f86e6cbaeebb97a5b8d32a2..a4c68c215dcfda2b09ba80ae26f30106b9f33f50 100644 (file)
--- a/man5/proc.5
+++ b/man5/proc.5
@@ -4862,7 +4862,7 @@ percent, accounting resumes.
 determines
 how often the kernel checks the amount of free space (value is in
 seconds).
-Default values are 4, 2 and 30.
+Default values are 4, 2, and 30.
 That is, suspend accounting if 2% or less space is free; resume it
 if 4% or more space is free; consider information about amount of free space
 valid for 30 seconds.
@@ -5538,7 +5538,7 @@ See
 .BR namespaces (7).
 .TP
 .I /proc/sys/vm
-This directory contains files for memory management tuning, buffer and
+This directory contains files for memory management tuning, buffer, and
 cache management.
 .TP
 .IR /proc/sys/vm/admin_reserve_kbytes " (since Linux 3.10)"
@@ -5593,7 +5593,7 @@ To free dentries and inodes, use:
 .IP
     echo 2 > /proc/sys/vm/drop_caches
 .IP
-To free pagecache, dentries and inodes, use:
+To free pagecache, dentries, and inodes, use:
 .IP
     echo 3 > /proc/sys/vm/drop_caches
 .IP

diff --git a/man7/arp.7 b/man7/arp.7
index bf134ada48c0ec201e98bb837ce9479979a34eb9..d31866f50cfb65dbf34328fe7aa2a1558a086ca2 100644 (file)
--- a/man7/arp.7
+++ b/man7/arp.7
@@ -94,7 +94,7 @@ struct arpreq {
 .in
 .PP
 .BR SIOCSARP ", " SIOCDARP " and " SIOCGARP
-respectively set, delete and get an ARP mapping.
+respectively set, delete, and get an ARP mapping.
 Setting and deleting ARP maps are privileged operations and may
 be performed only by a process with the
 .B CAP_NET_ADMIN

diff --git a/man7/bootparam.7 b/man7/bootparam.7
index 09ee212f5f708aeddd9ac53a8a29118a9eb33e7a..4bf6c77695a08b70d0105f0cbd6d2e1e1c348e36 100644 (file)
--- a/man7/bootparam.7
+++ b/man7/bootparam.7
@@ -63,7 +63,7 @@ Most of the sorting is coded in the kernel source file
 .IR init/main.c .
 First, the kernel
 checks to see if the argument is any of the special arguments 'root=',
-\&'nfsroot=', 'nfsaddrs=', 'ro', 'rw', 'debug' or 'init'.
+\&'nfsroot=', 'nfsaddrs=', 'ro', 'rw', 'debug', or 'init'.
 The meaning of these special arguments is described below.
 .PP
 Then it walks a list of setup functions

diff --git a/man7/bpf-helpers.7 b/man7/bpf-helpers.7
index 5ddbe79baa5ce0d1a2e4504a27cf109e87c2e724..04a7f4186ae04e2cd76ee03ec38125f056e153fb 100644 (file)
--- a/man7/bpf-helpers.7
+++ b/man7/bpf-helpers.7
@@ -353,7 +353,7 @@ direct packet access.
 .INDENT 7.0
 .TP
 .B Description
-Recompute the layer 4 (e.g. TCP, UDP or ICMP) checksum for the
+Recompute the layer 4 (e.g. TCP, UDP, or ICMP) checksum for the
 packet associated to \fIskb\fP\&. Computation is incremental, so the
 helper must know the former value of the header field that was
 modified (\fIfrom\fP), the new value of this field (\fIto\fP), and the
@@ -601,7 +601,7 @@ metadata" mode only requires a single device where the
 configuration can be extracted from this helper.
 .sp
 This can be used together with various tunnels such as VXLan,
-Geneve, GRE or IP in IP (IPIP).
+Geneve, GRE, or IP in IP (IPIP).
 .TP
 .B Return
 0 on success, or a negative error in case of failure.
@@ -2809,7 +2809,7 @@ optional \(aq\fB\-\fP\(aq sign.
 Five least significant bits of \fIflags\fP encode base, other bits
 are currently unused.
 .sp
-Base must be either 8, 10, 16 or 0 to detect it automatically
+Base must be either 8, 10, 16, or 0 to detect it automatically
 similar to user space \fBstrtol\fP(3).
 .TP
 .B Return
@@ -2836,7 +2836,7 @@ The string may begin with an arbitrary amount of white space
 Five least significant bits of \fIflags\fP encode base, other bits
 are currently unused.
 .sp
-Base must be either 8, 10, 16 or 0 to detect it automatically
+Base must be either 8, 10, 16, or 0 to detect it automatically
 similar to user space \fBstrtoul\fP(3).
 .TP
 .B Return

diff --git a/man7/capabilities.7 b/man7/capabilities.7
index 6fecd5af84f4096da6a621d5bede8e03c4c8869f..3905126f61cd053f2dc36c475b0bf563823a4361 100644 (file)
--- a/man7/capabilities.7
+++ b/man7/capabilities.7
@@ -1481,7 +1481,7 @@ and filesystem user IDs (using
 .BR setresuid (2),
 or similar):
 .IP 1. 3
-If one or more of the real, effective or saved set user IDs
+If one or more of the real, effective, or saved set user IDs
 was previously 0, and as a result of the UID changes all of these IDs
 have a nonzero value,
 then all capabilities are cleared from the permitted, effective, and ambient

diff --git a/man7/charsets.7 b/man7/charsets.7
index 0c55392c62ce5849414afe0dc52bf92e210de4cf..1e28ef361b30ca32da999bb697271370eb99502d 100644 (file)
--- a/man7/charsets.7
+++ b/man7/charsets.7
@@ -250,7 +250,7 @@ The Japanese character set selected by ESC $ B has a more
 recent version selected by ESC & @ ESC $ B.
 .PP
 ISO 4873 stipulates a narrower use of character sets, where G0
-is fixed (always ASCII), so that G1, G2 and G3
+is fixed (always ASCII), so that G1, G2, and G3
 can be invoked only for codes with the high order bit set.
 In particular, \fB\(haN\fP and \fB\(haO\fP are not used anymore, ESC ( xx
 can be used only with xx=B, and ESC ) xx, ESC * xx, ESC + xx

diff --git a/man7/fanotify.7 b/man7/fanotify.7
index 56d940af71601afe326773e338427932c11270c9..75ed3d0ff29f1812a1719bc44ddd51d593a555dc 100644 (file)
--- a/man7/fanotify.7
+++ b/man7/fanotify.7
@@ -73,7 +73,7 @@ ignoring events for specific objects under a mount point or directory.
 .PP
 The
 .BR fanotify_mark (2)
-system call adds a file, directory, filesystem or mount point to a
+system call adds a file, directory, filesystem, or mount point to a
 notification group and specifies which events
 shall be reported (or ignored), or removes or modifies such an entry.
 .PP

diff --git a/man7/glob.7 b/man7/glob.7
index 329cf3f21bebe4afcb64b7fe2c348343c779670a..2b173e46de59555208115e3205ad9d62ee437d65 100644 (file)
--- a/man7/glob.7
+++ b/man7/glob.7
@@ -39,7 +39,7 @@ that will perform this function for a user program.
 The rules are as follows (POSIX.2, 3.13).
 .SS Wildcard matching
 A string is a wildcard pattern if it contains one of the
-characters \(aq?\(aq, \(aq*\(aq or \(aq[\(aq.
+characters \(aq?\(aq, \(aq*\(aq, or \(aq[\(aq.
 Globbing is the operation
 that expands a wildcard pattern into the list of pathnames
 matching the pattern.
@@ -59,7 +59,7 @@ The string enclosed by the brackets cannot be empty;
 therefore \(aq]\(aq can be allowed between the brackets, provided
 that it is the first character.
 (Thus, "\fI[][!]\fP" matches the
-three characters \(aq[\(aq, \(aq]\(aq and \(aq!\(aq.)
+three characters \(aq[\(aq, \(aq]\(aq, and \(aq!\(aq.)
 .PP
 .B Ranges
 .PP
@@ -80,14 +80,14 @@ An expression "\fI[!...]\fP" matches a single character, namely
 any character that is not matched by the expression obtained
 by removing the first \(aq!\(aq from it.
 (Thus, "\fI[!]a\-]\fP" matches any
-single character except \(aq]\(aq, \(aqa\(aq and \(aq\-\(aq.)
+single character except \(aq]\(aq, \(aqa\(aq, and \(aq\-\(aq.)
 .PP
-One can remove the special meaning of \(aq?\(aq, \(aq*\(aq and \(aq[\(aq by
+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.
+four characters \(aq[\(aq, \(aq?\(aq, \(aq*\(aq, and \(aq\e\(aq.
 .SS Pathnames
 Globbing is applied on each of the components of a pathname
 separately.

diff --git a/man7/locale.7 b/man7/locale.7
index 125961337ae6e1ac243d8feeebc81fbf9327ff2f..184b2cf7ea9df3d882714ba518053e2a71f1fcd2 100644 (file)
--- a/man7/locale.7
+++ b/man7/locale.7
@@ -45,7 +45,7 @@ and act accordingly to be portable to different cultures.
 .PP
 The header
 .I <locale.h>
-declares data types, functions and macros which are useful in this
+declares data types, functions, and macros which are useful in this
 task.
 .PP
 The functions it declares are

diff --git a/man7/man-pages.7 b/man7/man-pages.7
index b45cc0e510ee02f373725730e573664af1c5e4cd..9da96684d56999f0d0ae486cdbabcee87d57de01 100644 (file)
--- a/man7/man-pages.7
+++ b/man7/man-pages.7
@@ -73,7 +73,7 @@ Describes various human-readable file formats and configuration files.
 Games and funny little programs available on the system.
 .TP
 .B 7 Overview, conventions, and miscellaneous
-Overviews or descriptions of various topics, conventions and protocols,
+Overviews or descriptions of various topics, conventions, and protocols,
 character set standards, the standard filesystem layout, and miscellaneous
 other things.
 .TP
@@ -436,7 +436,7 @@ A list of limitations, known defects or inconveniences,
 and other questionable activities.
 .TP
 .B EXAMPLES
-One or more examples demonstrating how this function, file or
+One or more examples demonstrating how this function, file, or
 command is used.
 .IP
 For details on writing example programs,

diff --git a/man7/standards.7 b/man7/standards.7
index 8e022c0143ff316c927dbc29341aaa1e0b98bf3c..e1d8bd56ff9d276ef0c44f96059d7f0931fa7f56 100644 (file)
--- a/man7/standards.7
+++ b/man7/standards.7
@@ -225,7 +225,7 @@ XSI-conformant systems can be branded
 The POSIX.1-2001 document is broken into four parts:
 .IP
 .BR XBD :
-Definitions, terms and concepts, header file specifications.
+Definitions, terms, and concepts, header file specifications.
 .IP
 .BR XSH :
 Specifications of functions (i.e., system calls and library

diff --git a/man7/suffixes.7 b/man7/suffixes.7
index 9de3ad9fdf9abff0331c4ed80a79cd4c51757587..0f0ade220a14a47553e7233d682d92a3fde45ba9 100644 (file)
--- a/man7/suffixes.7
+++ b/man7/suffixes.7
@@ -196,7 +196,7 @@ Suffix      File type
  .pcf  X11 font files
  .pdf  Adobe Portable Data Format
        (use Acrobat/\fBacroread\fP or \fBxpdf\fP)
- .perl Perl source (see .ph, .pl and .pm)
+ .perl Perl source (see .ph, .pl, and .pm)
  .pfa  PostScript font definition files, ASCII format
  .pfb  PostScript font definition files, binary format
  .pgm  portable greymap format

diff --git a/man7/utf-8.7 b/man7/utf-8.7
index d8a065eb48a5ca3ba667c3647aaa097c869da565..ec93affca15e7aca19a3b288a364c5e14df0890d 100644 (file)
--- a/man7/utf-8.7
+++ b/man7/utf-8.7
@@ -179,7 +179,7 @@ strcmp(nl_langinfo(CODESET), "UTF-8") == 0
 .PP
 to determine whether a UTF-8 locale has been selected and whether
 therefore all plaintext standard input and output, terminal
-communication, plaintext file content, filenames and environment
+communication, plaintext file content, filenames, and environment
 variables are encoded in UTF-8.
 .PP
 Programmers accustomed to single-byte encodings such as US-ASCII or ISO 8859