about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-07-06 07:49:58 -0700
committerUlrich Drepper <drepper@redhat.com>2010-07-06 07:49:58 -0700
commiteb5e79feb71e6a9bf7fcb59a5e2c56ab09a08868 (patch)
treee411ac63adce3d0c37c572dad72396999eade40a
parent8a492a675e566dc1e666df0a86cbf541442cb179 (diff)
parent713df3d547041fddea30fa78c52dd0615bfd4c24 (diff)
downloadglibc-eb5e79feb71e6a9bf7fcb59a5e2c56ab09a08868.tar.gz
glibc-eb5e79feb71e6a9bf7fcb59a5e2c56ab09a08868.tar.xz
glibc-eb5e79feb71e6a9bf7fcb59a5e2c56ab09a08868.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
-rw-r--r--ChangeLog5
-rw-r--r--manual/arith.texi3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 946e9455ce..a649f09ce7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* sysdeps/unix/sysv/linux/fpathconf.c (__fpathconf): Implement
 	_PC_PIPE_BUF using F_GETPIPE_SZ.
 
+2010-07-05  Roland McGrath  <roland@redhat.com>
+
+	* manual/arith.texi (Rounding Functions): Fix rint description
+	implicit in round description.
+
 2010-07-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* elf/Makefile: Fix linking for a few tests to make recent linker
diff --git a/manual/arith.texi b/manual/arith.texi
index b1580a06f5..1b8a8c3d68 100644
--- a/manual/arith.texi
+++ b/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