aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2014-01-11 06:25:02 +1300
committerMichael Kerrisk <mtk.manpages@gmail.com>2014-01-11 06:25:02 +1300
commitf14ae16e5793ae9b5eb6e96340b89b5097a3166b (patch)
tree0557f02093cb063faaf51a0526381d2a401d0dfe
parentf577d7ef7a14f2f4b8c945381badd006bc42b835 (diff)
downloadman-pages-f14ae16e5793ae9b5eb6e96340b89b5097a3166b.tar.gz
accept.2, clock_getres.2, mkdir.2, request_key.2, wait.2, printf.3, bootparam.7: grfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r--man2/accept.22
-rw-r--r--man2/clock_getres.24
-rw-r--r--man2/mkdir.22
-rw-r--r--man2/request_key.22
-rw-r--r--man2/wait.22
-rw-r--r--man3/printf.32
-rw-r--r--man7/bootparam.72
7 files changed, 8 insertions, 8 deletions
diff --git a/man2/accept.2 b/man2/accept.2
index 57b44d55d9..4c905869f1 100644
--- a/man2/accept.2
+++ b/man2/accept.2
@@ -338,7 +338,7 @@ return a readability event because the connection might have been
removed by an asynchronous network error or another thread before
.BR accept ()
is called.
-If this happens then the call will block waiting for the next
+If this happens, then the call will block waiting for the next
connection to arrive.
To ensure that
.BR accept ()
diff --git a/man2/clock_getres.2 b/man2/clock_getres.2
index 9cd1936115..6809c7b9f3 100644
--- a/man2/clock_getres.2
+++ b/man2/clock_getres.2
@@ -235,10 +235,10 @@ these clocks may return
.B bogus results
if a process is migrated to another CPU.
.PP
-If the CPUs in an SMP system have different clock sources then
+If the CPUs in an SMP system have different clock sources, then
there is no way to maintain a correlation between the timer registers since
each CPU will run at a slightly different frequency.
-If that is the case then
+If that is the case, then
.I clock_getcpuclockid(0)
will return
.B ENOENT
diff --git a/man2/mkdir.2 b/man2/mkdir.2
index 1716b79042..fe813331a5 100644
--- a/man2/mkdir.2
+++ b/man2/mkdir.2
@@ -43,7 +43,7 @@ or, synonymously
the new directory will inherit the group ownership from its parent;
otherwise it will be owned by the effective group ID of the process.
-If the parent directory has the set-group-ID bit set then so will the
+If the parent directory has the set-group-ID bit set, then so will the
newly created directory.
.SH RETURN VALUE
.BR mkdir ()
diff --git a/man2/request_key.2 b/man2/request_key.2
index 40dcb00957..092a4caa5a 100644
--- a/man2/request_key.2
+++ b/man2/request_key.2
@@ -50,7 +50,7 @@ for the caller may be found, and only
.B searchable
keyrings may be searched.
.P
-If the key is not found then, if
+If the key is not found, then, if
.I callout_info
is set, this function will attempt to look further afield.
In such a case, the
diff --git a/man2/wait.2 b/man2/wait.2
index f5ea617380..de70a7bc5d 100644
--- a/man2/wait.2
+++ b/man2/wait.2
@@ -502,7 +502,7 @@ they cannot be used with
.B __WCLONE
.\" since 0.99pl10
Wait for "clone" children only.
-If omitted then wait for "non-clone" children only.
+If omitted, then wait for "non-clone" children only.
(A "clone" child is one which delivers no signal, or a signal other than
.B SIGCHLD
to its parent upon termination.)
diff --git a/man3/printf.3 b/man3/printf.3
index 79cabf6a12..43f20dc350 100644
--- a/man3/printf.3
+++ b/man3/printf.3
@@ -160,7 +160,7 @@ and
do not write more than
.I size
bytes (including the terminating null byte (\(aq\e0\(aq)).
-If the output was truncated due to this limit then the return value
+If the output was truncated due to this limit, then the return value
is the number of characters (excluding the terminating null byte)
which would have been written to the final string if enough space
had been available.
diff --git a/man7/bootparam.7 b/man7/bootparam.7
index e54ed3f49d..aa701c0fa4 100644
--- a/man7/bootparam.7
+++ b/man7/bootparam.7
@@ -1093,7 +1093,7 @@ aztcd=iobase[,magic_number]
.fi
.in
.IP
-If you set the magic_number to 0x79 then the driver will try and run
+If you set the magic_number to 0x79, then the driver will try and run
anyway in the event of an unknown firmware version.
All other values
are ignored.