aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kerrisk <mtk.manpages@gmail.com>2014-03-26 06:10:59 +0100
committerMichael Kerrisk <mtk.manpages@gmail.com>2014-03-26 07:33:17 +0100
commiteebf8c09a40aaf79ebebe0f3f58d902657c62fea (patch)
tree15d26bb81d7021483753e24aa8c5927d435333ed
parent4d196edb825edfa3599494fdcce24c4f15270b5d (diff)
downloadman-pages-eebf8c09a40aaf79ebebe0f3f58d902657c62fea.tar.gz
socket.7: grfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
-rw-r--r--man7/socket.74
1 files changed, 2 insertions, 2 deletions
diff --git a/man7/socket.7 b/man7/socket.7
index 824982f0c7..a901cb22c4 100644
--- a/man7/socket.7
+++ b/man7/socket.7
@@ -345,7 +345,7 @@ This option has no effect on stream-oriented sockets.
.B SO_BSDCOMPAT
Enable BSD bug-to-bug compatibility.
This is used by the UDP protocol module in Linux 2.0 and 2.2.
-If enabled ICMP errors received for a UDP socket will not be passed
+If enabled, ICMP errors received for a UDP socket will not be passed
to the user program.
In later kernel versions, support for this option has been phased out:
Linux 2.4 silently ignores it, and Linux 2.6 generates a kernel warning
@@ -632,7 +632,7 @@ or
(for
.BR connect (2))
just as if the socket was specified to be nonblocking.
-If the timeout is set to zero (the default)
+If the timeout is set to zero (the default),
then the operation will never timeout.
Timeouts only have effect for system calls that perform socket I/O (e.g.,
.BR read (2),