BUG 10841/10842 revised TOC and Run mode example for PnP RCL_2_4
authorfturovic <frank.turovich@nokia.com>
Tue, 09 Mar 2010 17:31:44 -0600
branchRCL_2_4
changeset 1086 c4cdf14b6868
parent 1084 328f2d956cbe
child 1088 59a83d386ea2
BUG 10841/10842 revised TOC and Run mode example for PnP
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/images/trim_remote_conns.png
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingProjectsToc.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_01.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_03.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_04.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_05.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm
core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -17,7 +17,7 @@
 </ul>
 <h4><a name="START_DB" id="START_DB"></a>Starting a session</h4>
 <p>Use the <b>Debug</b> command (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
-<p>If the project does not already have a launch configuration, the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> will automatically create one for emulator targets or ask for additional information to create one. It will generate a default name for the launch configuration and add it to the list of available launch configurations for the project. Once complete and saved the debug session is launched. If a  launch configuration is already available, the Debug command launches  the last  launch configuration used by the project. </p>
+<p>If the project does not already have a launch configuration, the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> will automatically create one for <a href="../../projects/launch/launch_emulator.htm">emulator</a> targets or ask for additional information to create <a href="../../projects/launch/launch_phone.htm">phone</a> or <a href="../../projects/launch/launch_board.htm">hardware device</a> configurations. It will generate a default name for the launch configuration and add it to the list of available launch configurations for the project. Once complete and saved the debug session is launched. If a  launch configuration is already available, the Debug command launches  the last  launch configuration used by the project. </p>
 <p>To create new launch configurations where none previously existed or launch the last one created:</p>
 <ul>
   <li>Click the <b>Debug</b> button (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) in the <b>Carbide C/C++</b> perspective</li>
@@ -41,7 +41,10 @@
 <h4>Other references</h4>
 <ul>
   <li><a href="debug.htm">Debugging overview</a> </li>
+  <li><a href="../../projects/launch/launch_emulator.htm">Symbian OS Emulator Launch</a></li>
+  <li><a href="../../projects/launch/launch_phone.htm">Symbian OS Phone Launch</a></li>
+  <li><a href="../../projects/launch/launch_board.htm">Symbian OS Reference Board Launch</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -9,7 +9,7 @@
 
 <body>
 <h2>Symbian OS Emulator Launch</h2>
-<p>Use the <b>Debug As</b> dialog<b></b> to select the New Launch Configuration Wizard that will create a launch configuration for the project. </p>
+<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. </p>
 <p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
 <p class="figure">Figure 1. Debug As dialog</p>
 <div class="step">
@@ -21,7 +21,7 @@
     <li>Select the <b>Symbian OS Emulator Launch</b> item, then click <b>OK</b></li>
     <li>Complete each page in the New Launch Configuration Wizard , then click Next</li>
     <li>Review  the settings in the <a href="wiz_new_launch_config.htm">New Launch Configuration</a> page</li>
-    <li>Click <b>Debug</b> to download and debug the project on the phone</li>
+    <li>Click <b>Debug</b> to download and debug the project on the emulator</li>
   </ol>
 </div>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -9,7 +9,7 @@
 
 <body>
 <h2>Symbian OS Phone Launch</h2>
-<p>Use the <b>Debug As</b> dialog<b></b> to select the New Launch Configuration Wizard that will create a launch configuration for the project. </p>
+<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. </p>
 <p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
 <p class="figure">Figure 1. Debug As dialog</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -104,6 +104,9 @@
 <h5>Other references</h5>
 <ul>
   <li><a href="../../projects/launch/launch_configs_overview.htm">Launch Configuration</a>  </li>
+  <li><a href="launch_emulator.htm">Symbian OS Emulator Launch</a></li>
+  <li><a href="launch_phone.htm">Symbian OS Phone Launch</a></li>
+  <li><a href="launch_board.htm">Symbian OS Reference Board Launch</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/trim_remote_conns.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -35,9 +35,9 @@
 </ul>
 <p align="center"><img src="../images/view_remote_connections.png" width="588" height="177"></p>
 <p class="figure">Figure 1 - Remote Connections view</p>
-<p>When the view is closed or another perspective opened, a small display item appears in the lower-left corner of the perspective. Click the connection name to  open the drop-down menu where you can open the Remote Connections view or switch between  connections.</p>
-<p align="center"><img src="../images/tab_remote_conns.png"></p>
-<p class="figure">Figure 2. Remote Connections tab </p>
+<p>When the view is closed or another perspective opened, a small display  appears in the trim area in the lower-right corner of the workspace showing the current active remote connection. Click the connection name to  open the drop-down menu where you can open the Remote Connections view or switch between  connections.</p>
+<p align="center"><img src="../images/trim_remote_conns.png" width="212" height="44"></p>
+<p class="figure">Figure 2. Available remote connection trim indicator</p>
 <h3>Remote Connections view toolbar icons</h3>
 <p>The following commands appear on the toolbar within the Remote Connections view: </p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -1,46 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Install Remote Agents pane</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Install Remote Agents pane</h2>
-<p>Use  the <strong>Install remote agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Install remote agents page</p>
-<p>Table 1. Install Remote Agents pane</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.2.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.0.4. </p>
-        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
-  </tr>
-  <tr>
-    <td><strong>Save</strong></td>
-    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
-  </tr>
-  <tr>
-    <td><strong>Install</strong></td>
-    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install remote agents list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
-        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
-  </tr>
-</table>
-<p></p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="wnd_on_device_check_tab.htm">Set Connection Settings </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Install Remote Agents pane</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Install Remote Agents pane</h2>
+<p>Use  the <strong>Install remote agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
+<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
+<p class="figure">Figure 2 - New Connection wizard Install remote agents page</p>
+<p>Table 1. Install Remote Agents pane</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Install remote agents</strong></td>
+    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.2.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.0.4. </p>
+        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
+  </tr>
+  <tr>
+    <td><strong>Save</strong></td>
+    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
+  </tr>
+  <tr>
+    <td><strong>Install</strong></td>
+    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install remote agents list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
+        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
+  </tr>
+</table>
+<p></p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
+  <li><a href="wnd_on_device_check_tab.htm">Set Connection Settings </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingProjectsToc.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingProjectsToc.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Creating Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>Creating Projects </h2>
-	 <p>The topics include:</p>
-	 <ul>
-	   <li><a href="../concepts/templates.htm">Project Templates</a></li>
-	   <li><a href="CreatingNewProjects.html">Creating from a Template</a></li>
-	   <li><a href="ImportingProjects.html">Importing Projects from a BLD.INF File</a></li>
-	   <li><a href="projects/prj_build_multi_projects.htm">Importing Projects with Inter-Dependencies</a></li>
-   </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-   </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Creating Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>Creating Projects </h2>
+	 <p>The topics include:</p>
+	 <ul>
+	   <li><a href="../concepts/templates.htm">Project Templates</a></li>
+	   <li><a href="CreatingNewProjects.html">Creating from a Template</a></li>
+	   <li><a href="ImportingProjects.html">Importing Projects from a BLD.INF File</a></li>
+	   <li><a href="projects/prj_build_multi_projects.htm">Importing Projects with Inter-Dependencies</a></li>
+   </ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -9,59 +9,26 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
+<p>Run mode on-device debugging enables you to download and launch a project on a phone or target device and debug it using the Carbide debugger. Before you can do that, some setup requirements are required. Once the setup is done, Carbide can then use plug-and-play (PnP) with USB to create a remote connection that connects  with the TRK agent on the target device to download, launch, and debug the program.</p>
 <ol>
-  <li><b>Install device connection software</b></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
+  <li><b>Setup system and development requirements</b> (below)</li>
+  <li><a href="../trk/trk_installation_instr.htm">Install</a> Application or System TRK v3.2.6 or later on the target device</li>
+  <li><a href="../trk/trk_connection_usb.htm">Connect</a> USB cable to phone or target device for PnP connectivity</li>
+  <li><a href="../CreatingProjectsToc.htm">Create</a> or <a href="../ImportingProjects.html">import</a> a project in the Carbide C/C++ workspace</li>
+  <li><a href="../projects/prj_build.htm">Build</a> the project</li>
+  <li><a href="../../debugger/debug/cmds_starting.htm">Debug</a> the project on  a <a href="../../projects/launch/launch_phone.htm">phone</a> or <a href="../../projects/launch/launch_board.htm"> target device</a></li>
 </ol>
 <div class="step">
-<h4><a name="runInstall" id="runInstall">	</a>Install Device Connection Software</h4>
-<p>The two choices for connecting are Bluetooth and PC Suite. </p>
-<h5>BlueTooth</h5>
-<ol>
-  <li>System requirements: </li>
+  <h4><a name="runInstall" id="runInstall2"> </a>Setup  system and development requirements</h4>
+  <p>All of the following requirements are required to build, communicate, and control programs on a phone or target device.</p>
   <ul>
-    <li>Administration rights on your computer</li>
-    <li> BT dongle attached to your computer</li>
-    <li>Bluetooth installer to install the drivers</li>
+    <li>Install <a href="../trk/trk_install_pcsuite.htm">PC Suite</a> or <a href="http://nds1.nokia.com/files/support/global/phones/software/Nokia_Ovi_Suite_webinstaller_ALL.exe">Ovi Suite</a> on your PC to ensure the correct drivers are installed for connecting to the phone or target device.</li>
+    <li>Install the correct version of <a href="run_mode_debug_01.htm">Perl</a> on your PC to support Symbian OS builds</li>
+    <li>Install a supported <a href="run_mode_debug_02.htm">SDK</a> and make sure its the default</li>
+    <li><a href="run_mode_debug_03.htm">Configure</a> the environmental variables</li>
+    <li>(Optional) <a href="run_mode_debug_04.htm">Setup</a> a virtual drive to use Techview and Cust Kits</li>
   </ul>
-  <li>Install the Bluetooth dongle to a USB port</li>
-  <li>Install the drivers from the Bluetooth CD</li>
-  <li>Click on the Bluetooth icon in your system tray and run the Bluetooth setup</li>
-  <li>Right click on the Bluetooth icon in the System tray and select Advanced Configuration</li>
-  <li>Click the Accessibility tab
-    <ol type="a">
-      <li>Check the option &ldquo;Let other Bluetooth devices discover this computer&rdquo;</li>
-        <li>Set the option under &ldquo;Allow&rdquo; to &ldquo;All Devices&rdquo;</li>
-      </ol>
-    </li>
-</ol>
-<p class="note"><b>NOTE</b> The Nokia PC image includes the Microsoft Bluetooth drivers which do not support serial emulation over Bluetooth. You need to download and install the drivers provided by the Bluetooth manufacturer to connect to a device. </p>
-<h5>Nokia PC Suite</h5>
-<ol>
-  <li>Install <a href="http://www.nokiausa.com/support/pcsuite/main.html%20or%20http://europe.nokia.com/A4144903">PC Suite</a> (or later version)    
-    <p>Launch the PC Suite installer and follow the onscreen instructions to install the software. When finished, a <b>Get Connected</b> wizard should appear</p>
-  </li>
-  <li> Press Next</li>
-  <li>In the &quot;Select your connection type&quot; window select &quot;Cable Connection&quot; and press Next</li>
-  <li>You will be prompted to connect the phone via the USB cable</li>
-  <li>Connect the phone and continue with  onscreen instructions</li>
-  <li>After installation your  phone should be listed</li>
-  <li>Click Finish</li>
-  <li>Select PC suite on your phone</li>
-  <p>The Nokia PC Suite window should appear</p>
-  <li>Select the Manage Connections icon</li>
-  <li>Uncheck all the connections available</li>
-  <li>Click Ok</li>
-  <p>PC Suite is now ready to use.</p>
-</ol>
+  <p>Once you've setup your environment, its time to verify that the TRK agent is on the phone or target device.</p>
 </div>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_01.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_01.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -1,37 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugger Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><b>Install Perl</b></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-</ol>
-<div class="step">
-<h4><a name="runPerl" id="runPerl"> </a>Install PERL</h4>
-<ul>
-  <li>Install ActivePERL version 5.6.1 b638</li>
-</ul>
-<blockquote>
-  <p>Software can be downloaded from: <a href="http://www.activestate.com/Products/ActivePerl/">http://www.activestate.com/Products/ActivePerl/</a>.</p>
-  <p class="note"><b>NOTE</b> Later releases of Perl are not yet supported by the Symbian utilities and can cause unknown compiling errors. </p>
-</blockquote>
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Installing PERL</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Installing PERL</h2>
+<p>PERL is required for many Symbian OS utilities and commands.</p>
+<div class="step">
+<h4><a name="runPerl" id="runPerl"> </a>Installing PERL</h4>
+<ul>
+  <li>Install ActivePERL version 5.6.1 b638</li>
+</ul>
+<blockquote>
+  <p>Software can be downloaded from: <a href="http://www.activestate.com/Products/ActivePerl/">http://www.activestate.com/Products/ActivePerl/</a>.</p>
+  <p class="note"><b>NOTE</b> Later releases of Perl are not yet supported by the Symbian utilities and can cause unknown compiling errors. </p>
+  </blockquote>
+</div>
+<h5>Other references</h5>
+<ul>
+  <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -4,41 +4,58 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugger Settings</title>
+<title>Installing an SDK</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><b>Install an SDK</b></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-  </ol>
+<h2>Installing an SDK</h2>
+<p>To create projects an SDK must be installed. If more than one SDK is installed one must be specified as the default.</p>
 <div class="step">
-<h4><a name="runSDK" id="runSDK"> </a>Install an SDK</h4>
-<p>The following SDKs can be downloaded from forum Nokia at: <a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/</a>.</p>
-<ul>
-  <li>Install at least one of the following SDKs:</li>
+<h4><a name="runSDK" id="runSDK"> </a>Installing an SDK</h4>
+<p>The following SDKs can be downloaded from Nokia at: <a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/</a>.</p>
+<ol>
+  <li>Install at least one of the following SDKs using the install directions that accompany the SDK:
+    <ul>
+      <li>Series 60 5.0</li>
+      <li>Qt for S60</li>
+      <li>Series80</li>
+      <li>Series 60 cust kits</li>
+      <li>Techview Development kits</li>
+    </ul>
+  </li>
+  <li>Set the default SDK to use for projects
+    <ol type="A">
+      <li>In Carbide.c++
+        <ol type="i">
+          <li>Click Window &gt; Preferences &gt; Carbide.c++ &gt; SDK Preferences to open the SDK Preferences panel</li>
+          <li>Select the SDK and click SDK Properties to open the SDK Properties dialog</li>
+          <li>Set the Default SDK value to Yes</li>
+          <li>Close all the dialogs</li>
+        </ol>
+      </li>
+      <li>In a command-line prompt:
+        <ol type="i">
+          <li>Set the default device devkit by typing on the command line:<br>
+            <br />
+  &gt; <span class="code">devices &ndash;setdefault @device id: name</span></li>
+          <p>The device id and name can be found in the devices.xml file. For example, for a Techview 9.2 kit you might type<br>
+              <br />
+            <span class="code">&gt; devices &ndash;setdefault @ SymbianOS_92_2006_wk40:com.symbian.techview</span></p>
+          <li>Now ensure the default device is set by entering:<br>
+            <br />
+  &gt; <span class="code">devices</span></li>
+          </ol>
+      </li>
+      <li>Make sure the correct SDK default is set.</li>
+      </ol>
+  </li>
+  </ol>
+  </div>
+
+<h5>Other references</h5>
 <ul>
-  <li> Series 60 5.0</li>
-  <li> Series 60 3.0</li>
-  <li>Series80</li>
-  <li>UIQ 3.0</li>
-  <li>Series 60 cust kits </li>
-  <li>Techview Development kits
-    <p></p>
-  </li>
+  <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</a>  </li>
 </ul>
-</ul>
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_03.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_03.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -1,56 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugger Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><b>Setup environment variables</b></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-  </ol>
-<div class="step">
-<h4><a name="runEnvVars" id="runEnvVars"> </a>Setup Environment Variables</h4>
-<ol>
-  <li>Set EPOCROOT variable
-    <ol type="a">
-      <li>Right click on My Computer and select Properties</li>
-      <li>Select the Advanced tab</li>
-      <li>Select the Environmental Variables button</li>
-      <li>Setup a new System variable called EPOCROOT. The value will depend on the path of the epoc32 folder in the kit, for example: </li>
-      <p>Variable name: <span class="code">EPOCROOT</span><br />
-      Variable value: <span class="code">\bin\techview\</span></p>
-    </ol>
-   </li>
-  <p class="note"><b>NOTE</b> Take note of the location of the epoc32 folder when using multiple kits. Some kits place the epoc32 folder at \bin\techview\ and some kits will place it at the root. If you have multiple installations and switch to a new kit, you will need to change the EPOCROOT path; otherwise build problems may occur. When building the ROM image, scripts may complain  about the EPOCROOT path or that it can&rsquo;t find bldmake.bat if an incorrect EPOCROOT path is set.</p>
-  <li>Set Path to Tools Directory
-    <ol type="a">
-      <li>If using an installer the tools path is set up automatically and points to:</li>
-          Variable: <span class="code">PATH</span><br>
-          Value: <span class="code">C:\Program Files\Common Files\Symbian\Tools</span>      
-        <li>If installing from zip files you will need to setup the tools path manually. Add the path to the beginning of the PATH variable:</li>
-       Variable: <span class="code">PATH</span><br />
-       Variable Value: <span class="code">\epoc32\tools;\epoc32\gcc\bin;</span>       
-       <li>If using multiple kits that use a mix of installer and zip files then you can set up your PATH variable like this:</li>
-       Variable: <span class="code">PATH</span><br />
-       Value: <span class="code">\epoc32\tools;\epoc32\gcc\bin;C:\Program Files\Common Files\Symbian\Tools</span>
-    </ol>
-  </li>
-  </ol>
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Configuring Environment Variables</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Configuring Environment Variables</h2>
+<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
+<div class="step">
+<h4><a name="runEnvVars" id="runEnvVars"> </a>Configuring Environment Variables</h4>
+<ol>
+  <li>Set EPOCROOT variable
+    <ol type="a">
+      <li>Right click on My Computer and select Properties</li>
+      <li>Select the Advanced tab</li>
+      <li>Select the Environmental Variables button</li>
+      <li>Setup a new System variable called EPOCROOT. The value will depend on the path of the epoc32 folder in the kit, for example: </li>
+      <p>Variable name: <span class="code">EPOCROOT</span><br />
+      Variable value: <span class="code">\bin\techview\</span></p>
+    </ol>
+   </li>
+  <p class="note"><b>NOTE</b> Take note of the location of the epoc32 folder when using multiple kits. Some kits place the epoc32 folder at \bin\techview\ and some kits will place it at the root. If you have multiple installations and switch to a new kit, you will need to change the EPOCROOT path; otherwise build problems may occur. When building the ROM image, scripts may complain  about the EPOCROOT path or that it can&rsquo;t find bldmake.bat if an incorrect EPOCROOT path is set.</p>
+  <li>Set Path to Tools Directory
+    <ol type="a">
+      <li>If using an installer the tools path is set up automatically and points to:</li>
+          Variable: <span class="code">PATH</span><br>
+          Value: <span class="code">C:\Program Files\Common Files\Symbian\Tools</span>      
+        <li>If installing from zip files you will need to setup the tools path manually. Add the path to the beginning of the PATH variable:</li>
+       Variable: <span class="code">PATH</span><br />
+       Variable Value: <span class="code">\epoc32\tools;\epoc32\gcc\bin;</span>       
+       <li>If using multiple kits that use a mix of installer and zip files then you can set up your PATH variable like this:</li>
+       Variable: <span class="code">PATH</span><br />
+       Value: <span class="code">\epoc32\tools;\epoc32\gcc\bin;C:\Program Files\Common Files\Symbian\Tools</span>
+    </ol>
+  </li>
+  </ol>
+</div>
+<h5>Other references</h5>
+<ul>
+  <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</a>  </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_04.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_04.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -1,43 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugger Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><b>Setup a virtual drive for Techview and Cust Kits</b></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-  </ol>
-<div class="step">
-  <h4><a name="runVirDrive" id="runVirDrive"> </a>Setup a Virtual Drive for Techview and Cust Kits</h4>
-<p>Techvew Kits and cust kits have kernel components, kernel extensions and device drivers that are typically built on a virtual drive. So if you want to debug them the debugger will need to load files from the virtual drive that the binaries were built on. If you do not know the virtual drive the kit was built on you should first pick a drive letter randomly.</p>
-  <ol>
-    <li>To subst a drive, type on a command line:<br />
-    &gt; subst <span class="question">drive_letter:</span> <span class="question">path_to_kit<br />
-    </span>For example:<br />
-&gt;<span class="code"> subst M: C:\Symbian\S60_3_0_200626</span></li>
-    <li>On the command line type:<br />
-&gt;<span class="code">subst</span><br />
-    <p>You should see the new virtual drive pointing to your kit. If the debugger tries to load a file it can&rsquo;t find, it will look for it on the virtual drive. You can see this in the stack crawl. The stack crawl should give the full path of the file on the virtual drive the file was built on. The debugger will not be able to load the file until the correct virtual drive is specified.</p>
-    <p>If this happens you can redo the virtual drive to use the drive specified in the stack crawl or navigate to the file using the existing virtual drive. From that point the IDE will add that path and recursively check folders for files it needs.</p>
-    </li>
-    <li>Make sure when you set up your default SDK in the Carbide IDE that you use the virtual drive.</li>
-  </ol>
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Setup a Virtual Drive for Techview and Cust Kits</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setup a Virtual Drive for Techview and Cust Kits (optional)</h2>
+<p>Techview Kits and cust kits have kernel components, kernel extensions and device drivers that are typically built on a virtual drive. So if you want to debug them the debugger will need to load files from the virtual drive that the binaries were built on. If you do not know the virtual drive the kit was built on you should first pick a drive letter randomly.</p>
+<div class="step">
+  <h4><a name="runVirDrive" id="runVirDrive"> </a>Setup a Virtual Drive for Techview and Cust Kits</h4>
+  <ol>
+    <li>To subst a drive, type on a command line:<br />
+    &gt; subst <span class="question">drive_letter:</span> <span class="question">path_to_kit<br />
+    </span>For example:<br />
+&gt;<span class="code"> subst M: C:\Symbian\S60_3_0_200626</span></li>
+    <li>On the command line type:<br />
+&gt;<span class="code">subst</span><br />
+    <p>You should see the new virtual drive pointing to your kit. If the debugger tries to load a file it can&rsquo;t find, it will look for it on the virtual drive. You can see this in the stack crawl. The stack crawl should give the full path of the file on the virtual drive the file was built on. The debugger will not be able to load the file until the correct virtual drive is specified.</p>
+    <p>If this happens you can redo the virtual drive to use the drive specified in the stack crawl or navigate to the file using the existing virtual drive. From that point the IDE will add that path and recursively check folders for files it needs.</p>
+    </li>
+    <li>Make sure when you set up your default SDK in the Carbide IDE that you use the virtual drive.</li>
+  </ol>
+</div>
+<h5>Other references</h5>
+<ul>
+  <li><a href="run_mode_debug.htm">Run Mode On-Device Debugging</a>  </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_05.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_05.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -1,43 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugger Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><b>Set the default kit in Devices.xml </b></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-</ol>
-<div class="step">
-<h4><a name="runDefKit" id="runDefKit"> </a>Set the Default Kit in Devices.xml </h4>
-<p>The Symbian environment needs to know the kit you are using. This is needed since you may have multiple kits installed. You can specify the development kit by setting a default in the file called devices.xml located in the <span class="code">C:\Program Files\Common Files\Symbian</span> folder.</p>
-  <h5>From the command line</h5>
-  <ol>
-    <li>Set the default device devkit by typing on the command line:<br />
-&gt; <span class="code">devices &ndash;setdefault @device id: name</span></li>
-  
-  <p>The device id and name can be found in the devices.xml file. For example, for a Techview 9.2 kit you might type<br />
-    <span class="code">&gt; devices &ndash;setdefault @ SymbianOS_92_2006_wk40:com.symbian.techview</span></p>
-
-    <li>Now ensure the default device is set by entering:<br />
-&gt; <span class="code">devices</span></li>
-    <li>Make sure the correct default is set.</li>
-  </ol>
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Run Mode On-Device Debugging</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Run Mode On-Device Debugging</h2>
+<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
+<ol>
+  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
+  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
+  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
+  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
+  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
+  <li><b>Set the default kit in Devices.xml </b></li>
+  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
+  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
+  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
+</ol>
+<div class="step">
+<h4><a name="runDefKit" id="runDefKit"> </a>Set the Default Kit in Devices.xml </h4>
+<p>The Symbian environment needs to know the kit you are using. This is needed since you may have multiple kits installed. You can specify the development kit by setting a default in the file called devices.xml located in the <span class="code">C:\Program Files\Common Files\Symbian</span> folder.</p>
+  <h5>From the command line</h5>
+  <ol>
+    <li>Set the default device devkit by typing on the command line:<br />
+&gt; <span class="code">devices &ndash;setdefault @device id: name</span></li>
+  
+  <p>The device id and name can be found in the devices.xml file. For example, for a Techview 9.2 kit you might type<br />
+    <span class="code">&gt; devices &ndash;setdefault @ SymbianOS_92_2006_wk40:com.symbian.techview</span></p>
+
+    <li>Now ensure the default device is set by entering:<br />
+&gt; <span class="code">devices</span></li>
+    <li>Make sure the correct default is set.</li>
+  </ol>
+</div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -1,70 +1,70 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugger Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><b>Install the SISX file on the target device</b></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-</ol>
-<div class="step">
-<h4><a name="runSISX" id="runSISX"> </a>Install the SISX File on the Target Device</h4>
-<p>The on-device debug agent is delivered to the target device as a SISX file. There are two versions of TRK: Application TRK and System TRK.</p>
-  <ul>
-    <li>Application TRK&mdash; supports application debugging only and available to developers creating applications for devices. Developers do not have access to system level routines, system ROM, and other user application code. User cannot modify the LR and SR registers, and must use a SIS file to debug an application.</li>
-    <li>System TRK&mdash; supports both application and limited ROM debugging; including application executables and limited ROM based components (no device drivers). Also available to original equipment manufacturers (OEMs) for device creation and customization.</li>
-  </ul>
-  <p>The following SISX file is officially signed by Nokia: 
-  <span class="code">s60_3_0_app_trk_2_6_nokia_signed.sisx</span></p>
-  <h5>Installing using Bluetooth</h5>
-  <ol>
-    <li>Right click on the Bluetooth item on the system tray and select Quick Connect &gt; File Transfer &gt; Find Devices</li>
-    <li>Refresh the File Transfer window to allow the device to detect all the Bluetooth devices</li>
-    <li>From the list select your device and click Open</li>
-    <li>You should enable the My Bluetooth Places window popup option that creates a connection shortcut &ldquo;MyDeviceOBEX File Transfer&rdquo; in the My Bluetooth Places folder.</li>
-    <li>The Obex File Transfer window for your devices should open from within the My Bluetooth Folder</li>
-    <li>You will be prompted to enter a Bluetooth PIN code. Enter  any number.</li>
-    <li>On the device you will be prompted  to enter the same PIN code. Enter PIN code. </li>
-    <li>The device will then ask you to accept the connection request from the PC. Press OK.</li>
-    <p>The OBEX folder on the PC should now be available.</p>
-    <li>Drop the TRK SISX file into the folder</li>
-    <li>The device will prompt you to accept the connection request from the PC. Press OK.</li>
-    <li>The SISX file should then transfer from the PC to the device</li>
-    <li>Navigate to where the SISX file was placed</li>
-    <p>If you dropped it into the OBEX folder it will be in <span class="code">Applications &gt; Messages &gt; Inbox</span>. If you dropped it into the C folder it will be in <span class="code">Applications &gt; Utilities &gt;FileBrowse &gt; C</span>.</p>
-    <li>Select the TRK SISX file on the device to install the TRK debug agent.</li>
-  </ol>
-  <h5>Installing using PC Suite</h5>
-  <ol>
-    <li>Place the SISX file on your PC</li>
-    <li>Connect the USB cable to the phone</li>
-    <li>On the device it will display USB mode:<br />
-      PC Suite<br />
-      File transfer</li>
-    <li>Select PC Suite and the device will connect to the PC</li>
-    <li>Open PC suite. In the bottom left a status display should indicate &ldquo;Series 60 Device connected via USB&rdquo;.</li>
-    <li>Double click &ldquo;Install applications&rdquo;. The Nokia Application Installer wizard will appear.</li>
-    <li>On the left you should see My Computer and on the right My Phone</li>
-    <li>From My Computer select the SISX file on your PC</li>
-    <li>From My Phone select the &ldquo;Phone memory&rdquo; drop down list an select where you want to install the file.</li>
-    <li>Select the green arrow pointing from My Computer to My Device. The SISX file should then be transferred to the device and installed.</li>
-  </ol>
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Run Mode On-Device Debugging</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Run Mode On-Device Debugging</h2>
+<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
+<ol>
+  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
+  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
+  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
+  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
+  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
+  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
+  <li><b>Install the SISX file on the target device</b></li>
+  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
+  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
+</ol>
+<div class="step">
+<h4><a name="runSISX" id="runSISX"> </a>Install the SISX File on the Target Device</h4>
+<p>The on-device debug agent is delivered to the target device as a SISX file. There are two versions of TRK: Application TRK and System TRK.</p>
+  <ul>
+    <li>Application TRK&mdash; supports application debugging only and available to developers creating applications for devices. Developers do not have access to system level routines, system ROM, and other user application code. User cannot modify the LR and SR registers, and must use a SIS file to debug an application.</li>
+    <li>System TRK&mdash; supports both application and limited ROM debugging; including application executables and limited ROM based components (no device drivers). Also available to original equipment manufacturers (OEMs) for device creation and customization.</li>
+  </ul>
+  <p>The following SISX file is officially signed by Nokia: 
+  <span class="code">s60_3_0_app_trk_2_6_nokia_signed.sisx</span></p>
+  <h5>Installing using Bluetooth</h5>
+  <ol>
+    <li>Right click on the Bluetooth item on the system tray and select Quick Connect &gt; File Transfer &gt; Find Devices</li>
+    <li>Refresh the File Transfer window to allow the device to detect all the Bluetooth devices</li>
+    <li>From the list select your device and click Open</li>
+    <li>You should enable the My Bluetooth Places window popup option that creates a connection shortcut &ldquo;MyDeviceOBEX File Transfer&rdquo; in the My Bluetooth Places folder.</li>
+    <li>The Obex File Transfer window for your devices should open from within the My Bluetooth Folder</li>
+    <li>You will be prompted to enter a Bluetooth PIN code. Enter  any number.</li>
+    <li>On the device you will be prompted  to enter the same PIN code. Enter PIN code. </li>
+    <li>The device will then ask you to accept the connection request from the PC. Press OK.</li>
+    <p>The OBEX folder on the PC should now be available.</p>
+    <li>Drop the TRK SISX file into the folder</li>
+    <li>The device will prompt you to accept the connection request from the PC. Press OK.</li>
+    <li>The SISX file should then transfer from the PC to the device</li>
+    <li>Navigate to where the SISX file was placed</li>
+    <p>If you dropped it into the OBEX folder it will be in <span class="code">Applications &gt; Messages &gt; Inbox</span>. If you dropped it into the C folder it will be in <span class="code">Applications &gt; Utilities &gt;FileBrowse &gt; C</span>.</p>
+    <li>Select the TRK SISX file on the device to install the TRK debug agent.</li>
+  </ol>
+  <h5>Installing using PC Suite</h5>
+  <ol>
+    <li>Place the SISX file on your PC</li>
+    <li>Connect the USB cable to the phone</li>
+    <li>On the device it will display USB mode:<br />
+      PC Suite<br />
+      File transfer</li>
+    <li>Select PC Suite and the device will connect to the PC</li>
+    <li>Open PC suite. In the bottom left a status display should indicate &ldquo;Series 60 Device connected via USB&rdquo;.</li>
+    <li>Double click &ldquo;Install applications&rdquo;. The Nokia Application Installer wizard will appear.</li>
+    <li>On the left you should see My Computer and on the right My Phone</li>
+    <li>From My Computer select the SISX file on your PC</li>
+    <li>From My Phone select the &ldquo;Phone memory&rdquo; drop down list an select where you want to install the file.</li>
+    <li>Select the green arrow pointing from My Computer to My Device. The SISX file should then be transferred to the device and installed.</li>
+  </ol>
+</div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugger Settings</title>
+<title>Run Mode On-Device Debugging</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
@@ -70,7 +70,7 @@
     </ol>
   </ol>
   </div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugger Settings</title>
+<title>Run Mode On-Device Debugging</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
@@ -181,7 +181,7 @@
   <p align="center"><img src="images/Debug_Config_filetransfer_run.png" width="595" height="280" /></p>
   <p class="figure">Figure 9. Debug windows File Transfer pane </p>
 </div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -43,11 +43,7 @@
   <ul>
     <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
   </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
-  </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -14,42 +14,28 @@
   <li>DKU-2</li>
   <li>CA-53 </li>
 </ul>
+<p>Carbide uses plug-and-play (PnP) to create a remote connection  for the phone or target device once it's plugged in. Once a remote connection is created the <a href="../../reference/trk/view_remote_connection.htm">Remote Connections</a> view appears  in Carbide. In addition, the current available connection is shown  in the  workspace's lower-right trim area. </p>
+<p align="center"><img src="../../reference/images/trim_remote_conns.png" width="212" height="44"></p>
+<p class="figure">Figure 1. Current available connection shown in workspace trim area</p>
+<p class="note"><b>NOTE</b> PC Suite or Ovi Suite must be installed on your PC for the following steps to work.</p>
 <div class="step">
   <h4>Setting up a USB Connection for On-device Debugging </h4>
   <ol>
-    <li>Install the latest USB connectivity software, for example, S60 devices use Nokia PC Suite</li>
-    <li>Connect the USB connectivity cable  to your PC and then the target device</li>
-    <li>For S60 devices, select PC-Suite from the USB Mode list when the target device is connected</li>
-    <li>Download the Application TRK or System TRK SISX file to the device</li>
-    <li>On the PC 
-    (optional)</li>
-  </ol>
-  <ol>
-    <ol type="a">
-      <li>Open the Windows Computer Management (Windows XP) </li>
-      <p>Right-click <b>My Computer</b> and select <b>Manage</b> from the context menu to open the <b>Computer Management</b> window. Select <b>System Tools &gt; Device Manager &gt; Ports (COM &amp; LPT)</b> to display all active ports. </p>
-      <li>Locate the S60 Phone USB (COMx) item in the list (Figure 2) </li>
-      <p align="center"><img src="../../reference/images/wnd_win_device_mgr.png" width="502" height="339" /></p>
-      <p class="figure">Figure 2. Device Manager showing Ports (COM &amp; LPT) section</p>
-      <li>The USB COM Port number should match the COM port used in the <a href="../../projects/launch/page_connection.htm">Connections</a> tab of the TRK launch
-      configuration.</li>
-      <li>Close the Device Manager window</li>
-    </ol>
+    <li>Connect the USB connectivity cable  to your PC and then the phone or target device</li>
+    <li>On the phone or target device,  select PC-Suite from the USB Mode options when asked</li>
+    <li>In Carbide.c++, verify the current available connection is shown in the Remote Connections view or the indicator in the trim area</li>
   </ol>
 </div>
 <h5>Related concepts</h5>
 <ul>
-  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+  <li><a href="../../concepts/trk.htm">On-device Debugging</a></li>
+  <li><a href="../debugger/run_mode_debug.htm">Run Mode On-Device Debugging</a></li>
 </ul>
 <h5>Related references</h5>
 <ul>
   <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
 </ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="trk_install_usb.htm">Installing On-device Debug Agents using USB</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm	Tue Mar 09 17:31:44 2010 -0600
@@ -9,13 +9,14 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Installing an On-device Debug Agent </h2>
-<p>To use any version of the on-device debug agent on a target device it must be installed. We highly recommend using the  <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to help connect and verify that the latest version of TRK is installed on the device. Or, to manage this manually, follow the instructions to install the TRK debug agent software  using <a href="trk_install_bluetooth.htm">Bluetooth</a> or <a href="trk_install_usb.htm">USB</a>.</p>
+<p>To use any version of the on-device debug agent on a target device it must be installed. We highly recommend using the  <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to help connect and verify that the latest version of TRK (3.2.6+) is installed on the device, especially to support plug-and-play (PnP) connections. </p>
+<p>Refer to the <a href="trk_connection_bluetooth.htm">Bluetooth Connection Setup</a> page for more information on using Bluetooth or the <a href="trk_connection_usb.htm">USB Connection Setup</a> page if using USB.</p>
 <h5>Related references </h5>
 <ul>
   <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a></li>
   <li><a href="../../concepts/trk.htm">On-Device Debugging </a></li>
   <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Mar 09 10:34:04 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Mar 09 17:31:44 2010 -0600
@@ -9,13 +9,12 @@
     <topic label="Updating Carbide" 			href="html/tasks/start/carbide_updating.htm" />
     <topic label="Tour of the UI"				href="html/concepts/tour.html" />
     <topic label="Concepts" 					href="html/concepts/concepts.htm" />
-    <topic label="Application Emulator Debug Example"  	href="html/tasks/start/carbide_example.htm" >
-      <topic label="1. Creating New Projects" 		        	href="html/tasks/CreatingNewProjects.html" />
-      <topic label="2. Building Projects and Symbian Components" 	href="html/tasks/projects/prj_build.htm" />
-      <topic label="3. Creating a Launch Configuration"			href="html/tasks/projects/prj_debug_config.htm" />
-      <topic label="4. Debugging a Symbian OS Program" 			href="html/tasks/start/carbide_debugging.htm" />
-    </topic>
-    <topic label="DLL Emulator Example" href="html/concepts/SampleExampleProjectCreate.html" />
+	<topic label="Application Emulator Example"  				href="html/tasks/start/carbide_example.htm" >
+	  <topic label="1. Creating New Projects" 		        	href="html/tasks/CreatingNewProjects.html" />
+	  <topic label="2. Building Projects and Symbian Components" 	href="html/tasks/projects/prj_build.htm" />
+	  <topic label="3. Creating a Launch Configuration"			href="html/tasks/projects/prj_debug_config.htm" />
+	  <topic label="4. Debugging a Symbian OS Program" 			href="html/tasks/start/carbide_debugging.htm" />
+	</topic>
   </topic>
   <topic label="Carbide Menus " 					href="html/reference/menus/menus.htm" >
     <topic label="ABLD Actions" 				href="html/reference/menus/abld.htm" />
@@ -224,7 +223,6 @@
       </topic>
     </topic>
 	
-    <topic label="PnP Debugging"  href="html/projects/launch/pnp_debug_overview.htm" >
        <topic label="Debugging with an emulator"				href="html/projects/launch/launch_emulator.htm" >
 			<topic label="Executable Selection"					href="html/projects/launch/wiz_new_launch_config.htm#EXE_SEL" />
 			<topic label="Build Options Selection"				href="html/projects/launch/wiz_new_launch_config.htm#BLD_OPT" />
@@ -234,13 +232,19 @@
 			  <topic label="Unsetting Built-in Environment"	        href="html/reference/wnd_carbide_pref_x86.htm" />
 			</topic>
        </topic>
-	   
-       <topic href="html/projects/launch/launch_phone.htm" label="Debugging a phone">
+       
+    <topic label="Run mode debugging"  href="html/projects/launch/pnp_debug_overview.htm" >
+	   <topic href="html/projects/launch/launch_phone.htm" label="Debugging a phone">
           <topic label="Configure launch configuration"		href="html/projects/launch/wnd_config_launch_config.htm" />
           <topic label="Remote connection setting"			href="html/projects/launch/wnd_change_connection.htm" />
           <topic label="Debug process settings"				href="html/projects/launch/wnd_change_debug_process.htm" />
           <topic label="Other settings"						href="html/projects/launch/wnd_change_other_settings.htm" />
        </topic>
+    </topic>
+
+
+    <topic label="DLL Emulator Example" href="html/concepts/SampleExampleProjectCreate.html" />
+    </topic>
 	   
        <topic href="html/projects/launch/launch_board.htm" label="Debugging a reference board">
        </topic>
@@ -248,7 +252,8 @@
     <topic label="Run mode projects" 						href="html/tasks/RunModeToc.htm">
       <topic label="Run Mode Overview"  			href="html/tasks/start/carbide_overview_trk.htm" ></topic>
       <topic href="html/concepts/autotargeting.htm" label="Auto-Targeting of Executables"></topic>
-      <topic href="html/tasks/start/carbide_example_trk.htm" label="Run Mode Debug Example">
+      
+      <topic href="html/tasks/start/carbide_example_trk.htm" label="Run Mode Example">
         <topic href="html/tasks/trk/trk_preconditions.htm" label="1. Preconditions to On-Device Debugging"></topic>
         <topic href="html/tasks/trk/trk_installation_instr.htm" label="2. Installing an On-Device Debug Agent"></topic>
         <topic href="html/tasks/projects/working_with_sis_pkg_files.htm" label="3. Creating a PKG File"></topic>
@@ -256,7 +261,8 @@
         <topic href="html/tasks/start/carbide_deploying.htm" label="5. Deploying Programs"></topic>
         <topic href="html/tasks/trk/trk_carbide_setup.htm" label="6. Launch Configuration Setup">
           <topic href="html/reference/trk/panel_trk_overview.htm" label="Debug (On-device Debugging) Overview"></topic>
-        </topic>
+      </topic>
+        
         <topic href="html/tasks/projects/prj_debug_config.htm" label="7. Debugging Applications">
           <topic href="html/tasks/projects/prj_debug_dlls.htm" label="Debugging DLLs"></topic>
           <topic href="html/tasks/projects/prj_import_exe.htm" label="Importing a Symbian Executable"></topic>
@@ -265,17 +271,19 @@
           <topic href="html/concepts/arm_registers.htm" label="Registers"></topic>
           <topic href="html/reference/view_symbian_kernel.htm" label="Symbian OS Data View"></topic>
         </topic>
+        
       </topic>
       <topic label="Troubleshooting" 						href="html/tasks/trk/trk_troubleshooting.htm"/>
     </topic>
+    
     <topic label="Stop mode projects" 				href="html/tasks/StopModeToc.htm">
-      <topic label="Stop Mode Debug Example" 					href="html/tasks/debugger/stop_mode_debug.htm" >
+      <topic label="Stop Mode Debug Example" 				href="html/tasks/debugger/stop_mode_debug.htm" >
         <topic label="1. On-Device Debugging Preconditions" href="html/tasks/debugger/stop_mode_debug_precond.htm" />
         <topic label="2. Trace32 Support" 					href="html/projects/launch/trace32.htm" >
-          <topic label="Main" 							href="html/projects/launch/page_main.htm" />
+          <topic label="Main" 								href="html/projects/launch/page_main.htm" />
           <topic label="Connection" 						href="html/projects/launch/page_connection.htm" />
-          <topic label="Debugger" 						href="html/projects/launch/page_debugger.htm" />
-          <topic label="ROM Image" 						href="html/projects/launch/page_rom_image.htm" />
+          <topic label="Debugger" 							href="html/projects/launch/page_debugger.htm" />
+          <topic label="ROM Image" 							href="html/projects/launch/page_rom_image.htm" />
           <topic label="Executables" 						href="html/projects/launch/page_executables.htm" />
           <topic label="Source" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm" />
           <topic label="Commmon" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm/" />
@@ -287,7 +295,7 @@
       <topic label="Symbian OS Data View"					href="html/reference/view_symbian_kernel.htm" />
       <topic label="Toggle HW Breakpoint"           		href="html/reference/menus/hardware_breakpoints.htm" />
     </topic>
-    </topic>
+    
     <topic href="html/reference/trk/wnd_new_connection_wizard.htm" label="On-Device Connections Overview" >
       <topic label="Remote Connections view"			href="html/reference/trk/view_remote_connection.htm" />
       <topic href="html/reference/trk/wnd_new_conn_wiz_edit.htm" label="Adding, editing, and deleting connections" />
@@ -337,7 +345,6 @@
       <topic label="Debugging in ROM"		                href="html/tasks/projects/prj_debug_rom.htm" />
       <topic label="Importing Symbian Executables"		href="html/tasks/projects/prj_import_exe.htm" />
     </topic>
-  </topic>
   <topic href="html/reference/search/wnd_system_search.htm" label="System Search">
     <topic label="System Search view"      		href="html/reference/search/view_system_search.htm" />
     <topic label="System Search preferences"    href="html/reference/search/wnd_system_search_prefs.htm" />