diff options
| author | Michael Kerrisk <mtk.manpages@gmail.com> | 2012-10-21 08:04:42 +0200 |
|---|---|---|
| committer | Michael Kerrisk <mtk.manpages@gmail.com> | 2012-10-24 14:53:33 +0200 |
| commit | 7fac88a949c7fdf554cc048bd9b47059830ebb68 (patch) | |
| tree | 52171bcee3526213abcd6dd72a6e2abc0ddde394 /man2 | |
| parent | a9c1e09721a2b9da554bf9e98466c1c5d41afa3f (diff) | |
| download | man-pages-7fac88a949c7fdf554cc048bd9b47059830ebb68.tar.gz | |
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 'man2')
| -rw-r--r-- | man2/eventfd.2 | 6 | ||||
| -rw-r--r-- | man2/futex.2 | 8 | ||||
| -rw-r--r-- | man2/mmap2.2 | 2 | ||||
| -rw-r--r-- | man2/open.2 | 4 | ||||
| -rw-r--r-- | man2/pciconfig_read.2 | 2 | ||||
| -rw-r--r-- | man2/ptrace.2 | 8 | ||||
| -rw-r--r-- | man2/reboot.2 | 2 | ||||
| -rw-r--r-- | man2/request_key.2 | 2 | ||||
| -rw-r--r-- | man2/sched_rr_get_interval.2 | 2 | ||||
| -rw-r--r-- | man2/splice.2 | 2 | ||||
| -rw-r--r-- | man2/stat.2 | 2 | ||||
| -rw-r--r-- | man2/sync_file_range.2 | 2 | ||||
| -rw-r--r-- | man2/syscalls.2 | 2 | ||||
| -rw-r--r-- | man2/timer_create.2 | 4 | ||||
| -rw-r--r-- | man2/vm86.2 | 2 |
15 files changed, 25 insertions, 25 deletions
diff --git a/man2/eventfd.2 b/man2/eventfd.2 index 0bda2758f5..773bcd838b 100644 --- a/man2/eventfd.2 +++ b/man2/eventfd.2 @@ -28,8 +28,8 @@ eventfd \- create a file descriptor for event notification .SH DESCRIPTION .BR eventfd () creates an "eventfd object" that can be used as -an event wait/notify mechanism by userspace applications, -and by the kernel to notify userspace applications of events. +an event wait/notify mechanism by user-space applications, +and by the kernel to notify user-space applications of events. The object contains an unsigned 64-bit integer .RI ( uint64_t ) counter that is maintained by the kernel. @@ -278,7 +278,7 @@ and only one file descriptor is required (versus the two required for a pipe). When used in the kernel, an eventfd -file descriptor can provide a kernel-userspace bridge allowing, +file descriptor can provide a bridge from kernel to user space, allowing, for example, functionalities like KAIO (kernel AIO) .\" or eventually syslets/threadlets to signal to a file descriptor that some operation is complete. diff --git a/man2/futex.2 b/man2/futex.2 index fe69f2d4e7..29c78df6ba 100644 --- a/man2/futex.2 +++ b/man2/futex.2 @@ -16,7 +16,7 @@ .\" .TH FUTEX 2 2012-08-13 "Linux" "Linux Programmer's Manual" .SH NAME -futex \- Fast Userspace Locking system call +futex \- Fast User-Space Locking system call .SH SYNOPSIS .nf .sp @@ -48,7 +48,7 @@ described in .PP When a .BR futex (7) -operation did not finish uncontended in userspace, a call needs to be made +operation did not finish uncontended in user space, a call needs to be made to the kernel to arbitrate. Arbitration can either mean putting the calling process to sleep or, conversely, waking a waiting process. @@ -214,7 +214,7 @@ now.) .B EFAULT Error retrieving .I timeout -information from userspace. +information from user space. .TP .B EINTR A @@ -265,7 +265,7 @@ To reiterate, bare futexes are not intended as an easy-to-use abstraction for end-users. (There is no wrapper function for this system call in glibc.) Implementors are expected to be assembly literate and to have -read the sources of the futex userspace library referenced below. +read the sources of the futex user-space library referenced below. .\" .SH "AUTHORS" .\" .PP .\" Futexes were designed and worked on by diff --git a/man2/mmap2.2 b/man2/mmap2.2 index d13b7186cb..1749b3bcb4 100644 --- a/man2/mmap2.2 +++ b/man2/mmap2.2 @@ -61,7 +61,7 @@ is set appropriately. .SH ERRORS .TP .B EFAULT -Problem with getting the data from userspace. +Problem with getting the data from user space. .TP .B EINVAL (Various platforms where the page size is not 4096 bytes.) diff --git a/man2/open.2 b/man2/open.2 index ad318b1954..f9a63e9865 100644 --- a/man2/open.2 +++ b/man2/open.2 @@ -703,7 +703,7 @@ to the same numerical value as Most Linux file systems don't actually implement the POSIX .B O_SYNC semantics, which require all metadata updates of a write -to be on disk on returning to userspace, but only the +to be on disk on returning to user space, but only the .B O_DSYNC semantics, which require only actual file data and metadata necessary to retrieve it to be on disk by the time the system call returns. @@ -752,7 +752,7 @@ flag, its st_ctime and st_mtime fields are set to the current time. The .B O_DIRECT flag may impose alignment restrictions on the length and address -of userspace buffers and the file offset of I/Os. +of user-space buffers and the file offset of I/Os. In Linux alignment restrictions vary by file system and kernel version and might be absent entirely. diff --git a/man2/pciconfig_read.2 b/man2/pciconfig_read.2 index a4163e59d3..b9949b2753 100644 --- a/man2/pciconfig_read.2 +++ b/man2/pciconfig_read.2 @@ -20,7 +20,7 @@ pciconfig_read, pciconfig_write, pciconfig_iobase \- pci device information hand .PP Most of the interaction with PCI devices is already handled by the kernel PCI layer, -and thus these calls should not normally need to be accessed from userspace. +and thus these calls should not normally need to be accessed from user space. .TP .BR pciconfig_read () Reads to diff --git a/man2/ptrace.2 b/man2/ptrace.2 index c45e569a52..9580604a11 100644 --- a/man2/ptrace.2 +++ b/man2/ptrace.2 @@ -210,7 +210,7 @@ the offset must typically be word-aligned. In order to maintain the integrity of the kernel, some modifications to the USER area are disallowed. .\" FIXME In the preceding sentence, which modifications are disallowed, -.\" and when they are disallowed, how does userspace discover that fact? +.\" and when they are disallowed, how does user space discover that fact? .TP .BR PTRACE_GETREGS ", " PTRACE_GETFPREGS Copy the tracee's general-purpose or floating-point registers, @@ -252,7 +252,7 @@ As for .BR PTRACE_POKEUSER , some general-purpose register modifications may be disallowed. .\" FIXME In the preceding sentence, which modifications are disallowed, -.\" and when they are disallowed, how does userspace discover that fact? +.\" and when they are disallowed, how does user space discover that fact? .RI ( addr is ignored.) Note that SPARC systems have the meaning of @@ -1125,7 +1125,7 @@ for the following cases: .TP .IR si_code " <= 0" .B SIGTRAP -was delivered as a result of a userspace action, +was delivered as a result of a user-space action, for example, a system call .RB ( tgkill (2), .BR kill (2), @@ -1781,7 +1781,7 @@ before has attached to it. Attaching caused .BR epoll_wait (2) -to return to userspace with the error +to return to user space with the error .BR EINTR . In this particular case, the program reacted to .B EINTR diff --git a/man2/reboot.2 b/man2/reboot.2 index 7e63d1853a..18524a4068 100644 --- a/man2/reboot.2 +++ b/man2/reboot.2 @@ -161,7 +161,7 @@ is set appropriately. .SH ERRORS .TP .B EFAULT -Problem with getting userspace data under +Problem with getting user-space data under .BR LINUX_REBOOT_CMD_RESTART2 . .TP .B EINVAL diff --git a/man2/request_key.2 b/man2/request_key.2 index 5e7fc8547e..b4dad32909 100644 --- a/man2/request_key.2 +++ b/man2/request_key.2 @@ -54,7 +54,7 @@ If the key is not found then, if is set, this function will attempt to look further afield. In such a case, the .I callout_info -is passed to a userspace service such as +is passed to a user-space service such as .B /sbin/request\-key to generate the key. .P diff --git a/man2/sched_rr_get_interval.2 b/man2/sched_rr_get_interval.2 index 9169810db2..944d13da7f 100644 --- a/man2/sched_rr_get_interval.2 +++ b/man2/sched_rr_get_interval.2 @@ -81,7 +81,7 @@ is set appropriately. .SH ERRORS .TP .B EFAULT -Problem with copying information to userspace. +Problem with copying information to user space. .TP .B EINVAL Invalid pid. diff --git a/man2/splice.2 b/man2/splice.2 index 4590e2606c..244733fdd3 100644 --- a/man2/splice.2 +++ b/man2/splice.2 @@ -175,7 +175,7 @@ The three system calls .BR vmsplice (2), and .BR tee (2), -provide userspace programs with full control over an arbitrary +provide user-space programs with full control over an arbitrary kernel buffer, implemented within the kernel using the same type of buffer that is used for a pipe. In overview, these system calls perform the following tasks: diff --git a/man2/stat.2 b/man2/stat.2 index 0b82e1db3b..d4838a2e9c 100644 --- a/man2/stat.2 +++ b/man2/stat.2 @@ -460,7 +460,7 @@ T} 9000 S_IFNWK n 110000 network special (HP-UX) a000 S_IFLNK l@ 120000 symbolic link (BSD) b000 S_IFSHAD 130000 T{ -Solaris shadow inode for ACL (not seen by userspace) +Solaris shadow inode for ACL (not seen by user space) T} c000 S_IFSOCK s= 140000 socket (BSD; also "S_IFSOC" on VxFS) d000 S_IFDOOR D> 150000 Solaris door diff --git a/man2/sync_file_range.2 b/man2/sync_file_range.2 index 5c1781293b..82ed878981 100644 --- a/man2/sync_file_range.2 +++ b/man2/sync_file_range.2 @@ -172,7 +172,7 @@ Out of disk space. refers to something other than a regular file, a block device, a directory, or a symbolic link. .\" FIXME . (bug?) Actually, how can 'fd' refer to a symbolic link (S_ISLNK)? -.\" (In userspace at least) it isn't possible to obtain a file descriptor +.\" (In user space at least) it isn't possible to obtain a file descriptor .\" for a symbolic link. .SH VERSIONS .BR sync_file_range () diff --git a/man2/syscalls.2 b/man2/syscalls.2 index b9abf394e5..4bc23b7f73 100644 --- a/man2/syscalls.2 +++ b/man2/syscalls.2 @@ -624,7 +624,7 @@ and may never be in the standard kernel. There was briefly .BR set_zone_reclaim (2), added in Linux 2.6.13, and removed in 2.6.16; -this system call was never available to userspace. +this system call was never available to user space. .SH NOTES .PP Roughly speaking, the code belonging to the system call diff --git a/man2/timer_create.2 b/man2/timer_create.2 index 7e08911b9b..0d6360253b 100644 --- a/man2/timer_create.2 +++ b/man2/timer_create.2 @@ -238,12 +238,12 @@ is implemented within glibc, rather than the kernel. The timer IDs presented at user level are maintained by glibc, which maps these IDs to the timer IDs employed by the kernel. .\" See the glibc source file kernel-posix-timers.h for the structure -.\" that glibc uses to map userspace timer IDs to kernel timer IDs +.\" that glibc uses to map user-space timer IDs to kernel timer IDs .\" The kernel-level timer ID is exposed via siginfo.si_tid. .PP The POSIX timers system calls first appeared in Linux 2.6. Prior to this, -glibc provided an incomplete userspace implementation +glibc provided an incomplete user-space implementation .RB ( CLOCK_REALTIME timers only) using POSIX threads, and current glibc falls back to this implementation on systems diff --git a/man2/vm86.2 b/man2/vm86.2 index 49fb5e7965..b66cad3db5 100644 --- a/man2/vm86.2 +++ b/man2/vm86.2 @@ -58,7 +58,7 @@ is set appropriately. .TP .B EFAULT This return value is specific to i386 and indicates a problem with getting -userspace data. +user-space data. .TP .B ENOSYS This return value indicates the call is not implemented on the present |
