removed duplicate pages, unused images, and fixed links to same
authorfturovic <frank.turovich@nokia.com>
Mon, 10 Aug 2009 15:21:12 -0500
changeset 400 9b005a8e6778
parent 396 2ee12718a766
child 401 939a4e7e4597
removed duplicate pages, unused images, and fixed links to same
core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_resuming.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_stepping.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/viewing_debug.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/launch_configs_overview.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/sophia.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/trace32.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/reference/debugger_settings.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/panel_debug_exceptions.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm
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_wiz_add.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_module_wnd.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/AddingClasses.html
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/soft_attach_debug.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_debug_precond.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/view_symbian_kernel_set.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.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_config.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_debugging.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_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_connection_usb.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_install_usb.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.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/autotargeting.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Auto-Targeting of Executables</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Auto-Targeting of Executables</h2>
-<p>In run-mode  debugger now supports the auto-targeting of processes that are already running or are created during the execution of the debug session. Previously, the debugger forced users to explicitly attach to a running process. Now, the debugger attempts to target all the EXEs specified in the <a href="../reference/launch_configs/page_executables.htm">Executables</a> tab of the launch configuration. </p>
-<ul>
-  <li>If the executables are already started, it gets the load address of the executable and targets it for debugging, resolving any breakpoints it finds.</li>
-  <li>The debugger will target any executable not already started whenever a &quot;process load&quot; event occurs, resolving its breakpoints as well.</li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Auto-Targeting of Executables</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Auto-Targeting of Executables</h2>
+<p>In run-mode  debugger now supports the auto-targeting of processes that are already running or are created during the execution of the debug session. Previously, the debugger forced users to explicitly attach to a running process. Now, the debugger attempts to target all the EXEs specified in the <a href="../projects/launch/page_executables.htm">Executables</a> tab of the launch configuration. </p>
+<ul>
+  <li>If the executables are already started, it gets the load address of the executable and targets it for debugging, resolving any breakpoints it finds.</li>
+  <li>The debugger will target any executable not already started whenever a &quot;process load&quot; event occurs, resolving its breakpoints as well.</li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Common Debugging Actions</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Common Debugging Actions</h2>
-<p>  This section explains how to perform common debugging actions within the <a href="../reference/perspective_debug.htm">Debug perspective</a> to correct source-code errors, control program execution, and observe memory behavior:</p>
-<ul>
-  <li><a href="../tasks/debugger/work_debug_act_start.htm">Start</a> the debugger</li>
-  <li>Step <a href="../tasks/debugger/work_debug_act_stepinto.htm">into</a>, <a href="../tasks/debugger/work_debug_act_stepout.htm">out</a> of, or <a href="../tasks/debugger/work_debug_act_stepover.htm">over</a> routines</li>
-  <li><a href="../tasks/debugger/work_debug_act_stop.htm">Suspend</a>, <a href="../tasks/debugger/work_debug_act_resume.htm">resume</a>, or <a href="../tasks/debugger/work_debug_act_kill.htm">terminate</a> program execution</li>
-  <li><a href="../tasks/debugger/work_debug_act_run.htm">Run</a> the program</li>
-  <li><a href="../tasks/debugger/work_debug_act_restart.htm">Restart</a> the debugger</li>
-</ul>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="debugger_about.htm">About the Carbide.c++ Debugger</a></li>
-</ul>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../tasks/projects/prj_debug_config.htm">Debugger Configuration</a></li>
-  <li><a href="../reference/launch_configs/emulator_debugger.htm">Debugger Pane </a></li>
-  <li><a href="../reference/wnd_debugger_prefs.htm">Debugger Preferences</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Common Debugging Actions</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Common Debugging Actions</h2>
+<p>  This section explains how to perform common debugging actions within the <a href="../reference/perspective_debug.htm">Debug perspective</a> to correct source-code errors, control program execution, and observe memory behavior:</p>
+<ul>
+  <li><a href="../debugger/debug/cmds_starting.htm">Start</a> the debugger</li>
+  <li>Step <a href="../debugger/debug/cmds_stepping.htm">into</a>, <a href="../debugger/debug/cmds_stepping.htm">out</a> of, or <a href="../debugger/debug/cmds_stepping.htm">over</a> routines</li>
+  <li><a href="../debugger/debug/cmds_starting.htm">Suspend</a>, <a href="../debugger/debug/cmds_resuming.htm">resume</a>, or <a href="../debugger/debug/cmds_starting.htm">terminate</a> program execution</li>
+  <li><a href="../debugger/debug/cmds_resuming.htm">Run</a> the program</li>
+  <li><a href="../debugger/debug/cmds_resuming.htm">Restart</a> the debugger</li>
+</ul>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="debugger_about.htm">About the Carbide.c++ Debugger</a></li>
+</ul>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../tasks/projects/prj_debug_config.htm">Debugger Configuration</a></li>
+  <li><a href="../projects/launch/page_debugger.htm">Debugger Pane </a></li>
+  <li><a href="../reference/wnd_debugger_prefs.htm">Debugger Preferences</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -9,21 +9,42 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Concepts</h2>
-<p>The following concepts provide information on common Carbdie.c++ terminology, technologies, and processes:</p>
+<p>This section of the User Guide provides an overview of the main concepts in
+Carbide to create and build programs for Symbian OS. </p>
+<p> The Symbian OS plug-ins are a set of Eclipse plug-ins that provide project,
+  SDK and build support for Symbian OS developers. The plug-ins extend the
+  functionality provided by Eclipse and the C/C++ Development Toolkit (CDT). </p>
+<p> The plug-ins simplify Symbian OS development by removing the need to use
+  command line build tools, and provide a graphical interface to Symbian OS
+  specific file formats, such as AIF and MBM. </p>
+<p> The plug-ins provide a new perspective, called the Carbide.c++ Perspective, on
+  the Eclipse workbench. This perspective enhances the standard CDT C/C++
+  perspective by allowing you to select easily the SDKs and build target types
+  that you want to use for each project. </p>
+<p> The following topics discuss these concepts in more detail: </p>
 <ul>
   <li><a href="build_configurations.htm">Active Build Configuration</a></li>
   <li><a href="AIFDefWizard.html">AIF File</a></li>
   <li><a href="breakpoints.htm">Breakpoints</a></li>
   <li><a href="build_targets.htm">Build Targets</a></li>
+  <li><a href="macros_carbide.htm">Carbide Macros</a></li>
   <li><a href="cvs.htm">Concurrent Versions System (CVS)</a></li>
   <li><a href="contextual_menus.htm">Context menu support</a></li>
+  <li><a href="dependency_tracking.htm">Dependency Tracking</a></li>
   <li><a href="emulators.htm">Emulation Debugging</a></li>
+  <li><a href="ext_build_support.htm">External Builds Support</a></li>
   <li><a href="../projects/launch/launch_configs_overview.htm">Launch Configurations</a></li>
-  <li><a href="registers.htm">Registers</a></li>
   <li><a href="MBMDefWizard.html">MBM File</a></li>
   <li><a href="mmpfiles.htm">MMP Files</a></li>
+  <li><a href="ngage_projects.htm">N-Gage Projects</a></li>
   <li><a href="trk.htm">On-device Debugging</a></li>
+  <li><a href="precompiled_headers.htm">Precompiled Headers</a></li>
+  <li><a href="registers.htm">Registers</a></li>
+  <li><a href="../tasks/WorkingwithSDKs.html">SDK Support</a></li>
+  <li><a href="symbol_hints.htm">Symbol Hint</a></li>
+  <li><a href="symbols_pkg.htm">Symbols, .pkg</a></li>
   <li><a href="watchpoints.htm">Watchpoints</a></li>
+  <li><a href="workspaces.htm">Workspace Information</a></li>
 </ul>
 <div class="step">
   <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -14,7 +14,7 @@
 <ul>
   <li>Editor views - perform editing functions, format, compare, and a host of other file actions </li>
   <li><a href="../reference/view_breakpoints.htm">Breakpoints</a> view - enable, disable, remove, or select all breakpoints</li>
-  <li><a href="../reference/view_debug.htm">Debug</a> view - restart, step into, over, or out of routines, terminate or suspend program execution </li>
+  <li><a href="../debugger/debug/viewing_debug.htm">Debug</a> view - restart, step into, over, or out of routines, terminate or suspend program execution </li>
   <li><a href="../reference/view_memory_wnd.htm">Memory</a> view - add or remove memory monitors </li>
   <li><a href="../reference/view_cpp_projects.htm">Project Explorer</a> view - manage projects, build, delete, freeze, run, debug, and other common project commands</li>
   <li><a href="../reference/view_variables.htm">Variables</a> view - enable, disable, find, and change  the format or value of variables displayed</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,49 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>About the Carbide Debugger</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>About the Carbide.c++ Debugger</h2>
-<p>  A debugger controls program execution and shows the internal operation of a computer program. Use the debugger to find problems while the program executes. Also use the debugger to observe how a program uses memory to complete tasks.</p>
-<p>The Carbide.c++ debugger provides these levels of control over a computer program:</p>
-<ul>
-  <li>Execution of one statement at a time</li>
-  <li>Suspend execution after reaching a specific point in the program</li>
-  <li>Suspend execution after changing a specified memory value</li>
-  <li>Suspend any running thread from the stack crawl in the Debug view</li>
-</ul>
-<p>After the debugger suspends program execution, use  the <a href="../reference/perspective_debug.htm">Debug</a> perspective to perform these tasks:</p>
-<ul>
-  <li><a href="../reference/view_debug.htm">View</a> the function-call chain</li>
-  <li><a href="../reference/view_variables.htm">Manipulate</a> variable values</li>
-  <li><a href="../reference/view_registers.htm">View</a> register values in the computer processor</li>
-</ul>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="working_with_debugger.htm">Working with the Debugger </a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/debugger/work_debug_act_resume.htm">Resume</a></li>
-  <li><a href="../tasks/debugger/work_debug_act_stop.htm">Suspend</a></li>
-  <li><a href="../tasks/debugger/work_debug_act_kill.htm">Terminate</a></li>
-  <li><a href="../tasks/debugger/work_debug_act_restart.htm">Restart</a></li>
-  <li><a href="../tasks/debugger/work_debug_act_stepinto.htm">Step Into</a></li>
-  <li><a href="../tasks/debugger/work_debug_act_stepover.htm">Step Over</a></li>
-  <li><a href="../tasks/debugger/work_debug_act_stepout.htm">Step Return</a> </li>
-</ul>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../tasks/projects/prj_debug_config.htm">Debugger Configuration</a></li>
-  <li><a href="../reference/launch_configs/emulator_debugger.htm">Debugger Pane </a></li>
-  <li><a href="../reference/wnd_debugger_prefs.htm">Debugger Preferences</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>About the Carbide Debugger</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>About the Carbide.c++ Debugger</h2>
+<p>  A debugger controls program execution and shows the internal operation of a computer program. Use the debugger to find problems while the program executes. Also use the debugger to observe how a program uses memory to complete tasks.</p>
+<p>The Carbide.c++ debugger provides these levels of control over a computer program:</p>
+<ul>
+  <li>Execution of one statement at a time</li>
+  <li>Suspend execution after reaching a specific point in the program</li>
+  <li>Suspend execution after changing a specified memory value</li>
+  <li>Suspend any running thread from the stack crawl in the Debug view</li>
+</ul>
+<p>After the debugger suspends program execution, use  the <a href="../reference/perspective_debug.htm">Debug</a> perspective to perform these tasks:</p>
+<ul>
+  <li><a href="../debugger/debug/viewing_debug.htm">View</a> the function-call chain</li>
+  <li><a href="../reference/view_variables.htm">Manipulate</a> variable values</li>
+  <li><a href="../reference/view_registers.htm">View</a> register values in the computer processor</li>
+</ul>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="working_with_debugger.htm">Working with the Debugger </a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../debugger/debug/cmds_resuming.htm">Resume</a></li>
+  <li><a href="../debugger/debug/cmds_starting.htm">Suspend</a></li>
+  <li><a href="../debugger/debug/cmds_starting.htm">Terminate</a></li>
+  <li><a href="../debugger/debug/cmds_resuming.htm">Restart</a></li>
+  <li><a href="../debugger/debug/cmds_stepping.htm">Step Into</a></li>
+  <li><a href="../debugger/debug/cmds_stepping.htm">Step Over</a></li>
+  <li><a href="../debugger/debug/cmds_stepping.htm">Step Return</a> </li>
+</ul>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../tasks/projects/prj_debug_config.htm">Debugger Configuration</a></li>
+  <li><a href="../projects/launch/page_debugger.htm">Debugger Pane </a></li>
+  <li><a href="../reference/wnd_debugger_prefs.htm">Debugger Preferences</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,101 +1,101 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>N-Gage Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>N-Gage Projects</h2>
-<p>Carbide.c++ supports the importing of N-Gage projects. However, there are some process issues that effect how you can debug game projects on devices. The following provides a high level overview of the process you should follow to successfully import, build, deploy, and debug an N-Gage game on a device. </p>
-<h4>Importing N-Gage projects</h4>
-<p>To start,  import your game project into Carbide:</p>
-<ol>
-  <li>Install the N-Gage SDK on your PC</li>
-  <li>Place your game project inside the N-Gage SDK</li>
-  <li> In Carbide.c++, click<b> File &gt; <a href="../tasks/ImportingProjects.html">Import</a></b></li>
-  <li>Select <b>Symbian OS Bld.inf</b> importer and navigate to your bld.inf  file to import it </li>
-</ol>
-<h4>Building the N-Gage project</h4>
-<p>Once the game project has been imported, use these steps to create an N-GAGE game file:</p>
-<ol>
-  <li>Right-click the project and choose <b>Properties</b> to open the <b>Properties for <i>project_name</i></b> window  </li>
-  <li>In the <b>Carbide.c++ &gt; Carbide Build Configuration &gt; <a href="../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a></b> panel, click <b>Add</b>.</li>
-  <li>In the <b><a href="../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a></b> window:
-    <ol>
-      <li>Specify the project and metadata PKG files  to build</li>
-      <li>Enable  the<b> Sign sis file with certificate/key pair</b> for each PKG file </li>
-      <li>Select the certificate/key given to you by the Nokia R&amp;D Certificate Service</li>
-      <li>Click  <b>OK</b></li>
-    </ol>
-  </li>
-  <li>If using a batch file to build the N-Gage installation,  create a new builder within Carbide  by opening the <b>Properties for <i>project_name</i>  &gt;  Builders</b> panel and click <b>New</b>.  </li>
-<p align="center"><img src="images/pane_builders_properties.png" width="682" height="208"></p>
-<p align="center" class="figure">Figure 1 - Builders pane in project Properties dialog</p>
-      <li>Open the <b>Properties for <i>project_name</i> &gt;  Builders</b> panel</li>
-      <li>Click <b>New</b></li>
-      <li>Select <b>Program</b> in the <b>Choose configuration type</b> window, click <b>OK</b> </li>
-      <p align="center"><img src="images/wnd_properties_for_builder.png" width="800" height="640"></p>
-      <p align="center" class="figure">Figure 2 - <b>Properties for N-Gage Builder</b> dialog</p>
-      <li>In the <b>Properties for New_Builder</b> window 
-        <b>Main</b> tab:
-        <ul>
-          <li>Define the builder  name in the <b>Name</b> text box</li>
-          <li>Specify the <b>Location</b> of the builder of the installation file</li>
-          <li>Specify the <b>Working Directory</b>  </li>
-        </ul>
-      </li>
-      <li>Click <b>OK</b> </li>
-    <p>	The new builder appears in the <b>Builders</b> panel. The build steps are performed in the order they are displayed.  Your builder name should appear under the  <b>Carbide CPP Project Builder</b> item. If not, use the <b>Up</b> or <b>Down</b> controls to set the build order.
-      <p align="center"><img src="images/pane_builder_n_gage_builder.png" width="489" height="184"></p>
-      <p align="center" class="figure">Figure 4 - <b>Builder</b> dialog with new N-Gage Builder defined </p>
-  <li>Click OK to close the <b>Properties for <i>project_name</i></b> window</li>
-  <li>Build the project and its SISX file by selecting the <b>Project &gt; Build Project</b> menu item</li>
-  <p>The <a href="../reference/view_log.htm">Console</a> view shows information as the project  and it's SISX file are built and then the build of the installation file (<span class="code">N-GAGE</span>).</p>
-    </ol>
-<h3>For On-device Debugging </h3>
-<h4>Deploying the N-Gage project   to a device </h4>
-<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 TRK 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>
-<p>With your game file installed on the device, create a launch configuration for the project. In Carbide:</p>
-<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</li>
-  <li>Right-click the project and choose <b>Debug As &gt; Open Debug Dialog</b> to open the <b><a href="../reference/wnd_debug_configuration.htm">Debug</a></b> window</li>
-  <li><a href="../tasks/projects/prj_debug_config.htm">Create</a> an <b>Application TRK</b> launch configuration
-    <ul>
-      <li>In the <b><a href="../reference/launch_configs/page_connection.htm">Connection</a></b> tab select the COM port used to connect to the device. </li>
-      <li> In the <b><a href="../reference/launch_configs/app_trk_installation.htm">Installation</a></b> tab, verify that the game SISX file is correct </li>
-      <li>In the <b><a href="../reference/launch_configs/page_trk_debugger.htm">Debug</a></b> tab, enable the View messges between PC and debug agent on the phone if you want to monitor communications between TRK and Carbide </li>
-    </ul>
-  </li>
-
-  <li>Click <b>Debug</b>    </li>
-</ol>
-<p>The Debugger launches the game project in the device and halts when it encounters the breakpoint you set. </p>
-<h3>For Emulator Debugging </h3>
-<h4>Deploying and debugging the N-Gage project on an emulator</h4>
-<p>With your game file installed to the emulator, create a launch configuration for the project. In Carbide:</p>
-<ol>
-  <li>Open <b>Window &gt; Preferences &gt;   Run/Debug &gt; Launching</b> and disable the <b>Build (if required) before launching</b> option</li>
-  <li>Right-click the project and choose <b>Debug As &gt; Open Debug Dialog</b> to open the <b>Debug</b> window</li>
-  <li>Create an <b>Symbian OS Emulation </b> launch configuration</li>
-  <li>Click <b>Debug</b> to launch the emulator </li>
-  <li>In the emulator, select <b>File &gt; Open</b>,  locate and select the .N-GAGE installation file and click <b>Open</b> to install the project </li>
-  <li>Open the Installation folder, launch the N-Gage runtime application</li>
-  <li>In the N-Gage runtime launch the game  </li>
-  <li>If any breakpoint is hit in the game project, the debugger suspends</li>
-</ol>
-<p>From this point you can use all of the debugger features to debug the project. </p>
-<p>Always refer to the N-Gage documentation for more information on creating, deploying, and debugging N-Gage projects. </p>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>N-Gage Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>N-Gage Projects</h2>
+<p>Carbide.c++ supports the importing of N-Gage projects. However, there are some process issues that effect how you can debug game projects on devices. The following provides a high level overview of the process you should follow to successfully import, build, deploy, and debug an N-Gage game on a device. </p>
+<h4>Importing N-Gage projects</h4>
+<p>To start,  import your game project into Carbide:</p>
+<ol>
+  <li>Install the N-Gage SDK on your PC</li>
+  <li>Place your game project inside the N-Gage SDK</li>
+  <li> In Carbide.c++, click<b> File &gt; <a href="../tasks/ImportingProjects.html">Import</a></b></li>
+  <li>Select <b>Symbian OS Bld.inf</b> importer and navigate to your bld.inf  file to import it </li>
+</ol>
+<h4>Building the N-Gage project</h4>
+<p>Once the game project has been imported, use these steps to create an N-GAGE game file:</p>
+<ol>
+  <li>Right-click the project and choose <b>Properties</b> to open the <b>Properties for <i>project_name</i></b> window  </li>
+  <li>In the <b>Carbide.c++ &gt; Carbide Build Configuration &gt; <a href="../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a></b> panel, click <b>Add</b>.</li>
+  <li>In the <b><a href="../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a></b> window:
+    <ol>
+      <li>Specify the project and metadata PKG files  to build</li>
+      <li>Enable  the<b> Sign sis file with certificate/key pair</b> for each PKG file </li>
+      <li>Select the certificate/key given to you by the Nokia R&amp;D Certificate Service</li>
+      <li>Click  <b>OK</b></li>
+    </ol>
+  </li>
+  <li>If using a batch file to build the N-Gage installation,  create a new builder within Carbide  by opening the <b>Properties for <i>project_name</i>  &gt;  Builders</b> panel and click <b>New</b>.  </li>
+<p align="center"><img src="images/pane_builders_properties.png" width="682" height="208"></p>
+<p align="center" class="figure">Figure 1 - Builders pane in project Properties dialog</p>
+      <li>Open the <b>Properties for <i>project_name</i> &gt;  Builders</b> panel</li>
+      <li>Click <b>New</b></li>
+      <li>Select <b>Program</b> in the <b>Choose configuration type</b> window, click <b>OK</b> </li>
+      <p align="center"><img src="images/wnd_properties_for_builder.png" width="800" height="640"></p>
+      <p align="center" class="figure">Figure 2 - <b>Properties for N-Gage Builder</b> dialog</p>
+      <li>In the <b>Properties for New_Builder</b> window 
+        <b>Main</b> tab:
+        <ul>
+          <li>Define the builder  name in the <b>Name</b> text box</li>
+          <li>Specify the <b>Location</b> of the builder of the installation file</li>
+          <li>Specify the <b>Working Directory</b>  </li>
+        </ul>
+      </li>
+      <li>Click <b>OK</b> </li>
+    <p>	The new builder appears in the <b>Builders</b> panel. The build steps are performed in the order they are displayed.  Your builder name should appear under the  <b>Carbide CPP Project Builder</b> item. If not, use the <b>Up</b> or <b>Down</b> controls to set the build order.
+      <p align="center"><img src="images/pane_builder_n_gage_builder.png" width="489" height="184"></p>
+      <p align="center" class="figure">Figure 4 - <b>Builder</b> dialog with new N-Gage Builder defined </p>
+  <li>Click OK to close the <b>Properties for <i>project_name</i></b> window</li>
+  <li>Build the project and its SISX file by selecting the <b>Project &gt; Build Project</b> menu item</li>
+  <p>The <a href="../reference/view_log.htm">Console</a> view shows information as the project  and it's SISX file are built and then the build of the installation file (<span class="code">N-GAGE</span>).</p>
+    </ol>
+<h3>For On-device Debugging </h3>
+<h4>Deploying the N-Gage project   to a device </h4>
+<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 TRK 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>
+<p>With your game file installed on the device, create a launch configuration for the project. In Carbide:</p>
+<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</li>
+  <li>Right-click the project and choose <b>Debug As &gt; Open Debug Dialog</b> to open the <b><a href="../reference/wnd_debug_configuration.htm">Debug</a></b> window</li>
+  <li><a href="../tasks/projects/prj_debug_config.htm">Create</a> an <b>Application TRK</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>
+      <li>In the <b><a href="../projects/launch/page_debugger.htm">Debug</a></b> tab, enable the View messges between PC and debug agent on the phone if you want to monitor communications between TRK and Carbide </li>
+    </ul>
+  </li>
+
+  <li>Click <b>Debug</b>    </li>
+</ol>
+<p>The Debugger launches the game project in the device and halts when it encounters the breakpoint you set. </p>
+<h3>For Emulator Debugging </h3>
+<h4>Deploying and debugging the N-Gage project on an emulator</h4>
+<p>With your game file installed to the emulator, create a launch configuration for the project. In Carbide:</p>
+<ol>
+  <li>Open <b>Window &gt; Preferences &gt;   Run/Debug &gt; Launching</b> and disable the <b>Build (if required) before launching</b> option</li>
+  <li>Right-click the project and choose <b>Debug As &gt; Open Debug Dialog</b> to open the <b>Debug</b> window</li>
+  <li>Create an <b>Symbian OS Emulation </b> launch configuration</li>
+  <li>Click <b>Debug</b> to launch the emulator </li>
+  <li>In the emulator, select <b>File &gt; Open</b>,  locate and select the .N-GAGE installation file and click <b>Open</b> to install the project </li>
+  <li>Open the Installation folder, launch the N-Gage runtime application</li>
+  <li>In the N-Gage runtime launch the game  </li>
+  <li>If any breakpoint is hit in the game project, the debugger suspends</li>
+</ol>
+<p>From this point you can use all of the debugger features to debug the project. </p>
+<p>Always refer to the N-Gage documentation for more information on creating, deploying, and debugging N-Gage projects. </p>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,45 +1,45 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugger Program Execution</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugger Program Execution </h2>
-<p>  This section explains how to work with the debugger in the Carbide IDE to control program execution. The main component of the debugger is the <a href="../reference/perspective_debug.htm">Debug perspective</a>, which shows these items:</p>
-<ul>
-  <li>Common debugging controls in the <a href="../reference/view_debug.htm">Debug</a> view for:
-    <ul>
-      <li><a href="../tasks/debugger/work_debug_act_start.htm">Starting</a> the debugger</li>
-      <li><a href="../tasks/debugger/work_debug_act_run.htm">Running</a> the program</li>
-      <li>Stepping <a href="../tasks/debugger/work_debug_act_stepinto.htm">into</a>, <a href="../tasks/debugger/work_debug_act_stepout.htm">out</a> of, or <a href="../tasks/debugger/work_debug_act_stepover.htm">over</a> routines</li>
-      <li><a href="../tasks/debugger/work_debug_act_stop.htm">Suspending</a>, <a href="../tasks/debugger/work_debug_act_resume.htm">resuming</a>, or <a href="../tasks/debugger/work_debug_act_kill.htm">terminating</a> program execution</li>
-      <li><a href="../tasks/debugger/work_debug_act_disconnect.htm">Disconnecting</a> the debugger </li>
-      <li><a href="../tasks/debugger/work_debug_act_restart.htm">Restarting</a> the debugger</li>
-    </ul>
-  </li>
-  <li>Variable information in the <a href="../reference/view_variables.htm">Variables</a> view&mdash;see the variables in the executing code, their <a href="../tasks/variables/show_variables_view.htm">values</a>, and their <a href="../tasks/variables/set_variable_formats.htm">types</a></li>
-  <li>Breakpoint information in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view&mdash;see the <a href="../tasks/breakpoints/pgm_bp_enable.htm">breakpoints</a>, <a href="../tasks/breakpoints/pgm_bp_conditional.htm">conditional</a> breakpoints, and <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm">breakpoint actions</a></li>
-  <li>Source code&mdash;see the source code under debugger control</li>
-</ul>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="debugger_about.htm">Debugger</a></li>
-  <li><a href="emulators.htm">Emulation Debugging</a></li>
-  <li><a href="trk.htm">On-device Debugging</a></li>
-</ul>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../reference/perspective_debug.htm">Debug Perspective</a></li>
-  <li><a href="../reference/view_debug.htm">Debug View</a> </li>
-  <li><a href="../reference/view_expressions.htm">Expressions View</a></li>
-  <li><a href="../reference/view_variables.htm">Variables View</a></li>
-  <li><a href="../reference/view_breakpoints.htm">Breakpoints View </a>  </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugger Program Execution</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debugger Program Execution </h2>
+<p>  This section explains how to work with the debugger in the Carbide IDE to control program execution. The main component of the debugger is the <a href="../reference/perspective_debug.htm">Debug perspective</a>, which shows these items:</p>
+<ul>
+  <li>Common debugging controls in the <a href="../debugger/debug/viewing_debug.htm">Debug</a> view for:
+    <ul>
+      <li><a href="../debugger/debug/cmds_starting.htm">Starting</a> the debugger</li>
+      <li><a href="../debugger/debug/cmds_resuming.htm">Running</a> the program</li>
+      <li>Stepping <a href="../debugger/debug/cmds_stepping.htm">into</a>, <a href="../debugger/debug/cmds_stepping.htm">out</a> of, or <a href="../debugger/debug/cmds_stepping.htm">over</a> routines</li>
+      <li><a href="../debugger/debug/cmds_starting.htm">Suspending</a>, <a href="../debugger/debug/cmds_resuming.htm">resuming</a>, or <a href="../debugger/debug/cmds_starting.htm">terminating</a> program execution</li>
+      <li><a href="../debugger/debug/cmds_other.htm">Disconnecting</a> the debugger </li>
+      <li><a href="../debugger/debug/cmds_resuming.htm">Restarting</a> the debugger</li>
+    </ul>
+  </li>
+  <li>Variable information in the <a href="../reference/view_variables.htm">Variables</a> view&mdash;see the variables in the executing code, their <a href="../tasks/variables/show_variables_view.htm">values</a>, and their <a href="../tasks/variables/set_variable_formats.htm">types</a></li>
+  <li>Breakpoint information in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view&mdash;see the <a href="../tasks/breakpoints/pgm_bp_enable.htm">breakpoints</a>, <a href="../tasks/breakpoints/pgm_bp_conditional.htm">conditional</a> breakpoints, and <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm">breakpoint actions</a></li>
+  <li>Source code&mdash;see the source code under debugger control</li>
+</ul>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="debugger_about.htm">Debugger</a></li>
+  <li><a href="emulators.htm">Emulation Debugging</a></li>
+  <li><a href="trk.htm">On-device Debugging</a></li>
+</ul>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../reference/perspective_debug.htm">Debug Perspective</a></li>
+  <li><a href="../debugger/debug/viewing_debug.htm">Debug View</a> </li>
+  <li><a href="../reference/view_expressions.htm">Expressions View</a></li>
+  <li><a href="../reference/view_variables.htm">Variables View</a></li>
+  <li><a href="../reference/view_breakpoints.htm">Breakpoints View </a>  </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -25,7 +25,7 @@
   </tr>
   <tr>
     <td colspan="2"><h1 align="center">Carbide.c++ User Guide</h1>
-    <p align="center" class="titleSmall">Version 2.1.0, June, 2009</p></td>
+    <p align="center" class="titleSmall">Version 2.2.0, August, 2009</p></td>
   </tr>
 </table>
 <p align="center">&nbsp;</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_resuming.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_resuming.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,42 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Suspending and Resuming a Debug Session</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Suspending and Resuming a Debug Session</h2>
-<p>Once you've started a debug session, the <a href="viewing_debug.htm">Debug</a><b> </b>view provides controls to both suspend and resume program execution under debugger control. The following items describe the commands for:</p>
-<ul>
-  <li><a href="#PAUSE_PGM">Suspending a program</a></li>
-  <li><a href="#RESUME_PGM">Resuming a program</a></li>
-</ul>
-<h4><a name="PAUSE_PGM" id="PAUSE_PGM"></a>Suspending a program</h4>
-<p>Use the <b>Suspend</b> command  (<img src="../../images/icons/btn_suspend.png" width="17" height="17" align="absmiddle" />) to stop program execution during a debugging session.</p>
-<p>To suspend a running program:</p>
-<ol>
-  <li>Select the thread in the <b>Debug</b> view to suspend</li>
-  <li>Click the <b>Suspend</b> (<img src="../../images/icons/btn_suspend.png" width="17" height="17" align="absmiddle" />) button, or right-click the thread  and select <b>Suspend</b></li>
-</ol>
-<h4><a name="RESUME_PGM" id="PAUSE_PGM2"></a>Resuming a program</h4>
-<p>Use the <b>Resume</b> command  (<img src="../../images/icons/btn_resume.png" width="19" height="14" align="absmiddle" />) to continue executing a suspended debugging session. If the debugging session is already active, use this command to switch view from the Thread window to the executing program.</p>
-<p>The ways you can resume a program include:</p>
-<ul>
-  <li>Click the <b>Resume</b> button (<img src="../../images/icons/btn_resume.png" width="19" height="14" align="absmiddle" />) in the <b>Debug</b> view </li>
-</ul>
-<ul>
-  <li>Right-click  the thread in the <b>Debug</b> view and select <b>Resume</b> from the  context menu</li>
-</ul>
-<ul><li>Select <b>Run &gt; Resume</b> from the  menu bar </li>
-</ul>
-<p class="note"><b>NOTE</b> If the <a href="../../reference/view_debug.htm">Debug</a> view loses focus, the Resume control will appear disabled. To regain focus, select a thread in the Debug view to update the tool bar and reactivate the Resume control.</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="debug.htm">Debugging overview</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Suspending and Resuming a Debug Session</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Suspending and Resuming a Debug Session</h2>
+<p>Once you've started a debug session, the <a href="viewing_debug.htm">Debug</a><b> </b>view provides controls to both suspend and resume program execution under debugger control. The following items describe the commands for:</p>
+<ul>
+  <li><a href="#PAUSE_PGM">Suspending a program</a></li>
+  <li><a href="#RESUME_PGM">Resuming a program</a></li>
+</ul>
+<h4><a name="PAUSE_PGM" id="PAUSE_PGM"></a>Suspending a program</h4>
+<p>Use the <b>Suspend</b> command  (<img src="../../images/icons/btn_suspend.png" width="17" height="17" align="absmiddle" />) to stop program execution during a debugging session.</p>
+<p>To suspend a running program:</p>
+<ol>
+  <li>Select the thread in the <b>Debug</b> view to suspend</li>
+  <li>Click the <b>Suspend</b> (<img src="../../images/icons/btn_suspend.png" width="17" height="17" align="absmiddle" />) button, or right-click the thread  and select <b>Suspend</b></li>
+</ol>
+<h4><a name="RESUME_PGM" id="PAUSE_PGM2"></a>Resuming a program</h4>
+<p>Use the <b>Resume</b> command  (<img src="../../images/icons/btn_resume.png" width="19" height="14" align="absmiddle" />) to continue executing a suspended debugging session. If the debugging session is already active, use this command to switch view from the Thread window to the executing program.</p>
+<p>The ways you can resume a program include:</p>
+<ul>
+  <li>Click the <b>Resume</b> button (<img src="../../images/icons/btn_resume.png" width="19" height="14" align="absmiddle" />) in the <b>Debug</b> view </li>
+</ul>
+<ul>
+  <li>Right-click  the thread in the <b>Debug</b> view and select <b>Resume</b> from the  context menu</li>
+</ul>
+<ul><li>Select <b>Run &gt; Resume</b> from the  menu bar </li>
+</ul>
+<p class="note"><b>NOTE</b> If the <a href="viewing_debug.htm">Debug</a> view loses focus, the Resume control will appear disabled. To regain focus, select a thread in the Debug view to update the tool bar and reactivate the Resume control.</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="debug.htm">Debugging overview</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,47 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Starting and Terminating a Debug Session</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Starting  and Terminating a Debug Session</h2>
-<p>Once you've started a debug session, the <b>Debug</b> view provides controls to both terminate and restart the session. The following items describe the commands for:</p>
-<ul>
-  <li><a href="#START_DB">Starting a session</a></li>
-  <li><a href="#TERMINATE_DB">Terminating a session</a></li>
-  <li><a href="#RESTART_DB">Restarting a session</a></li>
-</ul>
-<h4><a name="START_DB" id="START_DB"></a>Starting a session</h4>
-<p>Use the <b>Debug</b> command (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
-<p>If the project does not already have a launch configuration, the <a href="../../tasks/projects/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> will automatically create one for emulator targets or ask for additional information to create one. It will generate a default name for the launch configuration and add it to the list of available launch configurations for the project. Once complete and saved the debug session is launched. If a  launch configuration is already available, the Debug command launches  the last  launch configuration used by the project. </p>
-<p>To create new launch configurations where none previously existed or launch the last one created:</p>
-<ul>
-  <li>Click the <b>Debug</b> button (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) in the <b>Carbide C/C++</b> perspective</li>
-  <li>Select <b>Run &gt; Debug</b> from the  menu bar </li>
-</ul>
-<p>To launch a specific launch configuration:</p>
-<ul>
-  <li>Right-click the project's EXE file in the C/C++ Projects view and select <b>Debug As &gt; <em>Project_Name</em></b> from the context menu</li>
-</ul>
-<h4><a name="TERMINATE_DB" id="START_DB2"></a>Terminating a session</h4>
-<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 TRK</b> or <b>System TRK</b> - kills the process on the device and ends the debug session. To terminate without killing the process, use <a href="../../tasks/debugger/work_debug_act_disconnect.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="../../tasks/debugger/work_debug_act_stop.htm">suspending</a> a program, as this temporarily suspends execution.</p>
-<p class="note"><b>NOTE</b> If the <a href="../../reference/view_debug.htm">Debug</a> view  loses focus, the Terminate control will appear disabled. To regain focus, select a thread in the Debug view to update the tool bar and reactivate the Terminate control. </p>
-<h4><a name="RESTART_DB" id="START_DB3"></a>Restarting a session</h4>
-<p>Use the <b>Restart</b> command  (<img src="../../images/icons/btn_restart.png" width="20" height="18" align="absmiddle" />) after stopping program execution. The debugger goes back to the beginning of the program and begins execution again. This behavior is equivalent to killing execution, then starting a new debugging session.</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="debug.htm">Debugging overview</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Starting and Terminating a Debug Session</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Starting  and Terminating a Debug Session</h2>
+<p>Once you've started a debug session, the <b>Debug</b> view provides controls to both terminate and restart the session. The following items describe the commands for:</p>
+<ul>
+  <li><a href="#START_DB">Starting a session</a></li>
+  <li><a href="#TERMINATE_DB">Terminating a session</a></li>
+  <li><a href="#RESTART_DB">Restarting a session</a></li>
+</ul>
+<h4><a name="START_DB" id="START_DB"></a>Starting a session</h4>
+<p>Use the <b>Debug</b> command (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
+<p>If the project does not already have a launch configuration, the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> will automatically create one for emulator targets or ask for additional information to create one. It will generate a default name for the launch configuration and add it to the list of available launch configurations for the project. Once complete and saved the debug session is launched. If a  launch configuration is already available, the Debug command launches  the last  launch configuration used by the project. </p>
+<p>To create new launch configurations where none previously existed or launch the last one created:</p>
+<ul>
+  <li>Click the <b>Debug</b> button (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) in the <b>Carbide C/C++</b> perspective</li>
+  <li>Select <b>Run &gt; Debug</b> from the  menu bar </li>
+</ul>
+<p>To launch a specific launch configuration:</p>
+<ul>
+  <li>Right-click the project's EXE file in the C/C++ Projects view and select <b>Debug As &gt; <em>Project_Name</em></b> from the context menu</li>
+</ul>
+<h4><a name="TERMINATE_DB" id="START_DB2"></a>Terminating a session</h4>
+<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 TRK</b> or <b>System TRK</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>
+<p class="note"><b>NOTE</b> If the <a href="viewing_debug.htm">Debug</a> view  loses focus, the Terminate control will appear disabled. To regain focus, select a thread in the Debug view to update the tool bar and reactivate the Terminate control. </p>
+<h4><a name="RESTART_DB" id="START_DB3"></a>Restarting a session</h4>
+<p>Use the <b>Restart</b> command  (<img src="../../images/icons/btn_restart.png" width="20" height="18" align="absmiddle" />) after stopping program execution. The debugger goes back to the beginning of the program and begins execution again. This behavior is equivalent to killing execution, then starting a new debugging session.</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="debug.htm">Debugging overview</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_stepping.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_stepping.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,68 +1,68 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Stepping Over, Into, and Out of Routines</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Stepping Over, Into, and Out of Routines</h2>
-<p>Once you've <a href="../../tasks/debugger/work_debug_act_resume.htm">suspended</a> a program debug session, the <a href="viewing_debug.htm">Debug</a> view provides controls to walk through program code, including commands for:</p>
-<ul>
-  <li><a href="#STEP_OVER">Stepping over a routine</a></li>
-  <li><a href="#STEP_INTO">Stepping into a routine</a></li>
-  <li><a href="#STEP_OUT">Stepping out of a routine</a><a href="#RESUME_PGM"></a></li>
-</ul>
-<h4><a name="STEP_OVER" id="STEP_OVER"></a>Stepping over a routine</h4>
-<p>Use the <b>Step Over</b> command  (<img src="../../images/icons/btn_stepover.png" width="19" height="14" />) to execute the current statement and advance to the next statement in the source code. If the current statement is a routine call, program execution continues until reaching one of these points:</p>
-<ul>
-  <li>the end of the called routine</li>
-  <li>a breakpoint</li>
-  <li>a watchpoint</li>
-  <li>an eventpoint that stops execution</li>
-</ul>
-<p>To step over a routine:</p>
-  <ul>
-    <li>Click the <b>Step Over</b> button (<img src="../../images/icons/btn_stepover.png" width="19" height="14" />) in the <b>Debug</b> view </li>
-    <li>Right-click the thread in the Debug view and select <b>Step Over</b> from the <b>Debug</b> contextual menu</li>
-    <li>Select <b>Run &gt; Step Over</b> from the  menu bar </li>
-  </ul>
-  <ul>
-    <p>The current statement or routine executes, then program execution stops.</p>
-  </ul>
-<h4><a name="STEP_INTO" id="STEP_OVER2"></a>Stepping into a routine</h4>
-<p>Use the <b>Step Into</b> command (<img src="../../images/icons/btn_stepinto.png" width="18" height="14" />) to execute one source-code statement at a time and follow execution into a routine call.</p>
-<p>When stepping through a program in a debug session the IDE attempts to match the program counter (PC) location in the executable with a known project source file. If there is no source file associated with the PC the debugger displays in the Debug view the current PC address of the thread (e.g. <span class="code">0x6002CC11(EUSER.DLL)()</span>) instead of the function name. At this point you can open the Disassembly view to step through the assembler code. This most commonly happens when trying to step into Symbian OS code. We recommend that you <a href="../../tasks/debugger/work_debug_act_stepover.htm">Step Return</a> out of the OS code and back into your project to continue debugging.</p>
-<ul>
-  <li>Click the <b>Step Into</b> button (<img src="../../images/icons/btn_stepinto.png" width="18" height="14" />) in the <a href="../../reference/view_debug.htm">Debug</a> view </li>
-  <li>Right-click the thread in the <b>Debug</b> view and select <b>Step Into</b> from the  context menu</li>
-  <li>Select <b>Run &gt; Step Into</b> from the  menu bar </li>
-</ul>
-<ul>
-  <p>After the debugger executes the source-code statement, the current-statement arrow moves to the next statement determined by these rules:</p>
-  <ul>
-    <li>If the executed statement did not call a routine, the current-statement arrow moves to the next statement in the source code.</li>
-    <li>If the executed statement called a routine, the current-statement arrow moves to the first statement in the called routine.</li>
-    <li>If the executed statement is the last statement in a called routine, the current-statement arrow moves to the statement that follows the calling routine.</li>
-  </ul>
-</ul>
-<h4><a name="STEP_OUT" id="STEP_OVER3"></a>Stepping out of a routine</h4>
-<p>Use the <b>Step Return</b> command (<img src="../../images/icons/btn_stepreturn.png" width="17" height="14" />) to execute the rest of the current routine and stop program execution after the routine returns to its caller. This command causes execution to return up the calling chain.</p>
-<p>To step out of a  routine:</p>
-  <ul>
-    <li>Click the <b>Step Return</b> button (<img src="../../images/icons/btn_stepreturn.png" width="17" height="14" />) in the <a href="../../reference/view_debug.htm">Debug</a> view </li>
-    <li>Right-click the thread in the <b>Debug</b> view, then select <b>Step Return</b> from the  context menu</li>
-    <li>Select <b>Run &gt; Step Return</b> from the  menu bar </li>
-</ul>
-<ul>
-  <p>The current routine executes and returns to its caller, then program execution stops</p>
-</ul>
-<h4>Other references</h4>
-<ul>
-<li><a href="debug.htm">Debugging overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Stepping Over, Into, and Out of Routines</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Stepping Over, Into, and Out of Routines</h2>
+<p>Once you've <a href="cmds_resuming.htm">suspended</a> a program debug session, the <a href="viewing_debug.htm">Debug</a> view provides controls to walk through program code, including commands for:</p>
+<ul>
+  <li><a href="#STEP_OVER">Stepping over a routine</a></li>
+  <li><a href="#STEP_INTO">Stepping into a routine</a></li>
+  <li><a href="#STEP_OUT">Stepping out of a routine</a></li>
+</ul>
+<h4><a name="STEP_OVER" id="STEP_OVER"></a>Stepping over a routine</h4>
+<p>Use the <b>Step Over</b> command  (<img src="../../images/icons/btn_stepover.png" width="19" height="14" />) to execute the current statement and advance to the next statement in the source code. If the current statement is a routine call, program execution continues until reaching one of these points:</p>
+<ul>
+  <li>the end of the called routine</li>
+  <li>a breakpoint</li>
+  <li>a watchpoint</li>
+  <li>an eventpoint that stops execution</li>
+</ul>
+<p>To step over a routine:</p>
+  <ul>
+    <li>Click the <b>Step Over</b> button (<img src="../../images/icons/btn_stepover.png" width="19" height="14" />) in the <b>Debug</b> view </li>
+    <li>Right-click the thread in the Debug view and select <b>Step Over</b> from the <b>Debug</b> contextual menu</li>
+    <li>Select <b>Run &gt; Step Over</b> from the  menu bar </li>
+  </ul>
+  <ul>
+    <p>The current statement or routine executes, then program execution stops.</p>
+  </ul>
+<h4><a name="STEP_INTO" id="STEP_OVER2"></a>Stepping into a routine</h4>
+<p>Use the <b>Step Into</b> command (<img src="../../images/icons/btn_stepinto.png" width="18" height="14" />) to execute one source-code statement at a time and follow execution into a routine call.</p>
+<p>When stepping through a program in a debug session the IDE attempts to match the program counter (PC) location in the executable with a known project source file. If there is no source file associated with the PC the debugger displays in the Debug view the current PC address of the thread (e.g. <span class="code">0x6002CC11(EUSER.DLL)()</span>) instead of the function name. At this point you can open the Disassembly view to step through the assembler code. This most commonly happens when trying to step into Symbian OS code. We recommend that you <a href="cmds_stepping.htm">Step Return</a> out of the OS code and back into your project to continue debugging.</p>
+<ul>
+  <li>Click the <b>Step Into</b> button (<img src="../../images/icons/btn_stepinto.png" width="18" height="14" />) in the <a href="viewing_debug.htm">Debug</a> view </li>
+  <li>Right-click the thread in the <b>Debug</b> view and select <b>Step Into</b> from the  context menu</li>
+  <li>Select <b>Run &gt; Step Into</b> from the  menu bar </li>
+</ul>
+<ul>
+  <p>After the debugger executes the source-code statement, the current-statement arrow moves to the next statement determined by these rules:</p>
+  <ul>
+    <li>If the executed statement did not call a routine, the current-statement arrow moves to the next statement in the source code.</li>
+    <li>If the executed statement called a routine, the current-statement arrow moves to the first statement in the called routine.</li>
+    <li>If the executed statement is the last statement in a called routine, the current-statement arrow moves to the statement that follows the calling routine.</li>
+  </ul>
+</ul>
+<h4><a name="STEP_OUT" id="STEP_OVER3"></a>Stepping out of a routine</h4>
+<p>Use the <b>Step Return</b> command (<img src="../../images/icons/btn_stepreturn.png" width="17" height="14" />) to execute the rest of the current routine and stop program execution after the routine returns to its caller. This command causes execution to return up the calling chain.</p>
+<p>To step out of a  routine:</p>
+  <ul>
+    <li>Click the <b>Step Return</b> button (<img src="../../images/icons/btn_stepreturn.png" width="17" height="14" />) in the <a href="viewing_debug.htm">Debug</a> view </li>
+    <li>Right-click the thread in the <b>Debug</b> view, then select <b>Step Return</b> from the  context menu</li>
+    <li>Select <b>Run &gt; Step Return</b> from the  menu bar </li>
+</ul>
+<ul>
+  <p>The current routine executes and returns to its caller, then program execution stops</p>
+</ul>
+<h4>Other references</h4>
+<ul>
+<li><a href="debug.htm">Debugging overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/viewing_debug.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/viewing_debug.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,104 +1,104 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debug view</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debug view </h2>
-<p>The <b>Debug</b> view provides an overview of the debug session as it relates to the executing program. The target debugging information is shown in a tree hierarchy. The  items that appear there include:</p>
-<ul>
-  <li>Launch instance (<img src="../images/debug_launch_instance_icon.png" width="16" height="16" align="absmiddle" />) - launch configuration name and type </li>
-  <li>Debugger instance (<img src="../images/debug_debugger_instance_icon.png" width="18" height="16" align="absmiddle" />) - debugger name and state </li>
-  <li>Executable instances (<img src="../images/debug_codebug_instance_icon.png" width="17" height="17" align="absmiddle" />) - other executables called by the launch instance </li>
-  <li>Thread instance (<img src="../images/debug_thread_instance_icon.png" width="16" height="15" align="absmiddle" />) - thread number and state </li>
-  <li>Stack frame reference (<img src="../images/debug_stack_frame_instance_icon.png" width="16" height="14" align="absmiddle" />) - displays stack frame number, function, filename, and file line number when symbols are available and stack frame number, memory address, and filename when symbols are not available </li>
-</ul>
-<p class="note"><b>NOTE</b> The number beside the thread label is a reference counter, not a thread 
-  identification number (TID).</p>
-<p>The CDT displays stack frames as child elements. It displays the reason for the suspension beside the thread, (such as end of stepping range, breakpoint hit, and signal received). When a program exits, the exit code is displayed.</p>
-<p>In addition to controlling the individual stepping of your programs, you can also control the debug session. You can perform actions such as terminating the session and stopping the program by using the debug launch controls available from Debug view. See Table 1 for details. </p>
-<p>Figure 1 shows the Debug view. Table 1 explains the items in the view.</p>
-<p align="center"><img src="../images/view_debug.png" width="545" height="264" /></p>
-<p class="figure">Figure 1 - Debug view</p>
-<h5>Table 1 Debug view&mdash;items</h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="14%" scope="col">Icon</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><a href="../tasks/debugger/work_debug_act_resume.htm">Resume</a></td>
-    <td><div align="center"><img src="../images/icon_debug_resume_btn.png" width="19" height="16" /></div></td>
-    <td><p>Click to perform these tasks:</p>
-        <ul>
-          <li>Continue execution up to the next breakpoint, watchpoint, or eventpoint</li>
-          <li>Run the program until it exits</li>
-          <li>Continue execution of a currently stopped program</li>
-        </ul></td>
-  </tr>
-  <tr>
-    <td><a href="../tasks/debugger/work_debug_act_stop.htm">Suspend</a></td>
-    <td><div align="center"><img src="../images/icon_debug_suspend_btn.png" width="19" height="16" /></div></td>
-    <td>Click to stop (pause) program execution.</td>
-  </tr>
-  <tr>
-    <td><a href="../tasks/debugger/work_debug_act_kill.htm">Terminate</a></td>
-    <td><div align="center"><img src="../images/icon_debug_terminate_btn.png" width="17" height="17" /></div></td>
-    <td>Click to terminate program execution. This ends the debugging session.</td>
-  </tr>
-  <tr>
-    <td><a href="../tasks/debugger/work_debug_act_disconnect.htm">Disconnect</a></td>
-    <td><center>
-      <img src="../images/icon_debug_disconnect.png" width="20" height="21">
-    </center>
-    </td>
-    <td><p>Detaches the debugger from the selected process (useful for debugging attached processes).</p>
-        <p class="note"><b>NOTE</b> After detaching the debugger from an on-device process, closing TRK on the device will also close the process. </p></td>
-  </tr>
-  <tr>
-    <td><b>Remove All Terminated </b></td>
-    <td><center>
-      <img src="../images/icon_debug_remove_all.png" width="21" height="19">
-    </center>
-    </td>
-    <td>Clears all terminated processes in Debug view.</td>
-  </tr>
-  <tr>
-    <td><a href="../../tasks/debugger/work_debug_act_restart.htm">Restart</a></td>
-    <td><div align="center"><img src="../images/icon_debug_restart_btn.png" width="19" height="19" /></div></td>
-    <td>Returns the debugger to the beginning of the program and begins execution again. This behavior is equivalent to killing execution, then starting a new debugging session.</td>
-  </tr>
-  <tr>
-    <td><a href="../../tasks/debugger/work_debug_act_stepover.htm">Step Over</a></td>
-    <td><div align="center"><img src="../images/icon_debug_step_over_btn.png" width="18" height="14" /></div></td>
-    <td>Click to execute the current line, including any routines, and proceed to the next statement.</td>
-  </tr>
-  <tr>
-    <td><a href="../../tasks/debugger/work_debug_act_stepinto.htm">Step Into</a></td>
-    <td><div align="center"><img src="../images/icon_debug_step_into_btn.png" width="18" height="14" /></div></td>
-    <td>Click to execute the current line, following execution inside a routine.</td>
-  </tr>
-  <tr>
-    <td><a href="../../tasks/debugger/work_debug_act_stepout.htm">Step Return</a></td>
-    <td><div align="center"><img src="../images/icon_debug_step_return_btn.png" width="18" height="15" /></div></td>
-    <td>Click to continue execution to the end of the current routine, then follow execution to the routine&rsquo;s caller.</td>
-  </tr>
-  <tr>
-    <td><b>Instruction Stepping Mode </b></td>
-    <td><div align="center"><img src="../images/icon_debug_instr_stepping_mode.png" width="18" height="16"></div></td>
-    <td>Activate to enable instruction stepping mode to examine a program as it steps into disassembled code.</td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  
-  <li><a href="debug.htm">Debugging overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debug view</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debug view </h2>
+<p>The <b>Debug</b> view provides an overview of the debug session as it relates to the executing program. The target debugging information is shown in a tree hierarchy. The  items that appear there include:</p>
+<ul>
+  <li>Launch instance (<img src="../images/debug_launch_instance_icon.png" width="16" height="16" align="absmiddle" />) - launch configuration name and type </li>
+  <li>Debugger instance (<img src="../images/debug_debugger_instance_icon.png" width="18" height="16" align="absmiddle" />) - debugger name and state </li>
+  <li>Executable instances (<img src="../images/debug_codebug_instance_icon.png" width="17" height="17" align="absmiddle" />) - other executables called by the launch instance </li>
+  <li>Thread instance (<img src="../images/debug_thread_instance_icon.png" width="16" height="15" align="absmiddle" />) - thread number and state </li>
+  <li>Stack frame reference (<img src="../images/debug_stack_frame_instance_icon.png" width="16" height="14" align="absmiddle" />) - displays stack frame number, function, filename, and file line number when symbols are available and stack frame number, memory address, and filename when symbols are not available </li>
+</ul>
+<p class="note"><b>NOTE</b> The number beside the thread label is a reference counter, not a thread 
+  identification number (TID).</p>
+<p>The CDT displays stack frames as child elements. It displays the reason for the suspension beside the thread, (such as end of stepping range, breakpoint hit, and signal received). When a program exits, the exit code is displayed.</p>
+<p>In addition to controlling the individual stepping of your programs, you can also control the debug session. You can perform actions such as terminating the session and stopping the program by using the debug launch controls available from Debug view. See Table 1 for details. </p>
+<p>Figure 1 shows the Debug view. Table 1 explains the items in the view.</p>
+<p align="center"><img src="../images/view_debug.png" width="545" height="264" /></p>
+<p class="figure">Figure 1 - Debug view</p>
+<h5>Table 1 Debug view&mdash;items</h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="14%" scope="col">Icon</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><a href="cmds_resuming.htm">Resume</a></td>
+    <td><div align="center"><img src="../images/icon_debug_resume_btn.png" width="19" height="16" /></div></td>
+    <td><p>Click to perform these tasks:</p>
+        <ul>
+          <li>Continue execution up to the next breakpoint, watchpoint, or eventpoint</li>
+          <li>Run the program until it exits</li>
+          <li>Continue execution of a currently stopped program</li>
+        </ul></td>
+  </tr>
+  <tr>
+    <td><a href="cmds_resuming.htm">Suspend</a></td>
+    <td><div align="center"><img src="../images/icon_debug_suspend_btn.png" width="19" height="16" /></div></td>
+    <td>Click to stop (pause) program execution.</td>
+  </tr>
+  <tr>
+    <td><a href="cmds_starting.htm">Terminate</a></td>
+    <td><div align="center"><img src="../images/icon_debug_terminate_btn.png" width="17" height="17" /></div></td>
+    <td>Click to terminate program execution. This ends the debugging session.</td>
+  </tr>
+  <tr>
+    <td><a href="cmds_other.htm">Disconnect</a></td>
+    <td><center>
+      <img src="../images/icon_debug_disconnect.png" width="20" height="21">
+    </center>
+    </td>
+    <td><p>Detaches the debugger from the selected process (useful for debugging attached processes).</p>
+        <p class="note"><b>NOTE</b> After detaching the debugger from an on-device process, closing TRK on the device will also close the process. </p></td>
+  </tr>
+  <tr>
+    <td><a href="cmds_other.htm">Remove All Terminated</a> </td>
+    <td><center>
+      <img src="../images/icon_debug_remove_all.png" width="21" height="19">
+    </center>
+    </td>
+    <td>Clears all terminated processes in Debug view.</td>
+  </tr>
+  <tr>
+    <td><a href="cmds_starting.htm">Restart</a></td>
+    <td><div align="center"><img src="../images/icon_debug_restart_btn.png" width="19" height="19" /></div></td>
+    <td>Returns the debugger to the beginning of the program and begins execution again. This behavior is equivalent to killing execution, then starting a new debugging session.</td>
+  </tr>
+  <tr>
+    <td><a href="cmds_stepping.htm">Step Over</a></td>
+    <td><div align="center"><img src="../images/icon_debug_step_over_btn.png" width="18" height="14" /></div></td>
+    <td>Click to execute the current line, including any routines, and proceed to the next statement.</td>
+  </tr>
+  <tr>
+    <td><a href="cmds_stepping.htm">Step Into</a></td>
+    <td><div align="center"><img src="../images/icon_debug_step_into_btn.png" width="18" height="14" /></div></td>
+    <td>Click to execute the current line, following execution inside a routine.</td>
+  </tr>
+  <tr>
+    <td><a href="cmds_stepping.htm">Step Return</a></td>
+    <td><div align="center"><img src="../images/icon_debug_step_return_btn.png" width="18" height="15" /></div></td>
+    <td>Click to continue execution to the end of the current routine, then follow execution to the routine&rsquo;s caller.</td>
+  </tr>
+  <tr>
+    <td><a href="cmds_other.htm">Instruction Stepping Mode </a></td>
+    <td><div align="center"><img src="../images/icon_debug_instr_stepping_mode.png" width="18" height="16"></div></td>
+    <td>Activate to enable instruction stepping mode to examine a program as it steps into disassembled code.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  
+  <li><a href="debug.htm">Debugging overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Attach to Process Launch Configuration</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<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>Attaching to a process requires a both target device running the Symbian OS and the presence of a TRK debug agent 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 TRK 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; Open Debug Dialog...</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 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>
-<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>
-  <li>The <a href="page_rom_log.htm">ROM Log </a> tab allows you to  specify where the ROM log file is stored and the <span class="code">Epoc32</span> directory.</li>
-  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug that are part of the project.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> tab  (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Attach to Process Launch Configuration</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<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>Attaching to a process requires a both target device running the Symbian OS and the presence of a TRK debug agent 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 TRK 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; Open Debug Dialog...</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 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>
+<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>
+  <li>The <a href="page_rom_log.htm">ROM Log </a> tab allows you to  specify where the ROM log file is stored and the <span class="code">Epoc32</span> directory.</li>
+  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug that are part of the project.</li>
+  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="wiz_new_launch_config.htm">Common</a> tab  (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
+</ul>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,79 +1,75 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1" />
-  <meta http-equiv="Content-Style-Type" content="text/css" />
-  <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-  <title>Customizing Launch Configurations</title>
-  <link rel="StyleSheet" href="../../../book.css" type="text/css" />
-</head>
-<body bgcolor="#ffffff">
-<h2>Customizing Launch Configurations</h2>
-<p>Use the <a href="wnd_debug_configuration.htm">Debug</a> dialog to customize launch configurations previously created in a project, or to create new launch configurations. Ideally, you should create new launch configurations using the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. Doing this will ensure that the project's default launch configuration is valid and can successfully launch a  debug session. However, not all default launch configurations satisfy all the needs of a project, so being able to modify a launch configuration's options can allow you to customize how the project is launched and debugged based on the needs of that project. </p>
-<p>There are two methods for setting up a launch configuration, including:</p>
-<ul>
-  <li><b>Default launch configuration</b> (recommended) &#8212;  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> automatically sets up a default launch configuration to run or debug the project on the first <b>Run</b> or <b>Debug</b> execution. This provides a quick and easy method to start running or debugging a  project without the inconvenience of setting a lot of options. The default launch configuration can always be edited later as the project launch requirements change.</li>
-  <li><b>Custom launch configuration</b>&#8212; enables you to create or modify a  launch configuration to suit the needs of the project. To modify a launch configuration, create one using the <b>New Launch Configuration Wizard</b>, then enable the <b>Advanced Options</b> option on the <b>New Launch Configuration</b> page before you click <b>Finish</b>. This  opens the <b>Debug</b> dialog so  you can immediately customize the new launch configuration's options. </li>
-</ul>
-<p class="note"><b>NOTE</b> To see if a project already has a launch configuration, open a Run or Debug window using the <b>Run &gt; Open Run Dialog...</b> or <b>Run &gt; Open Debug Dialog...</b> menu items. 
-    </blockquote>
-</p>
-  <p>In the event that the default launch configuration settings need to be changed, it is possible to edit them in the <a href="../../reference/wnd_debug_configuration.htm">Debug</a> window, or create a new launch configuration for the project that deviates from the default settings.</p>
-<div class="step">
-<h4>Creating a Custom Launch Configuration </h4>
-<ol>
-  <li>Open the Run or Debug launch configuration window
-    <ul>
-      <li>Select the Run> <b>Open Run Dialog</b>... or <b>Run &gt; Open Debug Dialog... </b> menu item
-        <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 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
-    configuration of that type.
-    <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 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
-  <p>Modify or fill in the following fields in the Main tab so the IDE
-    can setup the configuration properly each time. Typically when creating
-    a new executable from a project that has successfully linked, the
-    fields will be auto-populated and do not need to be modified. The important fields here are:</p>
-  <ul>
-      <li>Name - <span style="font-weight: normal;">This is a unique name to identify this  launch configuration. It can be any name.</span> </li>
-      <li>Project - <span style="font-weight: normal;">The project  to associate with this  launch configuration. Click Browse to select a different project.</span></li>
-      <li>Process to launch  - <span style="font-weight: normal;">This is the name of the executable that is linked to the project.</span></li>
-      </ul>
-  </li>
-  
-  <li>Modify settings in the other  tabs to customize the launch configuration
-    for the project
-    <ul>
-      <li>Environment (<i>Eclipse</i>) </li>
-      <li><a href="../../reference/launch_configs/emulator_debugger.htm">Debugger</a></li>
-      <li><a href="../../reference/launch_configs/page_executables.htm">Executables</a></li>
-      <li><a href="../../reference/wnd_carbide_pref_x86.htm">x86 Exceptions</a> </li>
-      <li>Arguments (<i>Eclipse</i>) </li>
-      <li>Source (<i>Eclipse</i>) </li>
-      <li>Common (<i>Eclipse</i>) </li>
-    </ul>
-    <p>To debug something outside of the workspace, be sure to import the binary into the <a href="../../reference/view_executables.htm">Executables</a> view. </p>
-  </li>
-  <li>Click Debug
-    <p>The IDE launches the executable. If the launch configuration is set to change perspective, it  switches to the specified perspective. </p>
-  </li>
-</ol>
-</div>
-<h4>Other references</h4>
-<ul>
-    <li></li>
-</ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="Content-Type"
+ content="text/html; charset=ISO-8859-1" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+  <title>Customizing Launch Configurations</title>
+  <link rel="StyleSheet" href="../../../book.css" type="text/css" />
+</head>
+<body bgcolor="#ffffff">
+<h2>Customizing Launch Configurations</h2>
+<p>Use the <a href="wnd_debug_configuration.htm">Debug</a> dialog to customize launch configurations previously created in a project, or to create new launch configurations. Ideally, you should create new launch configurations using the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. Doing this will ensure that the project's default launch configuration is valid and can successfully launch a  debug session. However, not all default launch configurations satisfy all the needs of a project, so being able to modify a launch configuration's options can allow you to customize how the project is launched and debugged based on the needs of that project. </p>
+<p>There are two methods for setting up a launch configuration, including:</p>
+<ul>
+  <li><b>Default launch configuration</b> (recommended) &#8212;  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> automatically sets up a default launch configuration to run or debug the project on the first <b>Run</b> or <b>Debug</b> execution. This provides a quick and easy method to start running or debugging a  project without the inconvenience of setting a lot of options. The default launch configuration can always be edited later as the project launch requirements change.</li>
+  <li><b>Custom launch configuration</b>&#8212; enables you to create or modify a  launch configuration to suit the needs of the project. To modify a launch configuration, create one using the <b>New Launch Configuration Wizard</b>, then enable the <b>Advanced Options</b> option on the <b>New Launch Configuration</b> page before you click <b>Finish</b>. This  opens the <b>Debug</b> dialog so  you can immediately customize the new launch configuration's options. </li>
+</ul>
+<p class="note"><b>NOTE</b> To see if a project already has a launch configuration, open a Run or Debug window using the <b>Run &gt; Open Run Dialog...</b> or <b>Run &gt; Open Debug Dialog...</b> menu items. 
+    
+</p>
+  <p>In the event that the default launch configuration settings need to be changed, it is possible to edit them in the <a href="../../reference/wnd_debug_configuration.htm">Debug</a> window, or create a new launch configuration for the project that deviates from the default settings.</p>
+<div class="step">
+<h4>Creating a Custom Launch Configuration </h4>
+<ol>
+  <li>Open the Run or Debug launch configuration window
+    <ul>
+      <li>Select the Run> <b>Open Run Dialog</b>... or <b>Run &gt; Open Debug Dialog... </b> menu item
+        <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 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
+    configuration of that type.
+    <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 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
+  <p>Modify or fill in the following fields in the Main tab so the IDE
+    can setup the configuration properly each time. Typically when creating
+    a new executable from a project that has successfully linked, the
+    fields will be auto-populated and do not need to be modified. The important fields here are:</p>
+  <ul>
+      <li>Name - <span style="font-weight: normal;">This is a unique name to identify this  launch configuration. It can be any name.</span> </li>
+      <li>Project - <span style="font-weight: normal;">The project  to associate with this  launch configuration. Click Browse to select a different project.</span></li>
+      <li>Process to launch  - <span style="font-weight: normal;">This is the name of the executable that is linked to the project.</span></li>
+      </ul>
+  </li>
+  
+  <li>Modify settings in the other  tabs to customize the launch configuration
+    for the project
+    <ul>
+      <li>Environment (<i>Eclipse</i>) </li>
+      <li><a href="page_debugger.htm">Debugger</a></li>
+      <li><a href="page_executables.htm">Executables</a></li>
+      <li><a href="page_exceptions.htm">x86 Exceptions</a> </li>
+      <li>Arguments (<i>Eclipse</i>) </li>
+      <li>Source (<i>Eclipse</i>) </li>
+      <li>Common (<i>Eclipse</i>) </li>
+    </ul>
+    <p>To debug something outside of the workspace, be sure to import the binary into the <a href="../../reference/view_executables.htm">Executables</a> view. </p>
+  </li>
+  <li>Click Debug
+    <p>The IDE launches the executable. If the launch configuration is set to change perspective, it  switches to the specified perspective. </p>
+  </li>
+</ol>
+</div>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/emulation.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/emulation.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Emulator Launch Configuration</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<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; Open Debug Dialog...</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 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>
-  <li>The <a href="page_main.htm">Main</a> tab defines the project to be launched. Enter the name of the project containing the class to launch in the project field, and the executable name in the the Executable field and the emulator or host application in the Emulator or host application 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>) defines the arguments to be passed to the application and to the virtual machine (if any). You can also specify the working directory to be used by the launched application. </li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_env.htm">Environment</a> tab (<i>standard CDT page</i>) defines the environment variable values to use when running or debugging a program. By default, the environment is inherited from the Eclipse runtime. You may override or append to the inherited environment. </li>
-  <li>The <a href="page_debugger.htm">Debugger</a> tab provides common debugger options for the project.</li>
-  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables are debugged by your project.</li>
-  <li>The <a href="page_exceptions.htm">x86 Exceptions</a> tab  lists all the x86 exceptions that the debugger can catch.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> tab (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file and specify which perspectives become active when the launch configuration is launched. </li>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Emulator Launch Configuration</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<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; Open Debug Dialog...</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 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>
+  <li>The <a href="page_main.htm">Main</a> tab defines the project to be launched. Enter the name of the project containing the class to launch in the project field, and the executable name in the the Executable field and the emulator or host application in the Emulator or host application 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>) defines the arguments to be passed to the application and to the virtual machine (if any). You can also specify the working directory to be used by the launched application. </li>
+  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_env.htm">Environment</a> tab (<i>standard CDT page</i>) defines the environment variable values to use when running or debugging a program. By default, the environment is inherited from the Eclipse runtime. You may override or append to the inherited environment. </li>
+  <li>The <a href="page_debugger.htm">Debugger</a> tab provides common debugger options for the project.</li>
+  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables are debugged by your project.</li>
+  <li>The <a href="page_exceptions.htm">x86 Exceptions</a> tab  lists all the x86 exceptions that the debugger can catch.</li>
+  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="wiz_new_launch_config.htm">Common</a> tab (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file and specify which perspectives become active when the launch configuration is launched. </li>
+</ul>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,37 +1,37 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Launch Configuration Overview</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css"></head>
-
-<body>
-<h2>Launch Configuration Overview</h2>
-<p>A <b>launch configuration</b> defines the operational settings used by the Carbide.c++ tools  to launch and debug programs. A project must have at least one launch configuration, and can have as many as necessary. This enables you to develop and debug your project using various compilers (GCCE and RVCT) and different targets (emulator and on-device) as each launch configuration can be tailored to fit the intended target. </p>
-<h4>Creating a Launch Configuration </h4>
-<p>To create a default launch configuration for a project use the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. Using this method ensures that you have a working launch configuration for the project. You can invoke the New Launch Configuration Wizard for projects lacking a launch configuration by selecting the <b>Run &gt; Debug</b> (<span class="code">F11</span>) or<b> </b><b>Run &gt; Run</b> (<span class="code">CTRL+F11</span>) menu options, or clicking the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" alt="Debug icon"/>) icons in the toolbar. If a project already has a defined launch configuration, selecting the  <b>Run</b> or <b>Debug</b> command calls  the   previously defined and last used launch configuration, bypassing the wizard entirely.</p>
-<p>For emulator projects  the wizard simply gathers the data it needs from the project and creates an emulator launch configuration and launches the emulator. For on-device targets, more information is required, so the wizard asks for the missing information it needs, creates the  launch configuration, then downloads the executable to the device and launches it. Once the emulator or device is loaded with the executable, the debug session   commences. </p>
-<p>You can  customize any project launch configuration  afterward using the <b>Debug</b> dialog as necessary. </p>
-<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 TRK</a></b> &#8212;used to run or debug applications on a target device using the Application TRK on-device debug agent. Application TRK 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 TRK and stop mode debugging.  This launch configuration is not available for emulator debugging.  Stop mode and TRK can both attach to a process from the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view.</li>
-  <li><b>Symbian OS Crash Debugger</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="sophia.htm">Symbian OS Sophia</a> </b> (<i>only available in OEM Edition</i>)&#8212;is an external debugger that the Carbide debugger communicates with, to debug any Symbian OS module on a target using a JTAG connection.</li>
-  <li><b><a href="stop_mode.htm">Symbian OS System TRK</a></b> (<i>not available Developer Editions</i>) &#8212;used to run or debug applications or ROM code on a target device using the System TRK on-device debug agent. System TRK 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="trace32.htm">Symbian OS Trace32</a></b> (<i>only available in OEM Edition</i>)&#8212;is an external debugger that the Carbide debugger communicates with, to debug any Symbian OS module on a target using a JTAG connection.</li>
-</ul>
-<p class="note"><b>NOTE</b> The specific launch configuration availability is determined by the Carbide.c++ edition you are using. </p>
-<h4>Other references</h4>
-<ul>
-  <li>Creating Projects Overview </li>
-  <li><a href="../../tasks/projects/wiz_new_launch_config.htm">New Launch Configuration Wizard</a></li>
-  <li><a href="wnd_debug_configuration.htm">Debug</a> dialog </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Launch Configuration Overview</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css"></head>
+
+<body>
+<h2>Launch Configuration Overview</h2>
+<p>A <b>launch configuration</b> defines the operational settings used by the Carbide.c++ tools  to launch and debug programs. A project must have at least one launch configuration, and can have as many as necessary. This enables you to develop and debug your project using various compilers (GCCE and RVCT) and different targets (emulator and on-device) as each launch configuration can be tailored to fit the intended target. </p>
+<h4>Creating a Launch Configuration </h4>
+<p>To create a default launch configuration for a project use the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. Using this method ensures that you have a working launch configuration for the project. You can invoke the New Launch Configuration Wizard for projects lacking a launch configuration by selecting the <b>Run &gt; Debug</b> (<span class="code">F11</span>) or<b> </b><b>Run &gt; Run</b> (<span class="code">CTRL+F11</span>) menu options, or clicking the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" alt="Debug icon"/>) icons in the toolbar. If a project already has a defined launch configuration, selecting the  <b>Run</b> or <b>Debug</b> command calls  the   previously defined and last used launch configuration, bypassing the wizard entirely.</p>
+<p>For emulator projects  the wizard simply gathers the data it needs from the project and creates an emulator launch configuration and launches the emulator. For on-device targets, more information is required, so the wizard asks for the missing information it needs, creates the  launch configuration, then downloads the executable to the device and launches it. Once the emulator or device is loaded with the executable, the debug session   commences. </p>
+<p>You can  customize any project launch configuration  afterward using the <b>Debug</b> dialog as necessary. </p>
+<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 TRK</a></b> &#8212;used to run or debug applications on a target device using the Application TRK on-device debug agent. Application TRK 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 TRK and stop mode debugging.  This launch configuration is not available for emulator debugging.  Stop mode and TRK can both attach to a process from the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view.</li>
+  <li><b>Symbian OS Crash Debugger</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="sophia.htm">Symbian OS Sophia</a> </b> (<i>only available in OEM Edition</i>)&#8212;is an external debugger that the Carbide debugger communicates with, to debug any Symbian OS module on a target using a JTAG connection.</li>
+  <li><b><a href="stop_mode.htm">Symbian OS System TRK</a></b> (<i>not available Developer Editions</i>) &#8212;used to run or debug applications or ROM code on a target device using the System TRK on-device debug agent. System TRK 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="trace32.htm">Symbian OS Trace32</a></b> (<i>only available in OEM Edition</i>)&#8212;is an external debugger that the Carbide debugger communicates with, to debug any Symbian OS module on a target using a JTAG connection.</li>
+</ul>
+<p class="note"><b>NOTE</b> The specific launch configuration availability is determined by the Carbide.c++ edition you are using. </p>
+<h4>Other references</h4>
+<ul>
+  <li>Creating Projects Overview </li>
+  <li><a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a></li>
+  <li><a href="wnd_debug_configuration.htm">Debug</a> dialog </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -17,7 +17,7 @@
 </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 behavior that occurs when launching a debug session varies based upon the <a href="page_main.htm">SDK</a>. Normally, <a href="../../tasks/debugger/work_debug_act_start.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>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="627" height="243"></p>
 <p class="figure">Figure 1. Main page (Emulation shown) </p>
 <h5>Table 1. Emulator Main page &mdash;items </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Configuration Pages</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Configuration Pages</h2>
-<p>The  pages in the <a href="wnd_debug_configuration.htm">Debug</a> dialog used to set options for the various launch configurations include: </p>
-<ul>
-  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm">Arguments</a> (<i>standard CDT page</i>) </li>
-  <li><a href="page_debugger.htm">Debugger</a></li>
-  <li><a href="page_executables.htm">Executables</a></li>
-  <li><a href="page_file_transfer.htm">File Transfer</a></li>
-  <li><a href="page_installation.htm">Installation</a> </li>
-  <li><a href="page_main.htm">Main</a></li>
-  <li><a href="page_rom_image.htm">ROM Image</a></li>
-  <li><a href="page_rom_log.htm">ROM Log</a></li>
-  <li><a href="page_exceptions.htm">x86 Exceptions</a></li>
-  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> (<i>standard CDT page</i>) </li>
-  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> (<i>standard CDT page</i>) </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide Configuration Pages</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Configuration Pages</h2>
+<p>The  pages in the <a href="wnd_debug_configuration.htm">Debug</a> dialog used to set options for the various launch configurations include: </p>
+<ul>
+  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_arg.htm">Arguments</a> (<i>standard CDT page</i>) </li>
+  <li><a href="page_debugger.htm">Debugger</a></li>
+  <li><a href="page_executables.htm">Executables</a></li>
+  <li><a href="page_file_transfer.htm">File Transfer</a></li>
+  <li><a href="page_installation.htm">Installation</a> </li>
+  <li><a href="page_main.htm">Main</a></li>
+  <li><a href="page_rom_image.htm">ROM Image</a></li>
+  <li><a href="page_rom_log.htm">ROM Log</a></li>
+  <li><a href="page_exceptions.htm">x86 Exceptions</a></li>
+  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> (<i>standard CDT page</i>) </li>
+  <li><a href="wiz_new_launch_config.htm">Common</a> (<i>standard CDT page</i>) </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Application TRK Launch Configuration</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2>Application TRK  Launch Configuration (Run-mode) </h2>
-<p>Select the <b>Symbian OS Application TRK </b>  launch configuration to debug or run applications on a target device using the Application TRK on-device debug agent. Application TRK 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="../../launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the Application TRK launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the Application TRK 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 TRK launch configuration in the Debug dialog </p>
-<p>The Application TRK 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>
-  <li>The <a href="page_debugger.htm">Debugger</a> tab defines debug configurations, such as entry point to begin debugging and target options.</li>
-  <li>The <a href="page_file_transfer.htm">File Transfer</a> tab displays an auto-populated list of files that the IDE transfers to the target device at the start of each launch. </li>
-  <li>The <a href="page_installation.htm">Installation</a> tab specifies the .sis file(s) to install on the target device.</li>
-  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> tab (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file</li>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Application TRK Launch Configuration</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Application TRK  Launch Configuration (Run-mode) </h2>
+<p>Select the <b>Symbian OS Application TRK </b>  launch configuration to debug or run applications on a target device using the Application TRK on-device debug agent. Application TRK 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 TRK launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the Application TRK 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 TRK launch configuration in the Debug dialog </p>
+<p>The Application TRK 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>
+  <li>The <a href="page_debugger.htm">Debugger</a> tab defines debug configurations, such as entry point to begin debugging and target options.</li>
+  <li>The <a href="page_file_transfer.htm">File Transfer</a> tab displays an auto-populated list of files that the IDE transfers to the target device at the start of each launch. </li>
+  <li>The <a href="page_installation.htm">Installation</a> tab specifies the .sis file(s) to install on the target device.</li>
+  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
+  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="wiz_new_launch_config.htm">Common</a> tab (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file</li>
+</ul>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/sophia.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/sophia.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,32 +1,32 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Sophia Launch Configuration</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2>Sophia Launch Configuration</h2>
-<p>Select the <b>Symbian OS Sophia </b> target interface (STI) launch configuration  (<i>only available in OEM Edition</i>) to debug any Symbian OS module on a target using a JTAG connection. The external Sophia debugger communicates with the  Carbide debugger and enables stop mode debugging of the target device. </p>
-<p>If  the <a href="../../launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create an Sophia launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the Sophia 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_sophia_launch_config.png" width="654" height="480"></p>
-<p class="figure">Figure 1. Sophia launch configuration in the Debug dialog </p>
-<p>The Sophia 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_connection.htm">Connection</a> tab defines the Sophia Target Interface, EJ_Debug type, and JTAG TCLK Frequency.</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>
-  <li>The <a href="page_rom_image.htm">ROM Image</a> tab allows you to define startup options and ROM image and ROM log file download information.</li>
-  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug that are part of the project.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> tab  (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li><a href="../../launch/launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Sophia Launch Configuration</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Sophia Launch Configuration</h2>
+<p>Select the <b>Symbian OS Sophia </b> target interface (STI) launch configuration  (<i>only available in OEM Edition</i>) to debug any Symbian OS module on a target using a JTAG connection. The external Sophia debugger communicates with the  Carbide debugger and enables stop mode debugging of the target device. </p>
+<p>If the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create an Sophia launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the Sophia 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_sophia_launch_config.png" width="654" height="480"></p>
+<p class="figure">Figure 1. Sophia launch configuration in the Debug dialog </p>
+<p>The Sophia 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_connection.htm">Connection</a> tab defines the Sophia Target Interface, EJ_Debug type, and JTAG TCLK Frequency.</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>
+  <li>The <a href="page_rom_image.htm">ROM Image</a> tab allows you to define startup options and ROM image and ROM log file download information.</li>
+  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug that are part of the project.</li>
+  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> tab  (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
+</ul>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>System TRK Launch Configuration</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2>System TRK  Launch Configuration (Stop-mode) </h2>
-<p>Select the <b>Symbian OS System TRK </b> launch configuration  (<i>only available in OEM Edition</i>) provides C/C++ stop-mode debug options that use a JTAG interface when a Symbian OS <a href="sophia.htm">Sophia</a> or <a href="trace32.htm">Trace32</a> 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="../../launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the System TRK launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the System TRK 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 TRK launch configuration in the Debug dialog </p>
-<p>The System TRK 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>
-  <li>The <a href="page_rom_image.htm">ROM Image</a> tab allows you to define startup options and ROM image download information.</li>
-  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> tab (<i>standard CDT page</i>)  defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>System TRK Launch Configuration</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>System TRK  Launch Configuration (Stop-mode) </h2>
+<p>Select the <b>Symbian OS System TRK </b> launch configuration  (<i>only available in OEM Edition</i>) provides C/C++ stop-mode debug options that use a JTAG interface when a Symbian OS <a href="sophia.htm">Sophia</a> or <a href="trace32.htm">Trace32</a> 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 TRK launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the System TRK 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 TRK launch configuration in the Debug dialog </p>
+<p>The System TRK 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>
+  <li>The <a href="page_rom_image.htm">ROM Image</a> tab allows you to define startup options and ROM image download information.</li>
+  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
+  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="wiz_new_launch_config.htm">Common</a> tab (<i>standard CDT page</i>)  defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
+</ul>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/trace32.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/trace32.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Trace32 Launch Configuration</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2> Trace32 Launch Configuration</h2>
-<p>Select the <b>Symbian OS Trace32 </b> launch configuration  (<i>only available in OEM Edition</i>) to debug any Symbian OS module on a target using a JTAG connection. The external Trace32 debugger communicates with the  Carbide debugger and enables stop mode debugging of the target device. </p>
-<p>If  the <a href="../../launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create a Trace32 launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the Trace32 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. Trace32 launch configuration in the Debug dialog </p>
-<p>The Trace32 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>
-  <li>The <a href="page_rom_image.htm">ROM Image</a> tab allows you to define startup options and ROM image download information.</li>
-  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> tab (<i>standard CDT page</i>)  defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li><a href="../../launch/launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Trace32 Launch Configuration</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2> Trace32 Launch Configuration</h2>
+<p>Select the <b>Symbian OS Trace32 </b> launch configuration  (<i>only available in OEM Edition</i>) to debug any Symbian OS module on a target using a JTAG connection. The external Trace32 debugger communicates with the  Carbide debugger and enables stop mode debugging of the target device. </p>
+<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create a Trace32 launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Open Debug Dialog...</b> menu option to open the <b>Debug</b> dialog. Select the Trace32 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. Trace32 launch configuration in the Debug dialog </p>
+<p>The Trace32 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>
+  <li>The <a href="page_rom_image.htm">ROM Image</a> tab allows you to define startup options and ROM image download information.</li>
+  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
+  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> tab (<i>standard CDT page</i>)  defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
+</ul>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -10,7 +10,7 @@
 </head>
 <body bgcolor="#ffffff">
 <h2>New Launch Configuration Wizard </h2>
-<p>The <b>New Launch Configuration Wizard</b> launches when no  launch configuration exists for 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 TRK requires different information than  one targeted for System TRK. </p>
+<p>The <b>New Launch Configuration Wizard</b> launches when no launch configuration exists for 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 TRK requires different information than  one targeted for System TRK. </p>
 <table width="700"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="41%" scope="col">Launch Configuration</th>
@@ -100,17 +100,17 @@
 <p align="center"><img src="../../images/icons/wiz_launch_config_finish.png" width="438" height="533"></p>
 <p class="figure">Figure 8 - New Launch Configuration page </p>
 <h3><a name="TRACE32" id="TRACE32"></a>Trace32 Initialization Settings</h3>
-<p>Use the <b>Trace32 Initialization Settings</b> page to specify the <a href="../../reference/wnd_Trace32_config.htm">initialization</a> script and target processor of the target device.Enter the Trace32 Initialization Script and choose the Target Processor, then click <b>Next</b>. </p>
+<p>Use the <b>Trace32 Initialization Settings</b> page to specify the <a href="trace32.htm">initialization</a> script and target processor of the target device.Enter the Trace32 Initialization Script and choose the Target Processor, then click <b>Next</b>. </p>
 <p> This page only appears when creating a Trace32 launch configuration. </p>
 <p align="center"><img src="../../images/icons/wiz_launch_config_trace32.png" width="438" height="533"></p>
 <p class="figure">Figure 9 - <b>Trace32 Initialization Settings</b> page </p>
 <h3><a name="SOPHIA" id="SOPHIA"></a>Sophia STI  Initialization Settings</h3>
-<p>Use the <b>Sophia STI  Initialization Settings</b> page to specify the target interface, <a href="../../reference/wnd_sophia_config.htm">initialization</a> file,  and target processor of the target device. Enter the Sophia Target Interface and Target Initialization File paths, choose a Target Processor, then click <b>Next</b>. </p>
+<p>Use the <b>Sophia STI  Initialization Settings</b> page to specify the target interface, <a href="sophia.htm">initialization</a> file,  and target processor of the target device. Enter the Sophia Target Interface and Target Initialization File paths, choose a Target Processor, then click <b>Next</b>. </p>
 <p>This page only appears when creating a Sophia STI launch configuration. </p>
 <p align="center"><img src="../../images/icons/wiz_launch_config_sophia.png" width="438" height="533"></p>
 <p class="figure">Figure 10 - Sophia STI  Initialization Settings page </p>
 <h3><a name="ROM_IMG" id="ROM_IMG"></a>Symbian ROM Image  Settings</h3>
-<p>Use the <b>Symbian ROM Image Settings</b> page to specify the method of <a href="../../reference/launch_configs/page_trk_debugger.htm">debugging</a>, the start address, and the <a href="../../reference/launch_configs/stop_mode_rom_image.htm">ROM Image</a> and Log File locations.  </p>
+<p>Use the <b>Symbian ROM Image Settings</b> page to specify the method of <a href="page_debugger.htm">debugging</a>, the start address, and the <a href="page_rom_image.htm">ROM Image</a> and Log File locations.  </p>
 <p>This page  appears when creating a Trace32 or Sophia STI launch configuration. </p>
 <p align="center"><img src="../../images/icons/wiz_launch_config_rom_image.png" width="438" height="533"></p>
 <p class="figure">Figure 11 - Symbian ROM Image  Settings page</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,66 +1,66 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Debug dialog</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debug dialog </h2>
-<p>Use the <b>Debug</b>  dialog to create, edit, and manage a project's <a href="launch_configs_overview.htm">launch configurations</a>. A <b>launch configuration</b> defines the settings used by the Carbide debugger to launch (Run) or debug programs. A project must have at least one  launch configuration in order to debug a project and can have many more. Projects that have no launch configuration  invoke the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> when either the <b>Run</b> or <b>Debug</b> command is selected. </p>
-<p>Select the <b>Run &gt; Debug Configuration...</b> menu option to open the <b>Debug</b> dialog.</p>
-<p>The tabs shown in the <b>Debug</b> dialog vary depending upon the  type of launch configuration highlighted in the configurations list. See <a href="launch_configs_overview.htm">Launch Configuration Overview</a> for more information on the various launch configuration types. </p>
-<p>Click <b>Debug</b> to start a new debug session using the selected launch configuration. </p>
-<p align="center" class="figure"><img src="../images/wnd_debug_emulation_launch_config.png" width="658" height="403"></p>
-<p align="center" class="figure"> Figure 1 - Debug dialog (Symbian OS Emulation configuration shown)</p>
-<h5>Table 1. Debug dialog &mdash; common items</h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="7%" scope="col">Icon</th>
-    <th width="41%" scope="col">Item</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="images/icon_new_launch_config.png" width="16" height="17"></div></td>
-    <td><b>New Launch Configuration</b></td>
-    <td><p>Click the New Launch Configuration icon to add a launch configuration to the configurations list. Default information based upon the project is automatically entered into the various text boxes.</p>
-        <p class="note"><b>NOTE</b> Normally, you should not have to change any of the default text box entries unless you are creating multiple debug launch configurations for the same project.</p></td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="images/icon_dup_launch_config.png" width="19" height="19"></div></td>
-    <td><b>Duplicate</b></td>
-    <td>Click the Duplicate icon to duplicate the currently selected launch configuration. </td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="images/icon_delete_launch_config.png" width="17" height="16"></div></td>
-    <td><b>Delete selected launch configuration(s) </b></td>
-    <td>Click the Delete icon to remove the currently selected configuration from the Configurations list.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><b>Collapse</b></td>
-    <td>Click the Collapse icon to collapse expanded lists of launch configurations.</td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="images/icon_filter_launch_config.png" width="21" height="18"></div></td>
-    <td><b>Filter launch configurations... </b></td>
-    <td><p>Click the Filter icon to select filter options that control which launch configurations appear in the list. Filter options include:</p>
-        <ul>
-          <li>Filter Closed Projects</li>
-          <li>Filter Deleted/Unavailable Projects</li>
-          <li>Filter Configuration Types</li>
-          <li>Apply Window Working Set(s)</li>
-          <li><a href="../../reference/trk/panel_filter.htm">Filtering Preferences...</a></li>
-      </ul></td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="../../launch/launch_configs_overview.htm">Launch Configuration Overview</a></li>
-  <li><a href="pages_overview.htm">Configuration Pages</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide Debug dialog</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debug dialog </h2>
+<p>Use the <b>Debug</b>  dialog to create, edit, and manage a project's <a href="launch_configs_overview.htm">launch configurations</a>. A <b>launch configuration</b> defines the settings used by the Carbide debugger to launch (Run) or debug programs. A project must have at least one  launch configuration in order to debug a project and can have many more. Projects that have no launch configuration  invoke the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> when either the <b>Run</b> or <b>Debug</b> command is selected. </p>
+<p>Select the <b>Run &gt; Debug Configuration...</b> menu option to open the <b>Debug</b> dialog.</p>
+<p>The tabs shown in the <b>Debug</b> dialog vary depending upon the  type of launch configuration highlighted in the configurations list. See <a href="launch_configs_overview.htm">Launch Configuration Overview</a> for more information on the various launch configuration types. </p>
+<p>Click <b>Debug</b> to start a new debug session using the selected launch configuration. </p>
+<p align="center" class="figure"><img src="../images/wnd_debug_emulation_launch_config.png" width="658" height="403"></p>
+<p align="center" class="figure"> Figure 1 - Debug dialog (Symbian OS Emulation configuration shown)</p>
+<h5>Table 1. Debug dialog &mdash; common items</h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="7%" scope="col">Icon</th>
+    <th width="41%" scope="col">Item</th>
+    <th width="52%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="images/icon_new_launch_config.png" width="16" height="17"></div></td>
+    <td><b>New Launch Configuration</b></td>
+    <td><p>Click the New Launch Configuration icon to add a launch configuration to the configurations list. Default information based upon the project is automatically entered into the various text boxes.</p>
+        <p class="note"><b>NOTE</b> Normally, you should not have to change any of the default text box entries unless you are creating multiple debug launch configurations for the same project.</p></td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="images/icon_dup_launch_config.png" width="19" height="19"></div></td>
+    <td><b>Duplicate</b></td>
+    <td>Click the Duplicate icon to duplicate the currently selected launch configuration. </td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="images/icon_delete_launch_config.png" width="17" height="16"></div></td>
+    <td><b>Delete selected launch configuration(s) </b></td>
+    <td>Click the Delete icon to remove the currently selected configuration from the Configurations list.</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><b>Collapse</b></td>
+    <td>Click the Collapse icon to collapse expanded lists of launch configurations.</td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="images/icon_filter_launch_config.png" width="21" height="18"></div></td>
+    <td><b>Filter launch configurations... </b></td>
+    <td><p>Click the Filter icon to select filter options that control which launch configurations appear in the list. Filter options include:</p>
+        <ul>
+          <li>Filter Closed Projects</li>
+          <li>Filter Deleted/Unavailable Projects</li>
+          <li>Filter Configuration Types</li>
+          <li>Apply Window Working Set(s)</li>
+          <li><a href="../../reference/trk/panel_filter.htm">Filtering Preferences...</a></li>
+      </ul></td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+  <li><a href="pages_overview.htm">Configuration Pages</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/debugger_settings.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/debugger_settings.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugger Settings</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugger Settings</h2>
-<p>The Carbide.c++ debugger settings include:</p>
-<ul>
-  <li><a href="perspective_debug.htm">Debug Perspective</a></li>
-  <li><a href="wnd_debug_configuration.htm">Debug Window </a> </li>
-  <li><a href="view_debug.htm">Debug View </a></li>
-</ul>
-<h5>Common concepts</h5>
-<ul>
-  <li><a href="../concepts/debugger_about.htm">About the Debugger</a></li>
-  <li><a href="../concepts/common_debug_actions.htm">Common Debugger Actions </a></li>
-</ul>
-<h5>Common tasks</h5>
-<ul>
-  <li><a href="../tasks/start/carbide_debugging.htm">Debugging a Program</a> (Example)</li>
-  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugger Settings</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debugger Settings</h2>
+<p>The Carbide.c++ debugger settings include:</p>
+<ul>
+  <li><a href="perspective_debug.htm">Debug Perspective</a></li>
+  <li><a href="wnd_debug_configuration.htm">Debug Window </a> </li>
+  <li><a href="../debugger/debug/viewing_debug.htm">Debug View </a></li>
+</ul>
+<h5>Common concepts</h5>
+<ul>
+  <li><a href="../concepts/debugger_about.htm">About the Debugger</a></li>
+  <li><a href="../concepts/common_debug_actions.htm">Common Debugger Actions </a></li>
+</ul>
+<h5>Common tasks</h5>
+<ul>
+  <li><a href="../tasks/start/carbide_debugging.htm">Debugging a Program</a> (Example)</li>
+  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/panel_debug_exceptions.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/panel_debug_exceptions.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -50,7 +50,7 @@
   <ul>
     <li><a href="perspective_debug.htm">Debug Perspective</a></li>
     <li><a href="wnd_debug_configuration.htm">Debug Window </a> </li>
-    <li><a href="view_debug.htm">Debug View</a></li>
+    <li><a href="../debugger/debug/viewing_debug.htm">Debug View</a></li>
   </ul>
 
 <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,52 +1,52 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debug perspective</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debug perspective</h2>
-<p>The Carbide.c++ <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.debug.ui.DebugPerspective)")'>
-Debug</a> perspective is where you  debug programs running on an emulator or  a target device. The default views include:</p>
-<ul>
-  <li><a href="view_debug.htm">Debug view</a> -  displays information about a suspended process during a debug session</li>
-  <li><a href="view_variables.htm">Variables view</a> - allows manipulation of variables used in source code</li>
-  <li><a href="view_breakpoints.htm">Breakpoints view</a> - allows manipulation of breakpoints and watchpoints</li>
-  <li><a href="view_symbian_kernel.htm">Symbian OS Data view</a> - shows kernel data in the Symbian OS running on the device being debugged</li>
-  <li><a href="view_executables.htm">Executables</a> view - provides a dynamic list of executables and their related source files</li>
-  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_editor_view.htm">Editor</a> view - one or more source code editor windows </li>
-  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view - displays an outline of a structured C/C++ file that is currently open in the 
-    editor view </li>
-  <li><a href="view_log.htm">Console</a> view - display<span><span>s the output of a process</span></span>, like  the execution of your program, or other outputs </li>
-  <li><a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/reference/ref-31.htm">Tasks</a> view - <span>displays </span>tasks that you manually add</li>
-</ul>
-<p>And can include:</p>
-<ul>
-  <li><a href="view_memory_wnd.htm">Memory</a> view - allows you to monitor and modify process memory</li>
-  <li><a href="view_disassembly.htm">Disassembly</a> view - displays the assembly code of the source code currently being debugged </li>
-  <li><a href="view_expressions.htm">Expressions</a> view - used to monitor and manipulate global and local variables, structure members, and array elements</li>
-  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm">Modules</a> view - uses the <a href="launch_configs/emulator_debugger.htm">Symbolics Loading</a> option to show modules loaded during a debug session </li>
-  <li><a href="view_registers.htm">Registers</a> view - shows general, FPU, or host-specific registers of the host computer or target device</li>
-</ul>
-<p align="center"><img src="../images/views/perspective_debug.png" width="830" height="704" alt="" /></p>
-<p class="figure">Figure 1. Debug perspective used by Carbide.c++</p>
-<p class="note"><b>NOTE</b> Click the <img src="../images/icons/double_arrow_icon.png" width="12" height="9" valign="absmiddle" alt="" /> icon to show additional options that may not be visible in the perspective view.</p>
-<p>For more information on perspectives see <b>Workbench User Guide &gt; Concepts &gt; <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/concepts-4.htm">Perspectives</a></b>, and for views see <b>C/C++ Development User Guide &gt; Reference
-&gt; <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm">C/C++ Views and Editors</a></b>.</p>
-<h5>Related references</h5>
-<ul>
-  <li> <a href="../concepts/CarbidePerspective.html">Carbide C/C++  Perspective</a></li>
-  <li><a href="view_debug.htm">Debug view</a></li>
-  <li><a href="view_variables.htm">Variables view</a></li>
-  <li><a href="view_breakpoints.htm">Breakpoints view</a></li>
-  <li><a href="view_memory_wnd.htm">Memory view</a></li>
-  <li><a href="view_symbian_kernel.htm">Symbian OS Data view</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debug perspective</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debug perspective</h2>
+<p>The Carbide.c++ <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.debug.ui.DebugPerspective)")'>
+Debug</a> perspective is where you debug programs running on an emulator or  a target device. The default views include:</p>
+<ul>
+  <li><a href="../debugger/debug/viewing_debug.htm">Debug view</a> - displays information about a suspended process during a debug session</li>
+  <li><a href="view_variables.htm">Variables view</a> - allows manipulation of variables used in source code</li>
+  <li><a href="view_breakpoints.htm">Breakpoints view</a> - allows manipulation of breakpoints and watchpoints</li>
+  <li><a href="view_symbian_kernel.htm">Symbian OS Data view</a> - shows kernel data in the Symbian OS running on the device being debugged</li>
+  <li><a href="view_executables.htm">Executables</a> view - provides a dynamic list of executables and their related source files</li>
+  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_editor_view.htm">Editor</a> view - one or more source code editor windows </li>
+  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view - displays an outline of a structured C/C++ file that is currently open in the 
+    editor view </li>
+  <li><a href="view_log.htm">Console</a> view - display<span><span>s the output of a process</span></span>, like  the execution of your program, or other outputs </li>
+  <li><a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/reference/ref-31.htm">Tasks</a> view - <span>displays </span>tasks that you manually add</li>
+</ul>
+<p>And can include:</p>
+<ul>
+  <li><a href="view_memory_wnd.htm">Memory</a> view - allows you to monitor and modify process memory</li>
+  <li><a href="view_disassembly.htm">Disassembly</a> view - displays the assembly code of the source code currently being debugged </li>
+  <li><a href="view_expressions.htm">Expressions</a> view - used to monitor and manipulate global and local variables, structure members, and array elements</li>
+  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_modules_view.htm">Modules</a> view - uses the <a href="../projects/launch/wiz_new_launch_config.htm">Symbolics Loading</a> option to show modules loaded during a debug session </li>
+  <li><a href="view_registers.htm">Registers</a> view - shows general, FPU, or host-specific registers of the host computer or target device</li>
+</ul>
+<p align="center"><img src="../images/views/perspective_debug.png" width="830" height="704" alt="" /></p>
+<p class="figure">Figure 1. Debug perspective used by Carbide.c++</p>
+<p class="note"><b>NOTE</b> Click the <img src="../images/icons/double_arrow_icon.png" width="12" height="9" valign="absmiddle" alt="" /> icon to show additional options that may not be visible in the perspective view.</p>
+<p>For more information on perspectives see <b>Workbench User Guide &gt; Concepts &gt; <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/concepts-4.htm">Perspectives</a></b>, and for views see <b>C/C++ Development User Guide &gt; Reference
+&gt; <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm">C/C++ Views and Editors</a></b>.</p>
+<h5>Related references</h5>
+<ul>
+  <li> <a href="../concepts/CarbidePerspective.html">Carbide C/C++ Perspective</a></li>
+  <li><a href="../debugger/debug/viewing_debug.htm">Debug view</a></li>
+  <li><a href="view_variables.htm">Variables view</a></li>
+  <li><a href="view_breakpoints.htm">Breakpoints view</a></li>
+  <li><a href="view_memory_wnd.htm">Memory view</a></li>
+  <li><a href="view_symbian_kernel.htm">Symbian OS Data view</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,58 +1,58 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Filter Preferences</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<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>
-<div class="step">
-  <h4>To access the Launch Configurations Filter Window</h4>
-</div>
-<ol>
-  <li>Select the <b>Run &gt; Open Debug Dialog...</b> menu item</li>
-  <p>The <b>Debug</b> window appears.</p>
-  <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 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>
-<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>
-    </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>
-    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
-    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
-</ul>
-<h5 align="left">Related references</h5>
-<ul>
-  <li><a href="../launch_configs/page_trk_main.htm">Main Pane</a></li>
-  <li><a href="../launch_configs/page_trk_debugger.htm">Debugger Pane</a></li>
-  <li><a href="../launch_configs/page_connection.htm">Connection Pane</a></li>
-  <li><a href="../launch_configs/page_file_transfer.htm">File Transfer Pane </a></li>
-  <li><a href="../launch_configs/app_trk_installation.htm">Installation Pane</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  <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; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Filter Preferences</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<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>
+<div class="step">
+  <h4>To access the Launch Configurations Filter Window</h4>
+</div>
+<ol>
+  <li>Select the <b>Run &gt; Open Debug Dialog...</b> menu item</li>
+  <p>The <b>Debug</b> window appears.</p>
+  <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 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>
+<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>
+    </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>
+    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
+    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
+</ul>
+<h5 align="left">Related references</h5>
+<ul>
+  <li><a href="../../projects/launch/page_main.htm">Main Pane</a></li>
+  <li><a href="../../projects/launch/page_debugger.htm">Debugger Pane</a></li>
+  <li><a href="../../projects/launch/page_connection.htm">Connection Pane</a></li>
+  <li><a href="../../projects/launch/page_file_transfer.htm">File Transfer Pane </a></li>
+  <li><a href="../../projects/launch/page_installation.htm">Installation Pane</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  <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; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,26 +1,26 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>TRK Panel Overview</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>TRK Pane Overview</h2>
-<p>When debugging a remote device using TRK, the following panes appear in the launch configuration window: </p>
-<ul>
-  <li><a href="../launch_configs/page_trk_main.htm">Main Pane</a></li>
-  <li><a href="../launch_configs/page_trk_debugger.htm">Debugger Pane</a></li>
-  <li><a href="../launch_configs/page_file_transfer.htm">File Transfer Pane </a></li>
-  <li><a href="../launch_configs/page_executables.htm">Executables Pane</a></li>
-  <li><a href="../launch_configs/app_trk_installation.htm">Installation Pane </a></li>
-  <li><a href="../launch_configs/sys_trk_rom_log.htm">ROM Log</a> (<i>System TRK only</i>)  </li>
-  <li><a href="../launch_configs/emulator_overview.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>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>TRK Panel Overview</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>TRK Pane Overview</h2>
+<p>When debugging a remote device using TRK, the following panes appear in the launch configuration window: </p>
+<ul>
+  <li><a href="../../projects/launch/page_main.htm">Main Pane</a></li>
+  <li><a href="../../projects/launch/page_debugger.htm">Debugger Pane</a></li>
+  <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 TRK 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>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,122 +1,122 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Adding, Editing, and Deleting Connections</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Adding, Editing, and Deleting Connections</h2>
-<p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common remote connection settings.</p>
-<ul>
-  <li><a href="CONN_EDIT">Edit connection name and type</a></li>
-  <li><a href="CONN_SET">Set Connection Settings pane</a></li>
-  <li><a href="#INSTALL">Install	Remote Agents pane</a></li>
-</ul>
-<h3><strong><a name="CONN_EDIT" id="INSTALL3"></a></strong>Edit connection name and type</h3>
-<p>Use the <b>Edit connection name and type</b> page to assign a name and connection type to the new connection setup.</p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="456" height="554"></p>
-<p class="figure">Figure 1 - New Connection wizard Edit connection name and type page</p>
-<p>Table 1. Edit connection name and type page - options</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="28%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Connetion Name</strong></td>
-    <td><p>Enter a name for the connection.</p>    </td>
-  </tr>
-  <tr>
-    <td><strong>Conection Type</strong></td>
-    <td>Select the type of connection this setup will use.</td>
-  </tr>
-  <tr>
-    <td><strong>Supported Services</strong></td>
-    <td><p>Shows a list of services supported by the connection type chosen.</p>    </td>
-  </tr>
-</table>
-<h3><strong><a name="CONN_SET" id="INSTALL2"></a></strong>Set Connection Settings pane</h3>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote agent installed on the device with the latest version available for Carbide. In this pane you can:</p>
-<ul>
-  <li>Set  the device OS used by the device and supported by the selected remote agent</li>
-  <li>Allow easy serial port selection when connecting to a device </li>
-  <li>Verify that you have the latest remote agent installed on a device</li>
-</ul>
-<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 2. Serial Connection Setting page - Set Connection Settings tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Serial Port </strong></td>
-    <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
-  </tr>
-  <tr>
-    <td><b>Baud Rate</b></td>
-    <td>a dropdown list of baud rates common to serial connections.</td>
-  </tr>
-  <tr>
-    <td><strong>Device OS </strong></td>
-    <td><p>A dropdown list of device OSes that are supported by the remote  agent  software. Select the OS used by the device before running a check. </p></td>
-  </tr>
-  <tr>
-    <td><b>Select a service to test</b></td>
-    <td>Click to select a listed service for testing.</td>
-  </tr>
-  <tr>
-    <td><strong>Test Service Status</strong></td>
-    <td><p>Click <strong>Test Service Status</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Check TRK version operation requires more than a few seconds.</p>
-        <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote agent version check.</p>
-      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
-      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
-      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
-      <ul>
-          <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
-        <li><strong>TRK not responding</strong> - this indicates that the COM port is open but TRK is not responding. First, verify that TRK is up and running on the device. Second, TRK may be listening on a different COM port, so choose another named COM port and try again.</li>
-      </ul>
-      <p align="left">&nbsp;</p></td>
-  </tr>
-</table>
-<h3><strong><a name="INSTALL" id="INSTALL"></a>Install Remote Agents</strong> pane</h3>
-<p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
-        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
-  </tr>
-  <tr>
-    <td><strong>Save</strong></td>
-    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
-  </tr>
-  <tr>
-    <td><strong>Install</strong></td>
-    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install latest TRK list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
-        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Adding, Editing, and Deleting Connections</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Adding, Editing, and Deleting Connections</h2>
+<p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common remote connection settings.</p>
+<ul>
+  <li><a href="#CONN_EDIT">Edit connection name and type</a></li>
+  <li><a href="#CONN_SET">Set Connection Settings pane</a></li>
+  <li><a href="#INSTALL">Install Remote Agents pane</a></li>
+</ul>
+<h3><strong><a name="CONN_EDIT" id="INSTALL3"></a></strong>Edit connection name and type</h3>
+<p>Use the <b>Edit connection name and type</b> page to assign a name and connection type to the new connection setup.</p>
+<p align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="456" height="554"></p>
+<p class="figure">Figure 1 - New Connection wizard Edit connection name and type page</p>
+<p>Table 1. Edit connection name and type page - options</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="28%" scope="col">Item</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Connetion Name</strong></td>
+    <td><p>Enter a name for the connection.</p>    </td>
+  </tr>
+  <tr>
+    <td><strong>Conection Type</strong></td>
+    <td>Select the type of connection this setup will use.</td>
+  </tr>
+  <tr>
+    <td><strong>Supported Services</strong></td>
+    <td><p>Shows a list of services supported by the connection type chosen.</p>    </td>
+  </tr>
+</table>
+<h3><strong><a name="CONN_SET" id="INSTALL2"></a></strong>Set Connection Settings pane</h3>
+<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote agent installed on the device with the latest version available for Carbide. In this pane you can:</p>
+<ul>
+  <li>Set  the device OS used by the device and supported by the selected remote agent</li>
+  <li>Allow easy serial port selection when connecting to a device </li>
+  <li>Verify that you have the latest remote agent installed on a device</li>
+</ul>
+<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
+<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
+<p>Table 2. Serial Connection Setting page - Set Connection Settings tab</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Serial Port </strong></td>
+    <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
+  </tr>
+  <tr>
+    <td><b>Baud Rate</b></td>
+    <td>a dropdown list of baud rates common to serial connections.</td>
+  </tr>
+  <tr>
+    <td><strong>Device OS </strong></td>
+    <td><p>A dropdown list of device OSes that are supported by the remote  agent  software. Select the OS used by the device before running a check. </p></td>
+  </tr>
+  <tr>
+    <td><b>Select a service to test</b></td>
+    <td>Click to select a listed service for testing.</td>
+  </tr>
+  <tr>
+    <td><strong>Test Service Status</strong></td>
+    <td><p>Click <strong>Test Service Status</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Check TRK version operation requires more than a few seconds.</p>
+        <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote agent version check.</p>
+      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
+      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
+      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
+      <ul>
+          <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
+        <li><strong>TRK not responding</strong> - this indicates that the COM port is open but TRK is not responding. First, verify that TRK is up and running on the device. Second, TRK may be listening on a different COM port, so choose another named COM port and try again.</li>
+      </ul>
+      <p align="left">&nbsp;</p></td>
+  </tr>
+</table>
+<h3><strong><a name="INSTALL" id="INSTALL"></a>Install Remote Agents</strong> pane</h3>
+<p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
+<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
+<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
+<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Install remote agents</strong></td>
+    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
+        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
+  </tr>
+  <tr>
+    <td><strong>Save</strong></td>
+    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
+  </tr>
+  <tr>
+    <td><strong>Install</strong></td>
+    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install latest TRK list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
+        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,122 +1,122 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Editing connections</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Editing connections</h2>
-<p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common remote connection settings.</p>
-<ul>
-  <li><a href="CONN_EDIT">Edit connection name and type</a></li>
-  <li><a href="CONN_SET">Set Connection Settings pane</a></li>
-  <li><a href="#INSTALL">Install	Remote Agents pane</a></li>
-</ul>
-<h3><strong><a name="CONN_EDIT" id="INSTALL3"></a></strong>Edit connection name and type</h3>
-<p>Use the <b>Edit connection name and type</b> page to assign a name and connection type to the new connection setup.</p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="456" height="554"></p>
-<p class="figure">Figure 1 - New Connection wizard Edit connection name and type page</p>
-<p>Table 1. Edit connection name and type page - options</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="28%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Connetion Name</strong></td>
-    <td><p>Enter a name for the connection.</p>    </td>
-  </tr>
-  <tr>
-    <td><strong>Conection Type</strong></td>
-    <td>Select the type of connection this setup will use.</td>
-  </tr>
-  <tr>
-    <td><strong>Supported Services</strong></td>
-    <td><p>Shows a list of services supported by the connection type chosen.</p>    </td>
-  </tr>
-</table>
-<h3><strong><a name="CONN_SET" id="INSTALL2"></a></strong>Set Connection Settings pane</h3>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote agent installed on the device with the latest version available for Carbide. In this pane you can:</p>
-<ul>
-  <li>Set  the device OS used by the device and supported by the selected remote agent</li>
-  <li>Allow easy serial port selection when connecting to a device </li>
-  <li>Verify that you have the latest remote agent installed on a device</li>
-</ul>
-<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 2. Serial Connection Setting page - Set Connection Settings tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Serial Port </strong></td>
-    <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
-  </tr>
-  <tr>
-    <td><b>Baud Rate</b></td>
-    <td>a dropdown list of baud rates common to serial connections.</td>
-  </tr>
-  <tr>
-    <td><strong>Device OS </strong></td>
-    <td><p>A dropdown list of device OSes that are supported by the remote  agent  software. Select the OS used by the device before running a check. </p></td>
-  </tr>
-  <tr>
-    <td><b>Select a service to test</b></td>
-    <td>Click to select a listed service for testing.</td>
-  </tr>
-  <tr>
-    <td><strong>Test Service Status</strong></td>
-    <td><p>Click <strong>Test Service Status</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Check TRK version operation requires more than a few seconds.</p>
-        <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote agent version check.</p>
-      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
-      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
-      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
-      <ul>
-          <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
-        <li><strong>TRK not responding</strong> - this indicates that the COM port is open but TRK is not responding. First, verify that TRK is up and running on the device. Second, TRK may be listening on a different COM port, so choose another named COM port and try again.</li>
-      </ul>
-      <p align="left">&nbsp;</p></td>
-  </tr>
-</table>
-<h3><strong><a name="INSTALL" id="INSTALL"></a>Install Remote Agents</strong> pane</h3>
-<p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
-        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
-  </tr>
-  <tr>
-    <td><strong>Save</strong></td>
-    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
-  </tr>
-  <tr>
-    <td><strong>Install</strong></td>
-    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install latest TRK list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
-        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Editing connections</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Editing connections</h2>
+<p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common remote connection settings.</p>
+<ul>
+  <li><a href="#CONN_EDIT">Edit connection name and type</a></li>
+  <li><a href="#CONN_SET">Set Connection Settings pane</a></li>
+  <li><a href="#INSTALL">Install Remote Agents pane</a></li>
+</ul>
+<h3><strong><a name="CONN_EDIT" id="INSTALL3"></a></strong>Edit connection name and type</h3>
+<p>Use the <b>Edit connection name and type</b> page to assign a name and connection type to the new connection setup.</p>
+<p align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="456" height="554"></p>
+<p class="figure">Figure 1 - New Connection wizard Edit connection name and type page</p>
+<p>Table 1. Edit connection name and type page - options</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="28%" scope="col">Item</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Connetion Name</strong></td>
+    <td><p>Enter a name for the connection.</p>    </td>
+  </tr>
+  <tr>
+    <td><strong>Conection Type</strong></td>
+    <td>Select the type of connection this setup will use.</td>
+  </tr>
+  <tr>
+    <td><strong>Supported Services</strong></td>
+    <td><p>Shows a list of services supported by the connection type chosen.</p>    </td>
+  </tr>
+</table>
+<h3><strong><a name="CONN_SET" id="INSTALL2"></a></strong>Set Connection Settings pane</h3>
+<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote agent installed on the device with the latest version available for Carbide. In this pane you can:</p>
+<ul>
+  <li>Set  the device OS used by the device and supported by the selected remote agent</li>
+  <li>Allow easy serial port selection when connecting to a device </li>
+  <li>Verify that you have the latest remote agent installed on a device</li>
+</ul>
+<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
+<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
+<p>Table 2. Serial Connection Setting page - Set Connection Settings tab</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Serial Port </strong></td>
+    <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
+  </tr>
+  <tr>
+    <td><b>Baud Rate</b></td>
+    <td>a dropdown list of baud rates common to serial connections.</td>
+  </tr>
+  <tr>
+    <td><strong>Device OS </strong></td>
+    <td><p>A dropdown list of device OSes that are supported by the remote  agent  software. Select the OS used by the device before running a check. </p></td>
+  </tr>
+  <tr>
+    <td><b>Select a service to test</b></td>
+    <td>Click to select a listed service for testing.</td>
+  </tr>
+  <tr>
+    <td><strong>Test Service Status</strong></td>
+    <td><p>Click <strong>Test Service Status</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Check TRK version operation requires more than a few seconds.</p>
+        <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote agent version check.</p>
+      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
+      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
+      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
+      <ul>
+          <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
+        <li><strong>TRK not responding</strong> - this indicates that the COM port is open but TRK is not responding. First, verify that TRK is up and running on the device. Second, TRK may be listening on a different COM port, so choose another named COM port and try again.</li>
+      </ul>
+      <p align="left">&nbsp;</p></td>
+  </tr>
+</table>
+<h3><strong><a name="INSTALL" id="INSTALL"></a>Install Remote Agents</strong> pane</h3>
+<p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
+<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
+<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
+<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Install remote agents</strong></td>
+    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
+        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
+  </tr>
+  <tr>
+    <td><strong>Save</strong></td>
+    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
+  </tr>
+  <tr>
+    <td><strong>Install</strong></td>
+    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install latest TRK list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
+        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,101 +1,101 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Disassembly Window</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {
-	color: #FF0000;
-	font-weight: bold;
-}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Disassembly View</h2>
-<p>  When debugging your application, the <b>Disassembly</b> view shows the loaded program as assembler instructions. When you use the Disassembly view, you can do the following tasks:</p>
-<ul>
-  <li>Step through the disassembly instructions of your program using the <b>Instruction Stepping Mode</b> (<img src="images/icon_instr_stepping_mode.png" width="18" height="16" align="absmiddle">) icon in the <a href="view_debug.htm">Debug</a> view (Figure 1). </li>
-  <li>Reposition the PC  using the various move commands (Figure 1) by first selecting the line to move to, then select the command from the context menu.</li>
-  <li>Set breakpoints at the start of any assembler instruction by right-clicking the left hand column to view the context menu options (Figure 2) </li>
-</ul>
-<p>Figure 1 shows the Dissassembly view and the PC context menu that appears when you right-click in the data pane. Right-clicking  the left border opens the breakpoint context menu.</p>
-<p align="center"><img src="images/view_disassembly.png" width="555" height="272" alt="" /></p>
-<p class="figure">Figure 1 - Repositioning the PC in the Disassembly view</p>
-<p class="figure"><img src="images/view_disassm_breakpoint.png" width="506" height="172" alt="" /></p>
-<p class="figure">Figure 2 - Setting Breakpoints in the Disassembly view </p>
-<h5>Table 1. Disassembly view &mdash;context menu</h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-      <th width="26%" scope="col">Item</th>
-      <th width="8%" scope="col">Icon</th>
-      <th width="66%" scope="col">Explanation</th>
-  </tr>
-    <tr>
-      <td><b>Run to Line </b></td>
-      <td><center>
-        <img src="images/icon_dis_run_to_line.png" width="18" height="18">
-      </center>      </td>
-      <td>Select <b>Run to Line</b> to execute the program from the currently executed line (the green line) to the selected line (the blue line).</td>
-  </tr>
-    <tr>
-      <td><b>Move to Line</b></td>
-      <td><center>
-        <img src="images/icon_dis_move_to_line.png" width="19" height="15">
-      </center>
-      </td>
-      <td><p>Select <b>Move to Line</b> to move the program counter to the selected line  (the blue line) skipping all intermediate lines but not resume execution. This enables you to skip suspect code and continue stepping through your program.</p>
-      <p class="note"><span class="style1">WARNING</span> Using this command can leave a program in an unstable state. Use at your own risk.</p></td>
-    </tr>
-    <tr>
-      <td><b>Resume at Line </b></td>
-      <td><center>
-        <img src="images/icon_dis_resume_at_line.png" width="18" height="14">
-      </center>      </td>
-      <td><p>Select <b>Resume at Line</b> to begin program execution at the selected line   (the blue line), skipping all lines between it and the currently executed line  (the green line). </p>
-      <p class="note"><span class="style1">WARNING</span> Using this command can leave a program in an unstable state. Use at your own risk.</p></td>
-    </tr>
-    <tr>
-      <td><b>Toggle Breakpoint </b></td>
-      <td><center>
-      </center>      </td>
-      <td>Right-click in left-hand column of the Disassembly view and select this option to toggle the breakpoint state between <a href="../tasks/breakpoints/pgm_bp_setting.htm">setting</a> and <a href="../tasks/breakpoints/pgm_bp_clearing.htm">removing</a> the breakpoint. </td>
-    </tr>
-    <tr>
-      <td><b>Disable/Enable Breakpoint </b></td>
-      <td><center>
-      </center>      </td>
-      <td>Right-click in left-hand column of the Disassembly view and select the breakpoint option shown as determined by the current state of the breakpoint.</td>
-    </tr>
-    <tr>
-      <td><b>Breakpoint Properties </b></td>
-      <td><center>
-      </center>      </td>
-      <td>Select this option to open the Breakpoint Properties dialog. </td>
-    </tr>
-</table>
-<div class="step">
-  <h4>Opening the Disassembly view </h4>
-  <ul>
-    <li>Select Window &gt; Show View &gt; Disassembly    </li>
-    </ul>
-  <blockquote>
-    <p>OR</p>
-  </blockquote>
-  <ul>
-    <li>Click the Instruction Stepping Mode (<img src="images/icon_instr_stepping_mode.png" width="18" height="16" align="absmiddle">) icon in the <a href="view_debug.htm">Debug</a> view 
-      <p>A Disassembly view appears in the current perspective.</p>
-    </li>
-  </ul>
-  </div>
-<h5>Related reference</h5>
-<ul><li><a href="../concepts/breakpoints.htm">Breakpoints</a></li>
-  <li><a href="../debugger/debug/cmds_reposition_pc.htm">Repositioning the Program Counter</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Disassembly Window</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {
+	color: #FF0000;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Disassembly View</h2>
+<p>  When debugging your application, the <b>Disassembly</b> view shows the loaded program as assembler instructions. When you use the Disassembly view, you can do the following tasks:</p>
+<ul>
+  <li>Step through the disassembly instructions of your program using the <b>Instruction Stepping Mode</b> (<img src="images/icon_instr_stepping_mode.png" width="18" height="16" align="absmiddle">) icon in the <a href="../debugger/debug/viewing_debug.htm">Debug</a> view (Figure 1). </li>
+  <li>Reposition the PC  using the various move commands (Figure 1) by first selecting the line to move to, then select the command from the context menu.</li>
+  <li>Set breakpoints at the start of any assembler instruction by right-clicking the left hand column to view the context menu options (Figure 2) </li>
+</ul>
+<p>Figure 1 shows the Dissassembly view and the PC context menu that appears when you right-click in the data pane. Right-clicking  the left border opens the breakpoint context menu.</p>
+<p align="center"><img src="images/view_disassembly.png" width="555" height="272" alt="" /></p>
+<p class="figure">Figure 1 - Repositioning the PC in the Disassembly view</p>
+<p class="figure"><img src="images/view_disassm_breakpoint.png" width="506" height="172" alt="" /></p>
+<p class="figure">Figure 2 - Setting Breakpoints in the Disassembly view </p>
+<h5>Table 1. Disassembly view &mdash;context menu</h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+      <th width="26%" scope="col">Item</th>
+      <th width="8%" scope="col">Icon</th>
+      <th width="66%" scope="col">Explanation</th>
+  </tr>
+    <tr>
+      <td><b>Run to Line </b></td>
+      <td><center>
+        <img src="images/icon_dis_run_to_line.png" width="18" height="18">
+      </center>      </td>
+      <td>Select <b>Run to Line</b> to execute the program from the currently executed line (the green line) to the selected line (the blue line).</td>
+  </tr>
+    <tr>
+      <td><b>Move to Line</b></td>
+      <td><center>
+        <img src="images/icon_dis_move_to_line.png" width="19" height="15">
+      </center>
+      </td>
+      <td><p>Select <b>Move to Line</b> to move the program counter to the selected line  (the blue line) skipping all intermediate lines but not resume execution. This enables you to skip suspect code and continue stepping through your program.</p>
+      <p class="note"><span class="style1">WARNING</span> Using this command can leave a program in an unstable state. Use at your own risk.</p></td>
+    </tr>
+    <tr>
+      <td><b>Resume at Line </b></td>
+      <td><center>
+        <img src="images/icon_dis_resume_at_line.png" width="18" height="14">
+      </center>      </td>
+      <td><p>Select <b>Resume at Line</b> to begin program execution at the selected line   (the blue line), skipping all lines between it and the currently executed line  (the green line). </p>
+      <p class="note"><span class="style1">WARNING</span> Using this command can leave a program in an unstable state. Use at your own risk.</p></td>
+    </tr>
+    <tr>
+      <td><b>Toggle Breakpoint </b></td>
+      <td><center>
+      </center>      </td>
+      <td>Right-click in left-hand column of the Disassembly view and select this option to toggle the breakpoint state between <a href="../tasks/breakpoints/pgm_bp_setting.htm">setting</a> and <a href="../tasks/breakpoints/pgm_bp_clearing.htm">removing</a> the breakpoint. </td>
+    </tr>
+    <tr>
+      <td><b>Disable/Enable Breakpoint </b></td>
+      <td><center>
+      </center>      </td>
+      <td>Right-click in left-hand column of the Disassembly view and select the breakpoint option shown as determined by the current state of the breakpoint.</td>
+    </tr>
+    <tr>
+      <td><b>Breakpoint Properties </b></td>
+      <td><center>
+      </center>      </td>
+      <td>Select this option to open the Breakpoint Properties dialog. </td>
+    </tr>
+</table>
+<div class="step">
+  <h4>Opening the Disassembly view </h4>
+  <ul>
+    <li>Select Window &gt; Show View &gt; Disassembly    </li>
+    </ul>
+  <blockquote>
+    <p>OR</p>
+  </blockquote>
+  <ul>
+    <li>Click the Instruction Stepping Mode (<img src="images/icon_instr_stepping_mode.png" width="18" height="16" align="absmiddle">) icon in the <a href="../debugger/debug/viewing_debug.htm">Debug</a> view 
+      <p>A Disassembly view appears in the current perspective.</p>
+    </li>
+  </ul>
+  </div>
+<h5>Related reference</h5>
+<ul><li><a href="../concepts/breakpoints.htm">Breakpoints</a></li>
+  <li><a href="../debugger/debug/cmds_reposition_pc.htm">Repositioning the Program Counter</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,103 +1,103 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Executables view</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Executables view </h2>
-<p>  The <b>Executables</b> view provides a dynamic list of executables and their related source files. The Executables view makes it easy to:</p>
-<ul>
-  <li>target all binaries for debugging because the symbolics are automatically loaded when a bld.inf is imported or a project is created from a template</li>
-  <li>debug a binary that is not part of a project in the workspace by importing it into the Executables view to load the symbolics</li>
-  <li> debug a process running on a device by <a href="../tasks/processes/attach_debugger_to_process.htm">attaching</a> to the process and importing the binaries associated with the process into the Executables view to load the symbolics. For example, you to debug a library loaded by the process, you would need to import the libary and the process executable. </li>
-  <li>remove binaries when a project is closed or deleted from the workspace</li>
-  <li>remove  binaries  imported from outside the workspace by clicking the <b>Remove the selected executables</b> icon (<img src="images/icon_delete_launch_config.png" width="17" height="16" align="absmiddle">) or deleting the binary from the Executables project in the <a href="view_cpp_projects.htm">Project Explorer</a> view </li>
-  <li>locate and manage which source and resource files are associated with each executable. Paths shown in black text have been resolved, those in gray text cannot be found. </li>
-  <li>identify and correct any path issues with missing source files (shown in gray text). Double-click the missing source file to open a <b>Locate File</b> editor view which enables you to find the missing file. </li>
-  <li>view routines and header files used by the source file. Click the tree control to expand or collapse a list of included header files and routine names for fast navigation. </li>
-  <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_cpp_projects.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 TRK or in stop mode, always specify the <a href="launch_configs/sys_trk_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 Executables view consists of the Executable Name and Source File Name panes describled in the table below. Use the Columns button in the toolbar to show or hide specific columns in each pane. Columns can be sorted and rearranged in the order desired. </p>
-<h5>Table 1. Executables view  information </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="17%" scope="col">Pane</th>
-    <th width="83%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Executable Name </b></td>
-    <td><p>Displays a list of  executables in the workspace as well as other files added by the user. Select an executable to update the Source File Name pane with related files. The executable information shown  can include: </p>
-      <ul>
-        <li><b>Executable Name</b> - (default) Name of the exectable file.</li>
-        <li><b>Executable Project</b> - (default) The project  associated with the executable.</li>
-        <li><b>Executable Location</b> - (default) The current location of the executable.</li>
-        <li><b>Executable Size</b> - The executable size shown in bytes.</li>
-        <li><b>Executable Date</b> - The source file&prime;s modification date.</li>
-        <li><b>Executable Type</b> - The executable type (.exe, etc.) </li>
-      </ul>
-      <p>Click the Columns icon (<img src="../images/icons/btn_columns.png" width="14" height="14" align="absmiddle" />) to set which columns to show in this pane.</p></td>
-  </tr>
-  <tr>
-    <td><b>Source File Name </b></td>
-    <td><p>Displays a list of  source files for the selected executable as extracted from the symbol table. The source file information shown can include: </p>
-      <ul>
-        <li><b>Source File Name</b> - (default) Name of the source file used by the executable. If no binary files are in the project the message <b>No source files found in &lt;project_name&gt;</b> is shown. </li>
-        <li><b>Source File Location</b> - (default) The current location of the source file. If the path is shown in gray text the source file was not located. To locate it, double-click to open a new editor, then click Locate File... to locate the missing file. The new path is compared to the old one and all files located in the same directory are automatically updated to use the new path.</li>
-        <li><b>Source File Original Location </b> - (default) The original location of the source file which may be different than the current location. </li>
-        <li><b>Source File Size</b> - The executable size shown in bytes.</li>
-        <li><b>Source File </b><b>Date </b>- The source file&prime;s modification date.</li>
-        <li><b>Source File Type</b> - The source type (.h, .inc, etc.) </li>
-      </ul>
-      <p>Expand a file&prime;s tree control to view the functions and header files used by the file. Double-click to open the source file for editing or to set breakpoints. </p>
-      <p>Click the Columns icon (<img src="../images/icons/btn_columns.png" width="14" height="14" align="absmiddle" />) to set which columns to show in this pane.</p></td>
-  </tr>
-</table>
-<h4>Executables view toolbar icons</h4>
-<p>The table below lists the unique icons displayed in the Executables view toolbar. </p>
-<h5>Table 2. Executables view toolbar options </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-      <th width="16%" scope="col">Command</th>
-      <th width="32%" scope="col">Name</th>
-      <th width="52%" scope="col">Description</th>
-  </tr>
-    <tr>
-      <td><div align="center"><img src="../images/icons/btn_restart.png" width="20" height="18" /></div></td>
-      <td><div align="left">Refresh the list of executables</div></td>
-      <td>Click to refresh the executables list. </td>
-    </tr>
-    <tr>
-      <td><div align="center"><img src="../images/icons/btn_import_executables.png" width="18" height="15" /></div></td>
-      <td>Import an executable file </td>
-      <td>Click to import an executable not in the workspace into the executables list. </td>
-    </tr>
-    <tr>
-      <td><center>
-        <img src="images/icon_delete_launch_config.png" width="17" height="16">
-      </center>
-      </td>
-      <td>Remove the selected executables</td>
-      <td>Click to remove one or more selected executables from the executables list. You will see a alert if the executable cannot be removed.</td>
-    </tr>
-    <tr>
-      <td><div align="center"><img src="../images/icons/btn_columns.png" width="14" height="14" /></div></td>
-      <td>Columns</td>
-      <td>Opens the  <b>Configure Columns</b> dialog for configuring which columns  appear in the Executable and Source File panes. </td>
-    </tr>
-</table>
-<h5>Other references</h5>
-<ul>
-  <li><a href="perspective_debug.htm">Debug perspective </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Executables view</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Executables view </h2>
+<p>  The <b>Executables</b> view provides a dynamic list of executables and their related source files. The Executables view makes it easy to:</p>
+<ul>
+  <li>target all binaries for debugging because the symbolics are automatically loaded when a bld.inf is imported or a project is created from a template</li>
+  <li>debug a binary that is not part of a project in the workspace by importing it into the Executables view to load the symbolics</li>
+  <li> debug a process running on a device by <a href="../tasks/processes/attach_debugger_to_process.htm">attaching</a> to the process and importing the binaries associated with the process into the Executables view to load the symbolics. For example, you to debug a library loaded by the process, you would need to import the libary and the process executable. </li>
+  <li>remove binaries when a project is closed or deleted from the workspace</li>
+  <li>remove  binaries  imported from outside the workspace by clicking the <b>Remove the selected executables</b> icon (<img src="images/icon_delete_launch_config.png" width="17" height="16" align="absmiddle">) or deleting the binary from the Executables project in the <a href="view_cpp_projects.htm">Project Explorer</a> view </li>
+  <li>locate and manage which source and resource files are associated with each executable. Paths shown in black text have been resolved, those in gray text cannot be found. </li>
+  <li>identify and correct any path issues with missing source files (shown in gray text). Double-click the missing source file to open a <b>Locate File</b> editor view which enables you to find the missing file. </li>
+  <li>view routines and header files used by the source file. Click the tree control to expand or collapse a list of included header files and routine names for fast navigation. </li>
+  <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_cpp_projects.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 TRK 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 Executables view consists of the Executable Name and Source File Name panes describled in the table below. Use the Columns button in the toolbar to show or hide specific columns in each pane. Columns can be sorted and rearranged in the order desired. </p>
+<h5>Table 1. Executables view  information </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="17%" scope="col">Pane</th>
+    <th width="83%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Executable Name </b></td>
+    <td><p>Displays a list of  executables in the workspace as well as other files added by the user. Select an executable to update the Source File Name pane with related files. The executable information shown  can include: </p>
+      <ul>
+        <li><b>Executable Name</b> - (default) Name of the exectable file.</li>
+        <li><b>Executable Project</b> - (default) The project  associated with the executable.</li>
+        <li><b>Executable Location</b> - (default) The current location of the executable.</li>
+        <li><b>Executable Size</b> - The executable size shown in bytes.</li>
+        <li><b>Executable Date</b> - The source file&prime;s modification date.</li>
+        <li><b>Executable Type</b> - The executable type (.exe, etc.) </li>
+      </ul>
+      <p>Click the Columns icon (<img src="../images/icons/btn_columns.png" width="14" height="14" align="absmiddle" />) to set which columns to show in this pane.</p></td>
+  </tr>
+  <tr>
+    <td><b>Source File Name </b></td>
+    <td><p>Displays a list of  source files for the selected executable as extracted from the symbol table. The source file information shown can include: </p>
+      <ul>
+        <li><b>Source File Name</b> - (default) Name of the source file used by the executable. If no binary files are in the project the message <b>No source files found in &lt;project_name&gt;</b> is shown. </li>
+        <li><b>Source File Location</b> - (default) The current location of the source file. If the path is shown in gray text the source file was not located. To locate it, double-click to open a new editor, then click Locate File... to locate the missing file. The new path is compared to the old one and all files located in the same directory are automatically updated to use the new path.</li>
+        <li><b>Source File Original Location </b> - (default) The original location of the source file which may be different than the current location. </li>
+        <li><b>Source File Size</b> - The executable size shown in bytes.</li>
+        <li><b>Source File </b><b>Date </b>- The source file&prime;s modification date.</li>
+        <li><b>Source File Type</b> - The source type (.h, .inc, etc.) </li>
+      </ul>
+      <p>Expand a file&prime;s tree control to view the functions and header files used by the file. Double-click to open the source file for editing or to set breakpoints. </p>
+      <p>Click the Columns icon (<img src="../images/icons/btn_columns.png" width="14" height="14" align="absmiddle" />) to set which columns to show in this pane.</p></td>
+  </tr>
+</table>
+<h4>Executables view toolbar icons</h4>
+<p>The table below lists the unique icons displayed in the Executables view toolbar. </p>
+<h5>Table 2. Executables view toolbar options </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+      <th width="16%" scope="col">Command</th>
+      <th width="32%" scope="col">Name</th>
+      <th width="52%" scope="col">Description</th>
+  </tr>
+    <tr>
+      <td><div align="center"><img src="../images/icons/btn_restart.png" width="20" height="18" /></div></td>
+      <td><div align="left">Refresh the list of executables</div></td>
+      <td>Click to refresh the executables list. </td>
+    </tr>
+    <tr>
+      <td><div align="center"><img src="../images/icons/btn_import_executables.png" width="18" height="15" /></div></td>
+      <td>Import an executable file </td>
+      <td>Click to import an executable not in the workspace into the executables list. </td>
+    </tr>
+    <tr>
+      <td><center>
+        <img src="images/icon_delete_launch_config.png" width="17" height="16">
+      </center>
+      </td>
+      <td>Remove the selected executables</td>
+      <td>Click to remove one or more selected executables from the executables list. You will see a alert if the executable cannot be removed.</td>
+    </tr>
+    <tr>
+      <td><div align="center"><img src="../images/icons/btn_columns.png" width="14" height="14" /></div></td>
+      <td>Columns</td>
+      <td>Opens the  <b>Configure Columns</b> dialog for configuring which columns  appear in the Executable and Source File panes. </td>
+    </tr>
+</table>
+<h5>Other references</h5>
+<ul>
+  <li><a href="perspective_debug.htm">Debug perspective </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,72 +1,72 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Console View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Console View </h2>
-<p>  The <b>Console</b> view display<span><span>s the output of a process and allows you to provide keyboard input to a process</span></span>. There are numerous consoles available, see the Open Console dropdown list for those available to you. Most are enabled from various project panels in Carbide. </p>
-<p align="center"><img src="../images/views/view_console_build.png" width="778" height="203" /></p>
-<p class="figure">Figure 1 - Console view showing build console information</p>
-<p>To view <span class="code">RDebug::Printf</span> output in the <b>Console</b> view when targeting devices, ensure that the following <a href="launch_configs/emulator_debugger.htm">Debugger</a> options are matched with settings in the <span class="code">epoc.ini</span> file. </p>
-<ul>
-  <li>Set <span class="code">LogToDebugger 1</span> to use the <b>View program output</b> option </li>
-  <li>Set <span class="code">LogToFile 1</span> to enable the <b>View emulator output</b> option</li>
-</ul>
-<h5>Table 1 Console view&mdash;items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="14%" scope="col">Icon</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Scroll Lock </b></td>
-    <td><div align="center"><img src="../images/icons/console_scroll_lock_icon.png" width="15" height="18" /></div></td>
-    <td>Toggles the scrolling of the console view contents. </td>
-  </tr>
-  <tr>
-    <td><b>Clear Console </b></td>
-    <td><div align="center"><img src="../images/icons/console_clear_console_icon.png" width="19" height="18" /></div></td>
-    <td>Clears all content in the Console view.</td>
-  </tr>
-  <tr>
-    <td><b>Pin Console </b></td>
-    <td><div align="center"><img src="../images/icons/console_pin_console_icon.png" width="19" height="18" /></div></td>
-    <td><p>Toggles the behavior of the console. When enabled the current console content is fixed all the time instead of scrolling out of sight. When disabled, the console changes according to the action. </p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Display Selected Console </b></td>
-    <td><div align="center"><img src="../images/icons/console_display_selected_icon.png" width="30" height="18" /></div></td>
-    <td>Changes the contents of the current console view to show the selected console output. </td>
-  </tr>
-  <tr>
-    <td><b>Open Console </b></td>
-    <td><div align="center"><img src="../images/icons/console_open_console_icon.png" width="30" height="18" /></div></td>
-    <td><p>Opens a new  console to display  the log for:</p>
-      <ul>
-        <li>Platform Security Diagnostics</li>
-        <li>New Windows System Messages Console </li>
-        <li>New Emulation Program Output Console</li>
-        <li>New TRK Program Output Console</li>
-        <li>New TRK Communications Log Console</li>
-        <li>New Trace32 Communications Log Console</li>
-        <li>New Symbian Rom Log Console</li>
-        <li>New Emulator Output Console</li>
-        <li>CVS</li>
-        <li>New Console View</li>
-      </ul>
-      <p>Remember  that <i>program output</i> is console output from the running binary  and <i>communications log</i> is the messages sent between TRK and the on-device debug agent. </p>      
-      <p class="note"><b>NOTE</b> You can pin any message log view so that it does not lose focus.</p></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Console View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Console View </h2>
+<p>  The <b>Console</b> view display<span><span>s the output of a process and allows you to provide keyboard input to a process</span></span>. There are numerous consoles available, see the Open Console dropdown list for those available to you. Most are enabled from various project panels in Carbide. </p>
+<p align="center"><img src="../images/views/view_console_build.png" width="778" height="203" /></p>
+<p class="figure">Figure 1 - Console view showing build console information</p>
+<p>To view <span class="code">RDebug::Printf</span> output in the <b>Console</b> view when targeting devices, ensure that the following <a href="../projects/launch/page_debugger.htm">Debugger</a> options are matched with settings in the <span class="code">epoc.ini</span> file. </p>
+<ul>
+  <li>Set <span class="code">LogToDebugger 1</span> to use the <b>View program output</b> option </li>
+  <li>Set <span class="code">LogToFile 1</span> to enable the <b>View emulator output</b> option</li>
+</ul>
+<h5>Table 1 Console view&mdash;items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="14%" scope="col">Icon</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Scroll Lock </b></td>
+    <td><div align="center"><img src="../images/icons/console_scroll_lock_icon.png" width="15" height="18" /></div></td>
+    <td>Toggles the scrolling of the console view contents. </td>
+  </tr>
+  <tr>
+    <td><b>Clear Console </b></td>
+    <td><div align="center"><img src="../images/icons/console_clear_console_icon.png" width="19" height="18" /></div></td>
+    <td>Clears all content in the Console view.</td>
+  </tr>
+  <tr>
+    <td><b>Pin Console </b></td>
+    <td><div align="center"><img src="../images/icons/console_pin_console_icon.png" width="19" height="18" /></div></td>
+    <td><p>Toggles the behavior of the console. When enabled the current console content is fixed all the time instead of scrolling out of sight. When disabled, the console changes according to the action. </p>
+    </td>
+  </tr>
+  <tr>
+    <td><b>Display Selected Console </b></td>
+    <td><div align="center"><img src="../images/icons/console_display_selected_icon.png" width="30" height="18" /></div></td>
+    <td>Changes the contents of the current console view to show the selected console output. </td>
+  </tr>
+  <tr>
+    <td><b>Open Console </b></td>
+    <td><div align="center"><img src="../images/icons/console_open_console_icon.png" width="30" height="18" /></div></td>
+    <td><p>Opens a new  console to display  the log for:</p>
+      <ul>
+        <li>Platform Security Diagnostics</li>
+        <li>New Windows System Messages Console </li>
+        <li>New Emulation Program Output Console</li>
+        <li>New TRK Program Output Console</li>
+        <li>New TRK Communications Log Console</li>
+        <li>New Trace32 Communications Log Console</li>
+        <li>New Symbian Rom Log Console</li>
+        <li>New Emulator Output Console</li>
+        <li>CVS</li>
+        <li>New Console View</li>
+      </ul>
+      <p>Remember  that <i>program output</i> is console output from the running binary  and <i>communications log</i> is the messages sent between TRK and the on-device debug agent. </p>      
+      <p class="note"><b>NOTE</b> You can pin any message log view so that it does not lose focus.</p></td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_module_wnd.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_module_wnd.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Modules View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Modules View</h2>
-<p>The <b>Modules</b> view displays a list of modules loaded while debugging your program. The listed modules can be selected to show related information. You can open the Modules view in the <a href="../concepts/CarbidePerspective.html">Carbide C/C++</a> perspective by selecting <b>Window &gt; Show view &gt; Other...</b>, then expand the Debug folder and select Modules. In the <a href="perspective_debug.htm">Debug</a> perspective select <b>Window &gt; Show view &gt; Modules</b>.</p>
-<p>The Modules view is only loaded during a debug session and closes when the debug session ends. Select the running man icon to list the Type, Symbols, and Symbols file for the executable. Select the stack of books icon to list the Type, Symbols, Symbols file, and Base address for the shared library. </p>
-<p>Figure 1 shows the Modules view.</p>
-<p align="center"><img src="../images/views/view_module.png" width="595" height="181" /></p>
-<p class="figure">Figure 1 - Modules view</p>
-<h5>Related reference </h5>
-<ul>
-  <li> <a href="view_debug.htm">Debug view</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Modules View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Modules View</h2>
+<p>The <b>Modules</b> view displays a list of modules loaded while debugging your program. The listed modules can be selected to show related information. You can open the Modules view in the <a href="../concepts/CarbidePerspective.html">Carbide C/C++</a> perspective by selecting <b>Window &gt; Show view &gt; Other...</b>, then expand the Debug folder and select Modules. In the <a href="perspective_debug.htm">Debug</a> perspective select <b>Window &gt; Show view &gt; Modules</b>.</p>
+<p>The Modules view is only loaded during a debug session and closes when the debug session ends. Select the running man icon to list the Type, Symbols, and Symbols file for the executable. Select the stack of books icon to list the Type, Symbols, Symbols file, and Base address for the shared library. </p>
+<p>Figure 1 shows the Modules view.</p>
+<p align="center"><img src="../images/views/view_module.png" width="595" height="181" /></p>
+<p class="figure">Figure 1 - Modules view</p>
+<h5>Related reference </h5>
+<ul>
+  <li> <a href="../debugger/debug/viewing_debug.htm">Debug view</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,49 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Signals View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Signals View</h2>
-<p>  The Signals view of the Debug perspective lets you view the signals defined on the selected debug target and how the debugger handles each one.</p>
-<p class="note"><b>NOTE</b> Currently Carbide.c++ does not  support this CDT feature.</p>
-<p>&nbsp;</p>
-<p>Figure 1 shows the Signals view.</p>
-<p align="center"><img src="../images/views/view_signals.png" width="500" height="205" /></p>
-<p class="figure">Figure 1 - Signals view</p>
-<h5>Table 1 Signals view&mdash;items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="36%" scope="col">Item</th>
-    <th width="64%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td>Name</td>
-    <td>Displays the name of the signal.</td>
-  </tr>
-  <tr>
-    <td>Pass</td>
-    <td>Where &quot;yes&quot; is displayed, the debugger lets your program see the signal. Your program can handle the signal, or else it may terminate if the signal is fatal and not handled.</td>
-  </tr>
-  <tr>
-    <td>Suspend</td>
-    <td>Where &quot;yes&quot; is displayed, the debugger suspends your program when this signal is handled.</td>
-  </tr>
-  <tr>
-    <td>Description</td>
-    <td>Displays a description of the signal.</td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<h5>Related reference </h5>
-<ul>
-  <li> <a href="view_debug.htm">Debug view</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Signals View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Signals View</h2>
+<p>  The Signals view of the Debug perspective lets you view the signals defined on the selected debug target and how the debugger handles each one.</p>
+<p class="note"><b>NOTE</b> Currently Carbide.c++ does not  support this CDT feature.</p>
+<p>&nbsp;</p>
+<p>Figure 1 shows the Signals view.</p>
+<p align="center"><img src="../images/views/view_signals.png" width="500" height="205" /></p>
+<p class="figure">Figure 1 - Signals view</p>
+<h5>Table 1 Signals view&mdash;items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="36%" scope="col">Item</th>
+    <th width="64%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td>Name</td>
+    <td>Displays the name of the signal.</td>
+  </tr>
+  <tr>
+    <td>Pass</td>
+    <td>Where &quot;yes&quot; is displayed, the debugger lets your program see the signal. Your program can handle the signal, or else it may terminate if the signal is fatal and not handled.</td>
+  </tr>
+  <tr>
+    <td>Suspend</td>
+    <td>Where &quot;yes&quot; is displayed, the debugger suspends your program when this signal is handled.</td>
+  </tr>
+  <tr>
+    <td>Description</td>
+    <td>Displays a description of the signal.</td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<h5>Related reference </h5>
+<ul>
+  <li> <a href="../debugger/debug/viewing_debug.htm">Debug view</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,52 +1,52 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Symbian Project Navigator view</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbian Project Navigator  view</h2>
-<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.project.ui.views.SymbianProjectNavigatorView)")'>Symbian Project Navigator</a> view shows all files that belong to the
-current build configuration. This view lists the Symbian projects in your current workspace and their corresponding *.inf file (typically bld.inf). The *.inf file contains the related MMP project files, which are also listed in a tree structure.  You can collapse or expand the list for each MMP to see which sources  belong to each MMP.</p>
-<p>To open this view select <b>Window &gt; Show View &gt; Symbian Project Navigator</b>, or select <b>Window &gt; Show View &gt; Other ...</b> and expand the Carbide.c++ folder then choose Symbian Project Navigator. </p>
-<p>Figure 1 shows the Symbian Project Navigator view.</p>
-<p align="center"><img src="images/view_sym_proj_nav.png" width="279" height="404" alt=""/></p>
-<p class="figure">Figure 1 - Symbian Project Navigator view</p>
-<h5>Table 1. Symbian Project Navigator view &mdash;shortcut  menu</h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="9%" scope="col">Icon</th>
-    <th width="61%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Toggle SOURCEPATH </b></td>
-    <td><div align="center"><img src="images/icon_sourcepath_filter.png" width="18" height="15"></div></td>
-    <td>Toggles the display between showing the <span class="code">SOURCEPATH</span> folders contained in the MMP file and showing the <span class="code">Bld.inf</span> structure. </td>
-  </tr>
-  <tr>
-    <td><b>Toggle MMPs</b></td>
-    <td><div align="center"><img src="images/icon_mmp_filter.png" width="20" height="17"></div></td>
-    <td>Toggle the display to show all MMP files or  the MMP files associated with the current build configuration. </td>
-  </tr>
-  <tr>
-    <td><b>Toggle MMP Order</b></td>
-    <td><center>
-      <img src="images/icon_svn_mmp_order.png" width="21" height="20">
-    </center>
-    </td>
-    <td>Toggle to show the  MMPs list in alphabetical or build order. The default setting is build order.</td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul><li><a href="view_symbian_kernel.htm">Symbian OS View</a></li>
-  <li><a href="view_debug.htm">Debug View</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Symbian Project Navigator view</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Symbian Project Navigator  view</h2>
+<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.project.ui.views.SymbianProjectNavigatorView)")'>Symbian Project Navigator</a> view shows all files that belong to the
+current build configuration. This view lists the Symbian projects in your current workspace and their corresponding *.inf file (typically bld.inf). The *.inf file contains the related MMP project files, which are also listed in a tree structure.  You can collapse or expand the list for each MMP to see which sources  belong to each MMP.</p>
+<p>To open this view select <b>Window &gt; Show View &gt; Symbian Project Navigator</b>, or select <b>Window &gt; Show View &gt; Other ...</b> and expand the Carbide.c++ folder then choose Symbian Project Navigator. </p>
+<p>Figure 1 shows the Symbian Project Navigator view.</p>
+<p align="center"><img src="images/view_sym_proj_nav.png" width="279" height="404" alt=""/></p>
+<p class="figure">Figure 1 - Symbian Project Navigator view</p>
+<h5>Table 1. Symbian Project Navigator view &mdash;shortcut  menu</h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="9%" scope="col">Icon</th>
+    <th width="61%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Toggle SOURCEPATH </b></td>
+    <td><div align="center"><img src="images/icon_sourcepath_filter.png" width="18" height="15"></div></td>
+    <td>Toggles the display between showing the <span class="code">SOURCEPATH</span> folders contained in the MMP file and showing the <span class="code">Bld.inf</span> structure. </td>
+  </tr>
+  <tr>
+    <td><b>Toggle MMPs</b></td>
+    <td><div align="center"><img src="images/icon_mmp_filter.png" width="20" height="17"></div></td>
+    <td>Toggle the display to show all MMP files or  the MMP files associated with the current build configuration. </td>
+  </tr>
+  <tr>
+    <td><b>Toggle MMP Order</b></td>
+    <td><center>
+      <img src="images/icon_svn_mmp_order.png" width="21" height="20">
+    </center>
+    </td>
+    <td>Toggle to show the  MMPs list in alphabetical or build order. The default setting is build order.</td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul><li><a href="view_symbian_kernel.htm">Symbian OS View</a></li>
+  <li><a href="../debugger/debug/viewing_debug.htm">Debug View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,114 +1,114 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Symbian OS Data</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbian OS Data view</h2>
-<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="view_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="view_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 TRK 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 TRK 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="wnd_debugger_prefs.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 TRK 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>
-<h3>Symbian OS Data pages
-</h3>
-<p>The Symbian OS Data view consists of five tabs. Each tabbed pane is described below. In all panes, the <b>Name Filter</b> field is a standard Eclipse UI control that allows you to find an item by filtering out items by name using wildcards (*, ?) and camel case naming conventions. Camel case refers to using mixed case multiple names merged together  in coding like <span class="code">SecInvInit</span> and <span class="code">DosServer</span>. In all panes, you can select an item and view its properties (attributes). In panes with columns you can click a column title to toggle between ascending and descending sorting. </p>
-<p>Data to be viewed includes:</p>
-<ul>
-  <li><a href="#overview">Overview</a></li>
-  <li><a href="#processes">Processes</a></li>
-  <li><a href="#threads">Threads</a></li>
-  <li><a href="#chunks">Chunks</a></li>
-  <li><a href="#Library">Libraries</a></li>
-</ul>
-<p class="note"><b>NOTE</b>  Information for the Chunks and Libraries tabs is not available when debugging with the TRK debug agent.</p>
-<p align="center"><img src="images/view_symbianOSkernel.png" width="602" height="300" alt="" /></p>
-<p class="figure">Figure 1. Symbian OS Data view</p>
-<h5>Table 1 - Symbian OS Data view toolbar buttons </h5>
-<table cellpadding="2" cellspacing="0"
-border="0">
-  <tr valign="top">
-    <th width="209" class="Cell">Button</th>
-    <th width="49" class="Cell">Icon</th>
-    <th width="534" class="Cell">Function</th>
-  </tr>
-  <tr valign="top">
-    <td class="Cell"><p> <b>Refresh data</b></p></td>
-    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_refresh.png" width="19" height="19" alt="" /></div></td>
-    <td class="Cell"><p> Click this button to force a refresh of data in the view. Use the <a href="wnd_debugger_prefs.htm">Carbide.c++ Debugger</a> preference panel <b>Time interval for auto-refreshing OS View</b> option to control the automatic refreshing of data. </p></td>
-  </tr>
-  <tr valign="top">
-    <td class="Cell"><p> <b>Enable/disable auto-refresh</b> </p></td>
-    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_autorefresh.png" width="19" height="21" alt="" /></div></td>
-    <td class="Cell"><p> Click this button to turn on/off  auto refresh of data.</p></td>
-  </tr>
-  <tr valign="top">
-    <td class="Cell"><p> <b>Debug process or thread</b> </p></td>
-    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_debug.png" width="22" height="20" alt="" /></div></td>
-    <td class="Cell"><p> Click the <b>Debug</b> button to attach to the process and debug the selected process or thread. Or right-click an item and choose <b>Debug</b>. This applys to both TRK (run mode) and Sophia/Trace32 (stop mode).</p>
-    </td>
-  </tr>
-  <tr valign="top">
-    <td class="Cell"><p> <b>Properties</b> </p></td>
-    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_prop.png" width="21" height="18" alt="" /></div></td>
-    <td class="Cell"><p>Click this button to show properties of currently selected item in the <b>Properties</b> view. Or right-click an item and choose <b>Properties</b>.</p></td>
-  </tr>
-  <tr valign="top">
-    <td class="Cell"><p> <b>Timer</b></p></td>
-    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_timer.png" width="21" height="18" alt="" /></div></td>
-    <td class="Cell"><p> Click this button to define the time interval for auto-refreshing data. This applies to run mode debugging only. </p></td>
-  </tr>
-  <tr valign="top">
-    <td class="Cell"><b>Collapse All </b></td>
-    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_collapse.png" width="17" height="17" alt="" /></div></td>
-    <td class="Cell">Click the <b>Collaps All</b> command to collapse all of the currently elements in the view.</td>
-  </tr>
-</table>
-<h4><a name="overview" id="overview"></a>Overview Tab</h4>
-<p>This tab (shown in Figure 1) provides a tree view of ownership  of all processes, threads, and chunks in the OS. 
-In contrast, the other tabs provide a flat list of corresponding kernel objects such as process, thread, chunk, library, etc.</p>
-<h4><a name="processes" id="processes"></a>Processes</h4>
-<p>The Processes tab (Figure 2) provides a flat list of corresponding kernel objects. 
-Click a column title to sort the list by the title attribute in alternating ascending and descending order. For example, you may choose to sort the process list by Name, ID, or by Priority. </p>
-<p align="center"><img src="images/view_symbianOS_PTC.png" width="602" height="291" alt="" /></p>
-<p class="figure">Figure 2. Processes Pane of Symbian OS View</p>
-<p>The process(es) being debugged will be shown in bold font. You can debug (attach debugger to) any process in the Processes tab by selecting it and clicking the &quot;Debug&quot; button or just by double clicking on it. In that case a new process item will show up in the Debug View if the process is not being debugged. Otherwise, you will get a message saying it's already under debug.</p>
-<h4><a name="threads" id="threads"></a>Threads</h4>
-<p>The Threads tab (Figure 3) provides a flat list of corresponding kernel objects. The list will display &ldquo;sortable&rdquo; attributes of that type of object in columns. The &ldquo;sortable attribute&rdquo; means you can sort the list by that attribute. For example, you may want to sort the list by the owning process name. Sort the list of any column by clicking on the column header. The thread(s) being debugged will be shown in bold font.</p>
-<p class="note"><b>NOTE</b> You can debug (attach debugger to) any thread in the Thread tab by double clicking on it or selecting it and clicking the Debug button. In that case, a new thread item will show up in Debug view if the thread is not being debugged.</p>
-<p align="center"><img src="images/view_symbianOS_threads.png" width="602" height="291" alt="" /></p>
-<p class="figure">Figure 3. Threads Pane of Symbian OS View</p>
-<h4><a name="chunks" id="chunks"></a>Chunks</h4>
-<p>Chunks are an area of contiguous linear memory. It is the unit of memory allocation where a region of RAM is mapped into contiguous logical addresses. Chunks are allocated during boot for such things as the Kernel's data and stack.</p>
-<p>The Chunks tab (Figure 4) provides a flat list of corresponding kernel objects. The list will display &ldquo;sortable&rdquo; attributes of that type of object in columns. The &ldquo;sortable attribute&rdquo; means you can sort the list by that attribute. For example, you may want to sort the list by the owning process name. Sort the list of any column by clicking on the column header.</p>
-<p class="note"> <b>NOTE</b> Chunks data is not available during TRK debugging.</p>
-<p align="center"><img src="images/view_symbianOS_chunks.png" width="530" height="278" alt="" /></p>
-<p class="figure">Figure 4. Chunks Pane of Symbian OS View</p>
-<h4><a name="Library" id="Library"></a>Libraries Tab</h4>
-<p> The Libraries pane (Figure 5) in the Symbian OS view provides  information on libraries in the Symbian OS residing on the target.</p>
-<p class="note"> <b>NOTE</b> Library data is not available during TRK debugging.</p>
-<p align="center"><img src="images/view_symbianOS_Lib.png" width="531" height="278" alt="" /></p>
-<p class="figure">Figure 5. Libraries Pane of Symbian OS View</p>
-<h3><a name="attach" id="attach"></a>Attaching to a Process</h3>
-<p>If <span class="note">you double click on a thread item in the Thread tab, or right-click and choose <b>Debug</b>, the owning process of the thread will be attached.</span> The thread with an attached process will appear in bold. You can also select a thread and click the bug icon in the Symbian OS Data toolbar. You can also view properties for the attached process by clicking the &quot;Show properties of the selected item&quot; icon () in the Symbian OS Data toolbar or right-click the thread and choose <b>Properties</b>.</p>
-<p class="note"><b>NOTE </b>If an executable is not part of a project in the workspace use the Executables view to import an executable to make it visible to the debugger. Once included in the Executables list, the symbolics for that executable can be loaded and breakpoints resolved and hit. Open a source file in an editor view or use the <a href="view_breakpoints.htm">Breakpoints</a> view to verify that the executable breakpoints have been <a href="../concepts/breakpoints.htm">resolved</a>. </p>
-<p class="note"><b>IMPORTANT</b> In stop mode debugging when debugging multiple processes at the same time, selecting a process in the <a href="view_debug.htm">Debug</a> pane and clicking <b>Terminate</b> disconnects the attached process on the board, leaving  all other processes running. It does not terminate the debug session.  However, if there is only one debug process  when you click <b>Terminate</b> the CPU is  suspended until the next debug session.</p>
-<p class="note"><b>WARNING</b> Detaching from a system process or any process not initiated by the program you are attempting to debug may cause the device to stop working, forcing a restart of the device. </p>
-<p><img src="images/symOSData_attachprocess.png" width="1144" height="332" alt="" /></p>
-<h5>Other  references</h5>
-<ul>
-  <li><a href="view_debug.htm">Debug view</a></li>
-  <li><a href="../tasks/debugger/view_symbian_kernel_set.htm">Setting Symbian OS View Refresh Rate</a><br />
-  </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Symbian OS Data</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Symbian OS Data view</h2>
+<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 TRK 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 TRK 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="wnd_debugger_prefs.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 TRK 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>
+<h3>Symbian OS Data pages
+</h3>
+<p>The Symbian OS Data view consists of five tabs. Each tabbed pane is described below. In all panes, the <b>Name Filter</b> field is a standard Eclipse UI control that allows you to find an item by filtering out items by name using wildcards (*, ?) and camel case naming conventions. Camel case refers to using mixed case multiple names merged together  in coding like <span class="code">SecInvInit</span> and <span class="code">DosServer</span>. In all panes, you can select an item and view its properties (attributes). In panes with columns you can click a column title to toggle between ascending and descending sorting. </p>
+<p>Data to be viewed includes:</p>
+<ul>
+  <li><a href="#overview">Overview</a></li>
+  <li><a href="#processes">Processes</a></li>
+  <li><a href="#threads">Threads</a></li>
+  <li><a href="#chunks">Chunks</a></li>
+  <li><a href="#Library">Libraries</a></li>
+</ul>
+<p class="note"><b>NOTE</b>  Information for the Chunks and Libraries tabs is not available when debugging with the TRK debug agent.</p>
+<p align="center"><img src="images/view_symbianOSkernel.png" width="602" height="300" alt="" /></p>
+<p class="figure">Figure 1. Symbian OS Data view</p>
+<h5>Table 1 - Symbian OS Data view toolbar buttons </h5>
+<table cellpadding="2" cellspacing="0"
+border="0">
+  <tr valign="top">
+    <th width="209" class="Cell">Button</th>
+    <th width="49" class="Cell">Icon</th>
+    <th width="534" class="Cell">Function</th>
+  </tr>
+  <tr valign="top">
+    <td class="Cell"><p> <b>Refresh data</b></p></td>
+    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_refresh.png" width="19" height="19" alt="" /></div></td>
+    <td class="Cell"><p> Click this button to force a refresh of data in the view. Use the <a href="wnd_debugger_prefs.htm">Carbide.c++ Debugger</a> preference panel <b>Time interval for auto-refreshing OS View</b> option to control the automatic refreshing of data. </p></td>
+  </tr>
+  <tr valign="top">
+    <td class="Cell"><p> <b>Enable/disable auto-refresh</b> </p></td>
+    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_autorefresh.png" width="19" height="21" alt="" /></div></td>
+    <td class="Cell"><p> Click this button to turn on/off  auto refresh of data.</p></td>
+  </tr>
+  <tr valign="top">
+    <td class="Cell"><p> <b>Debug process or thread</b> </p></td>
+    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_debug.png" width="22" height="20" alt="" /></div></td>
+    <td class="Cell"><p> Click the <b>Debug</b> button to attach to the process and debug the selected process or thread. Or right-click an item and choose <b>Debug</b>. This applys to both TRK (run mode) and Sophia/Trace32 (stop mode).</p>
+    </td>
+  </tr>
+  <tr valign="top">
+    <td class="Cell"><p> <b>Properties</b> </p></td>
+    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_prop.png" width="21" height="18" alt="" /></div></td>
+    <td class="Cell"><p>Click this button to show properties of currently selected item in the <b>Properties</b> view. Or right-click an item and choose <b>Properties</b>.</p></td>
+  </tr>
+  <tr valign="top">
+    <td class="Cell"><p> <b>Timer</b></p></td>
+    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_timer.png" width="21" height="18" alt="" /></div></td>
+    <td class="Cell"><p> Click this button to define the time interval for auto-refreshing data. This applies to run mode debugging only. </p></td>
+  </tr>
+  <tr valign="top">
+    <td class="Cell"><b>Collapse All </b></td>
+    <td class="Cell"><div align="center"><img src="images/view_symbianOSbtn_collapse.png" width="17" height="17" alt="" /></div></td>
+    <td class="Cell">Click the <b>Collaps All</b> command to collapse all of the currently elements in the view.</td>
+  </tr>
+</table>
+<h4><a name="overview" id="overview"></a>Overview Tab</h4>
+<p>This tab (shown in Figure 1) provides a tree view of ownership  of all processes, threads, and chunks in the OS. 
+In contrast, the other tabs provide a flat list of corresponding kernel objects such as process, thread, chunk, library, etc.</p>
+<h4><a name="processes" id="processes"></a>Processes</h4>
+<p>The Processes tab (Figure 2) provides a flat list of corresponding kernel objects. 
+Click a column title to sort the list by the title attribute in alternating ascending and descending order. For example, you may choose to sort the process list by Name, ID, or by Priority. </p>
+<p align="center"><img src="images/view_symbianOS_PTC.png" width="602" height="291" alt="" /></p>
+<p class="figure">Figure 2. Processes Pane of Symbian OS View</p>
+<p>The process(es) being debugged will be shown in bold font. You can debug (attach debugger to) any process in the Processes tab by selecting it and clicking the &quot;Debug&quot; button or just by double clicking on it. In that case a new process item will show up in the Debug View if the process is not being debugged. Otherwise, you will get a message saying it's already under debug.</p>
+<h4><a name="threads" id="threads"></a>Threads</h4>
+<p>The Threads tab (Figure 3) provides a flat list of corresponding kernel objects. The list will display &ldquo;sortable&rdquo; attributes of that type of object in columns. The &ldquo;sortable attribute&rdquo; means you can sort the list by that attribute. For example, you may want to sort the list by the owning process name. Sort the list of any column by clicking on the column header. The thread(s) being debugged will be shown in bold font.</p>
+<p class="note"><b>NOTE</b> You can debug (attach debugger to) any thread in the Thread tab by double clicking on it or selecting it and clicking the Debug button. In that case, a new thread item will show up in Debug view if the thread is not being debugged.</p>
+<p align="center"><img src="images/view_symbianOS_threads.png" width="602" height="291" alt="" /></p>
+<p class="figure">Figure 3. Threads Pane of Symbian OS View</p>
+<h4><a name="chunks" id="chunks"></a>Chunks</h4>
+<p>Chunks are an area of contiguous linear memory. It is the unit of memory allocation where a region of RAM is mapped into contiguous logical addresses. Chunks are allocated during boot for such things as the Kernel's data and stack.</p>
+<p>The Chunks tab (Figure 4) provides a flat list of corresponding kernel objects. The list will display &ldquo;sortable&rdquo; attributes of that type of object in columns. The &ldquo;sortable attribute&rdquo; means you can sort the list by that attribute. For example, you may want to sort the list by the owning process name. Sort the list of any column by clicking on the column header.</p>
+<p class="note"> <b>NOTE</b> Chunks data is not available during TRK debugging.</p>
+<p align="center"><img src="images/view_symbianOS_chunks.png" width="530" height="278" alt="" /></p>
+<p class="figure">Figure 4. Chunks Pane of Symbian OS View</p>
+<h4><a name="Library" id="Library"></a>Libraries Tab</h4>
+<p> The Libraries pane (Figure 5) in the Symbian OS view provides  information on libraries in the Symbian OS residing on the target.</p>
+<p class="note"> <b>NOTE</b> Library data is not available during TRK debugging.</p>
+<p align="center"><img src="images/view_symbianOS_Lib.png" width="531" height="278" alt="" /></p>
+<p class="figure">Figure 5. Libraries Pane of Symbian OS View</p>
+<h3><a name="attach" id="attach"></a>Attaching to a Process</h3>
+<p>If <span class="note">you double click on a thread item in the Thread tab, or right-click and choose <b>Debug</b>, the owning process of the thread will be attached.</span> The thread with an attached process will appear in bold. You can also select a thread and click the bug icon in the Symbian OS Data toolbar. You can also view properties for the attached process by clicking the &quot;Show properties of the selected item&quot; icon () in the Symbian OS Data toolbar or right-click the thread and choose <b>Properties</b>.</p>
+<p class="note"><b>NOTE </b>If an executable is not part of a project in the workspace use the Executables view to import an executable to make it visible to the debugger. Once included in the Executables list, the symbolics for that executable can be loaded and breakpoints resolved and hit. Open a source file in an editor view or use the <a href="view_breakpoints.htm">Breakpoints</a> view to verify that the executable breakpoints have been <a href="../concepts/breakpoints.htm">resolved</a>. </p>
+<p class="note"><b>IMPORTANT</b> In stop mode debugging when debugging multiple processes at the same time, selecting a process in the <a href="../debugger/debug/viewing_debug.htm">Debug</a> pane and clicking <b>Terminate</b> disconnects the attached process on the board, leaving  all other processes running. It does not terminate the debug session.  However, if there is only one debug process  when you click <b>Terminate</b> the CPU is  suspended until the next debug session.</p>
+<p class="note"><b>WARNING</b> Detaching from a system process or any process not initiated by the program you are attempting to debug may cause the device to stop working, forcing a restart of the device. </p>
+<p><img src="images/symOSData_attachprocess.png" width="1144" height="332" alt="" /></p>
+<h5>Other  references</h5>
+<ul>
+  <li><a href="../debugger/debug/viewing_debug.htm">Debug view</a></li>
+  <li><a href="../tasks/debugger/view_symbian_kernel_set.htm">Setting Symbian OS View Refresh Rate</a><br />
+  </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,80 +1,80 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debug Window</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debug Window</h2>
-<p>The <b>Debug</b> or launch configuration window provides C/C++ debugger options. A <a href="../projects/launch/launch_configs_overview.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="../tasks/projects/wiz_new_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" class="figure"><img src="images/wnd_debug_overview.png" width="864" height="471"><br />
-Figure 1 - Debug or launch configuration window (Symbian OS emulation view)</p>
-<h5>Table 1. Debug window &mdash; common items</h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="7%" scope="col">Icon</th>
-    <th width="41%" scope="col">Item</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="images/icon_new_launch_config.png" width="16" height="17"></div></td>
-    <td><b>New Launch Configuration</b></td>
-    <td><p>Click the New Launch Configuration icon to add a launch configuration to the Configurations list. Default information based upon the project is automatically entered into the various text boxes.</p>
-        <p class="note"><b>NOTE</b> Normally, you should not have to change any of the default text box entries unless you are creating multiple debug launch configurations for the same project.</p></td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="images/icon_dup_launch_config.png" width="19" height="19"></div></td>
-    <td><b>Duplicate</b></td>
-    <td>Click the Duplicate icon to duplicate the currently selected launch configuration. </td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="images/icon_delete_launch_config.png" width="17" height="16"></div></td>
-    <td><b>Delete selected launch configuration(s) </b></td>
-    <td>Click the Delete icon to remove the currently selected configuration from the Configurations list.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><b>Collapse</b></td>
-    <td>Click the Collapse icon to collapse expanded lists of launch configurations.</td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="images/icon_filter_launch_config.png" width="21" height="18"></div></td>
-    <td><b>Filter launch configurations... </b></td>
-    <td><p>Click the Filter icon to select filter options that control which launch configurations appear in the list. Filter options include:</p>
-        <ul>
-          <li>Filter Closed Projects</li>
-          <li>Filter Deleted/Unavailable Projects</li>
-          <li>Filter Configuration Types</li>
-          <li>Apply Window Working Set(s)</li>
-          <li><a href="trk/panel_filter.htm">Filtering Preferences...</a></li>
-      </ul></td>
-  </tr>
-</table>
-<div class="step">
-  <h4>To open the Debug window </h4>
-  <ul>
-    <li>Select the Run &gt; Open Debug Dialog... menu item</li>
-  </ul>
-  <ol>
-    The Debug window (Figure 1) appears.</ol>
-  <ul>
-    <li>Select Run &gt; Open Run Dialog...  to open a Run window to create a launch configuration for a release build.</li>
-  </ul>
-</div>
-<h5>Other references</h5>
-<ul>
-  <li><a href="perspective_debug.htm">Debug Perspective</a></li>
-  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  <li><a href="launch_configs/emulator_overview.htm">Emulator overview</a></li>
-  <li><a href="launch_configs/run_mode_overview.htm">Run-mode overview</a></li>
-  <li><a href="launch_configs/stop_mode_overview.htm">Stop-mode overview</a>  </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debug Window</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debug Window</h2>
+<p>The <b>Debug</b> or launch configuration window provides C/C++ debugger options. A <a href="../projects/launch/launch_configs_overview.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="../projects/launch/wiz_new_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" class="figure"><img src="images/wnd_debug_overview.png" width="864" height="471"><br />
+Figure 1 - Debug or launch configuration window (Symbian OS emulation view)</p>
+<h5>Table 1. Debug window &mdash; common items</h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="7%" scope="col">Icon</th>
+    <th width="41%" scope="col">Item</th>
+    <th width="52%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="images/icon_new_launch_config.png" width="16" height="17"></div></td>
+    <td><b>New Launch Configuration</b></td>
+    <td><p>Click the New Launch Configuration icon to add a launch configuration to the Configurations list. Default information based upon the project is automatically entered into the various text boxes.</p>
+        <p class="note"><b>NOTE</b> Normally, you should not have to change any of the default text box entries unless you are creating multiple debug launch configurations for the same project.</p></td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="images/icon_dup_launch_config.png" width="19" height="19"></div></td>
+    <td><b>Duplicate</b></td>
+    <td>Click the Duplicate icon to duplicate the currently selected launch configuration. </td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="images/icon_delete_launch_config.png" width="17" height="16"></div></td>
+    <td><b>Delete selected launch configuration(s) </b></td>
+    <td>Click the Delete icon to remove the currently selected configuration from the Configurations list.</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><b>Collapse</b></td>
+    <td>Click the Collapse icon to collapse expanded lists of launch configurations.</td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="images/icon_filter_launch_config.png" width="21" height="18"></div></td>
+    <td><b>Filter launch configurations... </b></td>
+    <td><p>Click the Filter icon to select filter options that control which launch configurations appear in the list. Filter options include:</p>
+        <ul>
+          <li>Filter Closed Projects</li>
+          <li>Filter Deleted/Unavailable Projects</li>
+          <li>Filter Configuration Types</li>
+          <li>Apply Window Working Set(s)</li>
+          <li><a href="trk/panel_filter.htm">Filtering Preferences...</a></li>
+      </ul></td>
+  </tr>
+</table>
+<div class="step">
+  <h4>To open the Debug window </h4>
+  <ul>
+    <li>Select the Run &gt; Open Debug Dialog... menu item</li>
+  </ul>
+  <ol>
+    The Debug window (Figure 1) appears.</ol>
+  <ul>
+    <li>Select Run &gt; Open Run Dialog...  to open a Run window to create a launch configuration for a release build.</li>
+  </ul>
+</div>
+<h5>Other references</h5>
+<ul>
+  <li><a href="perspective_debug.htm">Debug Perspective</a></li>
+  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  <li><a href="../projects/launch/emulation.htm">Emulator overview</a></li>
+  <li><a href="../projects/launch/run_mode.htm">Run-mode overview</a></li>
+  <li><a href="../projects/launch/stop_mode.htm">Stop-mode overview</a>  </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddingClasses.html	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddingClasses.html	Mon Aug 10 15:21:12 2009 -0500
@@ -1,84 +1,80 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Adding Classes in Tasks</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>Adding Classes</h2>
-   
-   <p>Use the <b>New Class</b> wizard to add a new C++ class to a project.   </p>
-
-   <div class="step">
-     <h4>To add a new C++ class</h4>
-
-   <ol><li>
-     <p>
-	   Click <b>File &gt; New &gt; Class</b> from the menu bar, 
-		  or select <b>New &gt; Class</b> from the project&prime;s pop-up
-	    menu where you want the new class to reside. </p> 
-     <p>
-	    The New C++ Class wizard then appears. 
-     </p> 
-	  </li> 
-	  <li> 
-	    <p>
-		   Specify the folder when the class should be created by typing the		    <b>Source Folder</b> name or by clicking <b>Browse</b> and
-	    selecting the source folder. </p> 
-		  
-	     <p align="center" class="Image"><img src="../images/newclasswiz.gif" alt="" width="500" height="568"  border="0" /></p>
-	  </li> 
-	  <li> 
-	    <p>
-		   Select the <b>Namespace</b> checkbox, if you want to add
-			 the class to a namespace. Click <b>Browse</b> to select an existing
-	    namespace, or type the name of the new namespace. </p> 
-	  </li> 
-	  <li> 
-	    <p>
-	    In the <b>Class Name</b> field, type the name of the class. </p> 
-	  </li> 
-	  <li> 
-	    <p>
-		   Click <b>Add</b> to choose the <b>Base Classes</b> from which the class has to be derived</p> 
-		  
-	     <p align="center" class="Image"><img src="../images/choosebaseclass.gif" alt="" width="306" height="565"  border="0" /></p>
-       <p>To select a base type you are looking for, do the following: </p>
-      <ol type="a">
-      <li>Type the search string to locate the class, struct and other low-level types you are looking for</li>
-
-         <li>Select a Visible Type to narrow your search. <br />
-		 <p>For example, if you are for looking for only classes then select the Class checkbox, etc. The Matching Types lists all the types matching the visible type and search string. The Qualifier lists the header file which contain the type
-            declaration of all the type listed.</p>
-         </li>
-         <li>Click Add to add the selected type to the Base Classes list. <br />
-		 <p>By default, the types are added with Public access and without Virtual inheritance, although these settings can be changed. </p>
-         </li>
-         <li>Click OK when you have completed adding base classes, or click Cancel to cancel the action.</li>
-      </ol>
-	  </li>
-     <li>Once the Base Classes are added, you can click Remove to remove a selected class from the list. You can also click Up and Down after selecting a class  from the list to change the order in which the base classes are inherited. </p> 
-        <p>Select the Method Stubs you want the wizard to generate by selecting the appropriate checkbox. By default, both Constructor and Destructor are selected. By
-			   default, the constructor is added with public access, and as non-virtual and non-inline, and the destructor is added as public, virtual, and not inline. </p> 
-        <p>
-	       Select the Use Default checkbox to create the C++
-			   class in new header and source files with default names. Otherwise, deselect
-			   the Use Default checkbox, and enter the Header and Source file names. Click Browse to select the Header and Source files, if you want to
-        add the class declaration and definition to existing files. </p> 
-
-     <li>
-	       Click Finish to create a C++ class according to the
-        specification, or click Cancel to cancel the task.</li> 
-</ol>
-   </div>
-   <h5>Related concepts</h5>
-	   <ul>
-         <li><a href="../concepts/SDKSupport.html">SDK Support</a></li>
-       </ul>
-	   <h5>Related tasks</h5>
-	   <ul>
-         <li><a href="../reference/NewClassWizard.html">New C++ Classs Wizard</a></li>
-   </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-   </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Adding Classes in Tasks</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>Adding Classes</h2>
+   
+   <p>Use the <b>New Class</b> wizard to add a new C++ class to a project.   </p>
+
+   <div class="step">
+     <h4>To add a new C++ class</h4>
+
+   <ol><li>
+     <p>
+	   Click <b>File &gt; New &gt; Class</b> from the menu bar, 
+		  or select <b>New &gt; Class</b> from the project&prime;s pop-up
+	    menu where you want the new class to reside. </p> 
+     <p>
+	    The New C++ Class wizard then appears. 
+     </p> 
+	  </li> 
+	  <li> 
+	    <p>
+		   Specify the folder when the class should be created by typing the		    <b>Source Folder</b> name or by clicking <b>Browse</b> and
+	    selecting the source folder. </p> 
+		  
+	     <p align="center" class="Image"><img src="../images/newclasswiz.gif" alt="" width="500" height="568"  border="0" /></p>
+	  </li> 
+	  <li> 
+	    <p>
+		   Select the <b>Namespace</b> checkbox, if you want to add
+			 the class to a namespace. Click <b>Browse</b> to select an existing
+	    namespace, or type the name of the new namespace. </p> 
+	  </li> 
+	  <li> 
+	    <p>
+	    In the <b>Class Name</b> field, type the name of the class. </p> 
+	  </li> 
+	  <li> 
+	    <p>
+		   Click <b>Add</b> to choose the <b>Base Classes</b> from which the class has to be derived</p> 
+		  
+	     <p align="center" class="Image"><img src="../images/choosebaseclass.gif" alt="" width="306" height="565"  border="0" /></p>
+       <p>To select a base type you are looking for, do the following: </p>
+      <ol type="a">
+      <li>Type the search string to locate the class, struct and other low-level types you are looking for</li>
+
+         <li>Select a Visible Type to narrow your search. <br />
+		 <p>For example, if you are for looking for only classes then select the Class checkbox, etc. The Matching Types lists all the types matching the visible type and search string. The Qualifier lists the header file which contain the type
+            declaration of all the type listed.</p>
+         </li>
+         <li>Click Add to add the selected type to the Base Classes list. <br />
+		 <p>By default, the types are added with Public access and without Virtual inheritance, although these settings can be changed. </p>
+         </li>
+         <li>Click OK when you have completed adding base classes, or click Cancel to cancel the action.</li>
+      </ol>
+	  </li>
+     <li>Once the Base Classes are added, you can click Remove to remove a selected class from the list. You can also click Up and Down after selecting a class  from the list to change the order in which the base classes are inherited. <p></p> 
+        <p>Select the Method Stubs you want the wizard to generate by selecting the appropriate checkbox. By default, both Constructor and Destructor are selected. By
+			   default, the constructor is added with public access, and as non-virtual and non-inline, and the destructor is added as public, virtual, and not inline. </p> 
+        <p>
+	       Select the Use Default checkbox to create the C++
+			   class in new header and source files with default names. Otherwise, deselect
+			   the Use Default checkbox, and enter the Header and Source file names. Click Browse to select the Header and Source files, if you want to
+        add the class declaration and definition to existing files. </p> 
+
+     <li>
+	       Click Finish to create a C++ class according to the
+        specification, or click Cancel to cancel the task.</li> 
+</ol>
+   </div>
+   <h5>Related tasks</h5>
+	   <ul>
+         <li><a href="../reference/NewClassWizard.html">New C++ Classs Wizard</a></li>
+   </ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -27,7 +27,7 @@
     <li>Import the MMP or INF file</li>
     <li>Select the Project in the C/C++ Project pane you want to debug</li>
     <li>From the IDE select Run &gt; Debug&hellip;</li>
-    <li>The <a href="../projects/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>  appears</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 class="figure">Figure 4. Debug Window</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,117 +1,117 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Using Soft Attach for On-Device Debugging</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Using Soft Attach  for On-Device Debugging</h2>
-<p>You can debug hardware via Trace32 using the soft attach option. This enables you to debug an image flashed to ROM or on a memory card. Soft attach includes all the capabilities fo Stop-mode debugging but can't debug any code loaded before the OS is booted. </p>
-<p>There are several components that must be provided to the debugger so that it can communicate with the attached hardware device. They are:</p>
-<ul>
-  <li><b>Config_carbide.t32</b> - a required configuration file used to configure Carbide for soft attach debugging</li>
-  <li><b>.cmm file</b> - you must select the correct .cmm script file for the hardware otherwise it will not initialize properly and the debugger will be unable to communicate. The .cmm script files are located in the <span class="code">&lt;Carbide&gt;\plugins\com.nokia.carbide.cpp.support_2.0.x.xxx\Symbian_Support\Trace32\cmm_scripts</span> directory.<br>
-    <br>
-  Also, if there is a specific .cmm file for the device, like H2 or H4, especially if it includes <span class="code">_attach</span> in the name, choose that version over the others to do soft attach on the hardware. </li>
-  <li><b>.log file</b> - you must have a valid .log file for the ROM image in order to debug the image </li>
-</ul>
-<p>If the  <a href="../projects/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> is used, you will be asked to identify the above files. If you used the <b>New</b> or <b><a href="../../reference/wnd_debug_configuration.htm">Debug</a></b> dialog to create a launch configuration, make sure that the above files are supplied. </p>
-<p>The major steps to perform a soft attach  are: </p>
-<ol>
-  <li><a href="#buildProject">Import and build</a> your project and the ROM image </li>
-  <li><a href="#startHardware">Startup the device</a> using the ROM image </li>
-  <li><a href="#debuggerSetup">Setup the debugger</a> and begin debugging </li>
-</ol>
-<div class="step">
-  <h4><a name="buildProject" id="buildProject"> </a>1. Importing and building the project and ROM image </h4>
-  <ol>
-    <li><a href="../ImportingProjects.html">Import</a> the project</li>
-    <li><a href="../projects/prj_build.htm">Build</a> the project</li>
-    <li><a href="../../reference/ROM_build_settings.html">Create</a> a ROM image 
-      <p>Enter the desired command-line arguments for the ROM image in the ROM Build Command Line text box in the <b>Carbide ROM Build Settings</b> panel of the <b>Properties for &lt;project&gt;</b> dialog. </p>
-    </li>
-  </ol>
-</div>
-<div class="step">
-<h4><a name="startHardware" id="startHardware"> </a>2. Starting up the device with the ROM image </h4>
-<ol>
-    <li>Transfer the ROM image to the hardware via memory card or flash </li>
-    <p class="note"><b>NOTE</b> Ensure that the hardware includes a boot loader program so that it can boot the ROM image from the memory card. </p>
-    <li>Power up the device  
-      <p>Once  the operating system has booted up, it is ready for the debugger to attach </p>
-    </li>
-  </ol>
-  <p>&nbsp;</p>
-</div>
-<div class="step">
-<h4><a name="debuggerSetup" id="debuggerSetup"> </a>3. Setting up the debugger to debug </h4>
-<ol>
-  <li>On the hardware, launch the program to debug</li>
-  <li>Click Run &gt; Debug to launch the <a href="../projects/wiz_new_launch_config.htm">New Launch Configuration Wizard</a></li>
-  <li>In the Launch Types page
-    <ol type="a">
-      <li>Select the Trace32 Launch Configuration</li>
-      <li>Click Next </li>
-    </ol>
-  </li>
-  <li>In the Symbian ROM Image Settings page
-    <ol type="a">
-      <li>Enter the path to the Trace32 Initialization Script .cmm file </li>
-      <li>Select the Target Processor  </li>
-      <li>Click Next </li>
-    </ol>
-    In the Symbian ROM Image Settings page
-    <ol type="a">
-      <li>Enable Soft attach</li>
-      <li>Enter the Symbian ROM Log File </li>
-      <li>Click Next </li>
-    </ol>
-  </li>
-  <li>In the New Launch Configuration page
-    <ol type="a">
-      <li>Enable the &quot;Open launch configuration for additional customization of launch settings&quot; option </li>
-      <li>Click Finish </li>
-    </ol>
-  </li>
-  <li>In the Debug &gt; Symbian OS Trace 32 &gt; <i>New_Configuration</i> &gt; Connection tab 
-    <ol type="a">
-      <li>Enable the &quot;View messages between Carbide and Trace32&quot;</li>
-      <li>Click Debug </li>
-    </ol>
-  </li>
-  <p align="left">If the View messages between Carbide and Trace32 option is enabled, the Console view will show the communications between the debugger and the hardware (Figure 1). If you do not see the messages, verify that the  <b>Trace32 Communications Log</b> is the active log view. </p>
-  <p align="center"><img src="images/soft_attach_cmm_console.png" width="927" height="199" class="figure"></p>
-  <p class="figure">Figure 1. Debugger log showing .cmm file being used to initialize hardware </p>
-  <li>Once the debugger connects to the hardware it will halt the hardware at a random memory address (Figure 2). Press Resume in the Debug view to begin debugging.</li>
-  <p align="center"><img src="images/soft_attach_random_address.png" width="593" height="268" class="figure"></p>
-  <p class="figure">Figure 2. Debugger stopping at a random address using soft attach </p>
-  <li>Debug the program in the Carbide debugger </li>
-  <p>Once the debugger is connected to the hardware you can: </p>
-  <ul>
-    <li>Set breakpoints in the editor view </li>
-  </ul>
-  <blockquote>
-    <p>If breakpoints were already set in the project then an Editor view should display them as <a href="../../concepts/breakpoints.htm">resolved</a>. If no breakpoints have been set, now is the time to add them. </p>
-    <p class="note"><b>NOTE</b> The number of breakpoints you can set is controlled by the hardware. </p>
-  </blockquote>
-  <ul><li>Click Suspend to halt  the processor on the hardware </li>
-    <li>Use Disconnect (<i>preferred</i>) to stop debugging the program. This does not halt the processor.  </li>
-    <li>Use Terminate to end  the debug session</li>
-  </ul>
-</ol>
-</div>
-<h4>Related references</h4>
-<ul>
-  <li><a href="../../reference/panel_debug_exceptions.htm">Debug</a> perspective </li>
-  <li><a href="../../reference/view_executables.htm">Executables</a> view</li>
-  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view</li>
-  <li><a href="../../reference/view_registers.htm">Registers</a> view</li>
-  <li><a href="../../reference/view_breakpoints.htm">Breakpoint</a> view    </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Using Soft Attach for On-Device Debugging</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Using Soft Attach  for On-Device Debugging</h2>
+<p>You can debug hardware via Trace32 using the soft attach option. This enables you to debug an image flashed to ROM or on a memory card. Soft attach includes all the capabilities fo Stop-mode debugging but can't debug any code loaded before the OS is booted. </p>
+<p>There are several components that must be provided to the debugger so that it can communicate with the attached hardware device. They are:</p>
+<ul>
+  <li><b>Config_carbide.t32</b> - a required configuration file used to configure Carbide for soft attach debugging</li>
+  <li><b>.cmm file</b> - you must select the correct .cmm script file for the hardware otherwise it will not initialize properly and the debugger will be unable to communicate. The .cmm script files are located in the <span class="code">&lt;Carbide&gt;\plugins\com.nokia.carbide.cpp.support_2.0.x.xxx\Symbian_Support\Trace32\cmm_scripts</span> directory.<br>
+    <br>
+  Also, if there is a specific .cmm file for the device, like H2 or H4, especially if it includes <span class="code">_attach</span> in the name, choose that version over the others to do soft attach on the hardware. </li>
+  <li><b>.log file</b> - you must have a valid .log file for the ROM image in order to debug the image </li>
+</ul>
+<p>If the  <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> is used, you will be asked to identify the above files. If you used the <b>New</b> or <b><a href="../../reference/wnd_debug_configuration.htm">Debug</a></b> dialog to create a launch configuration, make sure that the above files are supplied. </p>
+<p>The major steps to perform a soft attach  are: </p>
+<ol>
+  <li><a href="#buildProject">Import and build</a> your project and the ROM image </li>
+  <li><a href="#startHardware">Startup the device</a> using the ROM image </li>
+  <li><a href="#debuggerSetup">Setup the debugger</a> and begin debugging </li>
+</ol>
+<div class="step">
+  <h4><a name="buildProject" id="buildProject"> </a>1. Importing and building the project and ROM image </h4>
+  <ol>
+    <li><a href="../ImportingProjects.html">Import</a> the project</li>
+    <li><a href="../projects/prj_build.htm">Build</a> the project</li>
+    <li><a href="../../reference/ROM_build_settings.html">Create</a> a ROM image 
+      <p>Enter the desired command-line arguments for the ROM image in the ROM Build Command Line text box in the <b>Carbide ROM Build Settings</b> panel of the <b>Properties for &lt;project&gt;</b> dialog. </p>
+    </li>
+  </ol>
+</div>
+<div class="step">
+<h4><a name="startHardware" id="startHardware"> </a>2. Starting up the device with the ROM image </h4>
+<ol>
+    <li>Transfer the ROM image to the hardware via memory card or flash </li>
+    <p class="note"><b>NOTE</b> Ensure that the hardware includes a boot loader program so that it can boot the ROM image from the memory card. </p>
+    <li>Power up the device  
+      <p>Once  the operating system has booted up, it is ready for the debugger to attach </p>
+    </li>
+  </ol>
+  <p>&nbsp;</p>
+</div>
+<div class="step">
+<h4><a name="debuggerSetup" id="debuggerSetup"> </a>3. Setting up the debugger to debug </h4>
+<ol>
+  <li>On the hardware, launch the program to debug</li>
+  <li>Click Run &gt; Debug to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a></li>
+  <li>In the Launch Types page
+    <ol type="a">
+      <li>Select the Trace32 Launch Configuration</li>
+      <li>Click Next </li>
+    </ol>
+  </li>
+  <li>In the Symbian ROM Image Settings page
+    <ol type="a">
+      <li>Enter the path to the Trace32 Initialization Script .cmm file </li>
+      <li>Select the Target Processor  </li>
+      <li>Click Next </li>
+    </ol>
+    In the Symbian ROM Image Settings page
+    <ol type="a">
+      <li>Enable Soft attach</li>
+      <li>Enter the Symbian ROM Log File </li>
+      <li>Click Next </li>
+    </ol>
+  </li>
+  <li>In the New Launch Configuration page
+    <ol type="a">
+      <li>Enable the &quot;Open launch configuration for additional customization of launch settings&quot; option </li>
+      <li>Click Finish </li>
+    </ol>
+  </li>
+  <li>In the Debug &gt; Symbian OS Trace 32 &gt; <i>New_Configuration</i> &gt; Connection tab 
+    <ol type="a">
+      <li>Enable the &quot;View messages between Carbide and Trace32&quot;</li>
+      <li>Click Debug </li>
+    </ol>
+  </li>
+  <p align="left">If the View messages between Carbide and Trace32 option is enabled, the Console view will show the communications between the debugger and the hardware (Figure 1). If you do not see the messages, verify that the  <b>Trace32 Communications Log</b> is the active log view. </p>
+  <p align="center"><img src="images/soft_attach_cmm_console.png" width="927" height="199" class="figure"></p>
+  <p class="figure">Figure 1. Debugger log showing .cmm file being used to initialize hardware </p>
+  <li>Once the debugger connects to the hardware it will halt the hardware at a random memory address (Figure 2). Press Resume in the Debug view to begin debugging.</li>
+  <p align="center"><img src="images/soft_attach_random_address.png" width="593" height="268" class="figure"></p>
+  <p class="figure">Figure 2. Debugger stopping at a random address using soft attach </p>
+  <li>Debug the program in the Carbide debugger </li>
+  <p>Once the debugger is connected to the hardware you can: </p>
+  <ul>
+    <li>Set breakpoints in the editor view </li>
+  </ul>
+  <blockquote>
+    <p>If breakpoints were already set in the project then an Editor view should display them as <a href="../../concepts/breakpoints.htm">resolved</a>. If no breakpoints have been set, now is the time to add them. </p>
+    <p class="note"><b>NOTE</b> The number of breakpoints you can set is controlled by the hardware. </p>
+  </blockquote>
+  <ul><li>Click Suspend to halt  the processor on the hardware </li>
+    <li>Use Disconnect (<i>preferred</i>) to stop debugging the program. This does not halt the processor.  </li>
+    <li>Use Terminate to end  the debug session</li>
+  </ul>
+</ol>
+</div>
+<h4>Related references</h4>
+<ul>
+  <li><a href="../../reference/panel_debug_exceptions.htm">Debug</a> perspective </li>
+  <li><a href="../../reference/view_executables.htm">Executables</a> view</li>
+  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view</li>
+  <li><a href="../../reference/view_registers.htm">Registers</a> view</li>
+  <li><a href="../../reference/view_breakpoints.htm">Breakpoint</a> view    </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,37 +1,37 @@
-<!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 On-Device Debugging</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 or Sophia hardware.</p>
-<p>The basic steps include:</p>
-<ul>
-  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/SDKPreferences.html">SDK preferences</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/wiz_new_launch_config.htm">launch configuration</a> for <a href="../../reference/wnd_Trace32_config.htm">Trace32</a> or <a href="../../reference/wnd_sophia_config.htm">Sophia</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>
-<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/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> for the project</li>
-</ul>
-<h5>Related Tasks</h5>
-<ul>
-  <li><a href="stop_mode_debug_precond.htm">Stop Mode On-Device Debugging Preconditions</a></li>
-  <li><a href="../../reference/wnd_Trace32_config.htm">Symbian OS Trace32 Support</a></li>
-<li><a href="../../reference/wnd_sophia_config.htm">Symbian OS Sophia Target Interface Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<title>Stop Mode On-Device Debugging</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 or Sophia hardware.</p>
+<p>The basic steps include:</p>
+<ul>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/SDKPreferences.html">SDK preferences</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> for <a href="../../projects/launch/trace32.htm">Trace32</a> or <a href="../../projects/launch/sophia.htm">Sophia</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>
+<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>
+</ul>
+<h5>Related Tasks</h5>
+<ul>
+  <li><a href="stop_mode_debug_precond.htm">Stop Mode On-Device Debugging Preconditions</a></li>
+  <li><a href="../../projects/launch/trace32.htm">Symbian OS Trace32 Support</a></li>
+<li><a href="../../projects/launch/sophia.htm">Symbian OS Sophia Target Interface Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,32 +1,32 @@
-<!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 On-Device Debugging</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF" dir="ltr">
-<h2>Stop Mode On-Device Debugging Preconditions</h2>
-<p>Before conducting a Stop Mode On-Device debug session the following preconditions should be met.</p>
-<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 for <a href="http://www.lauterbach.com">Trace32</a> or <a href="http://www.sophia.com">Sophia</a> I/F tool support</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/SDKPreferences.html">SDK preferences</a> panel.</li>
-<li>Build your <a href="../../reference/ROM_build_settings.html">ROM Image</a></li>
-</ul>
-</div>
-<h5>Related Tasks</h5>
-<ul>
-  <li><a href="../../reference/wnd_Trace32_config.htm">Symbian OS Trace32 Support</a></li>
-<li><a href="../../reference/wnd_sophia_config.htm">Symbian OS Sophia Target Interface Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<title>Stop Mode On-Device Debugging</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF" dir="ltr">
+<h2>Stop Mode On-Device Debugging Preconditions</h2>
+<p>Before conducting a Stop Mode On-Device debug session the following preconditions should be met.</p>
+<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 for <a href="http://www.lauterbach.com">Trace32</a> or <a href="http://www.sophia.com">Sophia</a> I/F tool support</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/SDKPreferences.html">SDK preferences</a> panel.</li>
+<li>Build your <a href="../../reference/ROM_build_settings.html">ROM Image</a></li>
+</ul>
+</div>
+<h5>Related Tasks</h5>
+<ul>
+  <li><a href="../../projects/launch/trace32.htm">Symbian OS Trace32 Support</a></li>
+<li><a href="../../projects/launch/sophia.htm">Symbian OS Sophia Target Interface Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/view_symbian_kernel_set.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/view_symbian_kernel_set.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,37 +1,37 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Stopping Program Execution</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting Symbian OS Data View Refresh Rate</h2>
-<p>A global preference option in the  Preferences window of Carbide.c++ allows a user to change the time interval for auto-refreshing kernel data in the Symbian OS View.</p>
-<div class="step">
-  <h4>To set the refresh rate</h4>
-  <ol>
-    <li>Select Window &gt; Preferences to display Preferences window</li>
-    <li>Expand C/C++ and Debug from list</li>
-    <li>Select Carbide.c++ to display the Carbide.c++ Global settings panel (figure 1)</li>
-    <li>Enter a time interval from 3 to 600 seconds for kernel data to be refreshed. 20 seconds is the default.</li>
-  </ol>
-  <p align="center"><img src="images/setinterval_symOS_view.png" width="627" height="544" /> </p>
-  <p align="center" class="figure">Figure 1. Symbian OS Kernel Data Refresh Rate </p>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS Kernel View</a></li>
-  <li><a href="../../concepts/working_with_debugger.htm">Working with the Debugger </a></li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/view_debug.htm">Debug View</a></li>
-  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View Window</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Stopping Program Execution</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setting Symbian OS Data View Refresh Rate</h2>
+<p>A global preference option in the  Preferences window of Carbide.c++ allows a user to change the time interval for auto-refreshing kernel data in the Symbian OS View.</p>
+<div class="step">
+  <h4>To set the refresh rate</h4>
+  <ol>
+    <li>Select Window &gt; Preferences to display Preferences window</li>
+    <li>Expand C/C++ and Debug from list</li>
+    <li>Select Carbide.c++ to display the Carbide.c++ Global settings panel (figure 1)</li>
+    <li>Enter a time interval from 3 to 600 seconds for kernel data to be refreshed. 20 seconds is the default.</li>
+  </ol>
+  <p align="center"><img src="images/setinterval_symOS_view.png" width="627" height="544" /> </p>
+  <p align="center" class="figure">Figure 1. Symbian OS Kernel Data Refresh Rate </p>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS Kernel View</a></li>
+  <li><a href="../../concepts/working_with_debugger.htm">Working with the Debugger </a></li>
+</ul>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../../debugger/debug/viewing_debug.htm">Debug View</a></li>
+  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View Window</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,36 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugging a Program</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugging a Program</h2>
-<p>Use the <b>Debug</b> command (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
-<p>If this is the first time the program is launched for debugging, a new debug launch configuration is automatically created for you based on current project settings and assigned a name. If a debug launch configuration is already available, the Debug command launches using the last debug launch configuration used with the project. </p>
-<div class="step">
-  <h4>Launching a Program for Debugging </h4>
-  <ul>
-    <li>Click the Debug button (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) in the C/C++ perspective</li>
-    <p>or</p>
-	<li>Select Run &gt; Debug from the  menu bar </li>
-    <p>Both of these methods create a new debug launch configuration if none previously existed in the project or uses the last one launched for debugging. </p>
-    <li>To launch using a specific debug launch configuration, right-click the project's EXE file in the C/C++ Projects view and select Debug As &gt; <em>Project_Name</em> from the C/C++ Projects context menu</li>
-  </ul>
-  <ul>
-    <p>The debugger assumes control of the program execution as the program runs.</p>
-  </ul>
-</div>
-  <p>For more information on debugging, see <b>C/C++ Development User Guide &gt; Tasks &gt; Running and debugging projects &gt; Debugging</b>.</p>
-  <h5>Related references</h5>
-  <ul>
-    <li><a href="../../concepts/working_with_debugger.htm">Working with the Debugger </a></li>
-    <li><a href="../../reference/view_debug.htm">Debug View</a></li>
-  </ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugging a Program</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debugging a Program</h2>
+<p>Use the <b>Debug</b> command (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
+<p>If this is the first time the program is launched for debugging, a new debug launch configuration is automatically created for you based on current project settings and assigned a name. If a debug launch configuration is already available, the Debug command launches using the last debug launch configuration used with the project. </p>
+<div class="step">
+  <h4>Launching a Program for Debugging </h4>
+  <ul>
+    <li>Click the Debug button (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) in the C/C++ perspective</li>
+    <p>or</p>
+	<li>Select Run &gt; Debug from the  menu bar </li>
+    <p>Both of these methods create a new debug launch configuration if none previously existed in the project or uses the last one launched for debugging. </p>
+    <li>To launch using a specific debug launch configuration, right-click the project's EXE file in the C/C++ Projects view and select Debug As &gt; <em>Project_Name</em> from the C/C++ Projects context menu</li>
+  </ul>
+  <ul>
+    <p>The debugger assumes control of the program execution as the program runs.</p>
+  </ul>
+</div>
+  <p>For more information on debugging, see <b>C/C++ Development User Guide &gt; Tasks &gt; Running and debugging projects &gt; Debugging</b>.</p>
+  <h5>Related references</h5>
+  <ul>
+    <li><a href="../../concepts/working_with_debugger.htm">Working with the Debugger </a></li>
+    <li><a href="../../debugger/debug/viewing_debug.htm">Debug View</a></li>
+  </ul>
+  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,46 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Attaching to a Symbian OS Process</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Attaching  to a Symbian OS Process</h2>
-<div>
-  <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. 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><span class="note">You can also attach to a process in the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view when debugging.</span></p>
-  <p class="note"><b>NOTE</b> You cannot attach to a process running on the emulator. It must be a target device running the Symbian OS and the TRK debug agent.</p>
-  <p>When attempting to find a process the debugger  uses the UID3  to locate the process. </p>
-  <div class="step">
-    <h4>Attaching to a Symbian OS Process</h4>
-    <ol>
-      <li><a href="../projects/prj_import_exe.htm">Import an executable</a> to import it into the <a href="../../reference/view_executables.htm">Executables</a> view </li>
-      <li>Select any project  in the workspace or the binary to attach to in the Executables view</li>
-      <p>In this example, we select the Executables project created when the binary was imported from the Project Explorer view (Figure 1). </p>
-      <p align="center"><img src="images/sos_processes_executables.png" width="258" height="189"></p>
-      <p class="figure">Figure 1 - Executables project created when importing an executable </p>
-      <li>Click Debug (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) to launch the <a href="../projects/wiz_new_launch_config.htm">New Configuration Launch Wizard</a> </li>
-      <li>Select the Attach to Process Launch Configuration option and fill in the requested information</li>
-      <li>Click Debug</li>
-      <p>The <b>Attach to Process </b>window appears. Click a column title to sort the processes in ascending or descending order to help you locate a specific process or use the filter text box to show specific processes. </p>
-      <p align="center"><img src="images/sos_processes_choose_thread.png" width="300" height="375" /></p>
-      <p class="figure">Figure 2 -<b> Attach to Process</b> window </p>
-      <li>Select a process, click OK</li>
-      <p>The <b>Attach to Process </b>window closes. Open a <a href="../../reference/view_symbian_kernel.htm">Symbian OS</a> view to show the process and thread information.</p>
-      <p class="note"><b>NOTE</b> Terminating an Attach to Process session actually kills the process on the device. This means you must restart the process on the device in order to attach to it again. </p>
-    </ol>
-  </div>
-</div>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../../reference/view_debug.htm">Debug View</a></li>
-  <li><a href="../../reference/wnd_debug_configuration.htm">Debug Window </a></li>
-  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Attaching to a Symbian OS Process</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Attaching  to a Symbian OS Process</h2>
+<div>
+  <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. 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><span class="note">You can also attach to a process in the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view when debugging.</span></p>
+  <p class="note"><b>NOTE</b> You cannot attach to a process running on the emulator. It must be a target device running the Symbian OS and the TRK debug agent.</p>
+  <p>When attempting to find a process the debugger  uses the UID3  to locate the process. </p>
+  <div class="step">
+    <h4>Attaching to a Symbian OS Process</h4>
+    <ol>
+      <li><a href="../projects/prj_import_exe.htm">Import an executable</a> to import it into the <a href="../../reference/view_executables.htm">Executables</a> view </li>
+      <li>Select any project  in the workspace or the binary to attach to in the Executables view</li>
+      <p>In this example, we select the Executables project created when the binary was imported from the Project Explorer view (Figure 1). </p>
+      <p align="center"><img src="images/sos_processes_executables.png" width="258" height="189"></p>
+      <p class="figure">Figure 1 - Executables project created when importing an executable </p>
+      <li>Click Debug (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Configuration Launch Wizard</a> </li>
+      <li>Select the Attach to Process Launch Configuration option and fill in the requested information</li>
+      <li>Click Debug</li>
+      <p>The <b>Attach to Process </b>window appears. Click a column title to sort the processes in ascending or descending order to help you locate a specific process or use the filter text box to show specific processes. </p>
+      <p align="center"><img src="images/sos_processes_choose_thread.png" width="300" height="375" /></p>
+      <p class="figure">Figure 2 -<b> Attach to Process</b> window </p>
+      <li>Select a process, click OK</li>
+      <p>The <b>Attach to Process </b>window closes. Open a <a href="../../reference/view_symbian_kernel.htm">Symbian OS</a> view to show the process and thread information.</p>
+      <p class="note"><b>NOTE</b> Terminating an Attach to Process session actually kills the process on the device. This means you must restart the process on the device in order to attach to it again. </p>
+    </ol>
+  </div>
+</div>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../../debugger/debug/viewing_debug.htm">Debug View</a></li>
+  <li><a href="../../reference/wnd_debug_configuration.htm">Debug Window </a></li>
+  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,63 +1,63 @@
-<!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" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Working with PKG and SIS Files</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2><b>Creating a .SIS File</b></h2>
-<p>Carbide.c++ attempts to build SIS files for all phone targets when a PKG file exists in a given build project. More than one SIS/PKG file can be included and built by a project, but only one can be downloaded to the device for debugging purposes. </p>
-<p>There are three main tools involved in generating SIS files from PKG files.</p>
-<ul>
-  <li>Makekeys - We invoke this tool when you don't specify a key/cert pair for OS
-  9.x SIS file creation.</li>
-  <li>Makesis &mdash; This tool takes a single PKG file as input and generates an unsigned SIS file. This is generally sufficient to run an application on a pre platform security device (EKA1). This tool is also used to generate SIS files for Platform Security, but in that case <span class="code">signsis</span> must be used.</li>
-  <li>Signsis &mdash; This tool is used to sign a SIS file generated by <span class="code">makesis</span>. This tool is not available on all SDKs. This tool requires an existing certificate/key pair and does not randomly generate the pair for self-signing.</li>
-</ul>
-<p>When a phone target build detects a PKG file at the end of a build, a post-link stage will be executed to create a SIS file, that is: </p>
-<ul>
-  <li>For non-Platform Security SDKs (pre-OS 9.x), <span class="code">makesis</span> is called</li>
-</ul>
-<p>Depending upon which tool is used, you will  need to complete some entries in the<a href="../../reference/build_properties/pane_build_config_sis.htm"> SIS Builder</a> pane of the Carbide Build Configurations window of the project Properties dialog box. You can access this pane by selecting a project in the C/C++ Projects view and select <b>Project &gt; Properties</b> &gt;  <b>Carbide Build Configurations</b>. Fill in the necessary information to add PKG files to the project for downloading. </p>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="19%" scope="col">Tool</th>
-    <th width="81%" scope="col">Explanation</th>
-  </tr>
-  <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="../../reference/launch_configs/app_trk_installation.htm">Installation</a> tab in Application TRK 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="550" height="221" /></p>
-    <p class="figure">Figure 1 - SIS Builder tab </p></td>
-  </tr>
-  <tr>
-    <td><b>SIS Properties </b></td>
-    <td><div align="center">
-      <p align="left">Complete the PKG File, and Signing Options settings in the <a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a> dialog. By default, SIS files are output in the directory of the original SIS file.</p>
-      <p><img src="../../reference/images/wnd_sis_properties.png" width="455" height="452"></p>
-      <p class="figure">Figure 2 - SIS Properties dialog </p>
-      </div></td>
-  </tr>
-</table>
-<p>For phones that utilize OS 9.x, all SIS files must be signed before being installed on a device. You can specify your certificate and key pair file in the SIS Builder pane. By default, if no certificate/key pair is defined, temporary ones will be created in the build directory. This is a process called self-signing. However, not all devices allow self-signed applications to be installed. For information on obtaining certificate and key pairs for your development please visit <a href="https://www.symbiansigned.com">https://www.symbiansigned.com</a>.</p>
-<p><b>Self-signing Tips</b></p>
-<p>The MMP file must have certain keywords specified correctly including: </p>
-<ul>
-  <li>The keyword <span class="code">uid3</span> must be specified in the correct range. See <a href="https://www.symbiansigned.com/app/page/uidfaq">https://www.symbiansigned.com/app/page/uidfaq</a> for more info.</li>
-  <li>VendorID requires a value, even if its zero (<span class="code">VENDORID 0</span>) </li>
-  <li>Capability requires a value, in this case none (<span class="code">CAPABILITY none</span>) </li>
-</ul>
-<p>Failure to include the above keywords can cause a self-signed APP/DLL process to fail to launch.</p>
-<p>After you have a valid .sis file, it will need to be uploaded to the target device. The sis file is uploaded and installed automatically once you run a Debug launch configuration.</p>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../start/carbide_deploying.htm">Manually Deploying Programs to Devices</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Working with PKG and SIS Files</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2><b>Creating a .SIS File</b></h2>
+<p>Carbide.c++ attempts to build SIS files for all phone targets when a PKG file exists in a given build project. More than one SIS/PKG file can be included and built by a project, but only one can be downloaded to the device for debugging purposes. </p>
+<p>There are three main tools involved in generating SIS files from PKG files.</p>
+<ul>
+  <li>Makekeys - We invoke this tool when you don't specify a key/cert pair for OS
+  9.x SIS file creation.</li>
+  <li>Makesis &mdash; This tool takes a single PKG file as input and generates an unsigned SIS file. This is generally sufficient to run an application on a pre platform security device (EKA1). This tool is also used to generate SIS files for Platform Security, but in that case <span class="code">signsis</span> must be used.</li>
+  <li>Signsis &mdash; This tool is used to sign a SIS file generated by <span class="code">makesis</span>. This tool is not available on all SDKs. This tool requires an existing certificate/key pair and does not randomly generate the pair for self-signing.</li>
+</ul>
+<p>When a phone target build detects a PKG file at the end of a build, a post-link stage will be executed to create a SIS file, that is: </p>
+<ul>
+  <li>For non-Platform Security SDKs (pre-OS 9.x), <span class="code">makesis</span> is called</li>
+</ul>
+<p>Depending upon which tool is used, you will  need to complete some entries in the<a href="../../reference/build_properties/pane_build_config_sis.htm"> SIS Builder</a> pane of the Carbide Build Configurations window of the project Properties dialog box. You can access this pane by selecting a project in the C/C++ Projects view and select <b>Project &gt; Properties</b> &gt;  <b>Carbide Build Configurations</b>. Fill in the necessary information to add PKG files to the project for downloading. </p>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="19%" scope="col">Tool</th>
+    <th width="81%" scope="col">Explanation</th>
+  </tr>
+  <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 TRK 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="550" height="221" /></p>
+    <p class="figure">Figure 1 - SIS Builder tab </p></td>
+  </tr>
+  <tr>
+    <td><b>SIS Properties </b></td>
+    <td><div align="center">
+      <p align="left">Complete the PKG File, and Signing Options settings in the <a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a> dialog. By default, SIS files are output in the directory of the original SIS file.</p>
+      <p><img src="../../reference/images/wnd_sis_properties.png" width="455" height="452"></p>
+      <p class="figure">Figure 2 - SIS Properties dialog </p>
+      </div></td>
+  </tr>
+</table>
+<p>For phones that utilize OS 9.x, all SIS files must be signed before being installed on a device. You can specify your certificate and key pair file in the SIS Builder pane. By default, if no certificate/key pair is defined, temporary ones will be created in the build directory. This is a process called self-signing. However, not all devices allow self-signed applications to be installed. For information on obtaining certificate and key pairs for your development please visit <a href="https://www.symbiansigned.com">https://www.symbiansigned.com</a>.</p>
+<p><b>Self-signing Tips</b></p>
+<p>The MMP file must have certain keywords specified correctly including: </p>
+<ul>
+  <li>The keyword <span class="code">uid3</span> must be specified in the correct range. See <a href="https://www.symbiansigned.com/app/page/uidfaq">https://www.symbiansigned.com/app/page/uidfaq</a> for more info.</li>
+  <li>VendorID requires a value, even if its zero (<span class="code">VENDORID 0</span>) </li>
+  <li>Capability requires a value, in this case none (<span class="code">CAPABILITY none</span>) </li>
+</ul>
+<p>Failure to include the above keywords can cause a self-signed APP/DLL process to fail to launch.</p>
+<p>After you have a valid .sis file, it will need to be uploaded to the target device. The sis file is uploaded and installed automatically once you run a Debug launch configuration.</p>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../start/carbide_deploying.htm">Manually Deploying Programs to Devices</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,101 +1,100 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1" />
-  <meta http-equiv="Content-Style-Type" content="text/css" />
-  <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-  <title>Creating a Launch Configuration</title>
-  <link rel="StyleSheet" href="../../../book.css" type="text/css" />
-</head>
-<body bgcolor="#ffffff">
-<h2>Creating a Launch Configuration</h2>
-<p>To run or debug a project you need a <a href="../../projects/launch/launch_configs_overview.htm">launch configuration</a>. A project must have at least one launch configuration, and can have as many as necessary. When run on an emulator project the wizard simply creates an emulator launch configuration and launches the emulator. When running a device project for the first time the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> seeks additional information required to create the launch configuration, then downloads the executable to the device and launches it. Once the emulator or device are loaded with the executable, the debug session  can commence. </p>
-<p>There are two methods for setting up a launch configuration, including:</p>
-<ul>
-  <li><b>Default launch configuration</b>&#8212;  automatically sets up a default launch configuration to run or debug the project on the first Run or Debug execution. This provides a quick and easy method to start running or debugging a new project without the hassle of setting a lot of options. The default launch configuration can always be edited later as the project launch requirements change.</li>
-  <li><b>Custom launch configuration</b>&#8212; enables you to setup a custom launch configuration to debug the project</li>
-</ul>
-<div class="step">
-<h4>Creating a Default Launch Configuration</h4>
-<p class="note"><b>NOTE</b> Carbide.c++ only creates a new default launch configuration when it cannot find one in the project. If the project already contains a launch configuration, Carbide.c++ launches that instead. </p>
-<ul>
-  <li>Click the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="middle" />) or <b>Debug</b> (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="middle" alt="Debug icon"/>) icon in the tool bar
-    <p>or</p>
-  </li>
-  <li>Choose Select <b>Run &gt; Run</b> menu option to launch the project or <b>Run &gt; Debug</b> menu option to debug the project</li>
-  <p>Carbide.c++ creates a default launch configuration for the project and begins running or debugging the project. If the project already has a defined launch configuration, clicking Run or Debug uses it instead of creating a new one. There are two possible scenarios when creating a default launch configuration: </p>
-  <ul>
-    <li><b>for emulator targets </b> - an emulator launch configuration is created based on the project settings </li>
-    <li><b>for target devices</b> - the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> appears asking for additional information</li>
-  </ul>
-</ul>
-</div>
-  <p class="note"><b>NOTE</b> To see if a project already has a launch configuration, open a Run or Debug window using the <b>Run &gt; Open Run Dialog...</b> or <b>Run &gt; Open Debug Dialog...</b> menu items. 
-    </blockquote>
-  </p>
-  <p>In the event that the default launch configuration settings need to be changed, it is possible to edit them in the <a href="../../reference/wnd_debug_configuration.htm">Debug</a> window, or create a new launch configuration for the project that deviates from the default settings.</p>
-<div class="step">
-<h4>Creating a Custom Launch Configuration </h4>
-<ol>
-  <li>Open the Run or Debug launch configuration window
-    <ul>
-      <li>Select the Run> <b>Open Run Dialog</b>... or <b>Run &gt; Open Debug Dialog... </b> menu item
-        <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_configuration_blank.png" width="709" height="455" 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
-    configuration of that type.
-    <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>
-  </li>
-  <p align="center"><img src="images/run_config_new.png" width="787" height="489" 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
-  <p>Modify or fill in the following fields in the Main tab so the IDE
-    can setup the configuration properly each time. Typically when creating
-    a new executable from a project that has successfully linked, the
-    fields will be auto-populated and do not need to be modified. The important fields here are:</p>
-  <ul>
-      <li>Name - <span style="font-weight: normal;">This is a unique name to identify this debug launch configuration. It can be any name.</span> </li>
-      <li>Project - <span style="font-weight: normal;">The project  to associate with this debug launch configuration. Click Browse to select a different project.</span></li>
-      <li>Process to launch  - <span style="font-weight: normal;">This is the name of the executable that is linked to the project.</span></li>
-      </ul>
-  </li>
-  
-  <li>Modify settings in the other Carbide tabs to customize the launch configuration
-    for the project
-    <ul>
-      <li>Environment (<i>Eclipse</i>) </li>
-      <li><a href="../../reference/launch_configs/emulator_debugger.htm">Debugger</a></li>
-      <li><a href="../../reference/launch_configs/page_executables.htm">Executables</a></li>
-      <li><a href="../../reference/wnd_carbide_pref_x86.htm">x86 Exceptions</a> </li>
-      <li>Arguments (<i>Eclipse</i>) </li>
-      <li>Source (<i>Eclipse</i>) </li>
-      <li>Common (<i>Eclipse</i>) </li>
-    </ul>
-    <p>To debug something outside of the workspace, be sure to import the binary into the <a href="../../reference/view_executables.htm">Executables</a> view. </p>
-  </li>
-  <li>Click Debug
-    <p>The IDE launches the executable. If the launch configuration is set to change perspective, it  switches to the specified perspective. </p>
-  </li>
-</ol>
-</div>
-<h5>Other references</h5>
-  <ul>
-    <li><a href="../../projects/launch/launch_configs_overview.htm">Launch Configurations</a> </li>
-    <li><a href="../../concepts/Projects.html">Projects</a></li>
-    <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
-    <li><a href="prj_build.htm">Building Projects</a></li>
-    <li><a href="prj_debug_dlls.htm">Debugging DLLs</a></li>
-    <li><a href="../../reference/view_executables.htm">Executables</a> view  </li>
-</ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+  <meta http-equiv="Content-Type"
+ content="text/html; charset=ISO-8859-1" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+  <title>Creating a Launch Configuration</title>
+  <link rel="StyleSheet" href="../../../book.css" type="text/css" />
+</head>
+<body bgcolor="#ffffff">
+<h2>Creating a Launch Configuration</h2>
+<p>To run or debug a project you need a <a href="../../projects/launch/launch_configs_overview.htm">launch configuration</a>. A project must have at least one launch configuration, and can have as many as necessary. When run on an emulator project the wizard simply creates an emulator launch configuration and launches the emulator. When running a device project for the first time the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> seeks additional information required to create the launch configuration, then downloads the executable to the device and launches it. Once the emulator or device are loaded with the executable, the debug session  can commence. </p>
+<p>There are two methods for setting up a launch configuration, including:</p>
+<ul>
+  <li><b>Default launch configuration</b>&#8212;  automatically sets up a default launch configuration to run or debug the project on the first Run or Debug execution. This provides a quick and easy method to start running or debugging a new project without the hassle of setting a lot of options. The default launch configuration can always be edited later as the project launch requirements change.</li>
+  <li><b>Custom launch configuration</b>&#8212; enables you to setup a custom launch configuration to debug the project</li>
+</ul>
+<div class="step">
+<h4>Creating a Default Launch Configuration</h4>
+<p class="note"><b>NOTE</b> Carbide.c++ only creates a new default launch configuration when it cannot find one in the project. If the project already contains a launch configuration, Carbide.c++ launches that instead. </p>
+<ul>
+  <li>Click the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="middle" />) or <b>Debug</b> (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="middle" alt="Debug icon"/>) icon in the tool bar
+    <p>or</p>
+  </li>
+  <li>Choose Select <b>Run &gt; Run</b> menu option to launch the project or <b>Run &gt; Debug</b> menu option to debug the project</li>
+  <p>Carbide.c++ creates a default launch configuration for the project and begins running or debugging the project. If the project already has a defined launch configuration, clicking Run or Debug uses it instead of creating a new one. There are two possible scenarios when creating a default launch configuration: </p>
+  <ul>
+    <li><b>for emulator targets </b> - an emulator launch configuration is created based on the project settings </li>
+    <li><b>for target devices</b> - the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> appears asking for additional information</li>
+  </ul>
+</ul>
+</div>
+  <p class="note"><b>NOTE</b> To see if a project already has a launch configuration, open a Run or Debug window using the <b>Run &gt; Open Run Dialog...</b> or <b>Run &gt; Open Debug Dialog...</b> menu items. 
+    
+  </p>
+  <p>In the event that the default launch configuration settings need to be changed, it is possible to edit them in the <a href="../../reference/wnd_debug_configuration.htm">Debug</a> window, or create a new launch configuration for the project that deviates from the default settings.</p>
+<div class="step">
+<h4>Creating a Custom Launch Configuration </h4>
+<ol>
+  <li>Open the Run or Debug launch configuration window
+    <ul>
+      <li>Select the Run> <b>Open Run Dialog</b>... or <b>Run &gt; Open Debug Dialog... </b> menu item
+        <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_configuration_blank.png" width="709" height="455" 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
+    configuration of that type.
+    <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>
+  </li>
+  <p align="center"><img src="images/run_config_new.png" width="787" height="489" alt="New launch configuration" /> </p>
+    <p class="figure">Figure 2 - New launch configuration with name and settings filled in (emulator)</p>
+  
+  <li>View the information to define the project and executable
+  <p>Modify or fill in the following fields in the Main tab so the IDE
+    can setup the configuration properly each time. Typically when creating
+    a new executable from a project that has successfully linked, the
+    fields will be auto-populated and do not need to be modified. The important fields here are:</p>
+  <ul>
+      <li>Name - <span style="font-weight: normal;">This is a unique name to identify this debug launch configuration. It can be any name.</span> </li>
+      <li>Project - <span style="font-weight: normal;">The project  to associate with this debug launch configuration. Click Browse to select a different project.</span></li>
+      <li>Process to launch  - <span style="font-weight: normal;">This is the name of the executable that is linked to the project.</span></li>
+      </ul>
+  </li>
+  
+  <li>Modify settings in the other Carbide tabs to customize the launch configuration
+    for the project
+    <ul>
+      <li>Environment (<i>Eclipse</i>) </li>
+      <li><a href="../../projects/launch/page_debugger.htm">Debugger</a></li>
+      <li><a href="../../projects/launch/page_executables.htm">Executables</a></li>
+      <li><a href="../../projects/launch/page_exceptions.htm">x86 Exceptions</a> </li>
+      <li>Arguments (<i>Eclipse</i>) </li>
+      <li>Source (<i>Eclipse</i>) </li>
+      <li>Common (<i>Eclipse</i>) </li>
+    </ul>
+    <p>To debug something outside of the workspace, be sure to import the binary into the <a href="../../reference/view_executables.htm">Executables</a> view. </p>
+  </li>
+  <li>Click Debug
+    <p>The IDE launches the executable. If the launch configuration is set to change perspective, it  switches to the specified perspective. </p>
+  </li>
+</ol>
+</div>
+<h5>Other references</h5>
+  <ul>
+    <li><a href="../../projects/launch/launch_configs_overview.htm">Launch Configurations</a> </li>
+    <li><a href="../../concepts/Projects.html">Projects</a></li>
+    <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
+    <li><a href="prj_build.htm">Building Projects</a></li>
+    <li><a href="prj_debug_dlls.htm">Debugging DLLs</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,32 +1,32 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugging in ROM</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugging in ROM</h2>
-<p>You will see symbolic information for other components when  you are debugging  in ROM using System TRK  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 TRK you must specify the ROM log file in the <a href="../../reference/launch_configs/sys_trk_rom_log.htm">ROM Log</a> tab of the TRK  or Attach to Process launch configurations</li>
-</ul>
-<blockquote>
-  <p class="note"><b>NOTE</b> You cannot debug ROM DLLs using Application TRK. </p>
-</blockquote>
-<ul>
-  <li>In Sophia or Trace32 you must specify the ROM log file in the ROM Image tab of the <a href="../../reference/wnd_Trace32_config.htm#ROM">Trace32</a> or <a href="../../reference/wnd_sophia_config.htm#ROM">Sophia</a> launch configuration</li>
-</ul>
-<h5>Other references </h5>
-<ul>
-  <li><a href="prj_import_exe.htm">Importing Executables for Debugging</a></li>
-  <li><a href="../../reference/wnd_Trace32_config.htm">Symbian OS Trace32 Support</a></li>
-  <li><a href="../../reference/wnd_sophia_config.htm">Symbian OS Sophia Target Interface Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugging in ROM</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debugging in ROM</h2>
+<p>You will see symbolic information for other components when  you are debugging  in ROM using System TRK  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 TRK you must specify the ROM log file in the <a href="../../projects/launch/page_rom_log.htm">ROM Log</a> tab of the TRK  or Attach to Process launch configurations</li>
+</ul>
+<blockquote>
+  <p class="note"><b>NOTE</b> You cannot debug ROM DLLs using Application TRK. </p>
+</blockquote>
+<ul>
+  <li>In Sophia or Trace32 you must specify the ROM log file in the ROM Image tab of the <a href="../../projects/launch/trace32.htm">Trace32</a> or <a href="../../projects/launch/sophia.htm">Sophia</a> launch configuration</li>
+</ul>
+<h5>Other references </h5>
+<ul>
+  <li><a href="prj_import_exe.htm">Importing Executables for Debugging</a></li>
+  <li><a href="../../projects/launch/trace32.htm">Symbian OS Trace32 Support</a></li>
+  <li><a href="../../projects/launch/sophia.htm">Symbian OS Sophia Target Interface Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,54 +1,53 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Working with PKG and SIS Files</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<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 TRK. 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:
-    <ul>
-      <li>application name &mdash; name of the application displayed on the target device</li>
-      <li>UID &mdash; (0x10004299) unique application ID value</li>
-      <li>major and minor version numbers &mdash; values that represent the application's major and minor version numbers</li>
-      <li>current build number &mdash; value that represents the current .sis build number</li>
-    </ul>
-  </li>
-  <li>Filenames and install location &mdash; the name of the file to include in the .sis file and its install location within the target device. Each line describes a single file.</li>
-  <li>Comments &mdash; .pkg file comment lines are preceeded by a semi-colon</li>
-</ul>
-<h3>PKG File Symbols </h3>
-<p>Carbide.c++  attempts to build SIS files for the current build configuration  when a PKG file exists in a given build project. However, there can be one or more SIS file per project but only one can be selected in the <a href="../../reference/launch_configs/app_trk_installation.htm">Installation</a> pane for downloading and debugging. We have introduced symbols you can use within your PKG file for Carbide so that you can use one PKG file in a project to produce several different SIS files, if required.</p>
-<p>The following symbols are available for PKG files in order to make reuse of PKG files more efficient across build targets. These symbols are only supported within Carbide.c++. They are:</p>
-<ul>
-  <li><span class="code">$(EPOCROOT)</span> &mdash; the location of the epoc32 folder but not including the epoc32 folder</li>
-  <li><span class="code">$(PLATFORM)</span> &mdash; platform designator, for example: ARMI, WINSC (Emulator) , GCCE, THUMB, etc.</li>
-  <li><span class="code">$(TARGET)</span> &mdash; target designator UDEB (Debug) or UREL (Release)</li>
-</ul>
-<p>These symbols are used to specify the input location of file resources on your host PC to be packaged in the SIS file. </p>
-<h4>Sample PKG file</h4>
-<p>A sample .pkg file might look like this:</p>
-<p class="listing">;Header<br />
-  #{&quot;HelloWorld&quot;},(0xA0004299),1,0,0<br>
-  <br />
-&quot;$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\HelloWorld.exe&quot; -&quot;!:\sys\bin\HelloWorld.exe&quot;<br />
-&quot;$(EPOCROOT)epoc32\data\z\resource\apps\HelloWorld.rsc&quot; -&quot;!:\resource\apps\HelloWorld.rsc&quot;<br />
-&quot;$(EPOCROOT)epoc32\data\z\private\10003af\import\apps\HelloWorld_reg.rsc&quot; - &quot;!:\private\10003a3f\import\apps\HelloWorld_reg.rsc&quot;<br />
-&quot;$(EPOCROOT)epoc32\data\z\resource\apps\HelloWorld.mbm&quot; -&quot;!:\resource\apps\HelloWorld.mbm&quot;</p>
-<p>In addition you will need to add the PKG file to the project before building the final application. Add the pkg file in the SIS builder tab of the <a href="../../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> in the project properties window.</p>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> pane</li>
-  <li><a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a> </li>
-  <li><a href="../../reference/launch_configs/app_trk_installation.htm">Installation</a> pane </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Working with PKG and SIS Files</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<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 TRK. 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:
+    <ul>
+      <li>application name &mdash; name of the application displayed on the target device</li>
+      <li>UID &mdash; (0x10004299) unique application ID value</li>
+      <li>major and minor version numbers &mdash; values that represent the application's major and minor version numbers</li>
+      <li>current build number &mdash; value that represents the current .sis build number</li>
+    </ul>
+  </li>
+  <li>Filenames and install location &mdash; the name of the file to include in the .sis file and its install location within the target device. Each line describes a single file.</li>
+  <li>Comments &mdash; .pkg file comment lines are preceeded by a semi-colon</li>
+</ul>
+<h3>PKG File Symbols </h3>
+<p>Carbide.c++  attempts to build SIS files for the current build configuration  when a PKG file exists in a given build project. However, there can be one or more SIS file per project but only one can be selected in the <a href="../../projects/launch/page_installation.htm">Installation</a> pane for downloading and debugging. We have introduced symbols you can use within your PKG file for Carbide so that you can use one PKG file in a project to produce several different SIS files, if required.</p>
+<p>The following symbols are available for PKG files in order to make reuse of PKG files more efficient across build targets. These symbols are only supported within Carbide.c++. They are:</p>
+<ul>
+  <li><span class="code">$(EPOCROOT)</span> &mdash; the location of the epoc32 folder but not including the epoc32 folder</li>
+  <li><span class="code">$(PLATFORM)</span> &mdash; platform designator, for example: ARMI, WINSC (Emulator) , GCCE, THUMB, etc.</li>
+  <li><span class="code">$(TARGET)</span> &mdash; target designator UDEB (Debug) or UREL (Release)</li>
+</ul>
+<p>These symbols are used to specify the input location of file resources on your host PC to be packaged in the SIS file. </p>
+<h4>Sample PKG file</h4>
+<p>A sample .pkg file might look like this:</p>
+<p class="listing">;Header<br />
+  #{&quot;HelloWorld&quot;},(0xA0004299),1,0,0<br>
+  <br />
+&quot;$(EPOCROOT)epoc32\release\$(PLATFORM)\$(TARGET)\HelloWorld.exe&quot; -&quot;!:\sys\bin\HelloWorld.exe&quot;<br />
+&quot;$(EPOCROOT)epoc32\data\z\resource\apps\HelloWorld.rsc&quot; -&quot;!:\resource\apps\HelloWorld.rsc&quot;<br />
+&quot;$(EPOCROOT)epoc32\data\z\private\10003af\import\apps\HelloWorld_reg.rsc&quot; - &quot;!:\private\10003a3f\import\apps\HelloWorld_reg.rsc&quot;<br />
+&quot;$(EPOCROOT)epoc32\data\z\resource\apps\HelloWorld.mbm&quot; -&quot;!:\resource\apps\HelloWorld.mbm&quot;</p>
+<p>In addition you will need to add the PKG file to the project before building the final application. Add the pkg file in the SIS builder tab of the <a href="../../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> in the project properties window.</p>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> pane</li>
+  <li><a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,61 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugging a Symbian OS Program on the S60 Emulator</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugging a Symbian OS Program</h2>
-<p>Use the Carbide.c++ debugger to debug a compiled Symbian OS program in an emulator or on-device. The same process works for other emulators and target devices as well.</p>
-<p class="note"><b>NOTE</b> This example uses an emulator. The steps are identical for on-device debugging, although a .sym file is not needed for emulator builds.</p>
-<div class="step">
-  <h4>Debugging a Symbian OS program</h4>
-<p class="note"><b>NOTE</b> You can only debug compiled programs. Use the <a href="../projects/prj_build.htm">Build Project</a> command to compile project sources into a binary file if you do not already have an executable in the project. You will also need a symbolics ( .sym) file for debugging on a target device. Ensure that a .sym file has been created. If you are importing an existing application, you may have to rebuild the application and create a related .sym file. Make sure a .sym file has been created in the output directory.</p>
-  <ol>
-    <li>Set a breakpoint in the HelloCarbide program</li>
-    <p>Open the \src\<span class="code">CHelloCarbideAppUI.cpp</span> file and <a href="../breakpoints/pgm_bp_setting.htm">set a breakpoint</a> in the <span class="code">HandleCommandL</span> routine.</p>
-    <p align="center"><img src="images/debug_set_breakpoint.png" width="602" height="238" /></p>
-  <p class="figure">Figure 1 - Breakpoint set in <span class="code">CHelloCarbideAppUI</span>::HandleCommandL routine. </p>
-  <li>Launch the Carbide.c++ debugger and S60 EPOC Emulator</li>
-  <p><a href="../debugger/work_debug_act_start.htm">Start</a> the Carbide debugger which launches the S60 EPOC Emulator and installs the HelloCarbide application. For on-device debugging, your application will be installed on your target device.</p>
-  <p align="center"><img src="images/debug_s60_emulator_launch.png" width="293" height="391" /></p>
-  <p class="figure"><span class="figure">Figure 2 - S60 Emulator launches</span></p>
-  <li>Open the Installed directory within the S60 Emulator or your target device </li>
-    Use  the S60 Emulator controls to locate and open the Installation directory. Select Open from the Options menu (Figure 3).
-    <p align="center"><img src="images/debug_s60_emulator_02.png" width="352" height="168" /></p>
-    <p class="figure">Figure 3 - Open the Installed directory </p>
-    <li>Launch the HelloCarbide application</li>
-    <p>Use the S60 Emulator or target device controls to launch the HelloCarbide application (Figure 4).
-  </p>
-    <p align="center"><img src="images/debug_s60_emulator_03.png" width="122" height="106" /></p>
-  <p class="figure">Figure 4 - Launch the HelloCarbide application </p>
-  <p>The HelloCarbide application launches (Figure 5). </p>
-    <p align="center"><img src="images/debug_s60_emulator_04.png" width="293" height="391" /></p>
-    <p class="figure">Figure 5 - HelloCarbide application running on S60 Emulator </p>
-    <li>Click the Options soft-key on the S60 Emulator to display the Select menu.</li>
-	<li>Choose the Message menu item and press the Select soft-key to send a message  (Figure 6).</li>
-	<p></p><p align="center"><img src="images/debug_s60_emulator_05.png" width="384" height="254" /></p>
-  <p class="figure">Figure 6 - Send Message to HelloCarbide application </p>
-  <p>The <span class="code">HandleCommandL</span> breakpoint  is hit in the program and control returns to the Carbide.c++ debugger (Figure 7). You can now set additional breakpoints, examine variables, or use the<a href="../../reference/view_debug.htm"> Debug view</a> buttons to control the program. </p>
-  <p align="center"><img src="images/debug_s60_emulator_06.png" width="602" height="238" /></p>
-  <p class="figure">Figure 7 - Back in the CHelloCarbideAppUI::HandleCommandL routine</p>
-  </ol>
-  <p>That's it for this basic introduction to debugging with Carbide.c++.</p>
-</div>
-<h5>Concepts</h5>
-  <ul>
-    <li><a href="../../concepts/Projects.html">Projects</a></li>
-</ul>
-  <h5>Tasks</h5>
-  <ul>
-    <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
-    <li><a href="../projects/prj_build.htm">Building Projects</a></li>
-    <li><a href="../projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  </ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugging a Symbian OS Program on the S60 Emulator</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debugging a Symbian OS Program</h2>
+<p>Use the Carbide.c++ debugger to debug a compiled Symbian OS program in an emulator or on-device. The same process works for other emulators and target devices as well.</p>
+<p class="note"><b>NOTE</b> This example uses an emulator. The steps are identical for on-device debugging, although a .sym file is not needed for emulator builds.</p>
+<div class="step">
+  <h4>Debugging a Symbian OS program</h4>
+<p class="note"><b>NOTE</b> You can only debug compiled programs. Use the <a href="../projects/prj_build.htm">Build Project</a> command to compile project sources into a binary file if you do not already have an executable in the project. You will also need a symbolics ( .sym) file for debugging on a target device. Ensure that a .sym file has been created. If you are importing an existing application, you may have to rebuild the application and create a related .sym file. Make sure a .sym file has been created in the output directory.</p>
+  <ol>
+    <li>Set a breakpoint in the HelloCarbide program</li>
+    <p>Open the \src\<span class="code">CHelloCarbideAppUI.cpp</span> file and <a href="../breakpoints/pgm_bp_setting.htm">set a breakpoint</a> in the <span class="code">HandleCommandL</span> routine.</p>
+    <p align="center"><img src="images/debug_set_breakpoint.png" width="602" height="238" /></p>
+  <p class="figure">Figure 1 - Breakpoint set in <span class="code">CHelloCarbideAppUI</span>::HandleCommandL routine. </p>
+  <li>Launch the Carbide.c++ debugger and S60 EPOC Emulator</li>
+  <p><a href="../../debugger/debug/cmds_starting.htm">Start</a> the Carbide debugger which launches the S60 EPOC Emulator and installs the HelloCarbide application. For on-device debugging, your application will be installed on your target device.</p>
+  <p align="center"><img src="images/debug_s60_emulator_launch.png" width="293" height="391" /></p>
+  <p class="figure"><span class="figure">Figure 2 - S60 Emulator launches</span></p>
+  <li>Open the Installed directory within the S60 Emulator or your target device </li>
+    Use  the S60 Emulator controls to locate and open the Installation directory. Select Open from the Options menu (Figure 3).
+    <p align="center"><img src="images/debug_s60_emulator_02.png" width="352" height="168" /></p>
+    <p class="figure">Figure 3 - Open the Installed directory </p>
+    <li>Launch the HelloCarbide application</li>
+    <p>Use the S60 Emulator or target device controls to launch the HelloCarbide application (Figure 4).
+  </p>
+    <p align="center"><img src="images/debug_s60_emulator_03.png" width="122" height="106" /></p>
+  <p class="figure">Figure 4 - Launch the HelloCarbide application </p>
+  <p>The HelloCarbide application launches (Figure 5). </p>
+    <p align="center"><img src="images/debug_s60_emulator_04.png" width="293" height="391" /></p>
+    <p class="figure">Figure 5 - HelloCarbide application running on S60 Emulator </p>
+    <li>Click the Options soft-key on the S60 Emulator to display the Select menu.</li>
+	<li>Choose the Message menu item and press the Select soft-key to send a message  (Figure 6).</li>
+	<p></p><p align="center"><img src="images/debug_s60_emulator_05.png" width="384" height="254" /></p>
+  <p class="figure">Figure 6 - Send Message to HelloCarbide application </p>
+  <p>The <span class="code">HandleCommandL</span> breakpoint  is hit in the program and control returns to the Carbide.c++ debugger (Figure 7). You can now set additional breakpoints, examine variables, or use the<a href="../../debugger/debug/viewing_debug.htm"> Debug view</a> buttons to control the program. </p>
+  <p align="center"><img src="images/debug_s60_emulator_06.png" width="602" height="238" /></p>
+  <p class="figure">Figure 7 - Back in the CHelloCarbideAppUI::HandleCommandL routine</p>
+  </ol>
+  <p>That's it for this basic introduction to debugging with Carbide.c++.</p>
+</div>
+<h5>Concepts</h5>
+  <ul>
+    <li><a href="../../concepts/Projects.html">Projects</a></li>
+</ul>
+  <h5>Tasks</h5>
+  <ul>
+    <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
+    <li><a href="../projects/prj_build.htm">Building Projects</a></li>
+    <li><a href="../projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  </ul>
+  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,72 +1,72 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Run Mode Debug Example</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode Debug Example (Application TRK) </h2>
-<p>This example shows how to create and build an application and debug it on a device using the Application TRK 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 TRK </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). When we import, we select an ARM target.</p>
-    <li>Go to the project Properties page and in the Carbide Build Configuration panel specify the PKG file in the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> tab </li>
-    <li>Build the project (Ctrl+B) </li>
-    <li>Verify that all the binaries built by the project appear  in the <a href="../../reference/view_executables.htm">Executables</a> view. </li>
-    <p class="note"><b>NOTE</b> The symbolics are automatically loaded for the binaries that appear in the Executables view.</p>
-    <li>Set  <a href="../breakpoints/pgm_bp_setting.htm">breakpoints</a> in the project source files </li>
-    <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="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) to launch the <a href="../projects/wiz_new_launch_config.htm">New Launch Configuration</a> wizard
-      <ol type="a">
-        <li>Select the Application TRK 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>
-        <p>For this example we select the musicplayer.exe as the main executable.</p>
-        <p align="center"><img src="../trk/images/trk_exe_selection.png" width="438" height="533"></p>
-        <p class="figure">Figure 2 - Executable Selection page showing selection </p>
-        <li>Select the remote connection to use in the TRK Connection Settings page, then click Next</li>
-        <p align="center"><img src="../trk/images/trk_conn_settings.png" width="438" height="533"></p>
-        <p class="figure">Figure 3 - TRK Connection Settings page showing selection </p>
-        <li>Select the SIS file to install in the TRK SIS Selection page if not already populated</li>
-      </ol>
-      <blockquote>
-        <p class="figure"><img src="../trk/images/trk_sis_selection.png" width="438" height="533"></p>
-        <p class="figure">Figure 4 - TRK Connection Settings page showing selection </p>
-      </blockquote>
-      <ol type="a">
-        <li>Click Finish </li>
-        <br>
-        <p>The SISX file is downloaded and authenticated, then the binaries are installed automatically on the phone. </p>
-      </ol>
-    <li>Once the debug session launches, control  returns to the Debugger when one of the breakpoints set earlier is hit. </li>
-    <p>At this point you can debug the program in the Debug perspective. Look at the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view to verify that the breakpoints set earlier are resolved. In this case, the breakpoint in the MCServer.exe.</p>
-    <p align="center"><img src="../trk/images/trk_debug_perspective_dll.png" width="902" height="629"></p>
-    <p class="figure">Figure 5 - Debug perspective showing the resolved breakpoint </p>
-	<li>Click Resume in the Debug view to hit the breakpoint set in the second EXE</li>
-    <p align="center"><img src="../trk/images/trk_debug_perspective_exe.png" width="902" height="629"></p>
-    <p class="figure">Figure 6 - Debug perspective showing the resolved EXE breakpoint </p>
-	<li>In the Debug view
-	  <ol type="a">
-	    <li>Click <a href="../debugger/work_debug_act_disconnect.htm">Disconnect</a> to leave the application running on the device, OR </li>
-	    <li>Click <a href="../debugger/work_debug_act_stop.htm">Terminate</a>  to stop the application running on the device</li>
-      </ol>
-    </li>
-  </ol>
-  <p>In addition, you can click the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data View</a> to examine the processes running on the devise during the debug session. </p>
-</div>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../trk/trk_troubleshooting.htm">On-device Debugging Troubleshooting</a></li>
-  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Run Mode Debug Example</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Run Mode Debug Example (Application TRK) </h2>
+<p>This example shows how to create and build an application and debug it on a device using the Application TRK 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 TRK </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). When we import, we select an ARM target.</p>
+    <li>Go to the project Properties page and in the Carbide Build Configuration panel specify the PKG file in the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> tab </li>
+    <li>Build the project (Ctrl+B) </li>
+    <li>Verify that all the binaries built by the project appear  in the <a href="../../reference/view_executables.htm">Executables</a> view. </li>
+    <p class="note"><b>NOTE</b> The symbolics are automatically loaded for the binaries that appear in the Executables view.</p>
+    <li>Set  <a href="../breakpoints/pgm_bp_setting.htm">breakpoints</a> in the project source files </li>
+    <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="../../images/icons/btn_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 TRK 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>
+        <p>For this example we select the musicplayer.exe as the main executable.</p>
+        <p align="center"><img src="../trk/images/trk_exe_selection.png" width="438" height="533"></p>
+        <p class="figure">Figure 2 - Executable Selection page showing selection </p>
+        <li>Select the remote connection to use in the TRK Connection Settings page, then click Next</li>
+        <p align="center"><img src="../trk/images/trk_conn_settings.png" width="438" height="533"></p>
+        <p class="figure">Figure 3 - TRK Connection Settings page showing selection </p>
+        <li>Select the SIS file to install in the TRK SIS Selection page if not already populated</li>
+      </ol>
+      <blockquote>
+        <p class="figure"><img src="../trk/images/trk_sis_selection.png" width="438" height="533"></p>
+        <p class="figure">Figure 4 - TRK Connection Settings page showing selection </p>
+      </blockquote>
+      <ol type="a">
+        <li>Click Finish </li>
+        <br>
+        <p>The SISX file is downloaded and authenticated, then the binaries are installed automatically on the phone. </p>
+      </ol>
+    <li>Once the debug session launches, control  returns to the Debugger when one of the breakpoints set earlier is hit. </li>
+    <p>At this point you can debug the program in the Debug perspective. Look at the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view to verify that the breakpoints set earlier are resolved. In this case, the breakpoint in the MCServer.exe.</p>
+    <p align="center"><img src="../trk/images/trk_debug_perspective_dll.png" width="902" height="629"></p>
+    <p class="figure">Figure 5 - Debug perspective showing the resolved breakpoint </p>
+	<li>Click Resume in the Debug view to hit the breakpoint set in the second EXE</li>
+    <p align="center"><img src="../trk/images/trk_debug_perspective_exe.png" width="902" height="629"></p>
+    <p class="figure">Figure 6 - Debug perspective showing the resolved EXE breakpoint </p>
+	<li>In the Debug view
+	  <ol type="a">
+	    <li>Click <a href="../../debugger/debug/cmds_other.htm">Disconnect</a> to leave the application running on the device, OR </li>
+	    <li>Click <a href="../../debugger/debug/cmds_starting.htm">Terminate</a>  to stop the application running on the device</li>
+      </ol>
+    </li>
+  </ol>
+  <p>In addition, you can click the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data View</a> to examine the processes running on the devise during the debug session. </p>
+</div>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../trk/trk_troubleshooting.htm">On-device Debugging Troubleshooting</a></li>
+  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,52 +1,52 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Launch Configuration Setup</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<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 TRK or System TRK, 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 TRK</b>&#8212; used to run or debug applications on a target device using the Application TRK on-device debug agent. Application TRK 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 TRK</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 TRK on-device debug agent. System TRK 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="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) in the toolbar to launch the <a href="../projects/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="../../reference/launch_configs/page_trk_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="859" height="629" /></p>
-<p class="figure">Figure 1. Debug launch configuration for on-device debugging   (<i>Application TRK shown</i>)</p>
-<div class="step">
-  <h4>Defining a Customized  Launch Configuration </h4>
-  <ol>
-    <li>Choose the Run &gt; Open Debug Dialog... 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 TRK </b> or <b>System TRK</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 TRK debug agent, the following   pages require review and possible option settings:</p>
-    <ul>
-      <li><a href="../../reference/launch_configs/page_trk_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="../../reference/launch_configs/page_trk_debugger.htm">Debugger</a>&#8212; provides control over entry points, message handling, and instruction set default settings</li>
-      <li><a href="../../reference/launch_configs/page_connection.htm">Connection</a>&#8212;   specifies the method used to transfer files to the target device</li>
-      <li><a href="../../reference/launch_configs/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="../../reference/launch_configs/app_trk_installation.htm">Installation</a>   (<i>Application TRK onl</i>y)&#8212;  specifies the .sis or .pkg file to install on the target device</li>
-      <li><a href="../../reference/launch_configs/page_executables.htm">Executables</a> &#8212; specifies the executables to be debugged</li>
-      <li><a href="../../reference/launch_configs/sys_trk_rom_log.htm">ROM Log</a>  (<i>System TRK 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>
-  </ol>
-</div>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../../projects/launch/launch_configs_overview.htm">Launch Configurations</a></li>
-  <li><a href="../../concepts/trk.htm">On-device Debugging</a></li>
-  <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
-  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Launch Configuration Setup</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<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 TRK or System TRK, 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 TRK</b>&#8212; used to run or debug applications on a target device using the Application TRK on-device debug agent. Application TRK 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 TRK</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 TRK on-device debug agent. System TRK 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="../../images/icons/btn_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="859" height="629" /></p>
+<p class="figure">Figure 1. Debug launch configuration for on-device debugging   (<i>Application TRK shown</i>)</p>
+<div class="step">
+  <h4>Defining a Customized  Launch Configuration </h4>
+  <ol>
+    <li>Choose the Run &gt; Open Debug Dialog... 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 TRK </b> or <b>System TRK</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 TRK debug agent, 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 TRK 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 TRK 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>
+  </ol>
+</div>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../../projects/launch/launch_configs_overview.htm">Launch Configurations</a></li>
+  <li><a href="../../concepts/trk.htm">On-device Debugging</a></li>
+  <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
+  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -27,7 +27,7 @@
     <p class="figure">Figure 1. Bluetooth Configuration windows Accessibility panel </p>
     <li>Write down the Bluetooth COM Port number from the  Local Services tab (Figure 2) for later use</li>
 	<p>The Bluetooth COM Port number in the Local Services tab
-	  should match the COM port used in the <a href="../../reference/launch_configs/page_connection.htm">Connections</a> tab of the TRK <a href="../../reference/launch_configs/run_mode_overview.htm">launch<br />
+	  should match the COM port used in the <a href="../../projects/launch/page_connection.htm">Connections</a> tab of the TRK <a href="../../projects/launch/page_main.htm">launch<br />
     configuration</a>.</p>
     <p align="center"><img src="images/wnd_bluetooth_config_services.png" width="460" height="437" /></p>
     <p class="figure">Figure 2. Bluetooth Configuration windows Local Services panel </p>
@@ -41,7 +41,7 @@
   </ul>
   <h5>Related references</h5>
   <ul>
-    <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
+    <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
   </ul>
   <h5>Related tasks</h5>
   <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -31,7 +31,7 @@
       <li>Locate the S60 Phone USB (COMx) item in the list (Figure 2) </li>
       <p align="center"><img src="../../reference/images/wnd_win_device_mgr.png" width="502" height="339" /></p>
       <p class="figure">Figure 2. Device Manager showing Ports (COM &amp; LPT) section</p>
-      <li>The USB COM Port number should match the COM port used in the <a href="../../reference/launch_configs/page_connection.htm">Connections</a> tab of the TRK launch
+      <li>The USB COM Port number should match the COM port used in the <a href="../../projects/launch/page_connection.htm">Connections</a> tab of the TRK launch
       configuration.</li>
       <li>Close the Device Manager window</li>
     </ol>
@@ -43,7 +43,7 @@
 </ul>
 <h5>Related references</h5>
 <ul>
-  <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
+  <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
 </ul>
 <h5>Related tasks</h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,57 +1,57 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Installing On-device Debug Agents using Bluetooth</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {color: #FF0000}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Installing On-device Debug Agents using Bluetooth </h2>
-<p>Use Bluetooth to install the on-device debug agent, either Application TRK or System TRK, as a SISX file, to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
-<p class="note"><b>NOTE</b> 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">
-  <h4>Installing an On-device Debug Agent using Bluetooth </h4>
-  <ol>
-    <li>On the device ensure that the Bluetooth communications is turned on</li>
-	<li>On the PC ensure that the Bluetooth device is turned on</li>
-	<li>From your PC, search for available Bluetooth devices and make sure your device is listed</li>
-	<li>On the PC, right-click the SISX file, then choose the Send To &gt; Bluetooth &gt; <i>device</i> menu item (Figure 1)    </li>
-	<p align="center"><img src="images/trk_menu_send_to.png" width="700" height="452" /></p>
-	<p class="figure">Figure 1. Right-click SISX file</p>
-	
-    <li> Follow the on-screen instructions to transfer the SISX file to the target device</li>
-	<p>The SISX file is transfered to the target device as a message. On the target device you may need to set a PIN code for the file transfer, accept the message, then wait for the &quot;You have 1 new message&quot; alert to appear.</p>
-    <li>Locate the new message on the target device</li>
-	<p>Start the Messaging application on the target device and locate the new message. </p>
-    <li>Select the SISx file and open the file to install it</li>
-	<li>Click OK when prompted to install TRK</li>
-	<li>Follow the instructions on the screen to finish installing the TRK debug agent</li>
-  </ol>
-</div>
-  <h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
-  </ul>
-  <h5>Related references</h5>
-  <ul>
-    
-  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
-  <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
-  </ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="trk_install_usb.htm">Installing On-device Debug Agents using USB</a></li>
-  <li><a href="trk_connection_bluetooth.htm">Connecting via Bluetooth</a></li>
-  <li><a href="trk_connection_usb.htm">Connecting via USB </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Installing On-device Debug Agents using Bluetooth</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {color: #FF0000}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Installing On-device Debug Agents using Bluetooth </h2>
+<p>Use Bluetooth to install the on-device debug agent, either Application TRK or System TRK, as a SISX file, to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
+<p class="note"><b>NOTE</b> 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">
+  <h4>Installing an On-device Debug Agent using Bluetooth </h4>
+  <ol>
+    <li>On the device ensure that the Bluetooth communications is turned on</li>
+	<li>On the PC ensure that the Bluetooth device is turned on</li>
+	<li>From your PC, search for available Bluetooth devices and make sure your device is listed</li>
+	<li>On the PC, right-click the SISX file, then choose the Send To &gt; Bluetooth &gt; <i>device</i> menu item (Figure 1)    </li>
+	<p align="center"><img src="images/trk_menu_send_to.png" width="700" height="452" /></p>
+	<p class="figure">Figure 1. Right-click SISX file</p>
+	
+    <li> Follow the on-screen instructions to transfer the SISX file to the target device</li>
+	<p>The SISX file is transfered to the target device as a message. On the target device you may need to set a PIN code for the file transfer, accept the message, then wait for the &quot;You have 1 new message&quot; alert to appear.</p>
+    <li>Locate the new message on the target device</li>
+	<p>Start the Messaging application on the target device and locate the new message. </p>
+    <li>Select the SISx file and open the file to install it</li>
+	<li>Click OK when prompted to install TRK</li>
+	<li>Follow the instructions on the screen to finish installing the TRK debug agent</li>
+  </ol>
+</div>
+  <h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+  </ul>
+  <h5>Related references</h5>
+  <ul>
+    
+  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+  <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
+  </ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="trk_install_usb.htm">Installing On-device Debug Agents using USB</a></li>
+  <li><a href="trk_connection_bluetooth.htm">Connecting via Bluetooth</a></li>
+  <li><a href="trk_connection_usb.htm">Connecting via USB </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,56 +1,56 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Installing On-device Debug Agents using USB</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<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 TRK or System TRK, as a SISX file, to enable on-device debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
-<p>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>
-<div class="step">
-  <h4>Installing an On-device Debug Agent using PC Suite (USB example) </h4>
-  <ol>
-    <li>Store the TRK SISX file  on the PC connected to the device </li>
-	<p>The Application TRK debug agents are stored online and can be downloaded and installed using the <a href="../reference/trk/wnd_new_connection_wizard.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
-	<li>Connect the USB cable to the PC, then to the  device</li>
-	<p>A status indicator should appear on the device indicating a serial connection has been established.</p>
-    <li>Connect to the device using the latest PC Suite software
-      <ol type="a">
-        <li>Install  PC Suite if not available </li>
-  <p class="note"><b>NOTE</b> If you have both Sony Ericcson Mobile Communications (SEMC) and Nokia PC Suites installed, conflicts may occur.</p>
-        <li>Launch the PC Suite software </li>
-        <li>Click the &quot;Click here to connect to  a phone&quot; and follow the Get Connected wizard instructions</li>
-	<p>Once the device has been found and authenticated by the PC its possible to install the TRK SISX file.</p>
-      </ol>
-    </li>
-    <li>Double-click the TRK SISX file to install  it on the device </li>
-  </ol>
-  <blockquote>
-    <p>The <b>PC Suite</b> application installer  launches and asks where to install the SISX file. Select the recommended destination  for installed applications on the device and click <b>Yes</b>. The SISX file is installed. </p>
-  Then exit out of PC Suite. </blockquote>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
-</ul>
-<h5>Related reference</h5>
-<ul>
-  
-  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
-  <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth</a></li>
-  <li><a href="trk_connection_bluetooth.htm">Connecting via Bluetooth</a></li>
-  <li><a href="trk_connection_usb.htm">Connecting via USB </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Installing On-device Debug Agents using USB</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<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 TRK or System TRK, as a SISX file, to enable on-device debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
+<p>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>
+<div class="step">
+  <h4>Installing an On-device Debug Agent using PC Suite (USB example) </h4>
+  <ol>
+    <li>Store the TRK SISX file  on the PC connected to the device </li>
+	<p>The Application TRK debug agents are stored online and can be downloaded and installed using the <a href="../../projects/launch/wiz_new_launch_config.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
+	<li>Connect the USB cable to the PC, then to the  device</li>
+	<p>A status indicator should appear on the device indicating a serial connection has been established.</p>
+    <li>Connect to the device using the latest PC Suite software
+      <ol type="a">
+        <li>Install  PC Suite if not available </li>
+  <p class="note"><b>NOTE</b> If you have both Sony Ericcson Mobile Communications (SEMC) and Nokia PC Suites installed, conflicts may occur.</p>
+        <li>Launch the PC Suite software </li>
+        <li>Click the &quot;Click here to connect to  a phone&quot; and follow the Get Connected wizard instructions</li>
+	<p>Once the device has been found and authenticated by the PC its possible to install the TRK SISX file.</p>
+      </ol>
+    </li>
+    <li>Double-click the TRK SISX file to install  it on the device </li>
+  </ol>
+  <blockquote>
+    <p>The <b>PC Suite</b> application installer  launches and asks where to install the SISX file. Select the recommended destination  for installed applications on the device and click <b>Yes</b>. The SISX file is installed. </p>
+  Then exit out of PC Suite. </blockquote>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+</ul>
+<h5>Related reference</h5>
+<ul>
+  
+  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+  <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth</a></li>
+  <li><a href="trk_connection_bluetooth.htm">Connecting via Bluetooth</a></li>
+  <li><a href="trk_connection_usb.htm">Connecting via USB </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,55 +1,55 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Installing On-device Debug Agents using USB</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Installing On-device Debug Agents using USB</h2>
-<p> An USB connection can be used to install the on-device debug agent, either Application TRK or System TRK, (SISX file), to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
-<p class="note"><b>NOTE</b> You can  use the connection software that came with your device to install the on-device debug agent SISX file. For example, all Nokia phones ship with the PC Suite software for installing programs. See your phone's operating manual for assistance on using it's software. </p>
-<div class="step">
-  <h4>Installing an On-device Debug Agent using USB</h4>
-  <ol>
-    <li>Connect the PC and the target device using a USB connectivity cable</li>
-	<p>Physically connect the USB cable to the PC, then to the target device.</p>
-    <li>Setup the target device to accept file transfers from the PC</li>
-	<p>The target device recognizes the USB cable connection.</p>
-      <ol type="a">
-        <li>Select USB Mode &gt; File Transfer, then press OK soft key </li>
-          <p>A notification message appears warning you the phone will be offline. </p>
-          <li>Press OK soft key to accept notification</li>
-          <p>The message &quot;USB file transfer connection active&quot; appears on the phone. On the PC, a folder appears showing the memory cards folders and files.</p>
-      </ol>
-	<li>Copy the SISX file to phone memory or  MMC card</li>
-	<p>Locate the SISX file on the PC, then select and copy it into the target device's memory card. </p>
-    <li>Install the SISX file </li>
-	<p>The final step is to install the SISX program on the target device. </p>
-      <ol type="a">
-        <li>Locate and launch the SISX file to install </li>
-          <li>Follow the instructions on the screen to finish installing the TRK debug agent</li>
-      </ol>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
-</ul>
-<h5>Related reference</h5>
-<ul>
-  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
-  <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth</a></li>
-  <li><a href="trk_connection_bluetooth.htm">Connecting via Bluetooth</a></li>
-  <li><a href="trk_connection_usb.htm">Connecting via USB </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Installing On-device Debug Agents using USB</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Installing On-device Debug Agents using USB</h2>
+<p> An USB connection can be used to install the on-device debug agent, either Application TRK or System TRK, (SISX file), to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
+<p class="note"><b>NOTE</b> You can  use the connection software that came with your device to install the on-device debug agent SISX file. For example, all Nokia phones ship with the PC Suite software for installing programs. See your phone's operating manual for assistance on using it's software. </p>
+<div class="step">
+  <h4>Installing an On-device Debug Agent using USB</h4>
+  <ol>
+    <li>Connect the PC and the target device using a USB connectivity cable</li>
+	<p>Physically connect the USB cable to the PC, then to the target device.</p>
+    <li>Setup the target device to accept file transfers from the PC</li>
+	<p>The target device recognizes the USB cable connection.</p>
+      <ol type="a">
+        <li>Select USB Mode &gt; File Transfer, then press OK soft key </li>
+          <p>A notification message appears warning you the phone will be offline. </p>
+          <li>Press OK soft key to accept notification</li>
+          <p>The message &quot;USB file transfer connection active&quot; appears on the phone. On the PC, a folder appears showing the memory cards folders and files.</p>
+      </ol>
+	<li>Copy the SISX file to phone memory or  MMC card</li>
+	<p>Locate the SISX file on the PC, then select and copy it into the target device's memory card. </p>
+    <li>Install the SISX file </li>
+	<p>The final step is to install the SISX program on the target device. </p>
+      <ol type="a">
+        <li>Locate and launch the SISX file to install </li>
+          <li>Follow the instructions on the screen to finish installing the TRK debug agent</li>
+      </ol>
+  </ol>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+</ul>
+<h5>Related reference</h5>
+<ul>
+  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+  <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth</a></li>
+  <li><a href="trk_connection_bluetooth.htm">Connecting via Bluetooth</a></li>
+  <li><a href="trk_connection_usb.htm">Connecting via USB </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Installing an On-device Debug Agent</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Installing an On-device Debug Agent </h2>
-<p>To use any version of the on-device debug agent on a target device it must be installed. We highly recommend using the  <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to help connect and verify that the latest version of TRK is installed on the device. Or, to manage this manually, follow the instructions to install the TRK debug agent software  using <a href="trk_install_bluetooth.htm">Bluetooth</a> or <a href="trk_install_usb.htm">USB</a>.</p>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="../../concepts/trk.htm">On-Device Debugging </a></li>
-  <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Installing an On-device Debug Agent</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Installing an On-device Debug Agent </h2>
+<p>To use any version of the on-device debug agent on a target device it must be installed. We highly recommend using the  <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to help connect and verify that the latest version of TRK is installed on the device. Or, to manage this manually, follow the instructions to install the TRK debug agent software  using <a href="trk_install_bluetooth.htm">Bluetooth</a> or <a href="trk_install_usb.htm">USB</a>.</p>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a></li>
+  <li><a href="../../concepts/trk.htm">On-Device Debugging </a></li>
+  <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>TRK Overview</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>TRK Overview</h2>
-<p>This section describes how to setup and use the on-device debug agent software to debug programs on S60 v3.x and UIQ 3rd edition devices. Topics include: </p>
-<ul>
-  <li><a href="trk_preconditions.htm">Preconditions for Using On-device Debugging </a></li>
-  <li><a href="trk_installation_instr.htm">Installing the </a><a href="trk_preconditions.htm">On-device Debug Agent </a><a href="trk_installation_instr.htm">on a Device</a></li>
-  <li>Connecting a PC to a Device using <a href="trk_install_pcsuite.htm">PC Suite</a>, <a href="trk_connection_bluetooth.htm">Bluetooth</a> or <a href="trk_connection_usb.htm">USB</a></li>
-  <li><a href="trk_carbide_setup.htm">Setting up Carbide.c++ Connectivity</a></li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
-  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
-  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>TRK Overview</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>TRK Overview</h2>
+<p>This section describes how to setup and use the on-device debug agent software to debug programs on S60 v3.x and UIQ 3rd edition devices. Topics include: </p>
+<ul>
+  <li><a href="trk_preconditions.htm">Preconditions for Using On-device Debugging </a></li>
+  <li><a href="trk_installation_instr.htm">Installing the </a><a href="trk_preconditions.htm">On-device Debug Agent </a><a href="trk_installation_instr.htm">on a Device</a></li>
+  <li>Connecting a PC to a Device using <a href="trk_install_pcsuite.htm">PC Suite</a>, <a href="trk_connection_bluetooth.htm">Bluetooth</a> or <a href="trk_connection_usb.htm">USB</a></li>
+  <li><a href="trk_carbide_setup.htm">Setting up Carbide.c++ Connectivity</a></li>
+</ul>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
+  <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
+  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,51 +1,51 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>ODD Preconditions</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Preconditions to On-Device Debugging</h2>
-<p>Before you can use on-device debugging to debug 3rd edition and UIQ devices, the following preconditions must be met.</p>
-<div class="step">
-  <h4>Verifying On-device Debugging Preconditions </h4>
-  <ol>
-    <li>Verify that your system has the following:
-      <ul>
-        <li>S60 v3.x, UIQ 2.X or UIQ 3.X kit installed</li>
-        <li>ActivePerl installed</li>
-        <li>RVCT or GCCE compiler</li>
-        <li>USB or Bluetooth capable S60 3rd Edition or UIQ 3rd Edition device</li>
-        <li>USB or Bluetooth support on your PC </li>
-        <li>Nokia PC Suite (or equivilent software) for connecting and installing applications to the device </li>
-      </ul>
-    </li>
-    <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog for debugging  S60 5th edition and UIQ devices</li>
-    <p>The Application TRK debug agents are stored If not, install it now 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 class="note"><b>NOTE</b> The Application TRK versions included with Carbide is for CE versions of devices only. They are not intended for use with RnD devices. </p>
-    <li>Specify the communication method with the on-target device during the debug session</li>
-  <p>Start the Application TRK or System TRK on the device. During startup of TRK on the device you must specify the communication method the on-device agent uses to debug the device. Currently, those methods include <a href="trk_connection_bluetooth.htm">Bluetooth</a> and <a href="trk_connection_usb.htm">USB</a> or a null serial cable. For Bluetooth, you must pair the device with the PC and a valid serial port assigned. For USB, A USB cable must connect the PC to the device and a valid serial port assigned. Use <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog to make the identification and connection setup quick and easy. </p>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
-  <li><a href="../../concepts/build_configurations.htm">Build Configuration</a></li>
-  <li><a href="../../projects/launch/launch_configs_overview.htm">Launch Configuration </a> </li>
-</ul>
-<h5>Related reference</h5>
-<ul>
-  <li><a href="trk_start_sisx.htm">Starting the On-Device TRK Debug Agent</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth</a></li>
-  <li><a href="trk_install_usb.htm">Installing On-device Debug Agents using USB </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>ODD Preconditions</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Preconditions to On-Device Debugging</h2>
+<p>Before you can use on-device debugging to debug 3rd edition and UIQ devices, the following preconditions must be met.</p>
+<div class="step">
+  <h4>Verifying On-device Debugging Preconditions </h4>
+  <ol>
+    <li>Verify that your system has the following:
+      <ul>
+        <li>S60 v3.x, UIQ 2.X or UIQ 3.X kit installed</li>
+        <li>ActivePerl installed</li>
+        <li>RVCT or GCCE compiler</li>
+        <li>USB or Bluetooth capable S60 3rd Edition or UIQ 3rd Edition device</li>
+        <li>USB or Bluetooth support on your PC </li>
+        <li>Nokia PC Suite (or equivilent software) for connecting and installing applications to the device </li>
+      </ul>
+    </li>
+    <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog for debugging  S60 5th edition and UIQ devices</li>
+    <p>The Application TRK debug agents are stored If not, install it now using the <a href="../../projects/launch/wiz_new_launch_config.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
+    <p class="note"><b>NOTE</b> The Application TRK versions included with Carbide is for CE versions of devices only. They are not intended for use with RnD devices. </p>
+    <li>Specify the communication method with the on-target device during the debug session</li>
+  <p>Start the Application TRK or System TRK on the device. During startup of TRK on the device you must specify the communication method the on-device agent uses to debug the device. Currently, those methods include <a href="trk_connection_bluetooth.htm">Bluetooth</a> and <a href="trk_connection_usb.htm">USB</a> or a null serial cable. For Bluetooth, you must pair the device with the PC and a valid serial port assigned. For USB, A USB cable must connect the PC to the device and a valid serial port assigned. Use <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog to make the identification and connection setup quick and easy. </p>
+  </ol>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+  <li><a href="../../concepts/build_configurations.htm">Build Configuration</a></li>
+  <li><a href="../../projects/launch/launch_configs_overview.htm">Launch Configuration </a> </li>
+</ul>
+<h5>Related reference</h5>
+<ul>
+  <li><a href="trk_start_sisx.htm">Starting the On-Device TRK Debug Agent</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth</a></li>
+  <li><a href="trk_install_usb.htm">Installing On-device Debug Agents using USB </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,49 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Bluetooth Connectivity Setup</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Starting the On-Device TRK Debug Agent</h2>
-<div class="step">
-  <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
-  <ol>
-    <li>Launch the Application TRK or System TRK program on the device</li>
-    <li>When requested, select your computer from the available Bluetooth devices list</li>
-    <p align="center"><img src="images/trk_bt_device_search_dialog.png" width="211" height="250" /></p>
-    <p class="figure">Figure 1. Example device list on a S60 3rd Edition or UIQ device</p>
-    <li>Verify the Bluetooth connection is working
-(Figure 2)
-      <p align="center"><img src="images/trk_bt_connected.png" width="211" height="250" /></p>
-      <p class="figure">Figure 2. COM port verification in TRK on a device</p>
-    </li>
-    <li>If Application TRK reports &quot;Not Connected&quot;
-      <ol type="a">
-        <li>Click Options &gt; Settings soft key </li>
-        <li>If Connection is not set to BlueTooth, choose BlueTooth </li>
-        <li>Click Ok soft key</li>
-        <li>Restart Application TRK  </li>
-      </ol>
-    </li>
-  </ol>
-</div>
-  <h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
-  </ul>
-  <h5>Related references</h5>
-  <ul>
-    <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
-  </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Bluetooth Connectivity Setup</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Starting the On-Device TRK Debug Agent</h2>
+<div class="step">
+  <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
+  <ol>
+    <li>Launch the Application TRK or System TRK program on the device</li>
+    <li>When requested, select your computer from the available Bluetooth devices list</li>
+    <p align="center"><img src="images/trk_bt_device_search_dialog.png" width="211" height="250" /></p>
+    <p class="figure">Figure 1. Example device list on a S60 3rd Edition or UIQ device</p>
+    <li>Verify the Bluetooth connection is working
+(Figure 2)
+      <p align="center"><img src="images/trk_bt_connected.png" width="211" height="250" /></p>
+      <p class="figure">Figure 2. COM port verification in TRK on a device</p>
+    </li>
+    <li>If Application TRK reports &quot;Not Connected&quot;
+      <ol type="a">
+        <li>Click Options &gt; Settings soft key </li>
+        <li>If Connection is not set to BlueTooth, choose BlueTooth </li>
+        <li>Click Ok soft key</li>
+        <li>Restart Application TRK  </li>
+      </ol>
+    </li>
+  </ol>
+</div>
+  <h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+  </ul>
+  <h5>Related references</h5>
+  <ul>
+    <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
+  </ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,48 +1,48 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Bluetooth Connectivity Setup</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Starting the On-Device Debug Agent Using USB </h2>
-<div class="step">
-  <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
-  <ol>
-    <li>On the device
-      <ol>
-        <li>Launch Application TRK or System TRK program on the device</li>
-        <li></li>
-      </ol>
-    </li>
-    <li>Select PC-Suite from the USB Mode list</li>
-    <li>Launch the Application TRK program</li>
-    <li>Halt the Bluetooth device search by pressing the Cancel soft key</li>
-    <li>Click Options &gt; Settings &gt; Connection</li>
-    <li>Change Connection type to USB and set connection options</li>
-    <blockquote>
-      <p align="center"><img src="images/trk_connection_options.png" width="211" height="250" />&nbsp;<img src="images/trk_usb_settings.png" width="211" height="250" /></p>
-      <p class="figure">Figure 1 - Change connection type to USB and set connection options</p>
-    </blockquote>
-    <li>Select Back and start the TRK again and you should be connected</li>
-  </ol>
-</div>
-  <h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
-  </ul>
-  <h5>Related references</h5>
-  <ul>
-    <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
-  </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Bluetooth Connectivity Setup</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Starting the On-Device Debug Agent Using USB </h2>
+<div class="step">
+  <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
+  <ol>
+    <li>On the device
+      <ol>
+        <li>Launch Application TRK or System TRK program on the device</li>
+        <li></li>
+      </ol>
+    </li>
+    <li>Select PC-Suite from the USB Mode list</li>
+    <li>Launch the Application TRK program</li>
+    <li>Halt the Bluetooth device search by pressing the Cancel soft key</li>
+    <li>Click Options &gt; Settings &gt; Connection</li>
+    <li>Change Connection type to USB and set connection options</li>
+    <blockquote>
+      <p align="center"><img src="images/trk_connection_options.png" width="211" height="250" />&nbsp;<img src="images/trk_usb_settings.png" width="211" height="250" /></p>
+      <p class="figure">Figure 1 - Change connection type to USB and set connection options</p>
+    </blockquote>
+    <li>Select Back and start the TRK again and you should be connected</li>
+  </ol>
+</div>
+  <h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+  </ul>
+  <h5>Related references</h5>
+  <ul>
+    <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
+  </ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm	Mon Aug 10 15:21:12 2009 -0500
@@ -1,125 +1,125 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>On-device Debugging Troubleshooting</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>On-device Debugging Troubleshooting </h2>
-<p>If you are having problems with  on-device debugging, see if the following solutions can solve the problem.</p>
-<h3><a name="deploy" id="deploy"></a>Deploying SIS Files using Carbide (Application TRK) </h3>
-<h4>Am unable to create my SIS file, what can cause this ?</h4>
-<blockquote>
-  <p>Ensure that you are using symbols in your PKG file to generate the SIS file. See <a href="../projects/working_with_sis_pkg_files.htm">Working with PKG and SIS Files</a> for more details. </p>
-</blockquote>
-<h4>How do I know my SIS file got installed correctly?</h4>
-<blockquote>
-  <p>If you did not receive an error message that Carbide.c++ could not install the SIS file, then  go to the Application Manager on the phone and look for the SIS file. If the SIS file is there it tells you that Carbide.c++ successfully deployed the application to the device. </p>
-  <p>Next, check the target directory on the device for the executable. If the executable is present, attempt to launch the executable. If the executable launches this lets you know the binaries were built correctly for the device. If the executable does not launch, try to build the application again using the command-line version of the tool.</p>
-  <p>To verify the install process, go to the  <a href="../../reference/launch_configs/app_trk_installation.htm">Installation</a> tab of your <a href="../../reference/launch_configs/run_mode_overview.htm">launch configuration</a> and disable the <b>Do not show installer UI on the phone</b> option. The next time Carbide.c++ attempts to deploy the application, prompts will appear on the phone verifying that it is okay to install the application. You can then watch the SIS file being installed on the phone. </p>
-</blockquote>
-<h4>How do I force the install of a SIS file to a device?</h4>
-<blockquote>
-  <p>In Carbide.c++, go to the <a href="../../reference/launch_configs/app_trk_installation.htm">Installation</a> tab of your <a href="../../reference/launch_configs/run_mode_overview.htm">launch configuration</a> and enable the<b> Install each launch even if installer file has not changed</b> option. Once set, just click the <b>Debug</b> control again to deploy the new application binaries to the device. </p>
-</blockquote>
-<h4>Am getting the an error when attempting to install my SIS file, what can I do?</h4>
-<blockquote>
-  <p>To get better error messages about possible install failures, go to the <a href="../../reference/launch_configs/app_trk_installation.htm">Installation</a> tab of your <a href="../../reference/launch_configs/run_mode_overview.htm">launch configuration</a> and disable the <b>Do not show installer UI on the phone</b> option. The next time Carbide.c++ attempts to deploy the application, prompts will appear on the phone verifying that it is okay to install the application. You can then watch the SIS file being installed on the phone. When the SIS file fails to install again, TRK will provide more specific errors on why the installation failed.</p>
-</blockquote>
-<h4>Am getting the error &quot;process fails to launch&quot;, what can I do to correct this?</h4>
-<blockquote>
-  <p>There are several things that can cause this error including:</p>
-</blockquote>
-<ul>
-  <li>Verify deployment of the SIS file, see <b>How do I know my SIS file got installed correctly?</b> above. </li>
-  <li>Verify that the MMP or PKG files does not contain any errors.</li>
-  <li>If the application uses a self-signed SIS, a UID3 is required that is set within the proper address range. See <a href="https://www.symbiansigned.com/app/page/uidfaq">https://www.symbiansigned.com/app/page/uidfaq</a> for more info.</li>
-  <li> Verify that the UID3 address  matches between the MMP and PKG file if using Application TRK. If using Sys TRK, verify the File Transfer tab on the System TRK launch configuration is correct. </li>
-  <li>Verify that  your binaries are built correctly by attempting to launch the executable on the phone from the target directory. If this fails, rebuild the application using the command-line tools, then see <b>How do I force the install of a SIS file to a device</b>? above to redeploys and debug again. </li>
-  <li>If debugging a DLL from an application and using System TRK, ensure that the DLL is included in the <a href="../../reference/launch_configs/page_file_transfer.htm">File Transfer</a> tab of the <a href="../../reference/launch_configs/run_mode_overview.htm">launch configuration</a> so that it is deployed to the device with the application. It is not added by default. </li>
-</ul>
-<h4>Am getting an exception when trying to debug with Application TRK </h4>
-<blockquote>
-  <p>The main reason for this is that you have entered ROM code or another prohibited address space. You can confirm this by checking the Disassembler view. When in a prohibited memory address the view may be blank. To correct, click Step Over or Resume to move to the next breakpoint in your code.</p>
-</blockquote>
-<h4>I'm running out of memory on the device, what can I do?</h4>
-<blockquote>
-  <p>On platforms that include Platform Security there are several directories like <span class="code">c:\sys\bin</span> where you cannot easily delete files that are no longer required. Over time the device's memory becomes full, making it difficult or impossible to install and debug additional programs.</p>
-  <p>If using Application TRK to install and debug programs,  use the Application Manager on the device to remove all the files specified in the program's PKG file, but not the SIS file itself. </p>
-  <p>If you are using System TRK to install and debug programs and additional files, you will need to create a SIS that includes the files listed in the File Transfer pane, <a href="../start/carbide_deploying.htm">deploy</a> it manually to  the device, then run the Application Manager on the device to remove the files.</p>
-</blockquote>
-<h3><a name="connect" id="connect"></a>Connectivity</h3>
-<h4>How can I use USB instead of Bluetooth to debug my application?</h4>
-<blockquote>
-  <p>For USB support in TRK 2.5 or greater, while the TRK application is running on the phone, choose Options &gt; Settings, then set Connection to USB.</p>
-  <p>For USB support in TRK v2.1, include the metrotrk_usb.ini file instead of the metrotrk_bt.ini file in your ROM image. You do this by modifying the metrotrk.iby file like this:</p>
-  <p>Replace the line:</p>
-  <p class="code">data=ZSYSTEM\..\metrotrk\metrotrk_bt.ini \metrotrk.ini</p>
-  <p>With:</p>
-  <p class="code">data=ZSYSTEM\..\metrotrk\metrotrk_usb.ini \metrotrk.ini</p>
-  <p>Then rebuild the ROM image.</p>
-  <p class="note"><b>NOTE</b> With the S60 wk46 release onwards, the port number needs to be set to 1 instead of 0.</p>
-  <h5>Installing Latest USB Drivers </h5>
-  <p>On the host PC, you need to update the USB drivers to work with the latest S60
-    devices. The latest drivers create a virtual com port on the host which you can
-    specify in Carbide. Download and install the latest Nokia Connectivity Cable
-  Drivers from PC Suite Vivaldi web site.</p>
-  <p>When you first connect the USB cable to the phone you'll get a prompt to choose
-    the &quot;PC Suite&quot; or &quot;File Transfer&quot; mode. Choose &quot;PC Suite&quot; mode to use TRK with
-    USB. Also you will get several &ldquo;New Hardware found&rdquo; wizards. You need to go
-    through the installation each time to successfully use the USB connection to
-  access the device.</p>
-  <h5>Connecting to Device using USB </h5>
-  <p>If the current Connection setting on the phone is Bluetooth, when you start
-    the TRK application on the phone you should see a list of Bluetooth devices. 
-    Press Cancel. In the TRK Welcome Screen press Options, then
-    the Settings control. You should see the connection set to Bluetooth. Select
-    the Options &gt; Change option and change the 
-    connection option to USB. Your connection should now show as USB. Press
-    Back to go to the TRK Welcome screen. In the TRK Welcome screen press Select &gt;
-  Connect. The status in the TRK welcome screen should show as connected. </p>
-  <p>The next time you connect the USB cable to the phone you&#8217;ll get a prompt to
-    choose the &quot;PC Suite&quot; or &quot;File Transfer&quot; mode. Choose &quot;PC Suite&quot; mode to use
-    TRK with USB. Then start the TRK application.</p>
-</blockquote>
-<h4>What is the virtual COM port number for my S60 phone on the host PC if I am using USB?</h4>
-<blockquote>
-  <p>Normally, you can determine the COM port ID using the Device Manager if TRK is already connected via USB.
-  </p>
-  <p>To check, choose Start &gt; Settings &gt; Control panel &gt; System &gt; Hardware &gt; Device Manager. In the Device Manager, choose &quot;Ports&quot; to view the active ports (Figure 1).</p>
-  <p align="center"><img src="images/trk_device_manager.gif" width="323" height="210" /></p>
-  <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>
-<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> 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>
-      <li>On the desktops, the Belkin Bluetooth dongle is known to properly provide BT Serial port emulation. Other Bluetooth dongles should work as long as the serial port service is provided by the Bluetooth driver</li>
-    </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>
-<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 Setup</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>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>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>On-device Debugging Troubleshooting</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>On-device Debugging Troubleshooting </h2>
+<p>If you are having problems with  on-device debugging, see if the following solutions can solve the problem.</p>
+<h3><a name="deploy" id="deploy"></a>Deploying SIS Files using Carbide (Application TRK) </h3>
+<h4>Am unable to create my SIS file, what can cause this ?</h4>
+<blockquote>
+  <p>Ensure that you are using symbols in your PKG file to generate the SIS file. See <a href="../projects/working_with_sis_pkg_files.htm">Working with PKG and SIS Files</a> for more details. </p>
+</blockquote>
+<h4>How do I know my SIS file got installed correctly?</h4>
+<blockquote>
+  <p>If you did not receive an error message that Carbide.c++ could not install the SIS file, then  go to the Application Manager on the phone and look for the SIS file. If the SIS file is there it tells you that Carbide.c++ successfully deployed the application to the device. </p>
+  <p>Next, check the target directory on the device for the executable. If the executable is present, attempt to launch the executable. If the executable launches this lets you know the binaries were built correctly for the device. If the executable does not launch, try to build the application again using the command-line version of the tool.</p>
+  <p>To verify the install process, go to the  <a href="../../projects/launch/page_main.htm">Installation</a> tab of your <a href="../../projects/launch/page_main.htm">launch configuration</a> and disable the <b>Do not show installer UI on the phone</b> option. The next time Carbide.c++ attempts to deploy the application, prompts will appear on the phone verifying that it is okay to install the application. You can then watch the SIS file being installed on the phone. </p>
+</blockquote>
+<h4>How do I force the install of a SIS file to a device?</h4>
+<blockquote>
+  <p>In Carbide.c++, go to the <a href="../../projects/launch/page_main.htm">Installation</a> tab of your <a href="../../projects/launch/page_main.htm">launch configuration</a> and enable the<b> Install each launch even if installer file has not changed</b> option. Once set, just click the <b>Debug</b> control again to deploy the new application binaries to the device. </p>
+</blockquote>
+<h4>Am getting the an error when attempting to install my SIS file, what can I do?</h4>
+<blockquote>
+  <p>To get better error messages about possible install failures, go to the <a href="../../projects/launch/page_main.htm">Installation</a> tab of your <a href="../../projects/launch/page_main.htm">launch configuration</a> and disable the <b>Do not show installer UI on the phone</b> option. The next time Carbide.c++ attempts to deploy the application, prompts will appear on the phone verifying that it is okay to install the application. You can then watch the SIS file being installed on the phone. When the SIS file fails to install again, TRK will provide more specific errors on why the installation failed.</p>
+</blockquote>
+<h4>Am getting the error &quot;process fails to launch&quot;, what can I do to correct this?</h4>
+<blockquote>
+  <p>There are several things that can cause this error including:</p>
+</blockquote>
+<ul>
+  <li>Verify deployment of the SIS file, see <b>How do I know my SIS file got installed correctly?</b> above. </li>
+  <li>Verify that the MMP or PKG files does not contain any errors.</li>
+  <li>If the application uses a self-signed SIS, a UID3 is required that is set within the proper address range. See <a href="https://www.symbiansigned.com/app/page/uidfaq">https://www.symbiansigned.com/app/page/uidfaq</a> for more info.</li>
+  <li> Verify that the UID3 address  matches between the MMP and PKG file if using Application TRK. If using Sys TRK, verify the File Transfer tab on the System TRK launch configuration is correct. </li>
+  <li>Verify that  your binaries are built correctly by attempting to launch the executable on the phone from the target directory. If this fails, rebuild the application using the command-line tools, then see <b>How do I force the install of a SIS file to a device</b>? above to redeploys and debug again. </li>
+  <li>If debugging a DLL from an application and using System TRK, ensure that the DLL is included in the <a href="../../projects/launch/page_file_transfer.htm">File Transfer</a> tab of the <a href="../../projects/launch/page_main.htm">launch configuration</a> so that it is deployed to the device with the application. It is not added by default. </li>
+</ul>
+<h4>Am getting an exception when trying to debug with Application TRK </h4>
+<blockquote>
+  <p>The main reason for this is that you have entered ROM code or another prohibited address space. You can confirm this by checking the Disassembler view. When in a prohibited memory address the view may be blank. To correct, click Step Over or Resume to move to the next breakpoint in your code.</p>
+</blockquote>
+<h4>I'm running out of memory on the device, what can I do?</h4>
+<blockquote>
+  <p>On platforms that include Platform Security there are several directories like <span class="code">c:\sys\bin</span> where you cannot easily delete files that are no longer required. Over time the device's memory becomes full, making it difficult or impossible to install and debug additional programs.</p>
+  <p>If using Application TRK to install and debug programs,  use the Application Manager on the device to remove all the files specified in the program's PKG file, but not the SIS file itself. </p>
+  <p>If you are using System TRK to install and debug programs and additional files, you will need to create a SIS that includes the files listed in the File Transfer pane, <a href="../start/carbide_deploying.htm">deploy</a> it manually to  the device, then run the Application Manager on the device to remove the files.</p>
+</blockquote>
+<h3><a name="connect" id="connect"></a>Connectivity</h3>
+<h4>How can I use USB instead of Bluetooth to debug my application?</h4>
+<blockquote>
+  <p>For USB support in TRK 2.5 or greater, while the TRK application is running on the phone, choose Options &gt; Settings, then set Connection to USB.</p>
+  <p>For USB support in TRK v2.1, include the metrotrk_usb.ini file instead of the metrotrk_bt.ini file in your ROM image. You do this by modifying the metrotrk.iby file like this:</p>
+  <p>Replace the line:</p>
+  <p class="code">data=ZSYSTEM\..\metrotrk\metrotrk_bt.ini \metrotrk.ini</p>
+  <p>With:</p>
+  <p class="code">data=ZSYSTEM\..\metrotrk\metrotrk_usb.ini \metrotrk.ini</p>
+  <p>Then rebuild the ROM image.</p>
+  <p class="note"><b>NOTE</b> With the S60 wk46 release onwards, the port number needs to be set to 1 instead of 0.</p>
+  <h5>Installing Latest USB Drivers </h5>
+  <p>On the host PC, you need to update the USB drivers to work with the latest S60
+    devices. The latest drivers create a virtual com port on the host which you can
+    specify in Carbide. Download and install the latest Nokia Connectivity Cable
+  Drivers from PC Suite Vivaldi web site.</p>
+  <p>When you first connect the USB cable to the phone you'll get a prompt to choose
+    the &quot;PC Suite&quot; or &quot;File Transfer&quot; mode. Choose &quot;PC Suite&quot; mode to use TRK with
+    USB. Also you will get several &ldquo;New Hardware found&rdquo; wizards. You need to go
+    through the installation each time to successfully use the USB connection to
+  access the device.</p>
+  <h5>Connecting to Device using USB </h5>
+  <p>If the current Connection setting on the phone is Bluetooth, when you start
+    the TRK application on the phone you should see a list of Bluetooth devices. 
+    Press Cancel. In the TRK Welcome Screen press Options, then
+    the Settings control. You should see the connection set to Bluetooth. Select
+    the Options &gt; Change option and change the 
+    connection option to USB. Your connection should now show as USB. Press
+    Back to go to the TRK Welcome screen. In the TRK Welcome screen press Select &gt;
+  Connect. The status in the TRK welcome screen should show as connected. </p>
+  <p>The next time you connect the USB cable to the phone you&#8217;ll get a prompt to
+    choose the &quot;PC Suite&quot; or &quot;File Transfer&quot; mode. Choose &quot;PC Suite&quot; mode to use
+    TRK with USB. Then start the TRK application.</p>
+</blockquote>
+<h4>What is the virtual COM port number for my S60 phone on the host PC if I am using USB?</h4>
+<blockquote>
+  <p>Normally, you can determine the COM port ID using the Device Manager if TRK is already connected via USB.
+  </p>
+  <p>To check, choose Start &gt; Settings &gt; Control panel &gt; System &gt; Hardware &gt; Device Manager. In the Device Manager, choose &quot;Ports&quot; to view the active ports (Figure 1).</p>
+  <p align="center"><img src="images/trk_device_manager.gif" width="323" height="210" /></p>
+  <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>
+<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> 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>
+      <li>On the desktops, the Belkin Bluetooth dongle is known to properly provide BT Serial port emulation. Other Bluetooth dongles should work as long as the serial port service is provided by the Bluetooth driver</li>
+    </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>
+<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 Setup</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>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>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Fri Aug 07 15:50:06 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Aug 10 15:21:12 2009 -0500
@@ -15,6 +15,7 @@
 		</topic>
 	
 		<topic label="Tour of the UI"				href="html/concepts/tour.html" />
+		<topic label="Concepts" 					href="html/concepts/concepts.htm" />
 
 		<topic label="Application Emulator Debug Example"  	href="html/tasks/start/carbide_example.htm" >
 			<topic label="1. Creating New Projects" 		        	href="html/tasks/CreatingNewProjects.html" />