3 files changed, 32 insertions, 9 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f506909ddbe..ffc73813378 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2012-04-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * msdog.texi (Windows Startup): Add description of emacsclient
+        operation under -c and -t on MS-Windows.
+
+        * misc.texi (emacsclient Options): Add cross-reference to "Windows
+        Startup".  (Bug#11091)
+
 2012-04-02  Dani Moncayo  <dmoncayo@gmail.com>  (tiny change)
 
         * custom.texi (Changing a Variable): Fix example.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 1a055b9cfd7..84b9d6ee03b 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1507,12 +1507,11 @@ Create a new graphical frame, instead of using an existing Emacs
 frame.  Emacs can create a graphical frame even if it was started in a
 text-only terminal, provided it is able to connect to a graphical
 display.  If Emacs is unable to connect to a graphical display, and on
-systems, such as MS-Windows, where it cannot create graphical frames
-when started from a text-only terminal, it creates a new text-only
-terminal frame (@pxref{Frames}) on the same terminal where it was
-started.  If you omit a filename argument while supplying the
-@samp{-c} option, the new frame displays the @samp{*scratch*} buffer
-(@pxref{Buffers}).
+systems, such as MS-Windows (@pxref{Windows Startup, emacsclient}),
+where it cannot create graphical frames when started from a text-only
+terminal, it creates a new text-only terminal frame (@pxref{Frames}).
+If you omit a filename argument while supplying the @samp{-c} option,
+the new frame displays the @samp{*scratch*} buffer (@pxref{Buffers}).
 
 @item -F @var{alist}
 @itemx --frame-parameters=@var{alist}
@@ -1599,9 +1598,10 @@ using an existing Emacs frame.  Emacs can open a text-only terminal
 even if it was started in another text-only terminal, or on a
 graphical display.  On systems, such as MS-Windows, where this is
 impossible, Emacs will create a new frame, either GUI or text-only, on
-the same terminal where it was started.  If you omit a filename
-argument while supplying this option, the new frame displays the
-@samp{*scratch*} buffer.  @xref{Buffers}.
+the same terminal where it was started (@pxref{Windows Startup,
+emacsclient}).  If you omit a filename argument while supplying this
+option, the new frame displays the @samp{*scratch*} buffer.
+@xref{Buffers}.
 @end table
 
   If you type @kbd{C-x C-c} (@code{save-buffers-kill-terminal}) in an
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi
index 2dcc1fa42f8..af948f113a4 100644
--- a/doc/emacs/msdog.texi
+++ b/doc/emacs/msdog.texi
@@ -109,6 +109,21 @@ invoked---that will always give you an editor.  When invoked via
 the program that invoked @command{emacsclient}.
 @end enumerate
 
+@cindex emacsclient, on MS-Windows
+Note that, due to limitations of MS-Windows, Emacs cannot have both
+GUI and text-mode frames in the same session.  It also cannot open
+text-mode frames on more than a single @dfn{Command Prompt} window,
+because each Windows program can have only one console at any given
+time.  For these reasons, if you invoke @command{emacsclient} with the
+@option{-c} option, and the Emacs server runs in a text-mode session,
+Emacs will always create a new text-mode frame in the same
+@dfn{Command Prompt} window where it was started; a GUI frame will be
+created only if the server runs in a GUI session.  Similarly, if you
+invoke @command{emacsclient} with the @option{-t} option, Emacs will
+create a GUI frame if the server runs in a GUI session, or a text-mode
+frame when the session runs in text-only mode in a @dfn{Command
+Prompt} window.  @xref{emacsclient Options}.
+
 @node Text and Binary
 @section Text Files and Binary Files
 @cindex text and binary files on MS-DOS/MS-Windows