Merge from emacs-24; up to 2014-07-26T12:14:42Z!schwab@linux-m68k.org

diff --cc doc/emacs/ChangeLog
index b1be1416a770cb1696bb4589018078da363cd2d8,1626a156ea1481c564ec3582ca033b4710958a14..23e1d0dff76ae02087ca26ef3b87098313889ee8
--- 1/doc/emacs/ChangeLog
--- 2/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,9 -1,8 +1,13 @@@
 -2014-10-06  Glenn Morris  <rgm@gnu.org>
+ 2014-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+       * Makefile.in (dist): Update for new output variables.
+ 
 +2014-10-12  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * macos.texi (Mac OS / GNUstep, Mac / GNUstep Basics)
 +      (Mac / GNUstep Customization): Mac OS X 10.6 or later now required.
 +
 +2014-10-09  Glenn Morris  <rgm@gnu.org>
  
        * package.texi (Package Menu): The package list was changed to not
        say "unsigned" any more.

diff --cc doc/emacs/Makefile.in
Simple merge

diff --cc doc/lispintro/ChangeLog
index 70d7767635fe1d2d4626b73f7b41020920957399,72c6023bba7f0800e4226953dd59185e3867f05a..6ccac447134dc5623444f338bcf1636d3f1b0b30
--- 1/doc/lispintro/ChangeLog
--- 2/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@@ -1,4 -1,8 +1,8 @@@
 -2014-07-15  Álvar Jesús Ibeas Martín  <alvar.ibeas@unican.es>  (tiny change)
+ 2014-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+       * Makefile.in (dist): Update for new output variables.
+ 
 +2014-07-16  Álvar Jesús Ibeas Martín  <alvar.ibeas@unican.es>  (tiny change)
  
        * emacs-lisp-intro.texi (Variables, Buffer Names, if & or)
        (Symbols as Chest, fwd-para while): Fix typos.

diff --cc doc/lispintro/Makefile.in
Simple merge

diff --cc doc/lispref/ChangeLog
index 8ec524cc5348783de9ef4a17430f6e26e3e08d5c,272f21f4570dec146dd11ed1cef9736c60e9bb85..3955bd09b38c60f09b69db1470ff5e367bfb0479
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,8 +1,8 @@@
 -2014-10-09  Glenn Morris  <rgm@gnu.org>
+ 2014-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+       * Makefile.in (dist): Update for new output variables.
+ 
 +2014-10-12  Glenn Morris  <rgm@gnu.org>
  
        * elisp.texi (DATE): Bump to October 2014.
  

diff --cc doc/lispref/Makefile.in
Simple merge

diff --cc doc/misc/ChangeLog
index 70207de3b3ba70533dfa6b43f4d73d144e428494,f4291479ce10aa3196682363334b38494348b318..23c3e66b86ffa8b6d6506183b93ed068a13db909
--- 1/doc/misc/ChangeLog
--- 2/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
+ 2014-10-13  Glenn Morris  <rgm@gnu.org>
+ 
+       * Makefile.in (dist): Update for new output variables.
+ 
 +2014-10-08  Leo Liu  <sdl.web@gmail.com>
 +
 +      * cl.texi (Porting Common Lisp): Remove parse-integer.
 +
 +2014-10-06  Ulf Jasper  <ulf.jasper@web.de>
 +
 +      * newsticker.texi (Supported Formats): Fix order of subheading and
 +      itemize.
 +
  2014-10-04  Glenn Morris  <rgm@gnu.org>
  
        * vip.texi (Other Vi Commands): Markup fix.

diff --cc doc/misc/Makefile.in
Simple merge