* doc/emacs/frames.texi (Frame Commands): Doc fix for delete-other-frames.

Note that it only deletes frames on current terminal.

2 files changed, 14 insertions, 3 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index b9dbddad3ca..5fba9eda3b0 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-12  Eric Hanchrow  <eric.hanchrow@gmail.com>
+
+	* frames.texi (Frame Commands): Note that delete-other-frames only
+	deletes frames on current terminal.
+
 2011-09-10  Eli Zaretskii  <eliz@gnu.org>
 
 	* sending.texi (Mail Misc): Document mail-add-attachment.
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 328deaec357..8ca598c3348 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -448,17 +448,23 @@ terminal.
 @item C-x 5 1
 @kindex C-x 5 1
 @findex delete-other-frames
-Delete all frames except the selected one.
+Delete all frames on the current terminal, except the selected one.
 @end table
 
-  The @kbd{C-x 5 0} (@code{delete-frame}) command will never delete
-the last frame, to prevent you from losing the ability to interact
+  The @kbd{C-x 5 0} (@code{delete-frame}) command never deletes the
+last frame.  This prevents you from losing the ability to interact
 with the Emacs process.  Note that when Emacs is run as a daemon
 (@pxref{Emacs Server}), there is always a ``virtual frame'' that
 remains after all the ordinary, interactive frames are deleted.  In
 this case, @kbd{C-x 5 0} can delete the last interactive frame; you
 can use @command{emacsclient} to reconnect to the Emacs session.
 
+  The @kbd{C-x 5 1} (@code{delete-other-frames}) command only deletes
+frames on the current terminal.  For example, if you call it from an X
+frame, it deletes the other frames on that X display; if the Emacs
+process has frames open on other X displays or text terminals, those
+are not deleted.
+
 @vindex focus-follows-mouse
   On X, you may have to tell Emacs how the window manager handles
 focus-switching between windows, in order for @kbd{C-x 5 o}