aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2021-01-09 12:53:15 +0100
committerMichael Kerrisk <mtk.manpages@gmail.com>2021-01-09 12:53:15 +0100
commit3d81c05a7997f32decebc93fce3d69102bed74f9 (patch)
tree42361deaa09a42599225ab91616f23d6c5178737
parent5473bd6687d21ff9edc3884f5c41a0ba1ae6d213 (diff)
downloadman-pages-3d81c05a7997f32decebc93fce3d69102bed74f9.tar.gz
time.1, ioctl_console.2, daemon.3, updwtmp.3, mouse.4, smartpqi.4: tfix (Oxford comma)
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r--man1/time.14
-rw-r--r--man2/ioctl_console.22
-rw-r--r--man3/daemon.32
-rw-r--r--man3/updwtmp.32
-rw-r--r--man4/mouse.42
-rw-r--r--man4/smartpqi.42
6 files changed, 7 insertions, 7 deletions
diff --git a/man1/time.1 b/man1/time.1
index f274aa9d8f..f26a1d53c8 100644
--- a/man1/time.1
+++ b/man1/time.1
@@ -125,8 +125,8 @@ sys %S
.\"
.SS The format string
The format is interpreted in the usual printf-like way.
-Ordinary characters are directly copied, tab, newline
-and backslash are escaped using \et, \en and \e\e,
+Ordinary characters are directly copied, tab, newline,
+and backslash are escaped using \et, \en, and \e\e,
a percent sign is represented by %%, and otherwise %
indicates a conversion.
The program
diff --git a/man2/ioctl_console.2 b/man2/ioctl_console.2
index 68d6815f6f..231b598e3a 100644
--- a/man2/ioctl_console.2
+++ b/man2/ioctl_console.2
@@ -183,7 +183,7 @@ intensity.
The default colors are, in order: black, dark red, dark
green, brown, dark blue, dark purple, dark cyan, light grey, dark
grey, bright red, bright green, yellow, bright blue, bright purple,
-bright cyan and white.
+bright cyan, and white.
(Since Linux 1.3.3.)
.TP
.B GIO_FONT
diff --git a/man3/daemon.3 b/man3/daemon.3
index c78c5c37d5..4db304079e 100644
--- a/man3/daemon.3
+++ b/man3/daemon.3
@@ -76,7 +76,7 @@ If
.I noclose
is zero,
.BR daemon ()
-redirects standard input, standard output and standard error
+redirects standard input, standard output, and standard error
to
.IR /dev/null ;
otherwise, no changes are made to these file descriptors.
diff --git a/man3/updwtmp.3 b/man3/updwtmp.3
index 1605a3f603..e58840a565 100644
--- a/man3/updwtmp.3
+++ b/man3/updwtmp.3
@@ -50,7 +50,7 @@ to the wtmp file.
.BR logwtmp ()
constructs a utmp structure using
.IR line ", " name ", " host ,
-current time and current process ID.
+current time, and current process ID.
Then it calls
.BR updwtmp ()
to append the structure to the wtmp file.
diff --git a/man4/mouse.4 b/man4/mouse.4
index 351df7f076..7faa328b07 100644
--- a/man4/mouse.4
+++ b/man4/mouse.4
@@ -121,7 +121,7 @@ as 0,0,0,0x20 when no other buttons are down.
.SS Mousesystems protocol
The
.B Mousesystems
-protocol uses 1 start bit, 8 data bits, no parity
+protocol uses 1 start bit, 8 data bits, no parity,
and two stop bits at the speed of 1200 bits/sec.
Data is sent to RxD in
5-byte packets.
diff --git a/man4/smartpqi.4 b/man4/smartpqi.4
index 3f99cea7cb..90ca67e0fb 100644
--- a/man4/smartpqi.4
+++ b/man4/smartpqi.4
@@ -49,7 +49,7 @@ attribute.
.TP
.B CCISS_GETPCIINFO
This operation returns the PCI domain, bus,
-device and function and "board ID" (PCI subsystem ID).
+device, and function and "board ID" (PCI subsystem ID).
.TP
.B CCISS_GETDRIVVER
This operation returns the driver version in four bytes, encoded as: