Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-305
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-306
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-307
   Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo.

 * emacs@sv.gnu.org/emacs--devo--0--patch-308
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-309
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-310
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-311
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-312
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-313
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-314
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-315
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-316
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-317
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-318
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-319
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-320
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-321
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-322
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-323
   lisp/play/cookie1.el (cookie): Work properly when there's only one entry

 * emacs@sv.gnu.org/emacs--devo--0--patch-324
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-325
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-326
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-327
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-328
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-329
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-330
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-105
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-106
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-107
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-108
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-109
   Clean up merge mistakes

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-110
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-571

1 files changed, 13 insertions, 8 deletions

diff --git a/man/frames.texi b/man/frames.texi
index 2b53bd58d2d..4eb0a523cad 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -57,7 +57,7 @@ so that you can use many of the features described in this chapter.
 * Tooltips::            Displaying information at the current mouse position.
 * Mouse Avoidance::     Moving the mouse pointer out of the way.
 * Non-Window Terminals::  Multiple frames on terminals that show only one.
-* XTerm Mouse::         Using the mouse in an XTerm terminal emulator.
+* Text-Only Mouse::     Using the mouse in text-only terminals.
 @end menu
 
 @node Mouse Commands
@@ -1035,21 +1035,26 @@ and use @kbd{M-x select-frame-by-name @key{RET} @var{name} @key{RET}}
 to select a frame according to its name.  The name you specify appears
 in the mode line when the frame is selected.
 
-@node XTerm Mouse
+@node Text-Only Mouse
 @section Using a Mouse in Terminal Emulators
-@cindex xterm, mouse support
+@cindex mouse support
 @cindex terminal emulators, mouse support
 
-  Some terminal emulators under X support mouse clicks in the terminal
-window.  In a terminal emulator which is compatible with @code{xterm},
+Some terminal emulators support mouse clicks in the terminal window.
+
+@cindex xterm
+In a terminal emulator which is compatible with @code{xterm},
 you can use @kbd{M-x xterm-mouse-mode} to give Emacs control over
 simple use of the mouse---basically, only non-modified single clicks
 are supported.  The normal @code{xterm} mouse functionality for such
 clicks is still available by holding down the @kbd{SHIFT} key when you
-press the mouse button.
+press the mouse button.  Xterm Mouse mode is a global minor mode
+(@pxref{Minor Modes}).  Repeating the command turns the mode off
+again.
 
-  Xterm Mouse mode is a global minor mode (@pxref{Minor Modes}).
-Repeating the command turns the mode off again.
+In the console on GNU/Linux, you can use @kbd{M-x t-mouse-mode}.  You
+need to have the gpm package installed and running on your system in
+order for this to work.
 
 @ignore
    arch-tag: 7dcf3a31-a43b-45d4-a900-445b10d77e49