about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--NEWS2
-rw-r--r--socket/sys/socket.h2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 28a62f4be3..808ea106b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2014-04-28  Ondřej Bílka  <neleai@seznam.cz>
+
+	[BZ #16854]
+	* socket/sys/socket.h: Fix typo in comment.
+
 2014-04-28  Wilco  <wdijkstr@arm.com>
 
-        * sysdeps/arm/fenv_private.h: New file.
+	* sysdeps/arm/fenv_private.h: New file.
 	* sysdeps/arm/math_private.h: New file.
 	* sysdeps/arm/fpu_control.h: Add _FPU_MASK_NCZV and _FPU_MASK_EXCEPT.
 
diff --git a/NEWS b/NEWS
index a8a6ea8fc0..48498dfcc2 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,7 @@ Version 2.20
   16642, 16648, 16649, 16670, 16674, 16677, 16680, 16683, 16689, 16695,
   16701, 16706, 16707, 16712, 16713, 16714, 16731, 16739, 16740, 16743,
   16758, 16759, 16760, 16770, 16786, 16789, 16799, 16800, 16815, 16824,
-  16831, 16838.
+  16831, 16838, 16854.
 
 * Running the testsuite no longer terminates as soon as a test fails.
   Instead, a file tests.sum (xtests.sum from "make xcheck") is generated,
diff --git a/socket/sys/socket.h b/socket/sys/socket.h
index c0f3ee65ec..95ee26ab11 100644
--- a/socket/sys/socket.h
+++ b/socket/sys/socket.h
@@ -203,7 +203,7 @@ extern ssize_t recvmsg (int __fd, struct msghdr *__message, int __flags);
 
 #ifdef __USE_GNU
 /* Receive up to VLEN messages as described by VMESSAGES from socket FD.
-   Returns the number of bytes read or -1 for errors.
+   Returns the number of messages received or -1 for errors.
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */