Merge from emacs-24 branch

[gnu-emacs] / doc / emacs / ack.texi

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 17054c303293d9c1d432b3b606ab8b66620d6bfc..51f6d70bd904f6b99e7e8da2fe33d79dc87d4b0b 100644 (file)
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -690,8 +690,8 @@ directory-local variables; and the @code{info-finder} feature that
 creates a virtual Info manual of package keywords.
 
 @item
-Károly L@H{o}rentey wrote the ``multi-terminal'' code, which allows Emacs to
-run on graphical and text-only terminals simultaneously.
+Károly L@H{o}rentey wrote the ``multi-terminal'' code, which allows
+Emacs to run on graphical and text terminals simultaneously.
 
 @item
 Martin Lorentzon wrote @file{vc-annotate.el}, support for version