# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1246483430 18000
# Node ID 82c247e583d43d3ee3807da2a7838be356f813c0
# Parent  9d9aecf552eeba27fa37add3bf60c8dffbc2ff7c# Parent  334622dd92836c1a146baf27bc2ef9251132ac4f
merge tims changes

diff -r 334622dd9283 -r 82c247e583d4 core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Wed Jul 01 15:49:34 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Wed Jul 01 16:23:50 2009 -0500
@@ -27,6 +27,15 @@
     </ul>      </td>
   </tr>
   <tr>
+    <td><b>Emulation</b></td>
+    <td><ul>
+      <li><a href="#EXE_SEL">Executable Selection</a></li>
+      <li><a href="#BLD_OPT">Build Option Selection</a></li>
+      <li><a href="#FINISH">New Launch Configuration</a></li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
     <td><b>Application TRK and System TRK</b></td>
     <td><ul>
       <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
@@ -51,12 +60,10 @@
     <td><b>Attach to Process</b></td>
     <td><ul>
       <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
-      </ul>      
-    </td>
+      </ul>    </td>
   </tr>
 </table>
 <p>To access the <b>New Launch Configurtion Wizard</b> click the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">). If no launch configuration exists for the  build target the wizard is launched. If a launch configuration already exists, then that launch configuration is launched and not the wizard.</p>
-For emulator targets, the New Launch Configuration Wizard automatically gathers all the information it needs from the project, so clicking <b>Debug</b> just launches the debug session.
 <p align="center"><img src="../../images/icons/menu_build_target.png" width="270" height="120"></p>
 <p class="figure">Figure 1 - Build Target selection list </p>
 <h3><a name="CATEGORY" id="LAUNCH2"></a>Category Types</h3>
@@ -68,7 +75,7 @@
 <p align="center"><img src="../../images/icons/wiz_launch_config_launch_types.png" width="438" height="533"></p>
 <p class="figure">Figure 3 - Launch Type page </p>
 <h3><a name="BLD_OPT" id="EXE_SEL2"></a>Build Options Selection </h3>
-<p>Use the <b>Build Options Selection </b> page to define if the launch configuration uses auto build or not. Choices include using the global auto built setting (default), enable or disable auto build for the launch configuration. You can also set the global option using the Configure Workspace Settings... to open the Launching preference panel.</p>
+<p>Use the <b>Build Options Selection </b> page to define if the launch configuration uses automatic build or not. Choices include using the global automatic built setting (default), enable or disable automatic build for the launch configuration. You can also set the global option using the Configure Workspace Settings... to open the Launching preference panel.</p>
 <p align="center"><img src="images/wiz_launch_config_build_options.png" width="484" height="533"></p>
 <p class="figure">Figure 4 - Build Options Selection page </p>
 <h3><a name="EXE_SEL" id="EXE_SEL"></a>Executable Selection </h3>
diff -r 334622dd9283 -r 82c247e583d4 core/com.nokia.carbide.cpp/introDATA.xml
--- a/core/com.nokia.carbide.cpp/introDATA.xml	Wed Jul 01 15:49:34 2009 -0500
+++ b/core/com.nokia.carbide.cpp/introDATA.xml	Wed Jul 01 16:23:50 2009 -0500
@@ -50,10 +50,10 @@
       </group>
       <group path="page-content/top-left">
          <extension id="com.nokia.carbide.cpp.doc.user-whatsnew" importance="low"/>
+      </group>
+      <group path="page-content/top-right">
          <extension id="com.nokia.carbide.cpp.uidesigner.doc.user-whatsnew" importance="low"/>
          <extension id="com.nokia.carbide.cpp.pi.doc.user-whatsnew" importance="low"/>
-      </group>
-      <group path="page-content/top-right">
          <extension id="com.nokia.carbide.cpp.codescanner-whatsnew" importance="low"/>
          <extension id="com.nokia.s60tools.appdep.help-whatsnew" importance="low"/>
          <extension id="com.nokia.carbide.epocwindDisplay-whatsnew" importance="low"/>