Misc small doc updates

* doc/emacs/ack.texi (Acknowledgments): No longer mention obsolete terminal.el.

* doc/misc/efaq.texi (Termcap/Terminfo entries for Emacs):
Use M-x term rather than M-x terminal-emulator.

* etc/NEWS: Related markup.

5 files changed, 13 insertions, 6 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index bcb9e69230d..7e42d0fcaba 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,6 +1,7 @@
 2014-01-24  Glenn Morris  <rgm@gnu.org>
 
-        * ack.texi (Acknowledgments): No longer mention obsolete xesam.el.
+        * ack.texi (Acknowledgments): No longer mention obsolete xesam.el,
+        terminal.el.
 
         * files.texi (Interlocking): Copyedit.
 
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index b3b21a277e9..b2fa245b032 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -818,9 +818,12 @@ command with its arguments.
 Richard Mlynarik wrote @file{cl-indent.el}, a package for indenting
 Common Lisp code; @file{ebuff-menu.el}, an ``electric'' browser for
 buffer listings; @file{ehelp.el}, bindings for browsing help screens;
-@file{rfc822.el}, a parser for E-mail addresses in the RFC-822 format,
-used in mail messages and news articles; and @file{terminal.el}, a
-terminal emulator for Emacs subprocesses.
+and @file{rfc822.el}, a parser for E-mail addresses in the RFC-822 format,
+used in mail messages and news articles.
+@ignore
+@c Obsolete since 24.4
+; and @file{terminal.el}, a terminal emulator for Emacs subprocesses.
+@end ignore.
 
 @item
 Gerd Möllmann was the Emacs maintainer from the beginning of Emacs 21
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d065f22a97a..571e7ecc70d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,8 @@
 2014-01-24  Glenn Morris  <rgm@gnu.org>
 
+        * efaq.texi (Termcap/Terminfo entries for Emacs):
+        Use M-x term rather than M-x terminal-emulator.
+
         * emacs-mime.texi (time-date): Use float-time.
 
 2014-01-22  David Engster  <deng@randomsample.de>
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index c54423e887e..e840cc26b80 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -2853,8 +2853,7 @@ To make a terminfo entry for @samp{emacs}, use @code{tic} or
 @file{/usr/lib/terminfo/d/dumb} to @file{/usr/lib/terminfo/e/emacs}.
 
 Having a termcap/terminfo entry will not enable the use of full screen
-programs in shell buffers.  Use @kbd{M-x terminal-emulator} for that
-instead.
+programs in shell buffers.  Use @kbd{M-x term} for that instead.
 
 A workaround to the problem of missing termcap/terminfo entries is to
 change terminal type @samp{emacs} to type @samp{dumb} or @samp{unknown}
diff --git a/etc/NEWS b/etc/NEWS
index 89d78d79efb..98fe06f74e6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -864,6 +864,7 @@ are obsolete.  Customize the `woman-*' faces instead.
 +++
 *** sup-mouse.el.
 
+---
 *** terminal.el is obsolete; use term.el instead.
 
 *** The previous version of todo-mode.el is obsolete and renamed otodo-mode.el.