emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r114030: * doc/misc/efaq.texi: Rename from faq.texi,


From: Glenn Morris
Subject: [Emacs-diffs] trunk r114030: * doc/misc/efaq.texi: Rename from faq.texi, to match its output files.
Date: Tue, 27 Aug 2013 17:19:09 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 114030
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-27 13:19:04 -0400
message:
  * doc/misc/efaq.texi: Rename from faq.texi, to match its output files.
  
  * doc/misc/Makefile.in: Update for faq.texi name change.
  
  * admin/admin.el (manual-misc-manuals): "faq" does not need special
    treatment any more.
renamed:
  doc/misc/faq.texi => doc/misc/efaq.texi 
faq.texi-20091113204419-o5vbwnq5f7feedwu-6301
modified:
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/admin.el                 admin.el-20091113204419-o5vbwnq5f7feedwu-2254
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/Makefile.in           
makefile.in-20091113204419-o5vbwnq5f7feedwu-6287
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2013-08-27 07:57:39 +0000
+++ b/admin/ChangeLog   2013-08-27 17:19:04 +0000
@@ -1,7 +1,7 @@
 2013-08-27  Glenn Morris  <address@hidden>
 
        * admin.el (manual-misc-manuals): Use INFO_COMMON rather than
-       INFO_TARGETS.
+       INFO_TARGETS.  "faq" does not need special treatment any more.
 
 2013-08-15  Glenn Morris  <address@hidden>
 

=== modified file 'admin/admin.el'
--- a/admin/admin.el    2013-08-27 07:57:39 +0000
+++ b/admin/admin.el    2013-08-27 17:19:04 +0000
@@ -289,9 +289,8 @@
 
 (defun manual-misc-html (name root html-node-dir html-mono-dir)
   ;; Hack to deal with the cases where .texi creates a different .info.
-  ;; Blech.  TODO Why not just rename the .texi files?
+  ;; Blech.  TODO Why not just rename the .texi (or .info) files?
   (let* ((texiname (cond ((equal name "ccmode") "cc-mode")
-                        ((equal name "efaq") "faq")
                         (t name)))
         (texi (expand-file-name (format "doc/misc/%s.texi" texiname) root)))
     (manual-html-node texi (expand-file-name name html-node-dir))

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-08-27 08:14:58 +0000
+++ b/doc/misc/ChangeLog        2013-08-27 17:19:04 +0000
@@ -1,5 +1,8 @@
 2013-08-27  Glenn Morris  <address@hidden>
 
+       * efaq.texi: Rename from faq.texi, to match its output files.
+       * Makefile.in: Update for faq.texi name change.
+
        * efaq-w32.texi (EMACSVER): Get it from emacsver.texi.
 
        * Makefile.in (webhack): Remove; it's nothing to do with Emacs.

=== modified file 'doc/misc/Makefile.in'
--- a/doc/misc/Makefile.in      2013-08-27 08:04:08 +0000
+++ b/doc/misc/Makefile.in      2013-08-27 17:19:04 +0000
@@ -98,6 +98,7 @@
        ede.dvi \
        ediff.dvi \
        edt.dvi \
+       efaq.dvi \
        eieio.dvi \
        emacs-mime.dvi \
        epa.dvi \
@@ -105,7 +106,6 @@
        ert.dvi \
        eshell.dvi \
        eudc.dvi \
-       faq.dvi \
        flymake.dvi \
        forms.dvi \
        gnus.dvi \
@@ -156,6 +156,7 @@
        ede.html \
        ediff.html \
        edt.html \
+       efaq.html \
        eieio.html \
        emacs-mime.html \
        epa.html \
@@ -163,7 +164,6 @@
        ert.html \
        eshell.html \
        eudc.html \
-       faq.html \
        flymake.html \
        forms.html \
        gnus.html \
@@ -214,6 +214,7 @@
        ede.pdf \
        ediff.pdf \
        edt.pdf \
+       efaq.pdf \
        eieio.pdf \
        emacs-mime.pdf \
        epa.pdf \
@@ -221,7 +222,6 @@
        ert.pdf \
        eshell.pdf \
        eudc.pdf \
-       faq.pdf \
        flymake.pdf \
        forms.pdf \
        gnus.pdf \
@@ -272,6 +272,7 @@
        ede.ps \
        ediff.ps \
        edt.ps \
+       efaq.ps \
        eieio.ps \
        emacs-mime.ps \
        epa.ps \
@@ -279,7 +280,6 @@
        ert.ps \
        eshell.ps \
        eudc.ps \
-       faq.ps \
        flymake.ps \
        forms.ps \
        gnus.ps \
@@ -515,6 +515,31 @@
 edt.html: $(edt_deps)
        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/edt.texi
 
+## No gfdl dependency.
+efaq_deps = ${srcdir}/efaq.texi $(emacsdir)/emacsver.texi
+efaq : $(buildinfodir)/efaq$(INFO_EXT)
+$(buildinfodir)/efaq$(INFO_EXT): $(efaq_deps)
+       $(mkinfodir)
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/efaq.texi
+efaq.dvi: $(efaq_deps)
+       $(ENVADD) $(TEXI2DVI) ${srcdir}/efaq.texi
+efaq.pdf: $(efaq_deps)
+       $(ENVADD) $(TEXI2PDF) ${srcdir}/efaq.texi
+efaq.html: $(efaq_deps)
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/efaq.texi
+
+efaq_w32_deps = ${srcdir}/efaq-w32.texi $(emacsdir)/emacsver.texi
+efaq-w32 : $(buildinfodir)/efaq-w32$(INFO_EXT)
+$(buildinfodir)/efaq-w32$(INFO_EXT): $(efaq_w32_deps)
+       $(mkinfodir)
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/efaq-w32.texi
+efaq-w32.dvi: $(efaq_w32_deps)
+       $(ENVADD) $(TEXI2DVI) ${srcdir}/efaq-w32.texi
+efaq-w32.pdf: $(efaq_w32_deps)
+       $(ENVADD) $(TEXI2PDF) ${srcdir}/efaq-w32.texi
+efaq-w32.html: $(efaq_w32_deps)
+       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/efaq-w32.texi
+
 eieio_deps = ${srcdir}/eieio.texi ${gfdl}
 eieio : $(buildinfodir)/eieio$(INFO_EXT)
 $(buildinfodir)/eieio$(INFO_EXT): $(eieio_deps)
@@ -611,31 +636,6 @@
 eudc.html: $(eudc_deps)
        $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/eudc.texi
 
-## No gfdl dependency.
-faq_deps = ${srcdir}/faq.texi $(emacsdir)/emacsver.texi
-efaq : $(buildinfodir)/efaq$(INFO_EXT)
-$(buildinfodir)/efaq$(INFO_EXT): $(faq_deps)
-       $(mkinfodir)
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/faq.texi
-faq.dvi: $(faq_deps)
-       $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
-faq.pdf: $(faq_deps)
-       $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi
-faq.html: $(faq_deps)
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/faq.texi
-
-efaq_w32_deps = ${srcdir}/efaq-w32.texi $(emacsdir)/emacsver.texi
-efaq-w32 : $(buildinfodir)/efaq-w32$(INFO_EXT)
-$(buildinfodir)/efaq-w32$(INFO_EXT): $(efaq_w32_deps)
-       $(mkinfodir)
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/efaq-w32.texi
-efaq-w32.dvi: $(efaq_w32_deps)
-       $(ENVADD) $(TEXI2DVI) ${srcdir}/efaq-w32.texi
-efaq-w32.pdf: $(efaq_w32_deps)
-       $(ENVADD) $(TEXI2PDF) ${srcdir}/efaq-w32.texi
-efaq-w32.html: $(efaq_w32_deps)
-       $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ ${srcdir}/efaq-w32.texi
-
 flymake_deps = ${srcdir}/flymake.texi ${gfdl}
 flymake : $(buildinfodir)/flymake$(INFO_EXT)
 $(buildinfodir)/flymake$(INFO_EXT): $(flymake_deps)

=== renamed file 'doc/misc/faq.texi' => 'doc/misc/efaq.texi'

reply via email to

[Prev in Thread] Current Thread [Next in Thread]