Merge changes between r10807 and r11185 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@11186 7b3dc134-2b1b-0410-93df-9e9f96275f8d

3 files changed, 8 insertions, 2 deletions

diff --git a/libc/manual/arith.texi b/libc/manual/arith.texi
index b1580a06f..1b8a8c3d6 100644
--- a/libc/manual/arith.texi
+++ b/libc/manual/arith.texi
@@ -1407,7 +1407,8 @@ do not raise the inexact exception if @var{x} is not an integer.
 @comment ISO
 @deftypefunx {long double} roundl (long double @var{x})
 These functions are similar to @code{rint}, but they round halfway
-cases away from zero instead of to the nearest even integer.
+cases away from zero instead of to the nearest integer (or other
+current rounding mode).
 @end deftypefun
 
 @comment math.h
diff --git a/libc/manual/locale.texi b/libc/manual/locale.texi
index e3e0563a3..d1a50cb0f 100644
--- a/libc/manual/locale.texi
+++ b/libc/manual/locale.texi
@@ -1210,7 +1210,7 @@ This function would normally be used like this:
   /* @r{Prepare the @code{getline} call.}  */
   line = NULL;
   len = 0;
-  while (getline (&line, &len, stdout) >= 0)
+  while (getline (&line, &len, stdin) >= 0)
     @{
       /* @r{Check the response.}  */
       int res = rpmatch (line);
diff --git a/libc/manual/memory.texi b/libc/manual/memory.texi
index 59ea1ee34..db63c3313 100644
--- a/libc/manual/memory.texi
+++ b/libc/manual/memory.texi
@@ -702,6 +702,11 @@ be allocated via @code{mmap}.
 @item M_MMAP_MAX
 The maximum number of chunks to allocate with @code{mmap}.  Setting this
 to zero disables all use of @code{mmap}.
+@item M_PERTURB
+If non-zero, memory blocks are filled with values depending on some
+low order bits of this parameter when they are allocated (except when
+allocated by @code{calloc}) and freed.  This can be used to debug the
+use of uninitialized or freed heap memory.
 @end table
 
 @end deftypefun