aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2016-09-16 12:42:20 +0200
committerMichael Kerrisk <mtk.manpages@gmail.com>2016-09-16 12:42:20 +0200
commit6f858d5cccae4f4fc7cb224da68bda7f0190571d (patch)
treefd70c37dfaeb47036592a108c5d1dba29f3b02a7
parent956e74b43f741abe865cc0b1629b996d56d9be20 (diff)
downloadman-pages-6f858d5cccae4f4fc7cb224da68bda7f0190571d.tar.gz
lirc.4, proc.5, netlink.7: tfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r--man4/lirc.42
-rw-r--r--man5/proc.512
-rw-r--r--man7/netlink.72
3 files changed, 8 insertions, 8 deletions
diff --git a/man4/lirc.4 b/man4/lirc.4
index 342478ab50..c333f2cd75 100644
--- a/man4/lirc.4
+++ b/man4/lirc.4
@@ -138,7 +138,7 @@ referred to below as
.P
In general, each driver should have a default set of settings.
The driver implementation is expected to re-apply the default settings
-when the device is closed by userspace, so that every application
+when the device is closed by user space, so that every application
opening the device can rely on working with the default settings
initially.
.\"
diff --git a/man5/proc.5 b/man5/proc.5
index a3709b5abe..f727e034c5 100644
--- a/man5/proc.5
+++ b/man5/proc.5
@@ -3387,10 +3387,10 @@ that commences with the character '@'.
.RE
.TP
.I /proc/net/netfilter/nfnetlink_queue
-This file contains information about netfilter userspace queueing, if used.
+This file contains information about netfilter user-space queueing, if used.
Each line represents a queue.
Queues that have not been subscribed to
-by userspace are not shown.
+by user space are not shown.
.nf
1 4207 0 2 65535 0 0 0 1
@@ -3423,16 +3423,16 @@ the application.
(4)
The copy mode of the queue.
It is either 1 (metadata only) or 2
-(also copy payload data to userspace).
+(also copy payload data to user space).
.TP
(5)
Copy range; that is, how many bytes of packet payload should be copied to
-userspace at most.
+user space at most.
.TP
(6)
queue dropped.
Number of packets that had to be dropped by the kernel because
-too many packets are already waiting for userspace to send back the mandatory
+too many packets are already waiting for user space to send back the mandatory
accept/drop verdicts.
.TP
(7)
@@ -3440,7 +3440,7 @@ queue user dropped.
Number of packets that were dropped within the netlink
subsystem.
Such drops usually happen when the corresponding socket buffer is
-full; that is, userspace is not able to read messages fast enough.
+full; that is, user space is not able to read messages fast enough.
.TP
(8)
sequence number.
diff --git a/man7/netlink.7 b/man7/netlink.7
index 6c2fac9cc1..84edcd5b17 100644
--- a/man7/netlink.7
+++ b/man7/netlink.7
@@ -442,7 +442,7 @@ is sent to user space via an ancillary data.
.\" commit 0a6a3a23ea6efde079a5b77688541a98bf202721
.\" Author: Christophe Ricard <christophe.ricard@gmail.com>
The kernel may fail to allocate the necessary room for the acknowledgment
-message back to userspace.
+message back to user space.
This option trims off the payload of the original netlink message.
The netlink message header is still included, so the user can guess from the
sequence number which message triggered the acknowledgment.