summaryrefslogtreecommitdiff
path: root/man7
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2012-10-21 08:04:42 +0200
committerMichael Kerrisk <mtk.manpages@gmail.com>2012-10-24 14:53:33 +0200
commit7fac88a949c7fdf554cc048bd9b47059830ebb68 (patch)
tree52171bcee3526213abcd6dd72a6e2abc0ddde394 /man7
parenta9c1e09721a2b9da554bf9e98466c1c5d41afa3f (diff)
eventfd.2, futex.2, mmap2.2, open.2, pciconfig_read.2, ptrace.2, reboot.2, request_key.2, sched_rr_get_interval.2, splice.2, stat.2, sync_file_range.2, syscalls.2, timer_create.2, vm86.2, pthread_attr_setscope.3, core.5, proc.5, aio.7, futex.7, netlink.7, time.7: Global fix: "userspace" ==> "user space" or "user-space"
Existing pages variously use "userspace or "user space". But, "userspace" is not quite an English word. So change "userspace" to "user space" or, when used attributively, "user-space". Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
Diffstat (limited to 'man7')
-rw-r--r--man7/aio.72
-rw-r--r--man7/futex.714
-rw-r--r--man7/netlink.718
-rw-r--r--man7/time.72
4 files changed, 18 insertions, 18 deletions
diff --git a/man7/aio.7 b/man7/aio.7
index 13202a1d..537dbb0e 100644
--- a/man7/aio.7
+++ b/man7/aio.7
@@ -160,7 +160,7 @@ Simultaneous asynchronous read or write operations using the same
.I aiocb
structure yield undefined results.
-The current Linux POSIX AIO implementation is provided in userspace by glibc.
+The current Linux POSIX AIO implementation is provided in user space by glibc.
This has a number of limitations, most notably that maintaining multiple
threads to perform I/O operations is expensive and scales poorly.
Work has been in progress for some time on a kernel
diff --git a/man7/futex.7 b/man7/futex.7
index 367f732c..dd8d20b2 100644
--- a/man7/futex.7
+++ b/man7/futex.7
@@ -7,15 +7,15 @@
.\" etc. to Steve Cheng <steve@ggi-project.org>.
.TH FUTEX 7 2012-08-05 "Linux" "Linux Programmer's Manual"
.SH NAME
-futex \- Fast Userspace Locking
+futex \- Fast User-Space Locking
.SH SYNOPSIS
.nf
.B #include <linux/futex.h>
.fi
.SH DESCRIPTION
.PP
-The Linux kernel provides futexes ("Fast Userspace muTexes")
-as a building block for fast userspace
+The Linux kernel provides futexes ("Fast user-space mutexes")
+as a building block for fast user-space
locking and semaphores.
Futexes are very basic and lend themselves well for building higher level
locking abstractions such as POSIX mutexes.
@@ -34,7 +34,7 @@ In its bare form, a futex has semaphore semantics;
it is a counter that can be incremented and decremented atomically;
processes can wait for the value to become positive.
.PP
-Futex operation is entirely userspace for the noncontended case.
+Futex operation is entirely user space for the noncontended case.
The kernel is only involved to arbitrate the contended case.
As any sane design will strive for noncontention,
futexes are also optimized for this situation.
@@ -47,7 +47,7 @@ via shared memory segments or because they share memory space,
in which case the application is commonly called multithreaded.
.SS "Semantics"
.PP
-Any futex operation starts in userspace,
+Any futex operation starts in user space,
but it may necessary to communicate with the kernel using the
.BR futex (2)
system call.
@@ -61,7 +61,7 @@ This is the noncontended case which is fast and should be common.
In the contended case, the atomic increment changed the counter
from \-1 (or some other negative number).
If this is detected, there are waiters.
-Userspace should now set the counter to 1 and instruct the
+User space should now set the counter to 1 and instruct the
kernel to wake up any waiters using the
.B FUTEX_WAKE
operation.
@@ -96,7 +96,7 @@ Current semantics are available from Linux 2.5.40 onward.
To reiterate, bare futexes are not intended as an easy to use
abstraction for end-users.
Implementors are expected to be assembly literate and to have read
-the sources of the futex userspace library referenced
+the sources of the futex user-space library referenced
below.
.PP
This man page illustrates the most common use of the
diff --git a/man7/netlink.7 b/man7/netlink.7
index dfdba9a5..3d499e34 100644
--- a/man7/netlink.7
+++ b/man7/netlink.7
@@ -6,7 +6,7 @@
.\" $Id: netlink.7,v 1.8 2000/06/22 13:23:00 ak Exp $
.TH NETLINK 7 2012-08-05 "Linux" "Linux Programmer's Manual"
.SH NAME
-netlink \- Communication between kernel and userspace (AF_NETLINK)
+netlink \- Communication between kernel and user space (AF_NETLINK)
.SH SYNOPSIS
.nf
.B #include <asm/types.h>
@@ -17,8 +17,8 @@ netlink \- Communication between kernel and userspace (AF_NETLINK)
.fi
.SH DESCRIPTION
Netlink is used to transfer information between kernel and
-userspace processes.
-It consists of a standard sockets-based interface for userspace
+user-space processes.
+It consists of a standard sockets-based interface for user space
processes and an internal kernel API for kernel modules.
The internal kernel interface is not documented in this manual page.
There is also an obsolete netlink interface
@@ -53,7 +53,7 @@ Messages from 1-wire subsystem.
Reserved for user-mode socket protocols.
.TP
.B NETLINK_FIREWALL
-Transport IPv4 packets from netfilter to userspace.
+Transport IPv4 packets from netfilter to user space.
Used by
.I ip_queue
kernel module.
@@ -82,7 +82,7 @@ Auditing.
.TP
.B NETLINK_FIB_LOOKUP
.\" FIXME More details on NETLINK_FIB_LOOKUP needed.
-Access to FIB lookup from userspace.
+Access to FIB lookup from user space.
.TP
.B NETLINK_CONNECTOR
Kernel connector.
@@ -95,7 +95,7 @@ in the Linux kernel source tree for further information.
Netfilter subsystem.
.TP
.B NETLINK_IP6_FW
-Transport IPv6 packets from netfilter to userspace.
+Transport IPv6 packets from netfilter to user space.
Used by
.I ip6_queue
kernel module.
@@ -105,7 +105,7 @@ DECnet routing messages.
.TP
.B NETLINK_KOBJECT_UEVENT
.\" FIXME More details on NETLINK_KOBJECT_UEVENT needed.
-Kernel messages to userspace.
+Kernel messages to user space.
.TP
.B NETLINK_GENERIC
Generic netlink family for simplified netlink usage.
@@ -268,7 +268,7 @@ A user process should follow this convention too.
However, reliable transmissions from kernel to user are impossible
in any case.
The kernel can't send a netlink message if the socket buffer is full:
-the message will be dropped and the kernel and the userspace process will
+the message will be dropped and the kernel and the user-space process will
no longer have the same view of kernel state.
It is up to the application to detect when this happens (via the
.B ENOBUFS
@@ -300,7 +300,7 @@ struct sockaddr_nl {
.I nl_pid
is the unicast address of netlink socket.
It's always 0 if the destination is in the kernel.
-For a userspace process,
+For a user-space process,
.I nl_pid
is usually the PID of the process owning the destination socket.
However,
diff --git a/man7/time.7 b/man7/time.7
index 5f08213e..76422843 100644
--- a/man7/time.7
+++ b/man7/time.7
@@ -97,7 +97,7 @@ The
system call is a special case.
It reports times with a granularity defined by the kernel constant
.IR USER_HZ .
-Userspace applications can determine the value of this constant using
+User-space applications can determine the value of this constant using
.IR sysconf(_SC_CLK_TCK) .
.\" glibc gets this info with a little help from the ELF loader;
.\" see glibc elf/dl-support.c and kernel fs/binfmt_elf.c.