# HG changeset patch
# User fturovic <frank.turovich@nokia.com>
# Date 1285185753 18000
# Node ID 047b263f100422b062fbde5a903920f85bd783db
# Parent  42a54f0190c1d9c20ecb293cfeb6eda7a2411c9c
more trk to coda changes

diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -12,7 +12,7 @@
 <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 CODA agent on the target device to download, launch, and debug the program.</p>
 <ol>
   <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_installation_instr.htm">Install</a> CODA (Carbide On-device Debug Agent) 4.x 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>
@@ -28,7 +28,7 @@
     <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>
-  <p>Once you've setup your environment, its time to verify that the CODA agent is on the phone or target device.</p>
+  <p>Once you've setup your environment, its time to verify that  CODA  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>
 
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -23,13 +23,11 @@
 </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 CODA: Symbian OS Device (Install SIS) and Symbian OS Device.</p>
+<p>CODA (Carbide On-device Debug Agent)  is delivered to the target device as a SISX file. It can be used with all Symbian OS launch configurations that require an on-device agent.</p>
   <ul>
     <li>Symbian OS Device (Install SIS)&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>Symbian OS Device&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>
@@ -46,7 +44,7 @@
     <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 CODA SISX file on the device to install the CODA debug agent.</li>
+    <li>Select the CODA SISX file on the device to install the CODA software.</li>
   </ol>
   <h5>Installing using PC Suite</h5>
   <ol>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -27,7 +27,7 @@
   <ol>
     <li>On the device make sure the Bluetooth port is turned on</li>
     <li>On the phone launch CODA.</li>
-    <p>The location of the CODA on-device debug agent will vary based on the phone. On some phones it will be in the Installed folder, on others it may be in the My Own folder.</p>
+    <p>The location of CODA (Carbide On-device Debug Agent) will vary based on the phone. On some phones it will be in the Installed folder, on others it may be in the My Own folder.</p>
     <li>CODA will ask which host you want to pair with. When requested, select your computer from the available Bluetooth devices list.</li>
     <li>After the host and phone are paired, CODA should be connected. Verify that CODA is running.</li>
     <li>On the PC:
@@ -52,7 +52,7 @@
     <li>Halt the Bluetooth device search by pressing Cancel</li>
     <li>Click Options &gt; Settings &gt; Connection</li>
     <li>Change Connection type to USB and set connection options (Figure 2) </li>
-    <li>Select Back and start the CODA again and you should be connected</li>
+    <li>Select Back and start the CODA software again and you should be connected</li>
     <p align="center"><img src="images/TRK_USB_settings.png" width="211" height="250" /></p>
     <p class="figure">Figure 2. USB Connection Settings</p>
     <li>On the PC</li>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_to_process.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_to_process.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_to_process.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -13,7 +13,7 @@
   <p>Use a <b>Symbian OS Attach to Process</b> launch configuration to attach the debugger to an already running Symbian OS process or thread on a target device. This is useful for debugging DLLs where the main process is unknown or for servers running in RAM in a client-server relationship where the client relies on the presence of the server process to operate.</p>
   <p>One common debugging DLL use case is when the developer doesn't know which process calls the DLL. This makes it difficult to debug the DLL because you doesn't know which process to attach to nor start. Carbide enables DLL debugging  by simply attaching the DLL to any running process as long as the DLL is included in the <a href="../../reference/view_executables.htm">Executables</a> view.</p>
   <p>You can also attach to a process in the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view when debugging.</p>
-  <p class="note"><b>NOTE</b> You cannot attach to a process running on the emulator. It must be a target device running the Symbian OS and the CODA debug agent.</p>
+  <p class="note"><b>NOTE</b> You cannot attach to a process running on the emulator. It must be a target device running the Symbian OS and the CODA software.</p>
   <p>When attempting to find a process the debugger  uses the UID3  to locate the process. </p>
   <div class="step">
     <h4>Attaching to any Running Process</h4>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -12,7 +12,7 @@
 <p>You will see symbolic information for other components when  you are debugging  in ROM using Symbian OS Device  if those components were built with symbolic information and the ROM Log file is specified. If a function in the stack crawl is in a ROM module and the IDE is able to find a file containing symbolic information for that module, the IDE will load it automatically and display function names. The IDE will also allow source level debugging and let you set breakpoints in this module. </p>
 <p>Some issues to pay attention to  when debugging include: </p>
 <ul>
-  <li>In Symbian OS Device you must specify the ROM log file in the <a href="../../projects/launch/page_rom_log.htm">ROM Log</a> tab of the CODA  or Attach to Process launch configurations</li>
+  <li>In Symbian OS Device you must specify the ROM log file in the <a href="../../projects/launch/page_rom_log.htm">ROM Log</a> tab of the <b>Symbian OS Device</b> or <b>Symbian OS Device (Attach to Process)</b> launch configurations</li>
 </ul>
 <blockquote>
   <p class="note"><b>NOTE</b> You cannot debug ROM DLLs using Symbian OS Device (Install SIS). </p>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -31,10 +31,10 @@
         <p>For this example we select the musicplayer.exe as the main executable.</p>
         <p align="center"><img src="../trk/images/trk_exe_selection.png" width="438" height="533"></p>
         <p class="figure">Figure 2 - Executable Selection page showing selection </p>
-        <li>Select the remote connection to use in the CODA Connection Settings page, then click Next</li>
+        <li>Select the remote connection to use in CODA Connection Settings page, then click Next</li>
         <p align="center"><img src="../trk/images/trk_conn_settings.png" width="438" height="533"></p>
         <p class="figure">Figure 3 - CODA Connection Settings page showing selection </p>
-        <li>Select the SIS file to install in the CODA SIS Selection page if not already populated</li>
+        <li>Select the SIS file to install in CODA SIS Selection page if not already populated</li>
       </ol>
       <blockquote>
         <p class="figure"><img src="../trk/images/trk_sis_selection.png" width="438" height="533"></p>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -24,7 +24,7 @@
     </ul>
   </li>
   <li><a href="../projects/prj_build.htm">Build</a> the project using a target for on-device build configuration (GCCE or ARM) </li>
-  <li>Start the CODA on-device debug agent on the device</li>
+  <li>Start the CODA software on the device</li>
   <li><a href="../projects/prj_debug_config.htm">Create</a> a Symbian OS Device (Install SIS) <a href="../trk/trk_carbide_setup.htm">launch configuration</a> to provide additional information to the debugger</li>
   <li>Launch the <a href="carbide_debugging.htm">debugger</a> to interactively control the program on the  device</li>
 </ol>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>Bluetooth Connection Setup</h2>
-<p>The on-device debug agent software supports the use of Bluetooth to debug programs running on a target device. To enable communication with a Bluetooth device, a connection must be established between the PC and the device. The on-device debug agent requires a dedicated COM port in order to talk with the device. In some cases, other programs that use the same COM port number will interfere with the CODA debug agent, essentially &quot;fighting&quot; over control of the COM port. Follow the steps below to setup a Bluetooth connection with the Bluetooth enabled device. </p>
+<p>The on-device debug agent software supports the use of Bluetooth to debug programs running on a target device. To enable communication with a Bluetooth device, a connection must be established between the PC and the device. The on-device debug agent requires a dedicated COM port in order to talk with the device. In some cases, other programs that use the same COM port number will interfere with CODA, essentially &quot;fighting&quot; over control of the COM port. Follow the steps below to setup a Bluetooth connection with the Bluetooth enabled device. </p>
 <p class="note"><b>NOTE</b> Ensure that no other program has commandeered the Bluetooth connection. For example, some phone connectivity programs will not release a COM port unless specifically told to do so. </p>
 <p class="note"><b>NOTE</b> Most problems with on-target debugging setup occur here, so be careful when performing each of these steps.</p>
 <div class="step">
@@ -27,7 +27,7 @@
     <p class="figure">Figure 1. Bluetooth Configuration windows Accessibility panel </p>
     <li>Write down the Bluetooth COM Port number from the  Local Services tab (Figure 2) for later use</li>
 	<p>The Bluetooth COM Port number in the Local Services tab
-	  should match the COM port used in the <a href="../../projects/launch/page_connection.htm">Connections</a> tab of the CODA <a href="../../projects/launch/page_main.htm">launch<br />
+	  should match the COM port used in the <a href="../../projects/launch/page_connection.htm">Connections</a> tab of CODA <a href="../../projects/launch/page_main.htm">launch<br />
     configuration</a>.</p>
     <p align="center"><img src="images/wnd_bluetooth_config_services.png" width="460" height="437" /></p>
     <p class="figure">Figure 2. Bluetooth Configuration windows Local Services panel </p>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>Installing On-device Debug Agents using Bluetooth </h2>
-<p>Use Bluetooth to install the on-device debug agent, either Symbian OS Device (Install SIS) or Symbian OS Device, as a SISX file, to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. Symbian OS Device (Install SIS) is usable on both consumer and RnD versions of the device. Symbian OS Device is only usable on RnD devices.</p>
+<p>Use Bluetooth to install the on-device debug agent, either <b>Symbian OS Device (Install SIS)</b> or <b>Symbian OS Device</b>, as a SISX file, to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. Symbian OS Device (Install SIS) is usable on both consumer and RnD versions of the device. Symbian OS Device is only usable on RnD devices.</p>
 <p>On some phones  it will be the <b>Installed</b> folder, on others it may be in <b>My Own </b>folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
 <p class="note"><b>NOTE</b> The following example shows how to install the SISX file from a PC running Windows XP SP2 using an internal Bluetooth device. The actions to install the SISX file may be different on your version of Windows. Refer to the OS documentation for information on transferring a file via a Bluetooth connection.</p>
 <div class="step">
@@ -28,7 +28,7 @@
 	<p>Start the Messaging application on the target device and locate the new message. </p>
     <li>Select the SISx file and open the file to install it</li>
 	<li>Click OK when prompted to install CODA</li>
-	<li>Follow the instructions on the screen to finish installing the CODA debug agent</li>
+	<li>Follow the instructions on the screen to finish installing CODA</li>
   </ol>
 </div>
   <h5>Related concepts</h5>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -8,32 +8,31 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
-<h2>Installing On-device Debug Agents using PC Suite</h2>
-<p>Use the PC Suite software that came with your device (<a href="http://europe.nokia.com/A4144905">Nokia PC Suite</a> is one example) to install the on-device debug agent, either Symbian OS Device (Install SIS) or Symbian OS Device, as a SISX file, to enable on-device debugging. Symbian OS Device (Install SIS) is usable on both consumer and RnD versions of the device. System TRK is only usable on RnD devices.</p>
+<h2>Installing On-device Debug Agents using Ovi/PC Suite</h2>
+<p>Use the <b>Ovi Suite</b> or <b>PC Suite</b> software that came with your device (<a href="http://europe.nokia.com/A4144905">Nokia PC Suite</a> is one example) to install CODA (Carbide On-device Debug Agent) as a SISX file, to enable on-device debugging. CODA is usable on both consumer and Rnd versions of the device. </p>
 <p>The installation location of the  on-device debug agent software varies based on the phone. On some phones  it will be the <b>Installed</b> folder, on others it may be in <b>My Own</b> folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
-<p>Using PC Suite you can install any TRK debug agent on the device  using  a Bluetooth or USB connection. </p>
+<p>Using PC Suite you can install CODA on the device  using  a Bluetooth or USB connection. </p>
 <p class="note"><b>NOTE</b> You can  use the connection software that came with your device to install the on-device debug agent SISX file. See your phone's operating manual for assistance on using it's software.</p>
 <div class="step">
-  <h4>Installing an On-device Debug Agent using PC Suite (USB example) </h4>
+  <h4>Installing CODA using Ovi/PC Suite (USB example) </h4>
   <ol>
-    <li>Store the TRK SISX file  on the PC connected to the device </li>
-	<p>The Application TRK debug agents are stored online and can be downloaded and installed using the <a href="../../projects/launch/wiz_new_launch_config.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
+    <li>Store the CODA SISX file  on the PC connected to the device </li>
+	<p>The CODA software is stored online and can be downloaded and installed using the <a href="../../projects/launch/wiz_new_launch_config.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
 	<li>Connect the USB cable to the PC, then to the  device</li>
 	<p>A status indicator should appear on the device indicating a serial connection has been established.</p>
     <li>Connect to the device using the latest PC Suite software
       <ol type="a">
-        <li>Install  PC Suite if not available </li>
-  <p class="note"><b>NOTE</b> If you have both Sony Ericcson Mobile Communications (SEMC) and Nokia PC Suites installed, conflicts may occur.</p>
-        <li>Launch the PC Suite software </li>
+        <li>Install  Ovi/PC Suite if not already installed</li>
+  <li>Launch the Ovi/PC Suite software </li>
         <li>Click the &quot;Click here to connect to  a phone&quot; and follow the Get Connected wizard instructions</li>
-	<p>Once the device has been found and authenticated by the PC its possible to install the TRK SISX file.</p>
+	<p>Once the device has been found and authenticated by the PC its possible to install the CODA SISX file.</p>
       </ol>
     </li>
-    <li>Double-click the TRK SISX file to install  it on the device </li>
+    <li>Double-click the CODA SISX file to install  it on the device </li>
   </ol>
   <blockquote>
-    <p>The <b>PC Suite</b> application installer  launches and asks where to install the SISX file. Select the recommended destination  for installed applications on the device and click <b>Yes</b>. The SISX file is installed. </p>
-  Then exit out of PC Suite. </blockquote>
+    <p>The <b>Ovi/PC Suite</b> application installer  launches and asks where to install the SISX file. Select the recommended destination  for installed applications on the device and click <b>Yes</b>. The SISX file is installed. </p>
+  Then exit out of Ovi/PC Suite. </blockquote>
 </div>
 <h5>Related concepts</h5>
 <ul>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -9,8 +9,8 @@
 </head>
 <body >
 <h2>Installing On-device Debug Agents using USB</h2>
-<p> An USB connection can be used to install the on-device debug agent, either Application TRK or System TRK, (SISX file), to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
-<p class="note"><b>NOTE</b> You can  use the connection software that came with your device to install the on-device debug agent SISX file. For example, all Nokia phones ship with the PC Suite software for installing programs. See your phone's operating manual for assistance on using it's software. </p>
+<p> An USB connection can be used to install CODA (Carbide On-device Debug Agent), to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
+<p class="note"><b>NOTE</b> You can  use the connection software that came with your device to install the on-device debug agent SISX file. For example, all Nokia phones ship with the Ovi/PC Suite software for installing programs. See your phone's operating manual for assistance on using it's software. </p>
 <div class="step">
   <h4>Installing an On-device Debug Agent using USB</h4>
   <ol>
@@ -24,9 +24,9 @@
           <li>Press OK soft key to accept notification</li>
           <p>The message &quot;USB file transfer connection active&quot; appears on the phone. On the PC, a folder appears showing the memory cards folders and files.</p>
       </ol>
-	<li>Copy the SISX file to phone memory or  MMC card</li>
+	<li>Copy the CODA SISX file to phone memory or  MMC card</li>
 	<p>Locate the SISX file on the PC, then select and copy it into the target device's memory card. </p>
-    <li>Install the SISX file </li>
+    <li>Install the CODA SISX file </li>
 	<p>The final step is to install the SISX program on the target device. </p>
       <ol type="a">
         <li>Locate and launch the SISX file to install </li>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <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 (3.2.6+) is installed on the device, especially to support plug-and-play (PnP) connections. </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 CODA (Carbide On-device Debug Agent) 4.x 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>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>CODA Overview</h2>
-<p>This section describes how to setup and use the CODA software (Carbide On-device Debug Agent) to debug programs on Symbian ^3, Symbian ^4, Nokia Qt SDK, S60 v5.x   devices. Topics include: </p>
+<p>This section describes how to setup and use CODA  (Carbide On-device Debug Agent) to debug programs on Symbian ^3, Symbian ^4, Nokia Qt SDK, S60 v5.x   devices. Topics include: </p>
 <ul>
   <li><a href="trk_preconditions.htm">Preconditions for Using On-device Debugging </a></li>
   <li><a href="trk_installation_instr.htm">Installing the </a><a href="trk_preconditions.htm">On-device Debug Agent </a><a href="trk_installation_instr.htm">on a Device</a></li>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -15,18 +15,17 @@
   <ol>
     <li>Verify that your system has the following:
       <ul>
-        <li>S60 v3.x or S60 v5.x kit installed</li>
-        <li>ActivePerl installed</li>
+        <li>A current Symbian OS SDK is installed</li>
+        <li>Perl installed</li>
         <li>RVCT or GCCE compiler</li>
         <li>USB or Bluetooth support on your PC </li>
-        <li>Nokia PC Suite (or equivilent software) for connecting and installing applications to the device </li>
+        <li>Nokia Ovi/PC Suite (or equivilent software) for connecting and installing applications to the device </li>
       </ul>
     </li>
-    <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog</li>
-    <p>The Application TRK debug agents are stored If not, install it now using the <a href="../../projects/launch/wiz_new_launch_config.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
-    <p class="note"><b>NOTE</b> The Application TRK versions included with Carbide is for CE versions of devices only. They are not intended for use with RnD devices. </p>
+    <li>Download and install the current CODA SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog</li>
+    <p>If CODA is not install, use the <a href="../../projects/launch/wiz_new_launch_config.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
     <li>Specify the communication method with the on-target device during the debug session</li>
-  <p>Start the Application TRK or System TRK on the device. During startup of TRK on the device you must specify the communication method the on-device agent uses to debug the device. Currently, those methods include <a href="trk_connection_bluetooth.htm">Bluetooth</a> and <a href="trk_connection_usb.htm">USB</a> or a null serial cable. For Bluetooth, you must pair the device with the PC and a valid serial port assigned. For USB, A USB cable must connect the PC to the device and a valid serial port assigned. Use <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to make the identification and connection setup quick and easy. </p>
+  <p>Start CODA on the device. During startup of CODA on the device you must specify the communication method the on-device agent uses to debug the device. Currently, those methods include <a href="trk_connection_bluetooth.htm">Bluetooth</a> and <a href="trk_connection_usb.htm">USB</a> or a null serial cable. For Bluetooth, you must pair the device with the PC and a valid serial port assigned. For USB, A USB cable must connect the PC to the device and a valid serial port assigned. Use <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to make the identification and connection setup quick and easy. </p>
   </ol>
 </div>
 <h5>Related concepts</h5>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -4,15 +4,15 @@
 <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>Bluetooth Connectivity Setup</title>
+<title>Starting the On-Device CODA Software</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
-<h2>Starting the On-Device TRK Debug Agent</h2>
+<h2>Starting the On-Device CODA Software</h2>
 <div class="step">
-  <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
+  <p>The location of the CODA software varies based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
   <ol>
-    <li>Launch the Application TRK or System TRK program on the device</li>
+    <li>Launch the CODA program on the device</li>
     <li>When requested, select your computer from the available Bluetooth devices list</li>
     <p align="center"><img src="images/trk_bt_device_search_dialog.png" width="211" height="250" /></p>
     <p class="figure">Figure 1. Example device list on a S60 3rd Edition or UIQ device</p>
@@ -21,12 +21,12 @@
       <p align="center"><img src="images/trk_bt_connected.png" width="211" height="250" /></p>
       <p class="figure">Figure 2. COM port verification in TRK on a device</p>
     </li>
-    <li>If Application TRK reports &quot;Not Connected&quot;
-      <ol type="a">
+    <li>If CODA reports &quot;Not Connected&quot;
+        <ol type="a">
         <li>Click Options &gt; Settings soft key </li>
         <li>If Connection is not set to BlueTooth, choose BlueTooth </li>
         <li>Click Ok soft key</li>
-        <li>Restart Application TRK  </li>
+        <li>Restart CODA  </li>
       </ol>
     </li>
   </ol>
diff -r 42a54f0190c1 -r 047b263f1004 core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm	Wed Sep 22 13:55:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm	Wed Sep 22 15:02:33 2010 -0500
@@ -10,11 +10,11 @@
 <body >
 <h2>Starting the On-Device Debug Agent Using USB </h2>
 <div class="step">
-  <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
+  <p>The location of the CODA software varies based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
   <ol>
     <li>On the device
       <ol>
-        <li>Launch Application TRK or System TRK program on the device</li>
+        <li>Launch the CODA program on the device</li>
     	<li>Select PC-Suite from the USB Mode list</li>
       </ol>
     </li>
@@ -25,7 +25,7 @@
       <p align="center"><img src="images/trk_connection_options.png" width="211" height="250" />&nbsp;<img src="images/trk_usb_settings.png" width="211" height="250" /></p>
       <p class="figure">Figure 1 - Change connection type to USB and set connection options</p>
     </blockquote>
-    <li>Select Back and start  TRK again and you should be connected</li>
+    <li>Select Back and start  CODA again and you should be connected</li>
   </ol>
 </div>
   <h5>Related concepts</h5>