BUG 12110 - text instances of apptrk/systrk changed, more images yet to update
authorfturovic <frank.turovich@nokia.com>
Tue, 21 Sep 2010 15:50:51 -0500
changeset 2087 617a89f9dffc
parent 2086 218e49ed806f
child 2088 a91e428e209c
child 2090 0a42921f1c76
BUG 12110 - text instances of apptrk/systrk changed, more images yet to update
core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/trk.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_other.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/images/code_process.png
core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_05.png
core/com.nokia.carbide.cpp.doc.user/html/projects/images/wnd_debug_AppTRK_launch_config.png
core/com.nokia.carbide.cpp.doc.user/html/projects/images/wnd_debug_attach_process_launch_config.png
core/com.nokia.carbide.cpp.doc.user/html/projects/images/wnd_debug_emulation_launch_config.png
core/com.nokia.carbide.cpp.doc.user/html/projects/images/wnd_debug_trace32_launch_config.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/emulation.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/filter_launch_config.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/icon_filter_launch_config.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/launch_board_01.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/launch_phone_01.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_debug_overview.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_launch_config_blank.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_launch_config_new.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.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/launch_types.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_connection.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_executables.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_file_transfer.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_installation.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_image.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_log.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_x86_exceptions.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_03.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_03.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_01.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_02.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/images/panel_filter.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_install_agent.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_setup_conn.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_test_conn.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_trk_debug_config.png
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.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/reference/trk/wnd_new_connection_wizard.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_os_data_overview.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/RunModeToc.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/images/Debug_Config_main.png
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_08.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug02.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.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_install_bluetooth.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm
core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -61,7 +61,7 @@
 <p>Once you have an <span class="code">.N-GAGE</span> game file, you need to deploy it on the target device:</p>
 <ol>
   <li>Verify that you have a valid developer certificate on the target device given to you by the  Nokia R&amp;D Certificate Service. If not, get and install one.</li>
-  <li>Verify that you have Application CODA installed on the target device. If not, install it now using <a href="../reference/trk/wnd_new_connection_wizard.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</li>
+  <li>Verify that you have CODA installed on the target device. If not, install it now using <a href="../reference/trk/wnd_new_connection_wizard.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</li>
 <li>Manually install the <span class="code">.N-GAGE</span>  file on the device</li>
 </ol>
 <h4>Debugging the Game project</h4>
@@ -69,7 +69,7 @@
 <ol>
   <li>Open <span class="note"><b>Window &gt; Preferences &gt; Run/Debug &gt;<img src="../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel </span>and disable the <b>Build (if required) before launching</b> option under the General Options group</li>
   <li>Right-click the project and choose <b>Debug As &gt; Debug Configuration</b> to open the <b><a href="../reference/wnd_debug_configuration.htm">Debug Cinfigurations</a></b> window</li>
-  <li><a href="../tasks/projects/prj_debug_config.htm">Create</a> an <b>Symbian OS Application CODA</b> launch configuration
+  <li><a href="../tasks/projects/prj_debug_config.htm">Create</a> an <b>Symbian OS Device (Install SIS)</b> launch configuration
       <ul>
       <li>In the <b><a href="../projects/launch/page_connection.htm">Connection</a></b> tab select the COM port used to connect to the device. </li>
       <li> In the <b><a href="../projects/launch/page_installation.htm">Installation</a></b> tab, verify that the game SISX file is correct </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -16,7 +16,7 @@
 </ul>
 <h2><a name="general"></a>General registers</h2>
 <p>Registers are the register contents of the central processing unit (CPU) of the host computer or the targeted device. When debugging projects using the emulator, only the host computer x86 registers are visible in the <a href="../reference/view_registers.htm">Registers</a> view. When debugging projects on a device, only the target device registers are visible. </p>
-<p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with Application CODA, you cannot change the LR and SP registers.</p>
+<p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with Symbian OS Device (Install SIS), you cannot change the LR and SP registers.</p>
 <p align="center"><img src="images/view_registers.png" width="463" height="260"></p>
 <p class="figure">Figure 1. Registers view with possible register types</p>
 <p>The types of registers can include:</p>
@@ -36,7 +36,7 @@
     <li>R14 is the link register (it is used for storing return addresses in the construction of sub routines)</li>
     <li>R15 is the program counter (PC)</li>
 </ul>
-<p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with Application CODA, you cannot change the LR, SP, and CPSR registers.</p>
+<p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with CODA (Carbide On-Device Debug Agent), you cannot change the LR, SP, and CPSR registers.</p>
 <p align="center"><img src="images/ARM_registers.PNG" alt="" width="648" height="276" /></p>
 <p align="left" class="figure">Figure 2 - ARM Registers </p>
 <h5>Other  references <b></b></h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/trk.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/trk.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -17,7 +17,7 @@
   <li>Can be built-in to the OS image or installed as a .sis file</li>
 </ul>
 <p>Using the on-device remote agent, one can use the Carbide.c++ IDE to debug programs running on phone hardware, making the debugging process much easier. The on-device debug agent works on all Nokia Qt SDK, Symbian^3, and Symbian TechView devkits.</p>
-<p>The Application CODA is stored online and available for download and installation using the <a href="../reference/trk/wnd_new_connection_wizard.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
+<p>The <b>Symbian OS Device (Install SIS)</b> is stored online and available for download and installation using the <a href="../reference/trk/wnd_new_connection_wizard.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
 <p>Some of the key benefits to using an on-device debug agent include:</p>
 <ul>
   <li>Easy debugging via serial interface (Bluetooth, USB, IrDA, etc)</li>
@@ -26,8 +26,8 @@
 </ul>
 <p>There are two variations of the on-device debug agent, they are:</p>
 <ul>
-  <li><b>Application CODA</b>&#8212;supports application debugging only and available to developers creating applications for devices. Developers do not have access to system level routines,  system ROM,   other user application code, cannot modify the LR and SR registers, and must use a SIS file to debug an application.</li>
-  <li><b>System CODA</b>&#8212;
+  <li><b>Symbian OS Device (Install SIS)</b>&#8212;supports application debugging only and available to developers creating applications for devices. Developers do not have access to system level routines,  system ROM,   other user application code, cannot modify the LR and SR registers, and must use a SIS file to debug an application.</li>
+  <li><b>Symbian OS Device</b>&#8212;
   supports both application and limited ROM debugging (includes application executables and limited ROM based components (i.e. no device drivers) and available to original equipment manufacturers (OEM) for device creation and customization</li>
 </ul>
 <h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_other.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_other.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -11,7 +11,7 @@
 <h2>Other Useful Commands</h2>
 <p>The <a href="viewing_debug.htm">Debug</a> view has a few other commands that are useful under some debugging situations:</p>
 <h4>Disconnecting from a process</h4>
-<p>Use the <b>Disconnect</b> command  (<img src="../../images/icons/btn_disconnect.png" width="20" height="21" align="absmiddle" />) when debugging with Application CODA or System CODA to detach the debugger from a process on the device while leaving the device running. </p>
+<p>Use the <b>Disconnect</b> command  (<img src="../../images/icons/btn_disconnect.png" width="20" height="21" align="absmiddle" />) when debugging with CODA (Carbide On-device Debug Agent) to detach the debugger from a process on the device while leaving the device running. </p>
 <p>When debugging in stop-mode it will detach the debugger and leave the CPU running on the device. </p>
 <ul>
   <li>Click the <b>Disconnect</b> button (<img src="../../images/icons/btn_disconnect.png" width="20" height="21" align="absmiddle" />) in the <b>Debug</b> view </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -31,7 +31,7 @@
 <p>Use the <b>Terminate</b> command (<img src="../../images/icons/btn_terminate.png" width="17" height="15" align="absmiddle" />) to stop or halt a program based on the type of debugging session underway. Terminate behavior includes: </p>
 <ul>
   <li><b>Emulator</b> - terminates program execution and ends the debug session</li>
-  <li><b>Application CODA</b> or <b>System CODA</b> - kills the process on the device and ends the debug session. To terminate without killing the process, use <a href="cmds_other.htm">Disconnect</a> instead. </li>
+  <li><b>Symbian OS Device</b> - kills the process on the device and ends the debug session. To terminate without killing the process, use <a href="cmds_other.htm">Disconnect</a> instead. </li>
   <li><b>Stop-mode soft attach</b> - suspends the attached process while other processes continue to run on the device. If only a single process is running on the device, the device CPU is suspended. Once the CPU is suspended you must launch a new debug session to resume the device CPU. </li>
 </ul>
 <p>This behavior differs from <a href="cmds_starting.htm">suspending</a> a program, as this temporarily suspends execution.</p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/code_process.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/run_mode_debug_05.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/wnd_debug_AppTRK_launch_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/wnd_debug_attach_process_launch_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/wnd_debug_emulation_launch_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/images/wnd_debug_trace32_launch_config.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,7 +9,7 @@
 
 <body>
 <h2>Applications  Launch Configuration</h2>
-<p>Use the <b>Symbian OS Applications</b> launch configuration to launch projects using the best launch configuration match. When chosen, Carbide examines the project and determines which specific launch configuration  works best for the project, then launches it with the selected launch configuration. It is essentially identical to clicking the <b>Debug</b> icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) in the toolbar.</p>
+<p>Use the <b>Symbian OS Device</b> launch configuration to launch projects using the best launch configuration match. When chosen, Carbide examines the project and determines which specific launch configuration  works best for the project, then launches it with the selected launch configuration. It is essentially identical to clicking the <b>Debug</b> icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) in the toolbar.</p>
 <h4>Other references</h4>
 <ul>
   <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,13 +9,13 @@
 
 <body>
 <h2>Attach to Process  Launch Configuration</h2>
-<p>Use the <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 from within any project. This is useful for debugging servers running in RAM in a client-server relationship where the client relies on the presence of the server process to operate as one example. </p>
+<p>Use the <b>Symbian OS Device (Attach to Process)</b> launch configuration to attach the debugger to an already running Symbian OS process or thread on a target device from within any project. This is useful for debugging servers running in RAM in a client-server relationship where the client relies on the presence of the server process to operate as one example. </p>
 <p>Attaching to a process requires a both target device running the Symbian OS and the presence of CODA on the device. <span class="note">You can also use the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view to attach to a process while debugging.</span> However, you can not attach to a process running on an emulator. </p>
-<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> created the Attach to Process launch configuration no changes are usually needed. The Attach to Process options match those of System CODA with one additional step, selection of the process to debug in the <b>Attach to Process</b> dialog. </p>
+<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> created the Attach to Process launch configuration no changes are usually needed. The Attach to Process options match those of Symbian OS Device with one additional step, selection of the process to debug in the <b>Attach to Process</b> dialog. </p>
 <p>To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the Attach to Process configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
-<p align="center"><img src="../images/wnd_debug_attach_process_launch_config.png" width="800" height="582"></p>
+<p align="center"><img src="../images/wnd_debug_attach_process_launch_config.png" width="780" height="578"></p>
 <p class="figure">Figure 1. Attach to Process launch configuration in the Debug dialog </p>
-<p>The <span class="figure">Attach to Process</span> launch configuration panes include:</p>
+<p>The <b>Symbian OS Device (Attach to Process)</b> launch configuration panes include:</p>
 <ul>
   <li>The <a href="page_main.htm">Main</a> tab defines the project to be launched. Enter the name of the project in the Project field, and the executable name in the Executable field.</li>
   <li>The <a href="page_debugger.htm">Debugger</a> tab defines debug configurations, such as entry point to begin debugging, target options, and instruction set.</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -29,7 +29,7 @@
         <p>The appropriate Run or <a href="../../reference/wnd_debug_configuration.htm">Debug</a> launch configuration window appears (Figure 1).</p>
       </li>
    </ul>
-  <p align="center"><img src="images/wnd_launch_config_blank.png" width="709" height="455" alt="Undefined launch configuration"/> </p>
+  <p align="center"><img src="images/wnd_launch_config_blank.png" width="780" height="578" alt="Undefined launch configuration"/> </p>
   <p class="figure">Figure 1 - Initial blank Debug launch configuration window</p>
   </li>
   <li>Select a type of launch configuration (for example, Symbian OS Emulation), then click the New launch configuration icon to create a new
@@ -37,7 +37,7 @@
     <p>A new configuration appears in the Configuration list under the
       appropriate section  using the project name and target to create the configuration name.</p>
   <p class="note"><b>NOTE</b> By default, when you click New, the project information is used to fill in the Project and Process to launch text boxes. You normally should not have to edit these for a run/debug a project. If a bld.inf has multiple MMPS then the first executable named in the list of MMP files is used to fill in the executable field.  Therefore, for projects with multiple MMPs you may need to change the executable field.    </p>
-  <p align="center"><img src="images/wnd_launch_config_new.png" width="787" height="489" alt="New launch configuration" /></p>
+  <p align="center"><img src="images/wnd_launch_config_new.png" width="874" height="640" alt="New launch configuration" /></p>
   <p class="figure">Figure 2 - New launch configuration with name and settings filled in (emulator)</p>
   </li>
   <li>View the information to define the project and executable
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/emulation.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/emulation.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -11,7 +11,7 @@
 <h2>Emulator Launch Configuration</h2>
 <p>Select the <b>Symbian OS Emulator</b> launch configuration  to run or debug executables using an emulator.  </p>
 <p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create a emulator launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the Symbian OS Emulation launch configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
-<p align="center"><img src="../images/wnd_debug_emulation_launch_config.png" width="658" height="403"></p>
+<p align="center"><img src="../images/wnd_debug_emulation_launch_config.png" width="874" height="640"></p>
 <p class="figure">Figure 1 - Emulator  launch configuration in Debug dialog </p>
 <p>The <b>Debug</b>  window provides C/C++ emulator debug options when a Symbian OS Emulation launch configuration is created. The  settings included in the Symbian OS Emulation launch configuration are a combination of Carbide, CDT, and Eclipse options. The tabs in the window include: </p>
 <ul>
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/filter_launch_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/icon_filter_launch_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/launch_board_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/launch_phone_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_debug_overview.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_launch_config_blank.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wnd_launch_config_new.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -14,15 +14,14 @@
     <li><strong>Symbian OS Phone Launch</strong> &mdash; uses the Eclipse Debugger for C/C++ as the debugger engine which includes snapshots, improved variables view, and other features not available in the Classic debugger.</li>
     <li><strong>Classic Symbian OS Reference Board Launch</strong> &mdash; uses the classic debugger engine.</li>
 </ul>
-<p align="center"><img src="images/launch_board_01.png" width="350" height="350"></p>
+<p align="center"><img src="images/launch_board_01.png" width="346" height="435"></p>
 <p class="figure">Figure 1. Debug As dialog</p>
     <div class="step">
       <h4>Creating a Launch Configuration for a Reference Board</h4>
       <ol>
         <li>Select the <b>Run &gt; Debug</b> menu item, or click the Debug (<img src="../../reference/images/view_symbianOSbtn_debug.png" width="18" height="17" align="absmiddle">) icon, or press F11<br>
-              <p><b>SHORTCUT</b> Select the <b class="note">Run &gt; Debug As &gt; Debug Symbian OS Application on Reference Board</b> menu item to skip Step 2.</p>
-</li>
-        <li>Select the <b>Symbian OS Reference Board Launch</b> item, then click <b>OK</b></li>
+        </li>
+        <li>Select the <b>Symbian OS Device</b> item, then click <b>OK</b></li>
         <li>Select a <a href="wiz_new_launch_config.htm">Launch Type</a>, then click Next</li>
         <li>Complete each page in the New Launch Configuration Wizard for the chosen Launch Type. </li>
         <li>Review  the settings in the <a href="wiz_new_launch_config.htm">New Launch Configuration</a> page</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -16,12 +16,11 @@
 <h4>Available Launch Configurations</h4>
 <p>Launch configurations come in several varieties, each designed for a specific purpose. You must choose one at the very start of the New Launch Configuration Wizard, so knowing the differences between them is important. Currently, the types to choose from include: </p>
 <ul>
-  <li><b><a href="applications.htm">Symbian OS Application</a></b> &#8212; used to run or debug executables. </li>
-  <li><b><a href="run_mode.htm">Symbian OS Appication CODA</a></b> &#8212; used to run or debug applications on a target device using the Application CODA on-device debug agent. Application CODA is an application that runs on released phones and allows you to debug your executables. The debugger will download a Symbian OS installation file to the phone and install it prior to launching.</li>
-  <li><b><a href="attach_process.htm">Symbian OS Attach to Process</a></b> &#8212; used to debug processes running on a target device for which a symbol file is available. This is available only for CODA and stop mode debugging.  This launch configuration is not available for emulator debugging.  Stop mode and CODA can both attach to a process from the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view.</li>
-  <li><b><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.debug.crashdebugger/html/view.html">Symbian OS Crash Debugger</a></b> &#8212; used to launch an interactive command-line session with the Symbian OS crash debugger when the device crashes </li>
-  <li><b><a href="emulation.htm">Symbian OS Emulation</a> </b>&#8212; used to run or debug executables on an emulator. </li>
-  <li><b><a href="stop_mode.htm">Symbian OS System CODA</a></b> &#8212; used to run or debug applications or ROM code on a target device using the System CODA on-device debug agent. System CODA is an application that runs on reference boards and prototype phones and allows you to debug your executables. The debugger will download files to the phone prior to launching.</li>
+    <li><b><a href="stop_mode.htm">Symbian OS Device</a></b> &#8212; used to run or debug applications or ROM code on a target device using  CODA (Carbide On-device Debug Agent).  CODA is an application that runs on reference boards and prototype phones and allows you to debug  executables. The debugger will download files to the phone prior to launching.</li>
+    <li><b><a href="attach_process.htm">Symbian OS Device (Attach to Process)</a></b> &#8212; used to debug processes running on a target device for which a symbol file is available. This is available only for CODA and stop mode debugging.  This launch configuration is not available for emulator debugging.  Stop mode and CODA can both attach to a process from the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view.</li>
+    <li><b><a href="run_mode.htm">Symbian OS Device (Install SIS)</a></b> &#8212; used to run or debug applications on a target device using   CODA.  CODA is an application that runs on released phones and allows you to debug your executables. The debugger will download a Symbian OS installation file to the phone and install it prior to launching.</li>
+  <li><b><a href="emulation.htm">Symbian OS Emulator</a> </b>&#8212; used to run or debug executables on an emulator. </li>
+  <li><b><a href="emulation.htm">Symbian OS Simulator</a> </b>&#8212; used to run or debug executables on a simulator. </li>
 </ul>
 <h4>Other references</h4>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -10,7 +10,7 @@
 <body >
 <h2>Launch Configuration Filtering </h2>
 <p>Use the  <b>Launch Configurations </b> preference panel to  filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs.  </p>
-<p align="center"><img src="images/filter_launch_config.png" width="682" height="587" /></p>
+<p align="center"><img src="images/filter_launch_config.png" width="635" height="579" /></p>
 <p class="figure">Figure 1 - Launch Configurations preference panel </p>
 <h5>Related references</h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -14,15 +14,14 @@
     <li><strong>Symbian OS Phone Launch</strong> &mdash; uses the Eclipse Debugger for C/C++ as the debugger engine which includes snapshots, improved variables view, and other features not available in the Classic debugger.</li>
     <li><strong>Classic Symbian OS Reference Board Launch</strong> &mdash; uses the classic debugger engine.</li>
 </ul>
-<p align="center"><img src="images/launch_phone_01.png" width="350" height="350" align="center"></p>
+<p align="center"><img src="images/launch_phone_01.png" width="346" height="435" align="center"></p>
 <p class="figure">Figure 1. Debug As dialog</p>
 <div class="step">
   <h4>Creating a Launch Configuration for  Emulators</h4>
   <ol>
     <li>Select the <b>Run &gt; Debug</b> menu item, or click the Debug (<img src="../../reference/images/view_symbianOSbtn_debug.png" width="18" height="17" align="absmiddle">) icon, or press F11<br>
-        <p><b>SHORTCUT</b> Select the <b class="note">Run &gt; Debug As &gt; Debug Symbian OS Application on Emulator</b> menu item to skip Step&nbsp;2.</p>
     </li>
-    <li>Select the <b>Symbian OS Emulator Launch</b> item, then click <b>OK</b></li>
+    <li>Select the <b>Symbian OS Emulator </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 emulator</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -3,26 +3,25 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Symbian OS Phone Launch</title>
+<title>Symbian OS Device Launch</title>
 <link href="../../../book.css" rel="stylesheet" type="text/css">
 </head>
 
 <body>
-<h2>Symbian OS Phone Launch</h2>
+<h2>Symbian OS Device Launch</h2>
 <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. Currently there are two choices of debugger:</p>
 <ul>
-    <li><strong>Symbian OS Phone Launch</strong> &mdash; uses the Eclipse Debugger for C/C++ as the debugger engine which includes snapshots, improved variables view, and other features not available in the Classic debugger.</li>
+    <li><strong>Device</strong> &mdash; uses the Eclipse Debugger for C/C++ as the debugger engine which includes snapshots, improved variables view, and other features not available in the Classic debugger.</li>
     <li><strong>Classic Symbian OS Reference Board Launch</strong> &mdash; uses the classic debugger engine.</li>
 </ul>
-<p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
+<p align="center"><img src="images/launch_phone_01.png" width="346" height="435"></p>
 <p class="figure">Figure 1. Debug As dialog</p>
 <div class="step">
   <h4>Creating a Launch Configuration for a Phone</h4>
   <ol>
     <li>Select the <b>Run &gt; Debug</b> menu item, or click the Debug (<img src="../../reference/images/view_symbianOSbtn_debug.png" width="18" height="17" align="absmiddle">) icon, or press F11<br>
-        <p><b>SHORTCUT</b> Select the <b class="note">Run &gt; Debug As &gt; Debug Symbian OS Application on Phone</b> menu item to skip Step 2.</p>
     </li>
-    <li>Select the <b>Symbian OS Phone Launch</b> item, then click <b>OK</b></li>
+    <li>Select the <b>Device</b> item, then click <b>OK</b></li>
     <li>(Optional) Modify the launch configuration settings
       <ol type="a">
           <li>Modify the <a href="wnd_change_connection.htm">Remote connection setting</a> options</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -10,12 +10,11 @@
 <body>
 <h2>Launch Types</h2>
 <p>The following launch configuration types are available:</p>
-<ul>
-  <li><a href="applications.htm">Applications</a></li>
-  <li><a href="run_mode.htm">Application CODA</a></li>
-  <li><a href="attach_process.htm">Attach to Process</a></li>
-  <li><a href="emulation.htm">Emulation</a></li>
-  <li><a href="stop_mode.htm">System CODA</a></li>
+<ul><li><a href="stop_mode.htm">Symbian OS Device</a><a href="stop_mode.htm"></a></li>
+  <li><a href="attach_process.htm">Symbian OS Device (Attach to Process)</a><a href="attach_process.htm"></a></li>
+  <li><a href="run_mode.htm">Symbian OS Device (Install SIS)</a></li>
+  <li><a href="emulation.htm">Symbian OS </a><a href="emulation.htm">Emulator</a></li>
+  <li><a href="simulator.htm">Symbian OS Simulator</a></li>
 </ul>
 <h4>Other references</h4>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_connection.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_connection.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -13,10 +13,10 @@
 <p align="center"><span class="figure"><img src="images/page_connection.png" width="598" height="224"></span></p>
 <p class="figure">Figure 1. Connection page</p>
 <h5>Table 1. <span class="figure">Connection</span> page &mdash;items </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+<table width="800"  border="0" cellpadding="2" cellspacing="0">
   <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
+    <th width="26%" scope="col">Item</th>
+    <th width="74%" scope="col">Explanation</th>
   </tr>
   <tr>
     <td><b>Serial Port </b></td>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -5,17 +5,18 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Carbide Debugger panes</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
 <body >
 <h2>Debugger panes</h2>
 <p>The options shown in the <b>Debugger</b> page differ based upon the type of launch configuration. Generally, the options fall into these choices: </p>
 <ul>
-  <li><a href="#emulator_mode">Emulation Debugger page</a> (Emulation) </li>
-  <li><a href="#trk_runmode">Run-mode Debugger page</a> (Application CODA) </li>
-  <li><a href="#trk_stopmode">Stop-mode Debugger page</a> (System CODA, Attach to Process) </li>
+  <li><a href="#emulator_mode">Emulation Debugger page</a> (<i>Emulator</i>) </li>
+  <li><a href="#trk_runmode">Run-mode Debugger page</a> (<i>Device (Install SIS)</i>) </li>
+  <li><a href="#trk_stopmode">Stop-mode Debugger page</a> (<i>Device, Device (Attach to Process)</i>) </li>
 </ul>
 <h3><a name="emulator_mode" id="emulator_mode"></a>Emulation Debugger page </h3>
-<p>The <b>Symbian OS <a href="emulation.htm">Emulation</a></b> launch configurations the <b>Debugger</b> page to specify  entry point breaks and which  logs to output to the Console view.</p>
+<p>The <b>Symbian OS <a href="emulation.htm">Emulator</a></b> launch configurations the <b>Debugger</b> page to specify  entry point breaks and which  logs to output to the Console view.</p>
 <p align="center"><img src="images/page_debugger_emulation.png" width="685" height="219"></p>
 <p class="figure">Figure 1 - Debugger page showing emulation options </p>
 <h5>Table 1. Debugger page &mdash; emulation options </h5>
@@ -48,7 +49,7 @@
   </tr>
 </table>
 <h3><a name="trk_runmode" id="trk_runmode"></a>Run-mode Debugger page </h3>
-<p>In a run-mode launch configuration like <b><a href="run_mode.htm">Application CODA</a></b>, you can specify an entry break point and how messages are handled as well as define the default instruction set. </p>
+<p>In a run-mode launch configuration like <b><a href="run_mode.htm">Symbian OS Device (Install SIS)</a></b>, you can specify an entry break point and how messages are handled as well as define the default instruction set. </p>
 <p align="center"><img src="images/page_debugger_run_mode.png" width="660" height="174"></p>
 <p class="figure">Figure 2 - Debugger page showing run-mode options  </p>
 <h5>Table 2. Debugger page &mdash; run-mode  options </h5>
@@ -68,7 +69,7 @@
   </tr>
 </table>
 <h3><a name="trk_stopmode" id="trk_stopmode"></a>Stop-mode Debugger page </h3>
-<p>In  stop-mode launch configurations like <b><a href="stop_mode.htm">System CODA</a></b>,<b> </b>and <a href="attach_process.htm"><b>Attach to Process</b></a>, use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
+<p>In  stop-mode launch configurations like <b><a href="stop_mode.htm">Symbian OS Device</a></b>,<b> </b>and <a href="attach_process.htm"><b>Symbian OS Device (Attach to Process)</b></a>, use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
 <p align="center"><img src="images/page_debugger_stop_mode.png" width="578" height="174"></p>
 <p class="figure">Figure 3 - Debugger page showing stop-mode options  </p>
 <h5>Table 3. Debugger page &mdash; stop-mode  options </h5>
@@ -96,9 +97,9 @@
 
 <h4>Other references</h4>
 <ul>
-  <li><a href="run_mode.htm">Application CODA  Launch Configuration</a></li>
-  <li><a href="emulation.htm">Emulation  Launch Configuration</a></li>
-  <li><a href="stop_mode.htm">System CODA  Launch Configuration </a></li>
+  <li><a href="run_mode.htm">Symbian OS Device (Install SIS) Launch Configuration</a></li>
+  <li><a href="emulation.htm">Emulator  Launch Configuration</a></li>
+  <li><a href="stop_mode.htm">Symbian OS Device Launch Configuration </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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_executables.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_executables.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -11,7 +11,7 @@
 <h2>Executables page </h2>
 <p>The <b>Executables</b> page specifies the executables   available to debug with your project based on the chosen rule. The Executables page gives you project level control over the executables associated with it. The page shows all the executables in the workspace or those imported into the Executables view from outside the workspace that can be debugged by this project. See the <a href="../../reference/view_executables.htm">Executables</a> view for information on controlling  executables from the workspace. </p>
 <p align="center"><img src="images/page_executables.png" width="598" height="224"></p>
-<p class="figure">Figure 1 - Executables page (System CODA example) </p>
+<p class="figure">Figure 1 - Executables page (Device example) </p>
 <h5>Table 1.  Executable page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_file_transfer.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_file_transfer.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,8 +9,8 @@
 </head>
 <body >
 <h2>File Transfer page</h2>
-<p>The <b>File Transfer</b> page displays an auto-populated list of files for <a href="stop_mode.htm">System CODA</a> that the IDE transfers to the target device at the start of each launch. For RnD device images, the target location for files is normally <span class="code">c:\sys\bin</span> or another protected area. For production device images <a href="run_mode.htm">Application CODA</a> does not support the transfer of files to <span class="code">c:\sys\bin</span> or other protected areas.</p>
-<p>Users can add, edit, or delete files in the list and sort   by clicking on a column header. By default, any file added is automatically checked for downloading to the device. Users can uncheck a file to remove it from the download list without removing the file itself. System CODA users can  use this panel to download any type of file, like bitmaps, HTML, sounds, and more, to the phone and applicable to Application CODA for transfering any files outside of the installation file.</p>
+<p>The <b>File Transfer</b> page displays an auto-populated list of files for <a href="stop_mode.htm">Symbian OS Device</a> that the IDE transfers to the target device at the start of each launch. For RnD device images, the target location for files is normally <span class="code">c:\sys\bin</span> or another protected area. For production device images <a href="run_mode.htm">Symbian OS Device (Install SIS)</a> does not support the transfer of files to <span class="code">c:\sys\bin</span> or other protected areas.</p>
+<p>Users can add, edit, or delete files in the list and sort   by clicking on a column header. By default, any file added is automatically checked for downloading to the device. Users can uncheck a file to remove it from the download list without removing the file itself.  CODA (Carbide On-device Debug Agent) users can  use this panel to download any type of file, like bitmaps, HTML, sounds, and more, to the phone and applicable to  CODA for transfering any files outside of the installation file.</p>
 <p align="center"><img src="images/page_file_transfer.png" width="598" height="224"></p>
 <p class="figure">Figure 1. File Transfer page</p>
 <h5>Table 1. <span class="figure">File Transfer</span> page &mdash;items </h5>
@@ -30,8 +30,8 @@
       <blockquote>
         <p> The target directories where files can be installed depends upon the type of device image you have on the device and which version of CODA you are using.      </p>
         <ul>
-          <li>Application CODA - public folders only on  production device images</li>
-          <li>System CODA - public and protected folders, like <span class="code">c:\sys\bin</span>, on  RnD device images</li>
+          <li>Symbian OS Device (Install SIS) - public folders only on  production device images</li>
+          <li>Symbian OS Device - public and protected folders, like <span class="code">c:\sys\bin</span>, on  RnD device images</li>
         </ul>
     </blockquote></td>
   </tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_installation.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_installation.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>Installation page</h2>
-<p>The  <b>Installation</b> page specifies the .sis file to install on the target device when using <a href="run_mode.htm">Application CODA</a>. This is required when using the CODA debug agent with 9.x based SDK&rsquo;s.</p>
+<p>The  <b>Installation</b> page specifies the .sis file to install on the target device when using <a href="run_mode.htm">Symbian OS Device (Install SIS)</a>. This is required when using  CODA with 9.x based SDK&rsquo;s.</p>
 <p align="center"><img src="images/page_installation.png" width="670" height="301" /></p>
 <p class="figure">Figure 1. Installation page</p>
 <h5>Table 1. Installation page &mdash;items </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -5,18 +5,17 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Carbide Main page </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
 <body >
 <h2>Main page </h2>
 <p>The options shown in the <b>Main</b> page differ based upon the type of launch configuration. Generally, the options fall into these choices: </p>
 <ul>
-  <li><a href="#emulator_mode">Emulation Main page</a> (Emulation) </li>
-  <li><a href="#run_mode">Run-mode Main page</a> (Application CODA) </li>
-  <li><a href="#stop_mode">Stop-Mode Main page</a> (System CODA) </li>
+  <li><a href="#emulator_mode">Emulation Main page</a> (Emulator) </li>
+  <li><a href="#run_mode">Run-mode Main page</a> (CODA) </li>
+  <li><a href="#stop_mode">Stop-Mode Main page</a> (CODA) </li>
 </ul>
 <h3><a name="emulator_mode" id="emulator_mode"></a>Emulation Main page </h3>
-<p>The <b>Symbian OS <a href="emulation.htm">Emulation</a></b> launch configuration uses the <b>Main</b> page to define the process to be launched by the emulator. </p>
+<p>The <b>Symbian OS <a href="emulation.htm">Emulator</a></b> launch configuration uses the <b>Main</b> page to define the process to be launched by the emulator. </p>
 <p>The behavior that occurs when launching a debug session varies based upon the <a href="page_main.htm">SDK</a>. Normally, <a href="../../debugger/debug/cmds_starting.htm">starting</a> a debug session launches the emulator (<span class="code">epoc.exe</span>) and you must then navigate to your application and open it. However, starting a debug session for an .exe file will, in most cases, launch the .exe directly. This starts the emulator and then opens your application automatically. Note that some SDKs do not support this behavior. In those cases you must still open your application in the emulator manually.</p>
 <p align="center"><img src="images/page_debug_main.png" width="611" height="322"></p>
 <p class="figure">Figure 1. Main page (<i>Emulation shown</i>) </p>
@@ -51,9 +50,9 @@
 </table>
 
 <h3><a name="run_mode" id="run_mode"></a>Run-mode Main page </h3>
-<p>The <b>Symbian OS <a href="run_mode.htm">Application CODA </a></b> launch configuration uses the <b>Main</b> page to defines the project and the process to launch on the target device. </p>
+<p>The <b><a href="run_mode.htm">Symbian OS Device (Install SIS) </a></b> launch configuration uses the <b>Main</b> page to defines the project and the process to launch on the target device. </p>
 <p align="center"><img src="images/page_main_run_mode.png" width="585" height="365"></p>
-<p class="figure">Figure 2 - Main page (<i>Application CODA shown</i>) </p>
+<p class="figure">Figure 2 - Main page (<i>Device (Install SIS)</i><i> shown</i>) </p>
 <h5>Table 2.  Run-mode Main page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -88,7 +87,7 @@
   </tr>
 </table>
 <h3><a name="stop_mode" id="stop_mode"></a>Stop-mode Main page </h3>
-<p>The <b>Symbian OS <a href="stop_mode.htm">System CODA</a></b> launch configurations uses the <b>Main</b> page to defines the project and the executable to launch on the target device. </p>
+<p>The <b><a href="stop_mode.htm">Symbian OS Device</a></b> launch configurations uses the <b>Main</b> page to defines the project and the executable to launch on the target device. </p>
 <p align="center"><img src="images/page_main_stop_mode.png" width="604" height="385"></p>
 <p class="figure">Figure 3. Main page</p>
 <h5>Table 3. Stop-mode Main page &mdash; items</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_image.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_image.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>ROM Image page </h2>
-<p>Use the <b>ROM Image</b> page in a <a href="stop_mode.htm">System CODA</a> launch configuration to define startup options and ROM image download information.</p>
+<p>Use the <b>ROM Image</b> page in a <a href="stop_mode.htm">Symbian OS Device</a> launch configuration to define startup options and ROM image download information.</p>
 <p align="center"><img src="images/page_rom_image.png" width="583" height="327"></p>
 <p class="figure">Figure 1 - ROM Image page in launch configuration </p>
   <h5>Table 4. Launch configuration window&mdash;ROM Image  tab items</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_log.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_log.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -8,7 +8,7 @@
 </head>
 <body bgcolor="#FFFFFF" dir="ltr">
 <h2> ROM Log page</h2>
-<p>Use the <b>ROM Log</b> page in a <a href="stop_mode.htm">System CODA</a> launch configuration to specify where the ROM log file is stored and the Epoc32 directory. </p>
+<p>Use the <b>ROM Log</b> page in a <a href="stop_mode.htm">Symbian OS Device</a> launch configuration to specify where the ROM log file is stored and the Epoc32 directory. </p>
 <p align="center"><img src="images/page_rom_log.png" width="570" height="193"></p>
 <p class="figure">Figure 1. ROM Log page </p>
 <h5>Table 1. ROM Log page&mdash;items </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_x86_exceptions.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_x86_exceptions.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>x86 Exceptions page </h2>
-<p>  Use the <b>x86 Exceptions</b> page in the <a href="emulation.htm">Emulation</a> launch configuration to set  the x86 exceptions  the debugger should catch. If you want the debugger to catch all the exceptions, enable all of the options in this page. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you want to handle.</p>
+<p>  Use the <b>x86 Exceptions</b> page in the <a href="emulation.htm">Symbian OS Emulator</a> launch configuration to set  the x86 exceptions  the debugger should catch. If you want the debugger to catch all the exceptions, enable all of the options in this page. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you want to handle.</p>
 <p align="center"><img src="images/page_x86_exceptions.png" width="622" height="277" /></p>
 <p align="center" class="figure">Figure 1 - x86 Exceptions page</p>
 <h5>Table 1. x86 Exceptions page &mdash;items </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -8,12 +8,12 @@
 </head>
 
 <body>
-<h2>Application CODA  Launch Configuration (Run-mode) </h2>
-<p>Select the <b>Symbian OS Application CODA </b>  launch configuration to debug or run applications on a target device using the Application CODA on-device debug agent. Application CODA is an application that runs on released phones and allows you to debug your executables. The debugger will download a Symbian OS installation file to the phone and install it prior to launching.</p>
-<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the Application CODA launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the Application CODA configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
-<p align="center"><img src="../images/wnd_debug_AppTRK_launch_config.png" width="871" height="600"></p>
-<p class="figure">Figure 1. Application CODA launch configuration in the Debug dialog </p>
-<p>The Application CODA launch configuration panes include: </p>
+<h2>Symbian OS Device (Install SIS)  Launch Configuration (Run-mode) </h2>
+<p>Select the <b>Symbian OS Device (Install SIS)</b>  launch configuration to debug or run applications on a target device using the  CODA (Carbide On-Device Debug Agent).  CODA is an application that runs on released phones and allows you to debug your executables. The debugger will download a Symbian OS installation file to the phone and install it prior to launching.</p>
+<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the  CODA launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the Symbian OS Device (Install SIS) configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
+<p align="center"><img src="../images/wnd_debug_AppTRK_launch_config.png" width="986" height="640"></p>
+<p class="figure">Figure 1. Device  launch configuration in the Debug dialog </p>
+<p>The  <b>Symbian OS Device (Install SIS)</b> launch configuration panes include: </p>
 <ul>
   <li>The <a href="page_main.htm">Main</a> tab defines the project to be launched. Enter the name of the project in the Project field, and the executable name in the Executable field.</li>
   <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm">Arguments</a> tab (<i>standard CDT page</i>) lets you specify the program arguments that an application uses.</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -3,17 +3,17 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>System TRK Launch Configuration</title>
+<title>Symbian OS Device Launch Configuration (Stop-mode)</title>
 <link href="../../../book.css" rel="stylesheet" type="text/css">
 </head>
 
 <body>
-<h2>System CODA  Launch Configuration (Stop-mode) </h2>
-<p>Select the <b>Symbian OS System CODA </b> launch configuration provides C/C++ stop-mode debug options that use a JTAG interface when a Symbian OS launch configuration is created. The  settings included in these launch configuration are a combination of Carbide, CDT, and Eclipse options. </p>
-<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the System CODA launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the System CODA configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
-<p align="center"><img src="../images/wnd_debug_trace32_launch_config.png" width="832" height="640"></p>
-<p class="figure">Figure 1. System CODA launch configuration in the Debug dialog </p>
-<p>The System CODA launch configuration panes include: </p>
+<h2>Symbian OS Device Launch Configuration (Stop-mode) </h2>
+<p>Select the <b>Symbian OS Device </b> launch configuration provides C/C++ stop-mode debug options. The  settings included in these launch configuration are a combination of Carbide, CDT, and Eclipse options. </p>
+<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the <b>Symbian OS Device</b> launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the <b>Symbian OS Device</b> or <b>Symbian OS Device (Attach to Process)</b> configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
+<p align="center"><img src="../images/wnd_debug_trace32_launch_config.png" width="866" height="635"></p>
+<p class="figure">Figure 1. <b>Symbian OS Device</b> launch configuration in the Debug dialog </p>
+<p>The <b>Symbian OS Device</b> launch configuration panes include: </p>
 <ul>
   <li>The <a href="page_main.htm">Main</a> tab defines the project to be launched. Enter the name of the project in the Project field, and the executable name in the Executable field.</li>
   <li>The <a href="page_debugger.htm">Debugger</a> tab defines debug configurations, such as entry point to begin debugging and target options.</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -10,7 +10,7 @@
 </head>
 <body >
 <h2>New Launch Configuration Wizard </h2>
-<p>The <b>New Launch Configuration Wizard</b> launches when no launch configuration exists for a build configuration in a project. Wherever possible the <b>New Launch Configuration </b> wizard gathers the information from the project and asks additional questions based on the type of launch configuration chosen. For example, a launch configuration using Application CODA requires different information than  one targeted for System CODA. </p>
+<p>The <b>New Launch Configuration Wizard</b> launches when no launch configuration exists for a build configuration in a project. Wherever possible the <b>New Launch Configuration </b> wizard gathers the information from the project and asks additional questions based on the type of launch configuration chosen. For example, a launch configuration using Symbian OS Device (Install SIS) requires different information than  one targeted for Symbian OS Device. </p>
 <p>Every project consists of one or more build configurations as listed under the <b>Build project</b> icon (<img src="../images/icon_build_project.png" alt="Build project icon" width="17" height="17" align="absmiddle">) of the toolbar or in the <a href="../../tasks/projects/prj_new_build_config.htm">Add/Remove Carbide Build Configuration</a> dialog. Every build configuration needs a launch configuration to enable debugging. Launch configurations can be shared between  build configurations. The <b>New Launch Configuration Wizard</b> detects when a build configuration doesn't have an associated launch configuration and guides you through the setup process.</p>
 <p align="center"><img src="images/menu_build_target.png" width="428" height="224"></p>
 <p class="figure">Figure 1. Build configurations for the chosen project appear under the Build icon</p>
@@ -41,14 +41,14 @@
         </ul></td>
     </tr>
     <tr>
-        <td><b>Application CODA and System CODA</b></td>
+        <td><b>Symbian OS Device (Install SIS)</b></td>
         <td><ul>
             <li><a href="#TRK_CONN">CODA Connection Settings</a></li>
-            <li><a href="#TRK_SIS">CODA SIS Selection</a> (<i>Application CODA only</i>) </li>
+            <li><a href="#TRK_SIS">CODA SIS Selection</a> (<i>Symbian OS Device (Install SIS) only</i>) </li>
         </ul></td>
     </tr>
     <tr>
-        <td><b>Attach to Process</b></td>
+        <td><b>Symbian OS Device (Attach to Process)</b></td>
         <td><ul>
             <li><a href="#TRK_CONN">CODA Connection Settings</a></li>
         </ul></td>
@@ -66,7 +66,7 @@
 <p align="center"><img src="images/wiz_launch_config_debug_as.png" alt="Debug As dialog" width="346" height="435"></p>
 <p class="figure">Figure 1 - Debug As dialog </p>
 <h3><a name="LAUNCH" id="LAUNCH"></a>Launch Types</h3>
-<p>Use the<b> Launch Types</b> page to select the type of launch configuration for the build target. This page does not appear when using an Emulator target. Available types are listed from the most frequently chosen (Application CODA) to the least likely type (Attach to Process). Select a type and click <b>Next</b>. </p>
+<p>Use the<b> Launch Types</b> page to select the type of launch configuration for the build target. This page does not appear when using an Emulator target. Available types are listed from the most frequently chosen  to the least likely type. Select a type and click <b>Next</b>. </p>
 <p align="center"><img src="images/wiz_launch_config_launch_types.png" width="438" height="533"></p>
 <p class="figure">Figure 2 - Launch Type page </p>
 <h3><a name="BLD_OPT" id="EXE_SEL2"></a>Build Options Selection </h3>
@@ -76,8 +76,8 @@
 <h3><a name="EXE_SEL" id="EXE_SEL"></a>Executable Selection </h3>
 <p>Use the <b>Application Selection </b> page to choose a binary created by the project to launch and debug and verify its location. If only a single binary is available the <b>Process to launch</b> option is disabled. </p>
 <p><b>EMULATOR ONLY</b> Use the <b>Location</b> field for emulator targets to verify that the correct executable on the host is selected. This field is not used with on-device launch configurations. </p>
-<p>Use the <b>Specify device path of remote process to launch</b> option to specify alternate paths for launching the executable from RAM (c:\sys\bin\), ROM (z:\sys\bin\) or  memory cards (e:\sys\bin\) . </p>
-<p>Select the Executable to launch, verify it is the correct binary, then click <b>Next</b>. </p>
+<p>Select the <b>Process to launch</b>, verify it is the correct binary. </p>
+<p>Use the <b>Specify device path of remote process to launch</b> option to specify alternate paths for launching the executable from RAM (<span class="code">c:\sys\bin\</span>), ROM (<span class="code">z:\sys\bin\</span>) or  memory cards (<span class="code">e:\sys\bin\</span>), then click <b>Next</b>. </p>
 <p align="center"><img src="images/wiz_launch_config_app_selection.png" width="438" height="533"> </p>
 <p class="figure">Figure 4 - Executable Selection page (when project has multiple EXEs)</p>
 <h3><a name="TRK_CONN" id="TRK_CONN"></a>CODA Connection Settings </h3>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -12,8 +12,8 @@
 <p>The <b>Debug Configurations</b> or launch configuration window provides C/C++ debugger options. A <a href="wiz_new_launch_config.htm">launch configuration</a> defines the settings used by the Carbide debugger to launch and debug programs. A project must have at least one debug launch configuration in order to debug a project and can have many more. </p>
 <p>By default, Carbide creates a debug launch configuration the first time you launch the debugger based on current project settings. If additional information is required, like a port ID, the <a href="wnd_config_launch_config.htm">New Launch Configuration Wizard</a>  appears asking for the additional information. </p>
 <p>The tabs in the window vary depending upon the currently selected launch configuration.</p>
-<p align="center"><img src="images/wnd_debug_overview.png" width="864" height="471"></p>
-<p align="center" class="figure">  Figure 1 - Debug or launch configuration window (Symbian OS emulation view)</p>
+<p align="center"><img src="images/wnd_debug_overview.png" width="879" height="592"></p>
+<p align="center" class="figure">  Figure 1 - Debug or launch configuration window (Symbian OS Emulator view)</p>
 <h5>Table 1. Debug Configuration window &mdash; common items</h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_03.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_03.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -23,9 +23,9 @@
         <li>Select the project to launch in the Project Explorer view.</li>
         <li>Launch a debug session using one of these actions:<br />
             <ul>
-                <li>Right-click the project in the Project Explorer view and choose <strong>Debug As &gt; Debug Symbian OS Application on Phone or Simulator</strong> menu option.</li>
+                <li>Right-click the project in the Project Explorer view and choose <strong>Debug As &gt; Debug on Emulator or Device </strong>menu option.</li>
                 <li>Click the Run &gt; Debug (F11) menu option.</li>
-                <li>Click the Debug (<img src="../../reference/pref_carb_symbian_sdk.htm" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar to build the project. </li>
+                <li>Click the Debug (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar to build the project. </li>
             </ul>
             <p>The first time you perform any of the following actions, the <strong>New Launch Configuration Wizard</strong> appears asking for the additional info to connect to a device.</p>
             <p><img src="../images/dll_new_launch_config.png" alt="New Launch Configuration Wizard" width="550" height="460"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_03.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_03.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -31,7 +31,7 @@
         <li>To run the project without the debugger choose:<br />
         	<p>To simply run the project on the chosen target use one of the following actions. Use this option to verify a release program's execution without debugging symbols.</p>
         	<ol type="a">
-                <li>Right-click the project and click Run As &gt; Run Symbian OS Application on Emulator.</li>
+                <li>Right-click the project and click Run As &gt; Run on Emulator or Device.</li>
                 <li>Click the Run &gt; Run (<span class="code">CTRL-F11</span>) menu item.</li>
                 <li>Click the Run (<img src="../images/icon_run.png" alt="Run icon" width="16" height="16" align="absmiddle">) icon in the toolbar.</li>
             </ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -30,9 +30,9 @@
         <li>Launch the debug session.<br />
             <p>To run the project on the chosen target and start a debug session use one of the following actions. Clicking Debug is the most common choice as it enables you to assume control of the executable should you encounter a problem.</p>
             <ul>
-                <li>Right-click the project and choose Debug As &gt; Debug Symbian OS Application on Emulator.</li>
+                <li>Right-click the project and choose Debug As &gt; Debug on Emulator or Device.</li>
                 <li>Click the Run &gt; Debug (<span class="code">F11</span>) menu item.</li>
-                <li>Click the Debug (<img src="../../reference/pref_carb_symbian_sdk.htm" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar.</li>
+                <li>Click the Debug (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar.</li>
             </ul>
             <p>The emulator is launched and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears to manage the debug session.</p>
         </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,10 +9,13 @@
 </head>
 <body >
 <h2>Remote Target Debugging (Run-mode) Tutorial</h2>
-<p>In this example we demonstrate how to debug applications on a remote device using the Application CODA remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
+<p>In this example we demonstrate how to debug applications on a remote device using the CODA (Carbide On-device Debug Agent). This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. </p>
+<p align="center"><img src="../images/code_process.png" alt="CODA process flow" width="384" height="192"></p>
+<p class="figure">Figure 1. CODA process flow</p>
+<p>The steps to do this include:</p>
 <ol>
     <li><a href="run_mode_debug_example_01.htm">Connect</a>  target device for PC</li>
-    <li><a href="../trk/trk_installation_instr.htm">Install </a>CODA remote agent (v3.2.7) or later on the target device</li>
+    <li><a href="../trk/trk_installation_instr.htm">Install</a> <a href="../../concepts/trk.htm">CODA</a> v4.x or later on the target device</li>
     <li><a href="run_mode_debug_example_04.htm">Configure</a> project for downloading</li>
     <li><a href="../../tasks/projects/prj_build.htm">Debug</a> project on target device</li>
 </ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_01.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_01.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,10 +9,10 @@
 </head>
 <body >
 <h2><strong>Connect  target device to PC</strong></h2>
-<p>In this example we demonstrate how to debug applications on a remote device using the Application CODA remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
+<p>In this example we demonstrate how to debug applications on a remote device using CODA (Carbide On-device Debug Agent). This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
 <ol>
     <li><strong>Connect target device to PC</strong></li>
-    <li><a href="../trk/trk_installation_instr.htm">Install </a>CODA remote agent (v3.2.7) or later on the target device</li>
+    <li><a href="../trk/trk_installation_instr.htm">Install</a> <a href="../../concepts/trk.htm">CODA</a> 4.x or later on the target device</li>
     <li><a href="run_mode_debug_example_04.htm">Configure</a> project for downloading</li>
     <li><a href="../../tasks/projects/prj_build.htm">Debug</a> project on target device</li>
     </ol>
@@ -25,14 +25,14 @@
         <li>Connect the USB cable between the remote device and PC running Carbide.<br />
         	<p>Use the <strong>Remote Connections</strong> view to verify a successful connection or by looking at the remote connection trim display shown at the bottom of the workplace window.</p>
         	<p><img src="../images/run_mode_debug_01.png" alt="Remote Connection view">&nbsp;&nbsp;&nbsp;<img src="../images/run_mode_debug_02.png" alt="Remote Connection trim indicator"></p>
-        	<p>The <strong>Status</strong> column indicates whether the service you need for debugging, CODA, is <strong>Available</strong>. If it's status is <strong>Not Accessible</strong> you are probably missing the CODA remote agent on the remote device.</p>
+        	<p>The <strong>Status</strong> column indicates whether the service you need for debugging, CODA, is <strong>Available</strong>. If it's status is <strong>Not Accessible</strong> you are probably missing  CODA on the remote device.</p>
         </li>
-        <li>Click OK on the remote device when it asks to use PC Suite mode with USB.<br />
-        	<p class="note"><strong>NOTE</strong> Debugging requires the use of PC Suite mode. If you are in another mode, like Mass storage mode, an alert appears asking you to change.</p>
+        <li>Click OK on the remote device when it asks to use Ovi Suite mode with USB.<br />
+        	<p class="note"><strong>NOTE</strong> Debugging requires the use of Ovi or Suite mode. If you are in another mode, like Mass storage mode, an alert appears asking you to change.</p>
         </li>
     </ol>
 </div>
-<p><strong>NEXT</strong>: <a href="run_mode_debug_example_02.htm">Install CODA remote agent</a></p>
+<p><strong>NEXT</strong>: <a href="run_mode_debug_example_02.htm">Install CODA</a></p>
 <h4>Other references</h4>
 <ul>
     <li><a href="run_mode_debug_example_00.htm">Remote Target Debugging (Run-mode)</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_02.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_02.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -4,22 +4,21 @@
 <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>Install TRK remote agent Tutorial</title>
+<title>Install CODA</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
 <body >
 <h2>Install CODA remote agent</h2>
-<p>In this example we demonstrate how to debug applications on a remote device using the Application CODA remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
+<p>In this example we demonstrate how to debug applications on a remote device using the CODA (Carbide On-device Debug Agent). This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
 <ol>
     <li><a href="run_mode_debug_example_01.htm">Connect</a> target device to PC</li>
-    <li><strong>Install CODA remote agent (v3.2.7) or later on the target device</strong></li>
+    <li><strong>Install CODA 4.x or later on the target device</strong></li>
     <li><a href="run_mode_debug_example_03.htm">Configure</a> project for downloading</li>
     <li><a href="run_mode_debug_example_04.htm">Debug</a> project on target device</li>
     </ol>
 <hr>
-<p>To debug on a remote device you need a program to communicate between the Carbide debugger and your executable running on the device. That program is the <strong>CODA</strong> (Carbide On-device Debug Agent) remote agent, also known as <strong>Application CODA</strong>. </p>
-<p>&nbsp;</p>
+<p>To debug on a remote device you need a program to communicate between the Carbide debugger and your executable running on the device. That program is  <strong>CODA</strong> (Carbide On-device Debug Agent). </p>
 <div class="step">
-    <h4>Installing or updating the TRK remote agent</h4>
+    <h4>Installing or updating CODA</h4>
     <ol>
         <li>Select the Connection to edit in the Remote Connections view.</li>
         <li>Click the Edit Settings... icon (<img src="../images/icon_edit_settings.png" alt="Edit Settings icon" width="17" height="17" align="absmiddle">) in the Remote Connections toolbar.<br />
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>Configure project for debugging</h2>
-<p>In this example we demonstrate how to debug applications on a remote device using the Application CODA remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
+<p>In this example we demonstrate how to debug applications on a remote device using the Symbian OS Device (Install SIS) remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
 <ol>
     <li><a href="run_mode_debug_example_01.htm">Connect</a> target device to PC</li>
     <li><a href="../trk/trk_installation_instr.htm">Install </a>CODA remote agent (v3.2.7) or later on the target device</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>Debug project on target device</h2>
-<p>In this example we demonstrate how to debug applications on a remote device using the Application CODA remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
+<p>In this example we demonstrate how to debug applications on a remote device using the Symbian OS Device (Install SIS) remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
 <ol>
     <li><a href="run_mode_debug_example_01.htm">Connect</a> target device to PC</li>
     <li><a href="run_mode_debug_example_02.htm">Install</a> CODA remote agent (v3.2.7) or later on the target device</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -47,7 +47,7 @@
   </tr>
 </table>
 <h3><a name="PUAnchor" id="PUAnchor"></a>Partial Upgrade Files</h3>
-<p>The SIS Builder supports the generation of partial upgrade .SIS files. A dialog appears when a SIS file exceeds 250k in size that describes the partial upgrade feature with a link to the SIS Builder page. Partial upgrade files enable Carbide to generate and download to the device only those portions of the application that have changed, enabling faster debug cycles. It does this using the SIS partial upgrade (PU) flag to mark the SIS file as a replacement or addition to the original SIS file. Debugging of large applications using Application CODA is enhanced as the entire application no longer needs to be installed on the device each time a change is made. </p>
+<p>The SIS Builder supports the generation of partial upgrade .SIS files. A dialog appears when a SIS file exceeds 250k in size that describes the partial upgrade feature with a link to the SIS Builder page. Partial upgrade files enable Carbide to generate and download to the device only those portions of the application that have changed, enabling faster debug cycles. It does this using the SIS partial upgrade (PU) flag to mark the SIS file as a replacement or addition to the original SIS file. Debugging of large applications using Symbian OS Device (Install SIS) is enhanced as the entire application no longer needs to be installed on the device each time a change is made. </p>
 <p>When the Partial update option is checked for a SIS file, both a complete and partial SIS files are generated. This ensures that the full SIS file is kept in sync with the partial upgrade SIS file. The partial upgrade SIS files are placed in the same folder as the full SIS file when stored in a project directory, or in the root of the project directory when the SIS file exists outside of the project. You can see where a partial upgrade file is created by examining the <b>Partial upgrade sis/sisx path</b> in the <a href="../../projects/launch/page_installation.htm">Installation</a> tab of the launch configuration. Links to the partial upgrade files are added to the project within the <a href="../view_proj_explorer.htm">Project Explorer</a> view.</p>
 <p class="note"><b>NOTE</b> Internally, the .PKG file format of a partial upgrade file is identical to a complete .PKG file with two exceptions, 1) the file list only includes the names of files changed, and 2) the PU flag is set.</p>
 <p>Partial upgrade files are deleted and only full SIS/SISX files are generated when:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>Set PKG File for  Build Configuration</h2>
-<p>The <b>Set PKG File for  Build Configuration</b> dialog appears when an <strong>Application CODA</strong> build configuration does not include a PKG file. Use it to assign a PKG file to the project's current build configuration that will be used to create a project's SIS installation file. If you define a launch configuration used for on-device debugging with the CODA debug agent, you will need to specify a PKG file for the project. A PKG file primarily provides a list of program and resource files to install on the device.</p>
+<p>The <b>Set PKG File for  Build Configuration</b> dialog appears when an <strong>Symbian OS Device (Install SIS)</strong> build configuration does not include a PKG file. Use it to assign a PKG file to the project's current build configuration that will be used to create a project's SIS installation file. If you define a launch configuration used for on-device debugging with the CODA debug agent, you will need to specify a PKG file for the project. A PKG file primarily provides a list of program and resource files to install on the device.</p>
 <p align="center"><img src="../images/set_pkg.png" width="544" height="359" /></p>
 <p class="figure">Figure 1 - Set PKG File for Build Configuration</p>
 <h5>Table 1 Items </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -46,7 +46,7 @@
       </ul>    
       <p class="note"><b>NOTE</b> On Symbian OS 9.x builds, if the key/cert pair are not defined, <span class="code">makekeys</span> will be called and temporary ones will be generated for you to      &quot;self-sign&quot; the application. Self-signed applications should be in the
         0xE0000000-0xEFFFFFFF range.</p>
-      <p class="note"><b>NOTE</b> All Application CODA build configuration require a PKG file. If none is found in the active project then you will be asked to <a href="pane_pkg_config.htm">choose</a> one.</p>      </td>
+      <p class="note"><b>NOTE</b> All Symbian OS Device (Install SIS) build configuration require a PKG file. If none is found in the active project then you will be asked to <a href="pane_pkg_config.htm">choose</a> one.</p>      </td>
   </tr>
 </table>
 <h5>Related reference </h5>
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/panel_filter.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_install_agent.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_setup_conn.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/tab_new_conn_test_conn.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_trk_debug_config.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -4,12 +4,14 @@
 <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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Filter Preferences</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
 <h2> Launch Configuration Filters</h2>
-<p>The    Launch Configuration Filters Preference window provides additional options for filtering out the launch configurations that appear in the list of configurations.</p>
+<p>The <img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.debug.internal.ui.preferences.LaunchConfigurationsPreferencePage)")'>Launch Configurations</a> preference panel provides additional options for filtering out the launch configurations that appear in the list of configurations.</p>
 <div class="step">
   <h4>To access the Launch Configurations Filter Window</h4>
 </div>
@@ -19,18 +21,15 @@
   <li>Select the Filter icon in the toolbar above the list of configuration types and defined configurations.</li>
   <p>The <b>Preferences (Filtered)</b> window appears (Figure 1).</p>
 </ol>
-<p align="center"><img src="../images/panel_filter.png" width="627" height="574" /></p>
+<p align="center"><img src="../images/panel_filter.png" width="635" height="596" /></p>
 <p class="figure">Figure 1 - Launch Configurations Filter Window</p>
-<p>The Launch Configuration Filters panel is used to filter out  launch configurations from the list of launch configuration types that appear in the Run or Debug window used to define launch configurations. For example, select the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run &gt; Run...</b> or <b>Run &gt; Debug...</b> window, as shown in Figure 2. Then select Run &gt; Debug... and notice that the types you have checked do not appear in the list. </p>
+<p>The <b>Launch Configurations</b> preference panel filters the list of launch configuration types that appear in the Run or Debug window as options. For example, select the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run &gt; Run...</b> or <b>Run &gt; Debug...</b> window. Then select <b>Run &gt; Debug...</b> and notice that the types you have checked do not appear in the list. </p>
 <div class="step">  
     <h4><b>To open the Launch Configurations Filter from Preferences</b></h4>
     <ol>
       <li>Select Window &gt; Preferences...</li>
-      <li>Expand the Run/Debug group</li>
-      <li>Expand Launching and select Launch Configurations</li>
+      <li>Click Run/Debug &gt; Launching &gt; Launch Configurations to open the preference panel</li>
     </ol>
-    <p align="center"><img src="../images/filter_launch_config.png" width="580" height="573" /></p>
-    <p align="left" class="figure">Figure 2 - Launch Configurations Filter</p>
 </div>
 <h5>Related concepts</h5>
   <ul>
@@ -51,7 +50,6 @@
   <li><a href="../../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
   <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
 </ul>
-<p>&nbsp;</p>
 <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -16,7 +16,7 @@
   <li><a href="../../projects/launch/page_file_transfer.htm">File Transfer Pane </a></li>
   <li><a href="../../projects/launch/page_executables.htm">Executables Pane</a></li>
   <li><a href="../../projects/launch/page_installation.htm">Installation Pane </a></li>
-  <li><a href="../../projects/launch/page_rom_log.htm">ROM Log</a> (<i>System CODA only</i>)  </li>
+  <li><a href="../../projects/launch/page_rom_log.htm">ROM Log</a> (<i>Symbian OS Device only</i>)  </li>
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a>&#8212;specifies the location of source files used when debugging a C or C++ application</li>
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a>&#8212;specifies the location to store your run configuration, how to access it and what perspective to open when running an application</li>
 </ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -12,7 +12,7 @@
 <body >
 <h2>Install Remote Agents</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/tab_new_conn_install_agent.png" width="464" height="554"></p>
+<p align="center"><img src="../images/tab_new_conn_install_agent.png" width="525" height="576"></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">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -12,7 +12,7 @@
 <body >
 <h2>Setup Connection</h2>
 <p>Use the <b>Edit Connection</b> page to assign a connection type, name, and connection settings to the new connection setup.</p>
-<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
+<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="525" height="576"></p>
 <p class="figure">Figure 1 - New Connection wizard Setup Connection tab</p>
 <p>Table 1. Setup Connection page - options</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -26,7 +26,7 @@
       <ul>
         <li>Bluetooth - serial port connection through Bluetooth</li>
         <li>Serial - serial port connection through a COM serial port</li>
-        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
+        <li>USB - serial port connection through USB that  supports CODA 4.x</li>
       </ul>
       <p>And the supported services may include:</p>
       <ul>
@@ -45,7 +45,7 @@
       <ul>
         <li>Bluetooth - serial port connection through Bluetooth</li>
         <li>Serial - serial port connection through a COM serial port</li>
-        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
+        <li>USB - serial port connection through USB that  supports CODA 4.x</li>
     </ul></td>
   </tr>
 </table>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -11,13 +11,13 @@
 </head>
 <body >
 <h2>Test Connection</h2>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote service installed on the device with the latest version available for Carbide. A remote service is any software on the device that can communicate with Carbide. This includes CODA, Trace, Performance Investigator, and other services. In this pane you can:</p>
+<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote service installed on the device with the latest version available for Carbide. A remote service is any software on the device that can communicate with Carbide. This includes CODA (Carbide On-device Debug Agent), Trace, Performance Investigator, and other services. In this pane you can:</p>
 <ul><li>Set  the device OS used by the device and supported by the remote service</li>
   <li>Verify that Carbide can communicate with the remote service via the chosen connection setting</li>
   <li>Verify that you have the latest version of the remote service  installed on the device</li>
 </ul>
 <p>Options presented may differ based on the type of connection setting  chosen.</p>
-<p align="center"><img src="../images/tab_new_conn_test_conn.png" width="464" height="554"></p>
+<p align="center"><img src="../images/tab_new_conn_test_conn.png" width="525" height="576"></p>
 <p class="figure">Figure 1 - Test Connection  pane in the New Connection dialog </p>
 <h5>Table 1<span class="figure"> Test Connection </span> pane &mdash; items</h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -26,8 +26,8 @@
     <th width="57%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td><strong>Device OS </strong></td>
-    <td><p>A dropdown list of device OSes that are supported by the CODA debug agent  software. Select the OS used by the device before running a check. </p>    </td>
+    <td><strong>Device OS (used to determine installer version)</strong></td>
+    <td><p>A dropdown list of device OSes that are supported by  CODA. Select the OS used by the device before running a check. </p>    </td>
   </tr>
   <tr>
     <td><strong>Select a service to test</strong></td>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -17,7 +17,7 @@
   <li><a href="#CONN_SET">Test Connection</a> - verify connection operates as intended</li>
   <li><a href="wnd_new_conn_install_tab.htm">Install	Remote Agents</a> - download and install remote agents</li>
 </ul>
-<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
+<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="525" height="576"></p>
 <p class="figure">Figure 1 - New Connection dialog</p>
 <h5>Related references</h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -22,7 +22,7 @@
   <li>find and set breakpoints, watchpoints, and eventpoints in source files. Double-click a source file to open it in an editor view and to review the status of its breakpoints. </li>
 </ul>
 <p>In addition, an <b>Executables</b> project is created in the <a href="view_proj_explorer.htm">Project Explorer</a> view. The binaries shown in the Executables project can be deleted which also removes them from the Executables view. For binaries outside the workspace you must import them into the Executables view so their symbolics can be used during the debug session. <span class="note">You can also drag and drop executables into the view. </span></p>
-<p class="note"><b>NOTE</b> To debug ROM DLLs with System CODA or in stop mode, always specify the <a href="../projects/launch/page_rom_log.htm">ROM Log file</a> in the project's launch configuration. </p>
+<p class="note"><b>NOTE</b> To debug ROM DLLs with Symbian OS Device or in stop mode, always specify the <a href="../projects/launch/page_rom_log.htm">ROM Log file</a> in the project's launch configuration. </p>
 <p align="center"><img src="images/view_executables.png" width="813" height="309" /></p>
 <p class="figure">Figure 1 - Executables view</p>
 <p align="left">The <strong>Executables</strong> view consists of the <strong>Executable Name</strong> and <strong>Source File Name</strong> panes describled in the table below. Use the <strong>Columns</strong> button in the toolbar to show or hide specific columns in each pane. Columns can be sorted and rearranged in the order desired. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_os_data_overview.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_os_data_overview.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -13,7 +13,7 @@
 <p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.debug.kernelaware.ui.SymbianOSView)")'>Symbian OS Data</a> view displays the processes and threads for the suspended debug session based on the selection in the <a href="../debugger/debug/viewing_debug.htm">Debug</a> view. Read-only data is displayed for ARM build configurations. To open the Symbian OS Data view select<b> Window &gt; Show View &gt; Symbian OS Data</b> when the <a href="perspective_debug.htm">Debug</a> perspective is visible or select <b>Window &gt; Show View &gt; Other...</b>, then expand the Carbide.c++ folder and select <b>Symbian OS Data</b> when the <a href="../concepts/CarbidePerspective.html">Carbide C/C++ perspective</a> is visible. Click <b>Ok</b> to display the Symbian OS Data window (Figure 1).</p>
 <p class="note"><b>NOTE</b> The Symbian OS Data view works with the debugger and will only display data during a live debug session. The Symbian OS Data view is not supported for emulator debugging, and will not show anything during emulator debug.</p>
 <p>The <b>Symbian OS Data</b> view reveals kernel data in the Symbian OS running on the device being debugged. The kernel data displayed is always that of the device with the currently selected thread or process in <a href="../debugger/debug/viewing_debug.htm">Debug</a> view. If you are debugging two devices at the same time, the content of the view will change when focus is switched from a thread on one device to a thread on another device. The kernel data includes more than just processes and threads. </p>
-<p>For the stop mode debugger and the crash debugger, all the data listed above is supported. For the Application and System CODA debuggers, the chunks and libraries views are not supported. The Symbian OS Data view is not supported for the emulator debugger and will show nothing during an emulator debug session. During a stop mode debug session or a CODA debug session, you are able to select a process or a thread in the Symbian OS Data view and attach the debugger to it for source level debugging if the binary  is listed in the <a href="view_executables.htm">Executables</a> view. Binaries listed in the Executable view can be source level debugged. Binaries  not listed in the Executables view can only be assembly code debugged in the <a href="view_disassembly.htm">Disassembly</a> view.</p>
+<p>For the stop mode debugger and the crash debugger, all the data listed above is supported. For the Application and Symbian OS Device debuggers, the chunks and libraries views are not supported. The Symbian OS Data view is not supported for the emulator debugger and will show nothing during an emulator debug session. During a stop mode debug session or a CODA debug session, you are able to select a process or a thread in the Symbian OS Data view and attach the debugger to it for source level debugging if the binary  is listed in the <a href="view_executables.htm">Executables</a> view. Binaries listed in the Executable view can be source level debugged. Binaries  not listed in the Executables view can only be assembly code debugged in the <a href="view_disassembly.htm">Disassembly</a> view.</p>
 <p class="note"><b>NOTE</b> Any executable must be included in the <b>Executables</b> view before it can be debugged. </p>
 <p>When the <a href="pref_carb_debugger.htm">Time interval for auto-refreshing OS View</a> option is enabled (which is on by default except for crash debugger), the data in the Symbian OS Data view will be auto-refreshed. Note that &quot;auto-refresh&quot; has a different meaning in different debuggers. During a stop mode debug session, the view will refresh data whenever the debugged program on the device is stopped and shows data as stale (greyed out) when the program is running. During a CODA debug session, the View will refresh data at a time interval regardless of whether the debugged program is stopped or not. The time interval is specified by an option in the Carbide.c++ global preference panel, which is five seconds by default.</p>
 <p>When auto-refresh is turned off, the debugger will not automatically refresh data in the View and will show the data as stale (greyed out). However you can manually refresh the data by clicking on the &quot;Refresh&quot; button in the View. Usually you may want to turn off the auto-refresh if you think it is slowing down your debug operations such as stepping.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -13,7 +13,7 @@
 <p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.debug.kernelaware.ui.SymbianOSView)")'>Symbian OS Data</a> view displays the processes and threads for the suspended debug session based on the selection in the <a href="../debugger/debug/viewing_debug.htm">Debug</a> view. Read-only data is displayed for ARM build configurations. To open the Symbian OS Data view select<b> Window &gt; Show View &gt; Symbian OS Data</b> when the <a href="perspective_debug.htm">Debug</a> perspective is visible or select <b>Window &gt; Show View &gt; Other...</b>, then expand the Carbide.c++ folder and select <b>Symbian OS Data</b> when the <a href="../concepts/CarbidePerspective.html">Carbide C/C++ perspective</a> is visible. Click <b>Ok</b> to display the Symbian OS Data window (Figure 1).</p>
 <p class="note"><b>NOTE</b> The Symbian OS Data view works with the debugger and will only display data during a live debug session. The Symbian OS Data view is not supported for emulator debugging, and will not show anything during emulator debug.</p>
 <p>The <b>Symbian OS Data</b> view reveals kernel data in the Symbian OS running on the device being debugged. The kernel data displayed is always that of the device with the currently selected thread or process in <a href="../debugger/debug/viewing_debug.htm">Debug</a> view. If you are debugging two devices at the same time, the content of the view will change when focus is switched from a thread on one device to a thread on another device. The kernel data includes more than just processes and threads. </p>
-<p>For the stop mode debugger and the crash debugger, all the data listed above is supported. For the Application and System CODA debuggers, the chunks and libraries views are not supported. The Symbian OS Data view is not supported for the emulator debugger and will show nothing during an emulator debug session. During a stop mode debug session or a CODA debug session, you are able to select a process or a thread in the Symbian OS Data view and attach the debugger to it for source level debugging if the binary  is listed in the <a href="view_executables.htm">Executables</a> view. Binaries listed in the Executable view can be source level debugged. Binaries  not listed in the Executables view can only be assembly code debugged in the <a href="view_disassembly.htm">Disassembly</a> view.</p>
+<p>For the stop mode debugger and the crash debugger, all the data listed above is supported. For the Application and Symbian OS Device debuggers, the chunks and libraries views are not supported. The Symbian OS Data view is not supported for the emulator debugger and will show nothing during an emulator debug session. During a stop mode debug session or a CODA debug session, you are able to select a process or a thread in the Symbian OS Data view and attach the debugger to it for source level debugging if the binary  is listed in the <a href="view_executables.htm">Executables</a> view. Binaries listed in the Executable view can be source level debugged. Binaries  not listed in the Executables view can only be assembly code debugged in the <a href="view_disassembly.htm">Disassembly</a> view.</p>
 <p class="note"><b>NOTE</b> Any executable must be included in the <b>Executables</b> view before it can be debugged. </p>
 <p>When the <a href="pref_carb_debugger.htm">Time interval for auto-refreshing OS View</a> option is enabled (which is on by default except for crash debugger), the data in the Symbian OS Data view will be auto-refreshed. Note that &quot;auto-refresh&quot; has a different meaning in different debuggers. During a stop mode debug session, the view will refresh data whenever the debugged program on the device is stopped and shows data as stale (greyed out) when the program is running. During a CODA debug session, the View will refresh data at a time interval regardless of whether the debugged program is stopped or not. The time interval is specified by an option in the Carbide.c++ global preference panel, which is five seconds by default.</p>
 <p>When auto-refresh is turned off, the debugger will not automatically refresh data in the View and will show the data as stale (greyed out). However you can manually refresh the data by clicking on the &quot;Refresh&quot; button in the View. Usually you may want to turn off the auto-refresh if you think it is slowing down your debug operations such as stepping.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/RunModeToc.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/RunModeToc.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -6,7 +6,7 @@
    <h2>Run Mode Projects </h2>
 	 <p>The topics include:</p>
 	 <ul>
-	   <li><a href="start/carbide_example_trk.htm">Run Mode Debug Example (Application CODA) </a></li>
+	   <li><a href="start/carbide_example_trk.htm">Run Mode Debug Example (Symbian OS Device (Install SIS)) </a></li>
 	   <li><a href="trk/trk_troubleshooting.htm">Troubleshooting</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/tasks/debugger/images/Debug_Config_main.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -23,10 +23,10 @@
 </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: Application CODA and System CODA.</p>
+<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>
   <ul>
-    <li>Application CODA&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 CODA&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>
+    <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -29,9 +29,9 @@
     <li>From the IDE select Run &gt; Debug&hellip;</li>
     <li>The <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>  appears</li>
     <p>To communicate between the Carbide.c++ debugger and the on-device debug agent or protocol interface you must define a debug launch configuration. The Debug window is where you define the type of debug launch configuration to use when debugging programs on the target device (Figure 4).</p>
-    <p><img src="images/Debug_Config_main.png" width="830" height="506" /></p>
+    <p><img src="images/Debug_Config_main.png" width="986" height="640" /></p>
     <p class="figure">Figure 4. Debug Window</p>
-    <li>Select either a Symbian OS Application CODA or Symbian OS System CODA configuration type for on-device debugging and click New</li>
+    <li>Select either a Symbian OS Device (Install SIS) or Symbian OS Device configuration type for on-device debugging and click New</li>
     <p>For debug launch configurations using the CODA debug agent, the following pages require review and possible option settings:</p>
     <ul>
       <li><b>Main</b> - defines the project to be launched on the target device</li>
@@ -145,7 +145,7 @@
       </tr>
     </table>
   <h5>Installation Tab</h5>
-  <p>For Application CODA select the Installation tab. The Installation pane specifies the .sis file to install on the target device. This is used by Application CODA because Application CODA downloads all files via a SIS file. This is required when using the CODA debug agent with 9.x based SDK&rsquo;s.</p>
+  <p>For  CODA select the Installation tab. The Installation pane specifies the .sis file to install on the target device. This is because  CODA downloads all files via a SIS file. This is required when using  CODA with 9.x based SDK&rsquo;s.</p>
   <p align="center"><img src="images/Debug_Config_installation_run.png" width="595" height="280" /></p>
   <p class="figure">Figure 8. Debug windows Installation pane</p>
     <p>Table 4. Installation pane</p>
@@ -176,8 +176,8 @@
       </tr>
     </table>
   <h5>File Transfer Tab</h5>
-  <p>For System CODA select the File Transfer pane. The File Transfer pane displays a list of files the Carbide IDE transfers to the target device at the start of each launch. By default, any file added is automatically checked for downloading to the device.</p>
-  <p class="note"><b>NOTE</b> If debugging a DLL from an application and using System CODA, ensure that the DLL is included so that it is deployed to the device with the application. It is not added by default.</p>
+  <p>For  CODA select the File Transfer pane. The File Transfer pane displays a list of files the Carbide IDE transfers to the target device at the start of each launch. By default, any file added is automatically checked for downloading to the device.</p>
+  <p class="note"><b>NOTE</b> If debugging a DLL from an application and using  CODA, ensure that the DLL is included so that it is deployed to the device with the application. It is not added by default.</p>
   <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -3,27 +3,27 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
-<title>Stop Mode On-Device Debugging</title>
+<title>Stop Mode Debug Example</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF" dir="ltr">
 <h2>Stop Mode Debug Example</h2>
-<p>This example shows how to create and build an application and debug it on a device using JTAG debug software and Lauterbach hardware.</p>
+<p>This example shows how to create and build an application and debug it on a device using stop-mode.</p>
 <p>The basic steps include:</p>
 <ul>
-  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs panel</a>.</li>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs</a> panel.</li>
   <li>Create project or <a href="../ImportingProjects.html">Import</a> the project's bld.inf file into Carbide.c++</li>
-<li>Specify your <a href="../../reference/ROM_build_settings.html">ROM build settings</a> for the selected project</li>
-  <li><a href="../projects/prj_build.htm">Build</a> your Project with the ARMV5 Debug Build Configuration</li>
-<li>Create a <a href="../../projects/launch/wiz_new_launch_config.htm">launch configuration</a></li>
+<li><a href="../projects/prj_build.htm">Build</a> your Project  using an ARM compiler</li>
+<li>Build ROM if required</li>
+<li>Create a <b>Symbian OS Simulator</b> <a href="../../projects/launch/wiz_new_launch_config.htm">launch configuration</a></li>
 <li><a href="work_debug_act_debug.htm">Launch</a> the debugger</li>
 </ul>
-<p>With stop mode debugging  you can use the Carbide.c++ IDE and a JTAG interface to communicate between the debugger and a board to debug any target type within the Symbian OS.</p>
+<p>With stop mode debugging  you can use the Carbide.c++ IDE  to  debug any target type within the Symbian OS.</p>
 <h3>Attach to Process </h3>
 <p>Use <a href="../../reference/view_symbian_kernel.htm#attach">Attach to Process</a> to debug any binaries outside the workspace. The methods to do this include:</p>
 <ul>
-  <li>Select a process in the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data View</a>, then click <a href="work_debug_act_debug.htm">Debug</a> to launch the debugger which then attaches to the selected process. Ensure that the binary to debug is included in the <a href="../../reference/view_executables.htm">Executables</a> view in order to set and hit any breakpoints. </li>
-  <li>Create an <b>Attach to Process Launch Configuration</b> using the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> for the project</li>
+  <li>Select a process in the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view, then click <a href="work_debug_act_debug.htm">Debug</a> to launch the debugger which then attaches to the selected process. Ensure that the debug version of the binary is included in the <a href="../../reference/view_executables.htm">Executables</a> view in order to set and hit any breakpoints. </li>
+  <li class="fix">UNKNOWN??? Create an <b>Symbian OS Device (Attach to Process)</b> launch configuration using the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> for the project</li>
 </ul>
 <h5>Related Tasks</h5>
 <ul>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug02.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<title>Stop Mode Debug Example</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF" dir="ltr">
+<h2>Stop Mode Debug Example 2</h2>
+<p>This example shows how to create and build an application and debug it on a device using stop-mode.</p>
+<p>The basic steps include:</p>
+<ul><li>Create project or <a href="../ImportingProjects.html">Import</a> the project's bld.inf file into Carbide.c++</li>
+<li><a href="../projects/prj_build.htm">Build</a> your Project  using an ARM compiler</li>
+<li>Build ROM if required</li>
+<li>Create a <b>Symbian OS Simulator</b> <a href="../../projects/launch/wiz_new_launch_config.htm">launch configuration</a></li>
+<li><a href="work_debug_act_debug.htm">Launch</a> the debugger</li>
+</ul>
+<p>With stop mode debugging  you can use the Carbide.c++ IDE  to  debug any target type within the Symbian OS.</p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="stop_mode_debug_precond.htm">Stop Mode On-Device Debugging Preconditions</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/stop_mode_debug_precond.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -12,14 +12,10 @@
 <div class="step">
 <h4>Verifying On-device Debugging Preconditions</h4>
 <ul>
-  <li>Install ActiveState PERL. You can download a copy of Perl at www.ActiveState.com.</li>
-<li>Install  the GCCE or RVCT 2.2 or greater compiler (not included with Carbide.c++).</li>
-<li>Install the TechView Devkit</li>
-<li>Install Board Support Package (BSP) for your target board</li>
-<li>Install JTAG software and drivers</li>
-<li>Connect JTAG interface between PC and hardware</li>
-<li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs panel</a>.</li>
-<li>Build your <a href="../../reference/ROM_build_settings.html">ROM Image</a></li>
+    <li>Install   RVCT 4.0 or greater compiler (<i>if required</i>)</li>
+    <li>Install Simulator (<i>if required</i>)</li>
+    <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDK</a> preference panel</li>
+<li>Build your <a href="../../reference/ROM_build_settings.html">ROM Image</a> if required</li>
 </ul>
 </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/projects/prj_creating_sis_file.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -30,7 +30,7 @@
   <tr>
     <td><b>SIS Builder </b></td>
     <td><p>Use the <b>Add</b> control to add one or more SIS or PKG files to the project up to the maximum number Carbide supports. Note that the <b>SIS Builder</b> pane operates on a build configuration level. You will need to add files in this pane for every build configuration in the project. </p>
-      <p>In addition, any PKG file added here is picked up by the <a href="../../projects/launch/page_installation.htm">Installation</a> tab in Application CODA configurations. However, as only one SIS file can be debugged at a time you must specify which SIS/PKG file to install for debugging purposes. This is handy if you have both a developer SIS file and a certified SIS file that you want to remain in sync during development. Both are always built but you only need to debug one. </p>
+      <p>In addition, any PKG file added here is picked up by the <a href="../../projects/launch/page_installation.htm">Installation</a> tab in Symbian OS Device (Install SIS) configurations. However, as only one SIS file can be debugged at a time you must specify which SIS/PKG file to install for debugging purposes. This is handy if you have both a developer SIS file and a certified SIS file that you want to remain in sync during development. Both are always built but you only need to debug one. </p>
       <p><img src="images/sis_builder_tab.png" width="573" height="203" /></p>
     <p class="figure">Figure 1 - SIS Builder tab </p></td>
   </tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,13 +9,13 @@
 </head>
 <body >
 <h2>Debugging in ROM</h2>
-<p>You will see symbolic information for other components when  you are debugging  in ROM using System CODA  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>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 System CODA 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 CODA  or Attach to Process launch configurations</li>
 </ul>
 <blockquote>
-  <p class="note"><b>NOTE</b> You cannot debug ROM DLLs using Application CODA. </p>
+  <p class="note"><b>NOTE</b> You cannot debug ROM DLLs using Symbian OS Device (Install SIS). </p>
 </blockquote>
 <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/projects/working_with_sis_pkg_files.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body >
 <h2>Creating a PKG  File</h2>
-<p>After creating a project for the application you are developing for a device,  you will need to create a .pkg file if you are using Application CODA. A .pkg file contains all the files that will need to be downloaded to the device.   Once a .pkg file is available, you can add it to a project, and the IDE will use it and additional information entered in the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> pane  to create an application's .sis installation file. By default, when creating a project, the .pkg file is located in the project's <b>sis</b> folder.</p>
+<p>After creating a project for the application you are developing for a device,  you will need to create a .pkg file if you are using Symbian OS Device (Install SIS). A .pkg file contains all the files that will need to be downloaded to the device.   Once a .pkg file is available, you can add it to a project, and the IDE will use it and additional information entered in the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> pane  to create an application's .sis installation file. By default, when creating a project, the .pkg file is located in the project's <b>sis</b> folder.</p>
 <p>A minimal .pkg file consists of the following lines:</p>
 <ul>
   <li>Header &mdash; provides the following information on a single line:
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,10 +9,10 @@
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 <body >
-<h2>Run Mode Debug Example (Application CODA) </h2>
-<p>This example shows how to create and build an application and debug it on a device using the Application CODA on-device debug agent. The majority of steps are identical to the ones used to create a program and debug in an emulator, with some minor variations.</p>
+<h2>Run Mode Debug Example (Symbian OS Device (Install SIS)) </h2>
+<p>This example shows how to create and build an application and debug it on a device using the Symbian OS Device (Install SIS) on-device debug agent. The majority of steps are identical to the ones used to create a program and debug in an emulator, with some minor variations.</p>
 <div class="step">
-  <h4>Debugging a Run-mode Project using Application CODA </h4>
+  <h4>Debugging a Run-mode Project using Symbian OS Device (Install SIS) </h4>
   <ol>
     <li>Import the Bld.inf to create a project using the Import wizard </li>
     <p>In this example we are importing a project called Music, a complex project that includes several EXEs (MusicPlayer, MusicShop, MusicVisualizer). For the import, we select an ARM target.</p>
@@ -24,7 +24,7 @@
     <p>In this example we will set one breakpoint in two different EXEs. The first is set in the file called <span class="code">MCEngine.cpp</span> (MCServer.exe) and the second is set in  <span class="code">MPlayerAppUI.cpp</span> (MusicPlayer.exe). </p>
     <li>Click the Debug icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration</a> wizard
       <ol type="a">
-        <li>Select the Application CODA Launch Configuration from the Launch Types page, then click Next</li>
+        <li>Select the Symbian OS Device (Install SIS) Launch Configuration from the Launch Types page, then click Next</li>
         <p align="center"><img src="../trk/images/trk_launch_types.png" width="438" height="533"></p>
         <p class="figure">Figure 1 - Launch Types page showing selection </p>
         <li>If you have more than one executable, select the Main Executable in the Executable Selection page of the wizard, then click Next</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -10,7 +10,7 @@
 </head>
 <body >
 <h2>Run Mode Overview </h2>
-<p>This example shows how to create and build an application and debug it on a device using the Application CODA on-device debug agent. Click this link to the <img src="../../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=com.nokia.carbide.cpp.doc.user.trk_appTRK_Using)")'>HelloCarbide</a> cheatsheet that provides links to detailed steps. The majority of steps are identical to the ones used to create a program and debug in an emulator, with some minor variations.</p>
+<p>This example shows how to create and build an application and debug it on a device using the Symbian OS Device (Install SIS) on-device debug agent. Click this link to the <img src="../../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=com.nokia.carbide.cpp.doc.user.trk_appTRK_Using)")'>HelloCarbide</a> cheatsheet that provides links to detailed steps. The majority of steps are identical to the ones used to create a program and debug in an emulator, with some minor variations.</p>
 <p>See the <a href="carbide_example_trk.htm">Run Mode Debug Example</a> for a walkthrough of the following steps which include:</p>
 <ol>
   <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs panel</a>.</li>
@@ -18,14 +18,14 @@
   <li>Verify that all the symbolics for the binaries are visible in the <a href="../../reference/view_executables.htm">Executables</a> view</li>
   <li><a href="../projects/prj_creating_sis_file.htm">Manage</a> the project's PKG file, being sure to:
     <ul>
-      <li><a href="../projects/working_with_sis_pkg_files.htm">Create</a> a PKG file for the application (if using Application CODA)</li>
+      <li><a href="../projects/working_with_sis_pkg_files.htm">Create</a> a PKG file for the application (if using Symbian OS Device (Install SIS))</li>
       <li><a href="../../reference/build_properties/pane_build_config_sis.htm">Include</a> the PKG file as part of the project in the SIS Builder pane of your project Properties </li>
       <li><a href="../../reference/build_properties/wnd_sis_properties.htm">Specify</a> application keys (if not a self-signing application) in the SIS Properties dialog </li>
     </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><a href="../projects/prj_debug_config.htm">Create</a> a Symbian OS Application CODA <a href="../trk/trk_carbide_setup.htm">launch configuration</a> to provide additional information to the debugger</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>
 <p class="note"><b>NOTE</b> Carbide will install the SISX file on the device prior to launching the debugger.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,32 +9,32 @@
 </head>
 <body >
 <h2>Launch Configuration Setup</h2>
-<p>To communicate between the Carbide.c++ debugger and the <a href="../../concepts/trk.htm">on-device debug agent</a>, using either Application CODA or System CODA, you must <a href="../projects/prj_debug_config.htm">define</a> a debug <a href="../../projects/launch/launch_configs_overview.htm">launch configuration</a> that matches the installed debug agent. The two configurations available include:</p>
+<p>To communicate between the Carbide.c++ debugger and the <a href="../../concepts/trk.htm">on-device debug agent</a>, using either Symbian OS Device (Install SIS) or Symbian OS Device, you must <a href="../projects/prj_debug_config.htm">define</a> a debug <a href="../../projects/launch/launch_configs_overview.htm">launch configuration</a> that matches the installed debug agent. The two configurations available include:</p>
 <ul>
-  <li><b>Symbian OS Appication CODA</b>&#8212; used to run or debug applications on a target device using the Application CODA on-device debug agent. Application CODA is an application that runs on released phones and allows you to debug your executables. The debugger will download a Symbian OS installation file to the phone and install it prior to launching.</li>
-  <li><b>Symbian OS System CODA</b> (<i>not available in the Developer Edition</i>) &#8212;used to run or debug applications or ROM code on a target device using the System CODA on-device debug agent. System CODA is an application that runs on reference boards and prototype phones and allows you to debug your executables. The debugger will download files to the phone prior to launching.</li>
+  <li><b>Symbian OS Device (Install SIS) </b>&#8212; used to run or debug applications on a target device using  CODA (Carbide On-device Debug Agent).  CODA is an application that runs on released phones and allows you to debug your executables. The debugger will download a Symbian OS installation file to the phone and install it prior to launching.</li>
+  <li><b>Symbian OS Device</b> &#8212; used to run or debug applications or ROM code on a target device using CODA.  CODA is an application that runs on reference boards and prototype phones and allows you to debug your executables. The debugger will download files to the phone prior to launching.</li>
 </ul>
 <p>By default, you can click the <b>Debug</b> icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) in the toolbar to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. This   creates a launch configuration for the project based on project information and any additional input required, like COM port selection. It is the recommended method for creating new launch configurations. Or, use the <a href="../../projects/launch/page_main.htm">Debug</a> window to create a customized  launch configuration. </p>
-<p align="center"><img src="../../reference/images/wnd_trk_debug_config.png" width="936" height="640" /></p>
-<p class="figure">Figure 1. Debug launch configuration for on-device debugging   (<i>Application TCF CODA shown</i>)</p>
+<p align="center"><img src="../../reference/images/wnd_trk_debug_config.png" width="823" height="640" /></p>
+<p class="figure">Figure 1. Debug launch configuration for on-device debugging   (<i>Device (Install SIS) shown</i>)</p>
 <div class="step">
   <h4>Defining a Customized  Launch Configuration </h4>
   <ol>
     <li>Choose the Run &gt; Debug As menu item </li>
     <p>The <a href="../../reference/wnd_debug_configuration.htm">Debug</a> window appears.</p>
     <li>Select a Configuration type for on-device debugging and click New</li>
-    <p>Choose the <b>Symbian OS Application TCF CODA </b> or <b>System CODA</b> configuration based on which debug agent is installed on the device, then click <b>New</b>. A new debug launch configuration appears in the Configuration list and the Main tab appears. </p>
+    <p>Choose the <b>Symbian OS Device </b> or<b> Symbian OS Device (Install SIS)</b> configuration based on which debug agent is installed on the device, then click <b>New</b>. A new debug launch configuration appears in the Configuration list and the Main tab appears. </p>
     <li>Enter the required information</li>
-    <p>For  debug launch configurations using the CODA debug agent, the following   pages require review and possible option settings:</p>
+    <p>For  debug launch configurations using  CODA, the following   pages require review and possible option settings:</p>
     <ul>
       <li><a href="../../projects/launch/page_main.htm">Main</a>&#8212; defines the project to be launched on the target device</li>
       <li>Arguments &#8212; enter command line build system arguments </li>
       <li><a href="../../projects/launch/page_debugger.htm">Debugger</a>&#8212; provides control over entry points, message handling, and instruction set default settings</li>
       <li><a href="../../projects/launch/page_connection.htm">Connection</a>&#8212;   specifies the method used to transfer files to the target device</li>
       <li><a href="../../projects/launch/page_file_transfer.htm">File Transfer</a> &#8212; the files  transfered to the target device at the start of each launch</li>
-      <li><a href="../../projects/launch/page_installation.htm">Installation</a>   (<i>Application CODA onl</i>y)&#8212;  specifies the .sis or .pkg file to install on the target device</li>
+      <li><a href="../../projects/launch/page_installation.htm">Installation</a>   (<i>Install SIS onl</i>y)&#8212;  specifies the .sis or .pkg file to install on the target device</li>
       <li><a href="../../projects/launch/page_executables.htm">Executables</a> &#8212; specifies the executables to be debugged</li>
-      <li><a href="../../projects/launch/page_rom_log.htm">ROM Log</a>  (<i>System CODA only</i>) &#8212; specifies the executables to be debugged</li>
+      <li><a href="../../projects/launch/page_rom_log.htm">ROM Log</a>  (<i>Device only</i>) &#8212; specifies the executables to be debugged</li>
     </ul>
     <li>Click Debug </li>
     <p>The Debug window closes and the Carbide.c++ debugger begins a debugging session using the new configuration. The next time you click the <b>Debug</b> icon, this debug launch configuration is used to start a debug session.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -32,7 +32,7 @@
     <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>
     <li>Click OK to close the Bluetooth Configuration window</li>
-    <li>Download the Application CODA or System CODA SISX file to the device</li>
+    <li>Download the Symbian OS Device (Install SIS) or Symbian OS Device SISX file to the device</li>
   </ol>
 </div>
   <h5>Related concepts</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Tue Sep 21 15:50:51 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 Application CODA or System CODA, as a SISX file, to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. Application CODA is usable on both consumer and RnD versions of the device. System CODA is only usable on RnD devices.</p>
+<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>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">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -9,7 +9,7 @@
 </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 Application CODA or System CODA, as a SISX file, to enable on-device debugging. Application CODA is usable on both consumer and RnD versions of the device. System TRK is only usable on RnD devices.</p>
+<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>
 <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 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm	Tue Sep 21 15:50:51 2010 -0500
@@ -94,13 +94,13 @@
   <p class="figure">Figure 1. Ports displayed in Ports section of Device Manager.</p>
   <p>In some situations all USB virtual COM ports are installed under &quot;Modems&quot; in the Device Manager. In the Device Manager dialog, choose &quot;Modems&quot; and see if there are two COM ports listed. One of them will work for debugging. Most of the time, the higher port number works for debugging with TRK.</p>
 </blockquote>
-<h4>I am having difficulty getting a Bluetooth connection to work with AppTRK, any suggestions?</h4>
+<h4>I am having difficulty getting a Bluetooth connection to work with CODA, any suggestions?</h4>
 <blockquote>
   <p>The following are known issues when trying to use Bluetooth serial port on the host:</p>
 </blockquote>
 <ul>
-  <li>XP Microsoft Bluetooth stack does not work correctly with bt serial port emulation (on the PC side). For using TRK, you need BT serial port emulation. Some of the BT dongle manufacturers recommend changing to their own drivers to enable Bt stack serial port emulation.
-    <ul>
+  <li>XP Microsoft Bluetooth stack does not work correctly with bt serial port emulation (on the PC side). For using CODA, you need BT serial port emulation. Some of the BT dongle manufacturers recommend changing to their own drivers to enable Bt stack serial port emulation.
+      <ul>
       <li> Resolution at the moment: Change the XP drivers to bt dongle manufacturers (IBM, TDK, MSI) own drivers by uninstalling the XP drivers and installing the dongle drivers. After the installation the Microsoft Bluetooth Enumerator and Microsoft Bluetooth Services must be shut down.</li>
       <li>From Computer Management -&gt; Device Manager uninstall the Microsoft BT Enumerator</li>
       <li>From Computer Management -&gt; Services and Applications -&gt; Services shutdown the Microsoft Bluetooth Services</li>
@@ -108,14 +108,14 @@
     </ul>
   </li>
 </ul>
-<h4>TRK is launched on the device, but I am getting &ldquo;Can&rsquo;t connect to TRK&rdquo; error message in the Carbide.c++ tools, any suggestions?</h4>
+<h4>CODA is launched on the device, but I am getting &ldquo;Can&rsquo;t connect to CODA&rdquo; error message in the Carbide.c++ tools, any suggestions?</h4>
 <blockquote>
   <p>Check that Carbide.c++ and your USB Virtual COM port or BT Serial Port agree on the port settings.</p>
 </blockquote>
 <ul>
-  <li>Use the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to quickly  determine if you can communicate with the device in the <strong>Check TRK version</strong> pane </li>
-  <li>Open your Bluetooth or USB cable's connection settings: Start -&gt; Settings -&gt; Control panel -&gt; System -&gt; Hardware -&gt; Device Manager. In the Device Manager dialog, click open the Ports directory, then you will see all the com ports available on the machine. Here you will be able to see the COM port for Bluetooth or USB. Sometimes you will have two COM ports for Bluetooth, so you might have to try specifying either of them. </li>
-  <li>In the Carbide tools, <a href="../projects/prj_debug_config.htm">open</a> the launch configuration associated with the target device and verify that you have specified the correct launch configuration for TRK. For example, the launch configuration should be either Symbian OS Application TRK or Symbian OS System TRK configuration. </li>
+  <li>Use the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to quickly  determine if you can communicate with the device in the <strong>Test Connection</strong> pane </li>
+  <li>Open your Bluetooth or USB cable's connection settings: Start &gt; Settings &gt; Control panel &gt; System &gt; Hardware &gt; Device Manager. In the Device Manager dialog, click open the Ports directory, then you will see all the com ports available on the machine. Here you will be able to see the COM port for Bluetooth or USB. Sometimes you will have two COM ports for Bluetooth, so you might have to try specifying either of them. </li>
+  <li>In the Carbide tools, <a href="../projects/prj_debug_config.htm">open</a> the launch configuration associated with the target device and verify that you have specified the correct launch configuration for TRK. For example, the launch configuration should be either Symbian OS Device (Install SIS) or Symbian OS Device configuration. </li>
   <li>In the Carbide tools, <a href="../projects/prj_debug_config.htm">open</a> the launch configuration associated with the target device. In the Connections tab make sure you specify the same COM port number as in the device manager. For Bluetooth, if two ports are listed in the device manager, then you need to try to both, to see which one works. For USB, don't select the COM port assigned to the serial port. Always select the COM port assigned to the virtual COM port ID for the phone that is specified in the Device Manager. </li>
   <li>Make sure the settings in these two dialogs are the same and that the launch configuration settings refer to the right COM port. You shouldn't have to touch the other settings, but they're Data Bits: 8; Parity: None; Stop Bits: 1; Flow Control: None. </li>
 </ul>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Sep 21 10:33:50 2010 -0700
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Sep 21 15:50:51 2010 -0500
@@ -26,12 +26,14 @@
 		  <topic label="Defining a launch configuration"			href="html/projects/tutorials/new_proj_from_template_03.htm" />
 		  <topic label="Launching and debugging an executable" 		href="html/projects/tutorials/new_proj_from_template_04.htm" />
 		</topic>
+		<!--
 		<topic label="DLL Projects"									href="html/projects/tutorials/new_proj_dll_example_00.htm" >
 		  <topic label="Creating DLL Projects" 						href="html/projects/tutorials/new_proj_dll_example_01.htm" />
 		  <topic label="Building the DLL Project" 					href="html/projects/tutorials/new_proj_dll_example_02.htm" />
 		  <topic label="Debugging a DLL Project"					href="html/projects/tutorials/new_proj_dll_example_03.htm" />
       	  <topic label="Debugging DLLs with Any Process"			href="html/tasks/projects/prj_debug_dlls_any_process.htm" />
 		</topic>
+		-->
 		<topic label="Remote Target Debugging (Run-mode)"			href="html/projects/tutorials/run_mode_debug_example_00.htm" >
 		  <topic label="Connect remote device to PC" 				href="html/projects/tutorials/run_mode_debug_example_01.htm" />
 		  <topic label="Install remote debug agent"					href="html/projects/tutorials/run_mode_debug_example_02.htm" />
@@ -190,12 +192,12 @@
     <topic label="Launch configurations"				href="html/projects/launch/launch_configs_overview.htm" >
       <topic label="New Launch Configuration Wizard"	href="html/projects/launch/wiz_new_launch_config.htm" />
       <topic label="Debug dialog"						href="html/projects/launch/wnd_debug_configuration.htm" />
-      <topic label="Launch types"			href="html/projects/launch/launch_types.htm" >
-        <topic label="Applications"					href="html/projects/launch/applications.htm" />
-        <topic label="Application TRK"				href="html/projects/launch/run_mode.htm" />
-        <topic label="Attach to Process"			href="html/projects/launch/attach_process.htm" />
-        <topic label="Emulation"					href="html/projects/launch/emulation.htm" />
-        <topic label="System TRK"					href="html/projects/launch/stop_mode.htm" />
+      <topic label="Launch types"								href="html/projects/launch/launch_types.htm" >
+        <topic label="Symbian OS Device"						href="html/projects/launch/stop_mode.htm" />
+        <topic label="Symbian OS Device (Install SIS)"			href="html/projects/launch/run_mode.htm" />
+        <topic label="Symbian OS Device (Attach to Process)"	href="html/projects/launch/attach_process.htm" />
+        <topic label="Symbian OS Emulator"						href="html/projects/launch/emulation.htm" />
+        <topic label="Symbian OS Simulator"						href="html/projects/launch/simulator.htm" />
         <anchor id="launch_config_ANCHOR"/>
       </topic>
       <topic label="Configuration panes"				href="html/projects/launch/pages_overview.htm" >
@@ -280,10 +282,10 @@
         
     
     <topic label="Stop mode projects" 				href="html/tasks/StopModeToc.htm">
-       <topic href="html/projects/launch/launch_board.htm" label="Debugging a reference board">
-       </topic>
-      <topic label="Stop Mode Debug Example" 				href="html/tasks/debugger/stop_mode_debug.htm" >
-        <topic label="On-Device Debugging Preconditions" href="html/tasks/debugger/stop_mode_debug_precond.htm" />
+      <topic label="On-Device Debugging Preconditions" 		href="html/tasks/debugger/stop_mode_debug_precond.htm" />
+      <topic label="Stop Mode Debug Examples"  >
+        <topic label="Stop Mode Debug Example 1" 			href="html/tasks/debugger/stop_mode_debug.htm" />
+        <topic label="Stop Mode Debug Example 2" 			href="html/tasks/debugger/stop_mode_debug02.htm" />
       </topic>
       <topic label="Building a ROM Image File"            href="html/reference/ROM_build_settings.html" />
       <topic label="Toggle HW Breakpoint"           		href="html/reference/menus/hardware_breakpoints.htm" />