* doc/lispref/numbers.texi (Numeric Conversions): Fix a typo.

Also some ChangeLog fixes.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b9e0fb9199d87556cf3c111a9dcf2e882c1e7ab8..6df7f1416c98306b1b3eb750354400a0fb7f8412 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-02  Glenn Morris  <rgm@gnu.org>
+
+       * numbers.texi (Numeric Conversions): Fix a typo.
+
 2013-12-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        Plain copy-file no longer chmods an existing destination (Bug#16133).
@@ -1355,14 +1359,16 @@
        Tweak markup.  Remove domain-error and friends, which seem to be
        unused after the floating-point code revamp.
 
-       * functions.texi (Obsolete Functions): Obsolescence also affects
+       * functions.texi (Defining Functions): defun is now a macro.
+       (Obsolete Functions): Obsolescence also affects
        documentation commands.  Various clarifications.
        (Declare Form): New node.
 
        * strings.texi (String Basics): Copyedits.
 
-       * os.texi (Idle Timers): Minor clarifications.
+       * os.texi (Startup Summary): Document leim-list.el change.
        (User Identification): Add system-users and system-groups.
+       (Idle Timers): Minor clarifications.
 
        * macros.texi (Defining Macros): Move description of `declare' to
        Declare Form node.
@@ -1378,14 +1384,6 @@
        the machine-independence of negative division since it does not
        happen in practice.
 
-2012-09-28  Chong Yidong  <cyd@gnu.org>
-
-       * os.texi (Startup Summary): Document leim-list.el change.
-
-2012-09-25  Chong Yidong  <cyd@gnu.org>
-
-       * functions.texi (Defining Functions): defun is now a macro.
-
 2012-09-28  Leo Liu  <sdl.web@gmail.com>
 
        * files.texi (Files): Fix typo.

diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index 5bff56e4cee1c5f2e809efc88dc99d93ca9459af..2e8fefed1c5e16278b5ce6519411ee4b44f3244c 100644 (file)
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -447,7 +447,7 @@ may be integers or floating point numbers.  @var{divisor} may also be
 functions convert @var{number} to an integer, or return it unchanged
 if it already is an integer.  If @var{divisor} is non-@code{nil}, they
 divide @var{number} by @var{divisor} and convert the result to an
-integer.  integer.  If @var{divisor} is zero (whether integer or
+integer.  If @var{divisor} is zero (whether integer or
 floating-point), Emacs signals an @code{arith-error} error.
 
 @defun truncate number &optional divisor