aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man2/capget.24
-rw-r--r--man2/madvise.22
-rw-r--r--man2/pciconfig_read.22
-rw-r--r--man2/ptrace.26
-rw-r--r--man2/sigaction.216
-rw-r--r--man3/setaliasent.32
-rw-r--r--man5/locale.52
-rw-r--r--man5/proc.510
-rw-r--r--man5/utmp.58
-rw-r--r--man7/epoll.72
-rw-r--r--man7/posixoptions.72
-rw-r--r--man7/signal.72
-rw-r--r--man7/spufs.72
-rw-r--r--man7/tcp.72
14 files changed, 31 insertions, 31 deletions
diff --git a/man2/capget.2 b/man2/capget.2
index ba44870a1f..913cf8fbc3 100644
--- a/man2/capget.2
+++ b/man2/capget.2
@@ -72,7 +72,7 @@ The calls will return
and set the
.I version
field of
-.I hdr
+.I hdrp
to
.B _LINUX_CAPABILITY_VERSION
when another version was specified.
@@ -80,7 +80,7 @@ when another version was specified.
The calls operate on the capabilities of the thread specified by the
.I pid
field of
-.I hdr
+.I hdrp
when that is non-zero, or on the capabilities of the calling thread if
.I pid
is 0.
diff --git a/man2/madvise.2 b/man2/madvise.2
index bddfa2791d..9539c7eb16 100644
--- a/man2/madvise.2
+++ b/man2/madvise.2
@@ -111,7 +111,7 @@ error
Do not make the pages in this range available to the child after a
.BR fork (2).
This is useful to prevent copy-on-write semantics from changing
-the physical location of a pagei(s) if the parent writes to it after a
+the physical location of a page(s) if the parent writes to it after a
.BR fork (2).
(Such page relocations cause problems for hardware that
DMAs into the page(s).)
diff --git a/man2/pciconfig_read.2 b/man2/pciconfig_read.2
index 29578a75c2..8c5b64f802 100644
--- a/man2/pciconfig_read.2
+++ b/man2/pciconfig_read.2
@@ -55,7 +55,7 @@ the IO base for PIO cycles, or the ISA holes if any.
.BR pciconfig_read ()
On success zero is returned.
On error, \-1 is returned and
-,I errno
+.I errno
is set appropriately.
.TP
.BR pciconfig_write ()
diff --git a/man2/ptrace.2 b/man2/ptrace.2
index a02f1acd4a..404e1d96c1 100644
--- a/man2/ptrace.2
+++ b/man2/ptrace.2
@@ -131,7 +131,7 @@ Reads a word at offset
.I addr
in the child's USER area,
which holds the registers and other information about the process
-(see \fI<linux/user.h>\fP and <sys/user.h>).
+(see \fI<linux/user.h>\fP and \fI<sys/user.h>\fP).
The word is returned as the result of the
.BR ptrace ()
call.
@@ -169,7 +169,7 @@ Copies a \fIsiginfo_t\fP structure (see
from the child to location \fIdata\fP in the parent.
(\fIaddr\fP is ignored.)
.TP
-.BR PTRACE_SETREGS " , " PTRACE_SETFPREGS
+.BR PTRACE_SETREGS ", " PTRACE_SETFPREGS
Copies the child's general purpose or floating-point registers,
respectively, from location \fIdata\fP in the parent.
As for
@@ -325,7 +325,7 @@ and inspect the return value of
the system call at the second stop.
(\fIaddr\fP is ignored.)
.TP
-.BR PTRACE_SYSEMU " , " PTRACE_SYSEMU_SINGLESTEP " (since Linux 2.6.14)"
+.BR PTRACE_SYSEMU ", " PTRACE_SYSEMU_SINGLESTEP " (since Linux 2.6.14)"
For
.BR PTRACE_SYSEMU ,
continue and stop on entry to the next syscall,
diff --git a/man2/sigaction.2 b/man2/sigaction.2
index dea88862e1..891773b096 100644
--- a/man2/sigaction.2
+++ b/man2/sigaction.2
@@ -267,7 +267,7 @@ fills in
.I si_code
is a value (not a bit mask)
indicating why this signal was sent.
-The following list shows the values can be placed in
+The following list shows the values which can be placed in
.I si_code
for any signal, along with reason that the signal was generated.
.RS 4
@@ -306,7 +306,7 @@ or
.\" through to 2.5.24 and then was backed out.
.RE
.PP
-The following values can be place in
+The following values can be placed in
.I si_code
for a
.B SIGILL
@@ -338,7 +338,7 @@ coprocessor error
internal stack error
.RE
.PP
-The following values can be place in
+The following values can be placed in
.I si_code
for a
.B SIGFPE
@@ -370,7 +370,7 @@ floating point invalid operation
subscript out of range
.RE
.PP
-The following values can be place in
+The following values can be placed in
.I si_code
for a
.B SIGSEGV
@@ -384,7 +384,7 @@ address not mapped to object
invalid permissions for mapped object
.RE
.PP
-The following values can be place in
+The following values can be placed in
.I si_code
for a
.B SIGBUS
@@ -401,7 +401,7 @@ non-existent physical address
object specific hardware error
.RE
.PP
-The following values can be place in
+The following values can be placed in
.I si_code
for a
.B SIGTRAP
@@ -415,7 +415,7 @@ process breakpoint
process trace trap
.RE
.PP
-The following values can be place in
+The following values can be placed in
.I si_code
for a
.B SIGCHLD
@@ -441,7 +441,7 @@ child has stopped
stopped child has continued (since Linux 2.6.9)
.RE
.PP
-The following values can be place in
+The following values can be placed in
.I si_code
for a
.B SIGPOLL
diff --git a/man3/setaliasent.3 b/man3/setaliasent.3
index 808ad71c14..bd5bf4ef10 100644
--- a/man3/setaliasent.3
+++ b/man3/setaliasent.3
@@ -75,7 +75,7 @@ is defined in
.nf
struct aliasent {
- char *alias_name; /* alias name */
+ char *alias_name; /* alias name */
size_t alias_members_len;
char **alias_members; /* alias name list */
int alias_local;
diff --git a/man5/locale.5 b/man5/locale.5
index ad3dbef575..b3b8a77b62 100644
--- a/man5/locale.5
+++ b/man5/locale.5
@@ -347,7 +347,7 @@ if the
.I currency_symbol
or
.I int_curr_symbol
- should precede the formatted monetary quantity or set to
+should precede the formatted monetary quantity or set to
.B 0
if the symbol succeeds the value.
.TP
diff --git a/man5/proc.5 b/man5/proc.5
index f822becaec..afe7db7ee5 100644
--- a/man5/proc.5
+++ b/man5/proc.5
@@ -880,7 +880,7 @@ use
apart from debugging.
The 'sl' value is the kernel hash slot for the
socket,
-the 'local address' is the local address and protocol number pair."St" is
+the 'local_address' is the local address and protocol number pair. "St" is
the internal status of the socket.
The "tx_queue" and "rx_queue" are the
outgoing and incoming data queue in terms of kernel memory usage.
@@ -902,8 +902,8 @@ Holds a dump of the TCP socket table.
Much of the information is not
of use apart from debugging.
The "sl" value is the kernel hash slot
-for the socket, the "local address" is the local address and port number pair.
-The "remote address" is the remote address and port number pair
+for the socket, the "local_address" is the local address and port number pair.
+The "rem_address" is the remote address and port number pair
(if connected). 'St' is the internal status of the socket.
The 'tx_queue' and 'rx_queue' are the
outgoing and incoming data queue in terms of kernel memory usage.
@@ -917,8 +917,8 @@ Holds a dump of the UDP socket table.
Much of the information is not of
use apart from debugging.
The "sl" value is the kernel hash slot for the
-socket, the "local address" is the local address and port number pair.
-The "remote address" is the remote address and port number pair
+socket, the "local_address" is the local address and port number pair.
+The "rem_address" is the remote address and port number pair
(if connected). "St" is the internal status of the socket.
The "tx_queue" and "rx_queue" are the outgoing and incoming data queue
in terms of kernel memory usage.
diff --git a/man5/utmp.5 b/man5/utmp.5
index e7c7b4310f..b734184f11 100644
--- a/man5/utmp.5
+++ b/man5/utmp.5
@@ -94,12 +94,12 @@ struct utmp {
int32_t tv_usec; /* Microseconds */
} ut_tv; /* Time entry was made */
#else
- long int ut_session; /* Session ID, used for windowing */
- struct timeval ut_tv; /* Time entry was made */
+ long int ut_session; /* Session ID, used for windowing */
+ struct timeval ut_tv; /* Time entry was made */
#endif
- int32_t ut_addr_v6[4]; /* IP address of remote host */
- char __unused[20]; /* Reserved for future use */
+ int32_t ut_addr_v6[4]; /* IP address of remote host */
+ char __unused[20]; /* Reserved for future use */
};
/* Backwards compatibility hacks. */
diff --git a/man7/epoll.7 b/man7/epoll.7
index 59176baf1a..03e1fe4cd0 100644
--- a/man7/epoll.7
+++ b/man7/epoll.7
@@ -334,7 +334,7 @@ by asking to read a certain amount of data and
returns a lower number of bytes,
you can be sure of having exhausted the read
I/O space for such file descriptor.
-The same is true when writing using the
+The same is true when writing using
.BR write (2).
.SS Possible Pitfalls and Ways to Avoid Them
.TP
diff --git a/man7/posixoptions.7 b/man7/posixoptions.7
index 436c909203..6327bc8f18 100644
--- a/man7/posixoptions.7
+++ b/man7/posixoptions.7
@@ -25,7 +25,7 @@
posixoptions \- optional parts of the POSIX standard
.SH DESCRIPTION
The POSIX standard (the information below is from POSIX.1-2001)
-describes a set of behavior and interfaces for a compliant system.
+describes a set of behaviors and interfaces for a compliant system.
However, many interfaces are optional and there are feature test macros
to test the availability of interfaces at compile time, and functions
.BR sysconf (3),
diff --git a/man7/signal.7 b/man7/signal.7
index 3cccdcfe06..4c08c72ae9 100644
--- a/man7/signal.7
+++ b/man7/signal.7
@@ -66,7 +66,7 @@ A process can change the disposition of a signal using
or (less portably)
.BR signal (2).
Using these system calls, a process can elect one of the
-following behavior to occur on delivery of the signal:
+following behaviors to occur on delivery of the signal:
perform the default action; ignore the signal;
or catch the signal with a
.IR "signal handler" ,
diff --git a/man7/spufs.7 b/man7/spufs.7
index 738d3e4ceb..e28b629a16 100644
--- a/man7/spufs.7
+++ b/man7/spufs.7
@@ -350,7 +350,7 @@ previous setting.
.B /fpcr
This file provides access to the Floating Point Status and
Control Register as a four-byte file.
-The operations on the
+The possible operations on the
.I fpcr
file are:
.RS
diff --git a/man7/tcp.7 b/man7/tcp.7
index 577e9563e8..1ea909e10c 100644
--- a/man7/tcp.7
+++ b/man7/tcp.7
@@ -828,7 +828,7 @@ returns false.
.B SIOCOUTQ
Returns the amount of unsent data in the socket send queue.
The socket must not be in LISTEN state, otherwise an error
-.BR ( EINVAL )
+.RB ( EINVAL )
is returned.
.SS Error Handling
When a network error occurs, TCP tries to resend the packet.