aboutsummaryrefslogtreecommitdiffstats
path: root/man2
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2014-02-05 16:09:11 +0100
committerMichael Kerrisk <mtk.manpages@gmail.com>2014-02-05 16:09:11 +0100
commita797afac4e5f17aeaeb72fd063f76ad25d0bd3ef (patch)
tree0c2b02c235381adf4ef9e26b8a380a30d913aba1 /man2
parent5019071b75bfea60eefff1aaf8b18b56f5417270 (diff)
downloadman-pages-a797afac4e5f17aeaeb72fd063f76ad25d0bd3ef.tar.gz
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>
Diffstat (limited to 'man2')
-rw-r--r--man2/fcntl.26
-rw-r--r--man2/msgget.22
-rw-r--r--man2/ptrace.22
-rw-r--r--man2/request_key.22
-rw-r--r--man2/shmget.22
-rw-r--r--man2/sigaction.22
-rw-r--r--man2/syscalls.22
7 files changed, 9 insertions, 9 deletions
diff --git a/man2/fcntl.2 b/man2/fcntl.2
index da155420ae..be9009d836 100644
--- a/man2/fcntl.2
+++ b/man2/fcntl.2
@@ -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
diff --git a/man2/msgget.2 b/man2/msgget.2
index 1691ea7369..342762ea2d 100644
--- a/man2/msgget.2
+++ b/man2/msgget.2
@@ -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.
diff --git a/man2/ptrace.2 b/man2/ptrace.2
index c77f7cff72..724c746774 100644
--- a/man2/ptrace.2
+++ b/man2/ptrace.2
@@ -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.
diff --git a/man2/request_key.2 b/man2/request_key.2
index 092a4caa5a..388765f207 100644
--- a/man2/request_key.2
+++ b/man2/request_key.2
@@ -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.
diff --git a/man2/shmget.2 b/man2/shmget.2
index 331ab3f586..f18e2221df 100644
--- a/man2/shmget.2
+++ b/man2/shmget.2
@@ -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.
diff --git a/man2/sigaction.2 b/man2/sigaction.2
index dc719395b5..f8ba1b5159 100644
--- a/man2/sigaction.2
+++ b/man2/sigaction.2
@@ -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
diff --git a/man2/syscalls.2 b/man2/syscalls.2
index 92fff52e25..42ae127daa 100644
--- a/man2/syscalls.2
+++ b/man2/syscalls.2
@@ -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.