merge from trunk

1 files changed, 16 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 554580c769a..4f1bb51c728 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,19 @@
+2013-08-27  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (webhack): Remove; it's nothing to do with Emacs.
+
+        * efaq-w32.texi: Move here from the web-pages repository.
+        * Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
+        (DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
+        (INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
+        (DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
+        Add DOCMISC_*_W32 variables.
+        (echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
+        (efaq_w32_deps): New variable.
+        (efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
+        (efaq-w32.pdf, efaq-w32.html): New rules.
+        (clean): Remove efaq-w32 products.
+
 2013-08-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * emacs-mime.texi (Encoding Customization): Exclude iso-2022-jp-2 and