ChangeLog fixes

3 files changed, 28 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 52d13cdc87a..86e684a9e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,8 +4,7 @@
         2014-01-20 stdalign: port to HP-UX compilers
         2014-01-16 strtoimax: port to platforms lacking 'long long'
         2014-01-16 update from texinfo
-        * doc/misc/texinfo.tex, lib/stdalign.in.h, lib/strtoimax.c:
-        Update from gnulib.
+        * lib/stdalign.in.h, lib/strtoimax.c: Update from gnulib.
 
 2014-01-12  Glenn Morris  <rgm@gnu.org>
 
@@ -1747,11 +1746,6 @@
         Merge from gnulib, incorporating:
         2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases
 
-2012-09-19  Tassilo Horn  <tsdh@gnu.org>
-
-        * doc/emacs/misc.texi (DocView Slicing): Document new slice from
-        BoundingBox feature.
-
 2012-09-18  Jan Djärv  <jan.h.d@swipnet.se>
 
         * configure.ac (HAVE_GTK): Mention if we use GTK2 or GTK3.
@@ -2188,11 +2182,6 @@
         * configure.ac (opsysfile): Set to empty on aix4-2, freebsd,
         gnu-linux, gnu-kfreebsd; and to usg5-4-common.h on sol2*, unixware.
 
-2012-07-30  Paul Eggert  <eggert@cs.ucla.edu>
-
-        Merge from gnulib, incorporating:
-        * doc/misc/texinfo.tex: Update to 2012-07-29.17 version.
-
 2012-07-29  Jan Djärv  <jan.h.d@swipnet.se>
 
         * Makefile.in (install-arch-indep): Handle space in locallisppath.
@@ -2714,7 +2703,7 @@
         New files.
         * build-aux/move-if-change, build-aux/snippet/_Noreturn.h:
         * build-aux/snippet/arg-nonnull.h, build-aux/snippet/c++defs.h:
-        * build-aux/snippet/warn-on-use.h, doc/misc/texinfo.tex:
+        * build-aux/snippet/warn-on-use.h:
         * lib/alloca.in.h, lib/allocator.h, lib/careadlinkat.c:
         * lib/careadlinkat.h, lib/dosname.h, lib/dup2.c, lib/filemode.c:
         * lib/filemode.h, lib/ftoastr.c, lib/ftoastr.h, lib/getloadavg.c:
@@ -3340,7 +3329,7 @@
         * Makefile.in (GNULIB_TOOL_FLAGS): Avoid msvc-inval, msvc-nothrow,
         pathmax, and raise, since these are needed only to address
         MSVC-related issues that Emacs doesn't have.
-        * doc/misc/texinfo.tex, lib/dup2.c, lib/gnulib.mk, lib/signal.in.h:
+        * lib/dup2.c, lib/gnulib.mk, lib/signal.in.h:
         * lib/sigprocmask.c, lib/stat.c, lib/stdio.in.h, lib/sys_stat.in.h:
         * lib/unistd.in.h, m4/dup2.m4, m4/getloadavg.m4, m4/gl-comp.m4:
         * m4/include_next.m4, m4/signal_h.m4, m4/signalblocking.m4:
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 76f949b9c23..c18620664db 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -803,6 +803,11 @@
 
         * trouble.texi (Crashing): Document addr2line.
 
+2012-09-19  Tassilo Horn  <tsdh@gnu.org>
+
+        * misc.texi (DocView Slicing): Document new slice from
+        BoundingBox feature.
+
 2012-09-19  Chong Yidong  <cyd@gnu.org>
 
         * killing.texi (Yanking): Minor clarification (Bug#12469).
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 394bb30ebfb..bd0763c78d5 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * texinfo.tex: Update from gnulib.
+
 2014-01-15  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (eww_deps): Does not depend on emacsver.texi.
@@ -761,6 +765,10 @@
         (efaq-w32.pdf, efaq-w32.html): New rules.
         (clean): Remove efaq-w32 products.
 
+2013-08-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * texinfo.tex: Update from gnulib.
+
 2013-08-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * emacs-mime.texi (Encoding Customization): Exclude iso-2022-jp-2 and
@@ -902,6 +910,10 @@
         `gnus-subthread-sort-functions' and remove the obsolete documentation
         of `gnus-sort-threads-recursively'.
 
+2012-07-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * texinfo.tex: Update to 2012-07-29.17 version.
+
 2013-07-29  David Engster  <deng@randomsample.de>
 
         * eieio.texi (top): Make clear that EIEIO is not a full CLOS
@@ -2245,6 +2257,10 @@
 
         * org.texi (Durations and time values): Fix typo.
 
+2012-05-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * texinfo.tex: Update from gnulib.
+
 2012-05-19  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc.texi (Basic Operations on Units, Customizing Calc):
@@ -2877,6 +2893,10 @@
         * gnus.texi (Gnus Utility Functions): Add more references and
         explanations (bug#9683).
 
+2011-09-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * texinfo.tex: Merge from gnulib.
+
 2011-09-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus.texi (Archived Messages): Note the default (bug#9552).