Various pages: tfix (Oxford comma)

Discovered using:

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

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
This commit is contained in:
Michael Kerrisk 2021-01-09 11:02:33 +01:00
parent 61eaa18945
commit 735334d454
42 changed files with 56 additions and 56 deletions

View File

@ -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) */"

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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) */"

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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

View File

@ -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.

View File

@ -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

View File

@ -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),

View File

@ -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),

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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),

View File

@ -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),

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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

View File

@ -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,

View File

@ -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

View File

@ -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

View File

@ -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