LDP
/
man-pages
mirror of https://github.com/mkerrisk/man-pages
0
1
Fork 0
Code Releases Activity

fcntl.2, msgget.2, ptrace.2, request_key.2, shmget.2, sigaction.2, syscalls.2, dbopen.3, euidaccess.3, getgrnam.3, getpwnam.3, strfmon.3, strtol.3, strtoul.3, cciss.4, hpsa.4, mouse.4, termcap.5, charsets.7, iso_8859-16.7, iso_8859-2.7, koi8-r.7, unicode.7, utf-8.7: Use Oxford comma 

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
This commit is contained in:
Michael Kerrisk 2014-02-05 16:09:11 +01:00
parent 5019071b75
commit a797afac4e
24 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man2/fcntl.2
View File

@ -191,7 +191,7 @@ and
.BR O_SYNC
flags; see BUGS, below.
.SS Advisory locking
.BR F_GETLK ", " F_SETLK " and " F_SETLKW
.BR F_GETLK ", " F_SETLK ", and " F_SETLKW
are used to acquire, release, and test for the existence of record
locks (also known as file-segment or file-region locks).
The third argument,
@ -1162,9 +1162,9 @@ Only the operations
.BR F_GETFL ,
.BR F_SETFL ,
.BR F_GETLK ,
.BR F_SETLK
.BR F_SETLK ,
and
.BR F_SETLKW ,
.BR F_SETLKW
are specified in POSIX.1-2001.
.BR F_GETOWN

2
man2/msgget.2
View File

@ -119,7 +119,7 @@ are set to the least significant 9 bits of
.IR msg_qnum ,
.IR msg_lspid ,
.IR msg_lrpid ,
.I msg_stime
.IR msg_stime ,
and
.I msg_rtime
are set to 0.

2
man2/ptrace.2
View File

@ -149,7 +149,7 @@ specifies the thread ID of the tracee to be acted on.
For requests other than
.BR PTRACE_ATTACH ,
.BR PTRACE_SEIZE ,
.B PTRACE_INTERRUPT
.BR PTRACE_INTERRUPT ,
and
.BR PTRACE_KILL ,
the tracee must be stopped.

2
man2/request_key.2
View File

@ -40,7 +40,7 @@ is called from a program invoked by
.BR request_key ()
on behalf of some other process to generate a key, then the keyrings of that
other process will be searched next, using that other process's UID, GID,
groups and security context to control access.
groups, and security context to control access.
.P
The keys in each keyring searched are checked for a match before any child
keyrings are recursed into.

2
man2/shmget.2
View File

@ -167,7 +167,7 @@ is set to the value of
.IP
.IR shm_lpid ,
.IR shm_nattch ,
.I shm_atime
.IR shm_atime ,
and
.I shm_dtime
are set to 0.

2
man2/sigaction.2
View File

@ -344,7 +344,7 @@ with the real user ID of the message sender.
.IP *
.B SIGCHLD
fills in
.IR si_pid ", " si_uid ", " si_status ", " si_utime " and " si_stime ,
.IR si_pid ", " si_uid ", " si_status ", " si_utime ", and " si_stime ,
providing information about the child.
The
.I si_pid

2
man2/syscalls.2
View File

@ -666,7 +666,7 @@ older system calls were superseded by newer ones,
and this has been treated somewhat unsystematically.
On platforms with
proprietary operating-system emulation,
such as parisc, sparc, sparc64 and alpha,
such as parisc, sparc, sparc64, and alpha,
there are many additional system calls; mips64 also contains a full
set of 32-bit system calls.

2
man3/dbopen.3
View File

@ -514,7 +514,7 @@ or
The
.IR del ,
.IR get ,
.I put
.IR put ,
and
.I seq
routines may fail and set

2
man3/euidaccess.3
View File

@ -47,7 +47,7 @@ uses the effective identifiers.
.I mode
is a mask consisting of one or more of
.BR R_OK ", " W_OK ", " X_OK " and " F_OK ,
.BR R_OK ", " W_OK ", " X_OK ", and " F_OK ,
with the same meanings as for
.BR access (2).

2
man3/getgrnam.3
View File

@ -234,7 +234,7 @@ One might argue that according to POSIX
should be left unchanged if an entry is not found.
Experiments on various
UNIX-like systems shows that lots of different values occur in this
situation: 0, ENOENT, EBADF, ESRCH, EWOULDBLOCK, EPERM and probably others.
situation: 0, ENOENT, EBADF, ESRCH, EWOULDBLOCK, EPERM, and probably others.
.\" more precisely:
.\" AIX 5.1 - gives ESRCH
.\" OSF1 4.0g - gives EWOULDBLOCK

2
man3/getpwnam.3
View File

@ -244,7 +244,7 @@ One might argue that according to POSIX
should be left unchanged if an entry is not found.
Experiments on various
UNIX-like systems show that lots of different values occur in this
situation: 0, ENOENT, EBADF, ESRCH, EWOULDBLOCK, EPERM and probably others.
situation: 0, ENOENT, EBADF, ESRCH, EWOULDBLOCK, EPERM, and probably others.
.\" more precisely:
.\" AIX 5.1 - gives ESRCH
.\" OSF1 4.0g - gives EWOULDBLOCK

2
man3/strfmon.3
View File

@ -161,7 +161,7 @@ and will no doubt cause confusion.
Surprisingly, the "fl" is preceded and followed by a space,
and "NLG" is preceded by one and followed by two spaces.
This may be a bug in the locale files.
The Italian, Australian, Swiss
The Italian, Australian, Swiss,
and Portuguese locales yield
.in +4n

2
man3/strtol.3
View File

@ -172,7 +172,7 @@ as long as
is not called to change the locale during their execution.
.SH CONFORMING TO
.BR strtol ()
conforms to SVr4, 4.3BSD, C89, C99 and POSIX.1-2001, and
conforms to SVr4, 4.3BSD, C89, C99, and POSIX.1-2001, and
.BR strtoll ()
to C99 and POSIX.1-2001.
.SH NOTES

2
man3/strtoul.3
View File

@ -176,7 +176,7 @@ as long as
is not called to change the locale during their execution.
.SH CONFORMING TO
.BR strtoul ()
conforms to SVr4, C89, C99 and POSIX-2001, and
conforms to SVr4, C89, C99, and POSIX-2001, and
.BR strtoull ()
to C99 and POSIX.1-2001.
.SH NOTES

2
man4/cciss.4
View File

@ -279,7 +279,7 @@ or medium changers.
.RE
.LP
The driver will output messages indicating which
devices have been added or removed and the controller, bus, target and
devices have been added or removed and the controller, bus, target, and
lun used to address each device.
The driver then notifies the SCSI midlayer
of these changes.

2
man4/hpsa.4
View File

@ -129,7 +129,7 @@ For example:
This attribute contains the 16 hex-digit (8 byte) LUN ID
by which a logical drive or physical device can be addressed.
.IR c : b : t : l
are the controller, bus, target and lun of the device.
are the controller, bus, target, and lun of the device.
.nf
For example:

2
man4/mouse.4
View File

@ -60,7 +60,7 @@ and
(positive means down).
Various mice can operate at different speeds.
To select speeds, cycle through the
speeds 9600, 4800, 2400 and 1200 bit/s, each time writing the two characters
speeds 9600, 4800, 2400, and 1200 bit/s, each time writing the two characters
from the table below and waiting 0.1 seconds.
The following table shows available speeds and the strings that select them:
.TS

2
man5/termcap.5
View File

@ -317,7 +317,7 @@ LO Turn soft labels on
mb Start blinking
MC Clear soft margins
md Start bold mode
me End all mode like so, us, mb, md and mr
me End all mode like so, us, mb, md, and mr
mh Start half bright mode
mk Dark mode (Characters invisible)
ML Set left soft margin

6
man7/charsets.7
View File

@ -44,7 +44,7 @@ It is currently described by the ECMA-6 standard.
.LP
Various ASCII variants replacing the dollar sign with other currency
symbols and replacing punctuation with non-English alphabetic characters
to cover German, French, Spanish and others in 7 bits exist.
to cover German, French, Spanish, and others in 7 bits exist.
All are
deprecated; glibc doesn't support locales whose character sets aren't
true supersets of ASCII.
@ -96,7 +96,7 @@ It is essentially obsolete; see 8859-10 (Latin-6) and 8859-13 (Latin-7).
.TP
8859-5
Cyrillic letters supporting Bulgarian, Byelorussian, Macedonian,
Russian, Serbian and Ukrainian.
Russian, Serbian, and Ukrainian.
Ukrainians read the letter "ghe"
with downstroke as "heh" and would need a ghe with upstroke to write a
correct ghe.
@ -305,7 +305,7 @@ by the Linux kernel and by
.BR xterm (1).
It is popular in Japan and Korea.
.LP
There are 4 graphic character sets, called G0, G1, G2 and G3,
There are 4 graphic character sets, called G0, G1, G2, and G3,
and one of them is the current character set for codes with
high bit zero (initially G0), and one of them is the current
character set for codes with high bit one (initially G1).

2
man7/iso_8859-16.7
View File

@ -36,7 +36,7 @@ characters and is not implemented yet by any program vendors.
.P
ISO 8859-16 supports the following languages: Albanian, Bosnian,
Croatian, English, Finnish, German, Hungarian, Irish, Polish,
Romanian, Slovenian and Serbian.
Romanian, Slovenian, and Serbian.
.P
Also note that the following Cyrillic-based languages have one-to-one
transliterations to Latin 10: Macedonian and Serbian.

2
man7/iso_8859-2.7
View File

@ -39,7 +39,7 @@ characters and is implemented by several program vendors.
.P
ISO 8859-2 supports the following languages: Albanian, Bosnian,
Croatian, Czech, English, Finnish, German, Hungarian, Irish, Polish,
Slovak, Slovenian and Sorbian.
Slovak, Slovenian, and Sorbian.
.P
Also note that the following Cyrillic-based languages have one-to-one
transliterations to Latin 2: Macedonian and Serbian.

2
man7/koi8-r.7
View File

@ -33,7 +33,7 @@ hexadecimal
KOI8-R is the character set of choice for encoding Russian texts for
many UNIX-like operation systems.
KOI8-R is a successor for KOI-8, a
de-facto standard for Internet Mail, News, WWW and other interactive
de-facto standard for Internet Mail, News, WWW, and other interactive
services at least all over the ex-SU territory.
.PP
KOI8-R is defined by RFC\ 1489 (Registration of a Cyrillic Character

4
man7/unicode.7
View File

@ -58,7 +58,7 @@ eventually include not only Hieroglyphs and various historic
Indo-European languages, but even some selected artistic scripts such
as Tengwar, Cirth, and Klingon.
UCS also covers a large number of
graphical, typographical, mathematical and scientific symbols,
graphical, typographical, mathematical, and scientific symbols,
including those provided by TeX, Postscript, APL, MS-DOS, MS-Windows,
Macintosh, OCR fonts, as well as many word processing and publishing
systems, and more are being added.
@ -173,7 +173,7 @@ technical reports published by the Unicode Consortium provide much
additional information on the semantics and recommended usages of
various characters.
They provide guidelines and algorithms for
editing, sorting, comparing, normalizing, converting and displaying
editing, sorting, comparing, normalizing, converting, and displaying
Unicode strings.
.SS Unicode under Linux
Under GNU/Linux, the C type

2
man7/utf-8.7
View File

@ -98,7 +98,7 @@ All possible 2^31 UCS codes can be encoded using
.BR UTF-8 .
.TP
*
The bytes 0xc0, 0xc1, 0xfe and 0xff are never used in the
The bytes 0xc0, 0xc1, 0xfe, and 0xff are never used in the
.B UTF-8
encoding.
.TP