From 23a7eec17201c7084f690dce82dcf75150828ca2 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 23 Aug 2011 14:19:39 +0100
Subject: documentation: update TERMCMD/TERMCMDRUN documentation

* xterm is now the default
* Konsole from KDE 4.x will no longer work due to changes in behaviour

(From yocto-docs rev: 031a619ca19dbc2011a4df7bba1c332f2770e15d)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 documentation/poky-ref-manual/development.xml   |  2 +-
 documentation/poky-ref-manual/ref-variables.xml | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'documentation')

diff --git a/documentation/poky-ref-manual/development.xml b/documentation/poky-ref-manual/development.xml
index 15f40fed6b..ff1d676607 100644
--- a/documentation/poky-ref-manual/development.xml
+++ b/documentation/poky-ref-manual/development.xml
@@ -270,7 +270,7 @@
         </para>
 
         <para>
-            The default shell used by <filename>devshell</filename> is the GNOME Terminal. 
+            The default shell used by <filename>devshell</filename> is xterm. 
             You can use other terminal forms by setting the 
             <glossterm><link linkend='var-TERMCMD'>TERMCMD</link></glossterm> and 
             <glossterm><link linkend='var-TERMCMDRUN'>TERMCMDRUN</link></glossterm> variables 
diff --git a/documentation/poky-ref-manual/ref-variables.xml b/documentation/poky-ref-manual/ref-variables.xml
index 3dd9183bcf..34ce56a080 100644
--- a/documentation/poky-ref-manual/ref-variables.xml
+++ b/documentation/poky-ref-manual/ref-variables.xml
@@ -1029,8 +1029,16 @@
                     This command is used by BitBake to launch a terminal window with a 
                     shell. 
                     The shell is unspecified so the user's default shell is used. 
-                    By default, the variable is set to "gnome-terminal" but it can 
-                    be any X11 terminal application or terminal multiplexers-like screen.
+                    By default, the variable is set to "xterm" but it can 
+                    be any X11 terminal application or a terminal multiplexer such as screen.
+                </para>
+                <para>
+                    NOTE: whilst KONSOLE_TERMCMD and KONSOLE_TERMCMDRUN are provided
+                    and will work with KDE's Konsole terminal application Konsole from KDE 3,
+                    Konsole in KDE 4.0 and later will no longer work here due to the fact
+                    that it now launches in the background by default, and it is not practically
+                    possible to wait until it has terminated. It is hoped that this can be fixed
+                    in a future version.
                 </para>
             </glossdef>
         </glossentry>
-- 
cgit v1.2.3-54-g00ecf