* 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.

2 files changed, 2 insertions, 3 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index f92fa8930b5..245c809ec81 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,7 +1,7 @@
 2013-08-27  Glenn Morris  <rgm@gnu.org>
 
         * 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  <rgm@gnu.org>
 
diff --git a/admin/admin.el b/admin/admin.el
index 875db2948e5..f8ca8aec261 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -289,9 +289,8 @@ Optional argument TYPE is type of output (nil means all)."
 
 (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))