BUG 10651 - added debugging dll with any process info, revised launch config pages and others
authorfturovic <frank.turovich@nokia.com>
Tue, 31 Aug 2010 16:18:02 -0500
changeset 1933 a77f12f0a631
parent 1930 d8b5c1e3a21e
child 1934 4f0cd256d26c
BUG 10651 - added debugging dll with any process info, revised launch config pages and others
core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/trk_appTrk_debugapps_cs.xml
core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm
core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm
core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm
core/com.nokia.carbide.cpp.doc.user/html/images/icons/menu_build_target.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_app_selection.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_finish.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_launch_types.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_rom_image.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trace32.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trk_conn.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trk_sis.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/menu_build_target.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_app_selection.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_build_options.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_debug_as.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_launch_types.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_rom_image.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_trk_conn.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_trk_sis.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_new_launch_config.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.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/tutorials/new_proj_dll_example_03.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.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/processes/attach_to_process.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/attach_to_process_launch_config.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/attach_to_process_proj_explorer.png
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_dlls.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm
core/com.nokia.carbide.cpp.doc.user/index.xml
core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/trk_appTrk_debugapps_cs.xml	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/trk_appTrk_debugapps_cs.xml	Tue Aug 31 16:18:02 2010 -0500
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<cheatsheet title="Debugging DLLs, Applications, and Executables">
-	<intro>
-		<description>
-		Read the following information to Debug DLLs, Applications, and Executables.
-		</description> 
-	</intro> 
-	
-	<item title="Debugging DLLs" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm" >
-		<description>
-		Click question mark on right side for instructions to debug DLLs.
-		</description>
-	</item>
-
-	<item title="Debugging Applications" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm" >
-		<description>
-		Click question mark on right side for instructions to debug applications.
-		</description>
-	</item>
-
-	<item title="Importing and Debugging a Symbian Executable" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm" >
-		<description>
-		Click question mark on right side for instructions to import and debug a Symbian executable.
-		</description>
-	</item>
-
-	<item title="Attaching to a Symbian OS Process" href="/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm" >
-		<description>
-		Click question mark on right side for instructions to attach to a Symbian OS Process.
-		</description>
-	</item>
-
-	<item title="Debugging a Symbian OS Program" href="/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm" >
-		<description>
-		Click question mark on right side for instructions to debug a compiled Symbian OS program.
-		</description>
-	</item>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cheatsheet title="Debugging DLLs, Applications, and Executables">
+	<intro>
+		<description>
+		Read the following information to Debug DLLs, Applications, and Executables.
+		</description> 
+	</intro> 
+	
+	<item title="Debugging DLLs" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm" >
+		<description>
+		Click question mark on right side for instructions to debug DLLs.
+		</description>
+	</item>
+
+	<item title="Debugging Applications" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm" >
+		<description>
+		Click question mark on right side for instructions to debug applications.
+		</description>
+	</item>
+
+	<item title="Importing and Debugging a Symbian Executable" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm" >
+		<description>
+		Click question mark on right side for instructions to import and debug a Symbian executable.
+		</description>
+	</item>
+
+	<item title="Attaching to a Symbian OS Process" href="/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_to_process.htm" >
+		<description>
+		Click question mark on right side for instructions to attach to a Symbian OS Process.
+		</description>
+	</item>
+
+	<item title="Debugging a Symbian OS Program" href="/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm" >
+		<description>
+		Click question mark on right side for instructions to debug a compiled Symbian OS program.
+		</description>
+	</item>
+
 </cheatsheet>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -9,14 +9,17 @@
 </head>
 <body >
 <h2>Auto-Targeting of Executables</h2>
-<p>In run-mode  the Carbide 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>
+<p>In run-mode  the Carbide 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 and binaries like DLLs 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>
+<h4>Debugging DLLs</h4>
+<p>One common debugging DLL use case is when the developer doesn't know which process calls the DLL. This makes it difficult to debug the DLL because you doesn't know which process to attach to nor start. Carbide enables DLL debugging  by simply attaching the DLL to any running process as long as the DLL is included in the <a href="../../reference/view_executables.htm">Executables</a> view. See <a href="../processes/attach_to_process.htm">Attaching  to a OS Process</a> for more details.</p>
 <h5>Other References</h5>
 <ul>
   <li><a href="../projects/launch/page_executables.htm">Executables</a></li>
+  <li><a href="../processes/attach_to_process.htm">Attaching  to a Process</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -16,7 +16,7 @@
 </ul>
 <p>Build configurations are defined when the project is created. A project can have any number of build configurations and more  can be <a href="../tasks/projects/prj_new_build_config.htm">added</a> as necessary. Each build configuration can have its own combination of tool settings to precisely control how it is defined and built. Build configurations are maintained in the project Properties window in the Carbide Build Configurations panel. To open the panel, select a project in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> or <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view and select <b>Project &gt; Properties</b> or right-click and select Properties.</p>
 <p align="center"><img src="images/build_configs.png" width="801" height="350"></p>
-<p>You can select a build configuration in the <b>Active Configuration</b> group or use the <b>Project &gt; Active  Configuration</b> menu option  to <a href="../tasks/projects/prj_set_build_tgt.htm">set</a> which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the <b>Run</b> (<img src="../images/icons/btn_run.png" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.</p>
+<p>You can select a build configuration in the <b>Active Configuration</b> group or use the <b>Project &gt; Active  Configuration</b> menu option  to <a href="../tasks/projects/prj_set_build_tgt.htm">set</a> which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the <b>Run</b> (<img src="../images/icons/btn_run.png" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../projects/images/icon_debug.png" width="17" height="16" align="absmiddle" />) control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.</p>
 <p>If no <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> is present in the project, one is created on initial launch. Subsequent launches of the project will use either the last launch configuration or if more than one launch configuration exists, it uses the most correct one.</p>
 <p class="note"><b>NOTE</b> The Carbide <b>Run</b> and <b>Debug</b> buttons are shaded in blue to indicate their behavior differs from the standard Eclipse behavior.</p>
 <h5>Table 1 Build Configuration items </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml	Tue Aug 31 16:18:02 2010 -0500
@@ -41,7 +41,7 @@
 		<description>Use the Symbian OS Data view to view processes, threads, chunks, and library information</description>
 		<topic label="Symbian OS Data"						href="html/reference/view_symbian_kernel.htm" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 
 	<!-- Symbian OS Data View Overview pane -->
@@ -49,7 +49,7 @@
 		<description>The Overview pane displays kernel objects by their heirarchical owner relationship</description>
 		<topic label="Symbian OS Data Overview"				href="html/reference/view_symbian_kernel.htm#overview" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 
 		<!-- Symbian OS Data View Processes pane -->
@@ -57,7 +57,7 @@
 		<description>The Processes pane lists processes in the target's Symbian OS</description>
 		<topic label="Symbian OS Processes"					href="html/reference/view_symbian_kernel.htm#processes" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 
 		<!-- Symbian OS Data View Thread pane -->
@@ -65,7 +65,7 @@
 		<description>The Threads pane lists threads in the target's Symbian OS</description>
 		<topic label="Symbian OS Threads"						href="html/reference/view_symbian_kernel.htm#threads" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 		
 	<!-- Symbian OS Data View Chunk pane -->
@@ -73,7 +73,7 @@
 		<description>The Chunks pane lists chunks in the target's Symbian OS</description>
 		<topic label="Symbian OS Chunks"						href="html/reference/view_symbian_kernel.htm#chunks" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 
 	<!-- Symbian OS Data View Library pane -->
@@ -81,7 +81,7 @@
 		<description>The Libraries pane lists libraries in the target's Symbian OS</description>
 		<topic label="Symbian OS Library List"					href="html/reference/view_symbian_kernel.htm#Library" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 
 		
@@ -166,14 +166,14 @@
 	<!-- LAUNCH.ATTACH -->
 	<context id="attach_main" >
 		<description>Create an Attach to Process launch configuration.</description>
-		<topic label="Attach to Process"  					href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Process"  					href="html/tasks/processes/attach_to_process.htm" />
 		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
 	</context>
 	
 	<!-- ATTACH TO PROCESS WINDOW -->
 	<context id="attach_choose_process" >
 		<description>Attaching to a process on the target device.</description>
-		<topic label="Attach to Process"  					href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Process"  					href="html/tasks/processes/attach_to_process.htm" />
 		<topic label="Symbian OS Data view"  				href="html/reference/view_symbian_kernel.htm" />
 		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
 	</context>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -16,11 +16,11 @@
   <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>Use the <b>Debug</b> command (<img src="../../projects/images/icon_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 <a href="../../projects/launch/launch_emulator.htm">emulator</a> targets or ask for additional information to create <a href="../../projects/launch/launch_phone.htm">phone</a> or <a href="../../projects/launch/launch_board.htm">hardware device</a> configurations. It will generate a default name for the launch configuration and add it to the list of available launch configurations for the project. Once complete and saved the debug session is launched. If a  launch configuration is already available, the Debug command launches  the last  launch configuration used by the project. </p>
 <p>To create new launch configurations where none previously existed or launch the last one created:</p>
 <ul>
-  <li>Click the <b>Debug</b> button (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) in the <b>Carbide C/C++</b> perspective</li>
+  <li>Click the <b>Debug</b> button (<img src="../../projects/images/icon_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>
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/menu_build_target.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_app_selection.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_finish.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_launch_types.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_rom_image.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trace32.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trk_conn.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trk_sis.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -1,19 +1,19 @@
-<!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>Applications Launch Configuration</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2>Applications  Launch Configuration</h2>
-<p>Use the <b>Symbian OS Applications</b> launch configuration to launch projects using the best launch configuration match. When chosen, Carbide examines the project and determines which specific launch configuration  works best for the project, then launches it with the selected launch configuration. It is essentially identical to clicking the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) in the toolbar.</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!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>Applications Launch Configuration</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Applications  Launch Configuration</h2>
+<p>Use the <b>Symbian OS Applications</b> launch configuration to launch projects using the best launch configuration match. When chosen, Carbide examines the project and determines which specific launch configuration  works best for the project, then launches it with the selected launch configuration. It is essentially identical to clicking the <b>Debug</b> icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) in the toolbar.</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/menu_build_target.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_app_selection.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_build_options.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_debug_as.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_launch_types.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_rom_image.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_trk_conn.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_trk_sis.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_new_launch_config.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -10,7 +10,7 @@
 <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, on-device, and reference boards) 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>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="../../projects/images/icon_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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -10,80 +10,90 @@
 </head>
 <body >
 <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 build configuration in a project. Wherever possible the <b>New Launch Configuration </b> wizard gathers the information from the project and asks additional questions based on the type of launch configuration chosen. For example, a launch configuration using Application TRK requires different information than  one targeted for System TRK. </p>
+<p>Every project consists of one or more build configurations as listed under the <b>Build project</b> icon (<img src="../images/icon_build_project.png" alt="Build project icon" width="17" height="17" align="absmiddle">) of the toolbar or in the <a href="../../tasks/projects/prj_new_build_config.htm">Add/Remove Carbide Build Configuration</a> dialog. Every build configuration needs a launch configuration to enable debugging. Launch configurations can be shared between  build configurations. The <b>New Launch Configuration Wizard</b> detects when a build configuration doesn't have an associated launch configuration and guides you through the setup process.</p>
+<p align="center"><img src="images/menu_build_target.png" width="428" height="224"></p>
+<p class="figure">Figure 1. Build configurations for the chosen project appear under the Build icon</p>
+<p>To access the <b>New Launch Configuration Wizard</b> click the <b>Debug</b> icon (<img src="../../projects/images/icon_debug.png" alt="" width="17" height="16" align="absmiddle">) on the toolbar. If no launch configuration exists for the  selected build target the wizard is launched. If a launch configuration already exists, then that launch configuration is launched and not the wizard.</p>
+<h2>Launch Configuration Wizard Pages</h2>
+<p>The following are the possible pages you will see depending upon your choice of build configuration and type of debugging required. Different launch configurations need different information to work properly. The following table lists all the pages seen when choosing common types of debugging.</p>
 <table width="700"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="41%" scope="col">Launch Configuration</th>
-    <th width="59%" scope="col">Wizard Pages</th>
-  </tr>
-  <tr>
-    <td><b>Common pages</b></td>
-    <td><ul>
-      <li><a href="#CATEGORY">Category Type</a></li>
-      <li><a href="#LAUNCH">Launch Type</a></li>
-      <li><a href="#BLD_OPT">Build Option Selection</a></li>
-      <li><a href="#EXE_SEL">Executable Selection</a></li>
-      <li><a href="#FINISH">New Launch Configuration</a></li>
-    </ul>      </td>
-  </tr>
-  <tr>
-    <td><b>Emulation</b></td>
-    <td><ul>
-      <li><a href="#EXE_SEL">Executable Selection</a></li>
-      <li><a href="#BLD_OPT">Build Option Selection</a></li>
-      <li><a href="#FINISH">New Launch Configuration</a></li>
-      </ul>    </td>
-  </tr>
-  <tr>
-    <td><b>Application TRK and System TRK</b></td>
-    <td><ul>
-      <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
-      <li><a href="#TRK_SIS">TRK SIS Selection</a> (<i>Application TRK only</i>) </li>
-    </ul>    </td>
-  </tr>
-  <tr>
-    <td><b>Attach to Process</b></td>
-    <td><ul>
-      <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
-      </ul>    </td>
-  </tr>
+    <tr>
+        <th width="41%" scope="col">Launch Configuration</th>
+        <th width="59%" scope="col">Wizard Pages</th>
+    </tr>
+    <tr>
+        <td><b>Common pages</b></td>
+        <td><ul>
+            <li><a href="#DEBUGAS">Debug As</a></li>
+            <li>Launch Types</li>
+            <li><a href="#BLD_OPT">Build Option Selection</a></li>
+            <li><a href="#EXE_SEL">Executable Selection</a></li>
+            <li><a href="#FINISH">New Launch Configuration</a></li>
+        </ul></td>
+    </tr>
+    <tr>
+        <td><b>Simulator</b></td>
+        <td><ul>
+            <li><a href="#EXE_SEL">Executable Selection</a></li>
+            <li><a href="#BLD_OPT">Build Option Selection</a></li>
+            <li><a href="#FINISH">New Launch Configuration</a></li>
+        </ul></td>
+    </tr>
+    <tr>
+        <td><b>Application TRK and System TRK</b></td>
+        <td><ul>
+            <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
+            <li><a href="#TRK_SIS">TRK SIS Selection</a> (<i>Application TRK only</i>) </li>
+        </ul></td>
+    </tr>
+    <tr>
+        <td><b>Attach to Process</b></td>
+        <td><ul>
+            <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
+        </ul></td>
+    </tr>
 </table>
-<p>To access the <b>New Launch Configurtion Wizard</b> click the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">). If no launch configuration exists for the  build target the wizard is launched. If a launch configuration already exists, then that launch configuration is launched and not the wizard.</p>
-<p align="center"><img src="../../images/icons/menu_build_target.png" width="270" height="120"></p>
-<p class="figure">Figure 1 - Build Target selection list </p>
-<h3><a name="CATEGORY" id="LAUNCH2"></a>Category Types</h3>
-<p>Use the<b> Category Types</b> page to select the the  launch category.  The choices include Phone, Board, and possibly others. The choice made here filters the <b>Launch Types</b> page to  only show valid launch configurations. Once a category is selected, click <b>Next</b>. </p>
-<p align="center"><img src="images/wiz_launch_config_categories.png" width="438" height="533"></p>
-<p class="figure">Figure 2 - Category Types page </p>
+<h3><a name="DEBUGAS" id="LAUNCH2"></a>Debug As</h3>
+<p>Use the<b> Debug As </b>dialog  to select the method of debugging for the chosen build configuration.  The choices include: </p>
+<ul>
+    <li><b>Symbian OS Phone of Simulator Launch</b> &ndash; choose to work with attached phones or devices</li>
+</ul>
+<ul>
+    <li><b>Symbian OS Platform Simulator Launch</b> &ndash; choose to work with platform boards</li>
+</ul>
+<p>The choice made here filters the <b>Launch Types</b> page to  only show valid launch configurations. Once a debug as choice is made, click <b>OK</b>. </p>
+<p align="center"><img src="images/wiz_launch_config_debug_as.png" alt="Debug As dialog" width="346" height="435"></p>
+<p class="figure">Figure 1 - Debug As dialog </p>
 <h3><a name="LAUNCH" id="LAUNCH"></a>Launch Types</h3>
 <p>Use the<b> Launch Types</b> page to select the type of launch configuration for the build target. This page does not appear when using an Emulator target. Available types are listed from the most frequently chosen (Application TRK) to the least likely type (Attach to Process). Select a type and click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_launch_types.png" width="438" height="533"></p>
-<p class="figure">Figure 3 - Launch Type page </p>
+<p align="center"><img src="images/wiz_launch_config_launch_types.png" width="438" height="533"></p>
+<p class="figure">Figure 2 - Launch Type page </p>
 <h3><a name="BLD_OPT" id="EXE_SEL2"></a>Build Options Selection </h3>
 <p>Use the <b>Build Options Selection </b> page to define if the launch configuration uses automatic build or not. Choices include using the global automatic built setting (default), enable or disable automatic build for the launch configuration. You can also set the global option using the Configure Workspace Settings... to open the Launching preference panel.</p>
-<p align="center"><img src="images/wiz_launch_config_build_options.png" width="484" height="533"></p>
-<p class="figure">Figure 4 - Build Options Selection page </p>
+<p align="center"><img src="images/wiz_launch_config_build_options.png" width="631" height="433"></p>
+<p class="figure">Figure 3 - Build Options Selection page </p>
 <h3><a name="EXE_SEL" id="EXE_SEL"></a>Executable Selection </h3>
 <p>Use the <b>Application Selection </b> page to choose a binary created by the project to launch and debug and verify its location. If only a single binary is available the <b>Process to launch</b> option is disabled. </p>
 <p><b>EMULATOR ONLY</b> Use the <b>Location</b> field for emulator targets to verify that the correct executable on the host is selected. This field is not used with on-device launch configurations. </p>
 <p>Use the <b>Specify device path of remote process to launch</b> option to specify alternate paths for launching the executable from RAM (c:\sys\bin\), ROM (z:\sys\bin\) or  memory cards (e:\sys\bin\) . </p>
 <p>Select the Executable to launch, verify it is the correct binary, then click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_app_selection.png" width="438" height="533"> </p>
-<p class="figure">Figure 5 - Executable Selection page (when project has multiple EXEs)</p>
+<p align="center"><img src="images/wiz_launch_config_app_selection.png" width="438" height="533"> </p>
+<p class="figure">Figure 4 - Executable Selection page (when project has multiple EXEs)</p>
 <h3><a name="TRK_CONN" id="TRK_CONN"></a>TRK Connection Settings </h3>
 <p>Use the <b>TRK Connection Settings</b> page to specify the connection used to communicate with the target device. If the device is already connected, the drop down list will include both the COM port and the name of the device using that port. Use the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Conection</a> dialog to verify and update all Carbide software services on the device. Choose the serial port used to communicate with the target device and click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_trk_conn.png" width="487" height="533"> </p>
-<p class="figure">Figure 6 - TRK Connection Settings  page </p>
+<p align="center"><img src="images/wiz_launch_config_trk_conn.png" width="487" height="533"> </p>
+<p class="figure">Figure 5 - TRK Connection Settings  page </p>
 <p>&nbsp;</p>
 <h3><a name="TRK_SIS" id="TRK_SIS"></a>TRK SIS Selection</h3>
 <p>Use the <b>TRK SIS Selection</b> page to select the SIS file to install on the target device. Click the <b>Modify SIS builder settings for build configuration</b> link to open the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> properties pane to add, edit, or review  the SIS files to build. Once the correct SIS File to Install is selected, click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_trk_sis.png" width="463" height="533"></p>
-<p class="figure">Figure 7 - TRK SIS Selection page </p>
+<p align="center"><img src="images/wiz_launch_config_trk_sis.png" width="463" height="533"></p>
+<p class="figure">Figure 6 - TRK SIS Selection page </p>
 <h3><a name="FINISH" id="FINISH"></a>New Launch Configuration</h3>
 <p>Use the <b>New Launch Configuration</b> page to note the name of the configuration, confirm the launch configuration settings,  and then launch the debug session. If something doesn't look right, click <b>Back</b> to return to a page and change its setting. If all the settings are correct, click <b>Finish</b> to start the debug session using this launch configuration. </p>
 <p>If you checkmark <b> Advanced settings</b>, the <a href="../../reference/wnd_debug_configuration.htm">Debug</a> dialog appears instead of launching the project. This enables you to make additional changes to the new launch configuration before starting the debug session. By design and intent, this should seldom be required for the initial launch. </p>
-<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>
+<p align="center"><img src="images/wiz_launch_new_launch_config.png" alt="New Launch Configuration dialog" width="631" height="433"></p>
+<p class="figure">Figure 7 - New Launch Configuration page </p>
 <h5>Other references</h5>
 <ul>
   <li><a href="../../projects/launch/launch_configs_overview.htm">Launch Configuration</a>  </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_03.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_03.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -25,7 +25,7 @@
             <ul>
                 <li>Right-click the project in the Project Explorer view and choose <strong>Debug As &gt; Debug Symbian OS Application on Phone or Simulator</strong> menu option.</li>
                 <li>Click the Run &gt; Debug (F11) menu option.</li>
-                <li>Click the Debug (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar to build the project. </li>
+                <li>Click the Debug (<img src="../projects/images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar to build the project. </li>
             </ul>
             <p>The first time you perform any of the following actions, the <strong>New Launch Configuration Wizard</strong> appears asking for the additional info to connect to a device.</p>
             <p><img src="../images/dll_new_launch_config.png" alt="New Launch Configuration Wizard" width="550" height="460"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -32,7 +32,7 @@
             <ul>
                 <li>Right-click the project and choose Debug As &gt; Debug Symbian OS Application on Emulator.</li>
                 <li>Click the Run &gt; Debug (<span class="code">F11</span>) menu item.</li>
-                <li>Click the Debug (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar.</li>
+                <li>Click the Debug (<img src="../projects/images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar.</li>
             </ul>
             <p>The emulator is launched and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears to manage the debug session.</p>
         </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -25,7 +25,7 @@
     		<p>We choose <strong>Phone Debug (armv5_udeb)</strong> for this example using the <strong>Manage Configurations</strong> icon on the toolbar, but yours name may differ based upon the SDK  selected for your project.</p>
             <p><img src="../images/debugging_project_07.png" alt="Select device target"></p>
         </li>
-        <li>Click the Debug icon (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) on the toolbar.
+        <li>Click the Debug icon (<img src="../projects/images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) on the toolbar.
     		<p>This opens the <strong>New Launch Configuration Wizard</strong> dialog asking for additional information. For the first launch you must define the name of the package to install on the target device.</p>
             <p><img src="../images/debugging_project_08.png" alt="New Launch Configuration Wizard" width="538" height="434"></p>
             <ol type="a">
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -24,7 +24,7 @@
         <li>Set breakpoints in the program.
         	<p><a href="../../debugger/breakpoints/toggling_breakpoints.htm">Set breakpoints</a> at the critical points in the program where you want to stop execution.</p>
         </li>
-        <li>Click the Debug icon (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) to launch the program for debugging on the target device.
+        <li>Click the Debug icon (<img src="../projects/images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) to launch the program for debugging on the target device.
         	<p>Follow the steps in <a href="run_mode_debug_example_03.htm">Configure project for downloading</a> to build and launch the program for debugging.</p>
         </li>
         <li>Use the Carbide debugger to examine program internals and control its execution.
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -13,7 +13,7 @@
 <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> debug a process running on a device by <a href="../tasks/processes/attach_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_proj_explorer.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>
@@ -25,7 +25,7 @@
 <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>
+<p align="left">The <strong>Executables</strong> view consists of the <strong>Executable Name</strong> and <strong>Source File Name</strong> panes describled in the table below. Use the <strong>Columns</strong> button in the toolbar to show or hide specific columns in each pane. Columns can be sorted and rearranged in the order desired. </p>
 <h5>Table 1. Executables view  information </h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -61,7 +61,7 @@
   </tr>
 </table>
 <h4>Executables view toolbar icons</h4>
-<p>The table below lists the unique icons displayed in the Executables view toolbar. </p>
+<p>The table below lists the unique icons displayed in the <strong>Executables</strong> view toolbar. </p>
 <h5>Table 2. Executables view toolbar options </h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -77,7 +77,7 @@
     <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>
+      <td>Click to select and import an executable not in the workspace into the executables list. </td>
     </tr>
     <tr>
       <td><center>
@@ -96,6 +96,8 @@
 <h5>Other references</h5>
 <ul>
   <li><a href="perspective_debug.htm">Debug perspective </a></li>
+  <li><a href="../concepts/autotargeting.htm">Auto-Targeting of Executables</a></li>
+  <li><a href="../tasks/processes/attach_to_process.htm">Attaching to a Process</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -9,12 +9,12 @@
 </head>
 <body >
 <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>Use the <b>Debug</b> command (<img src="../../projects/images/icon_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>
+    <li>Click the Debug button (<img src="../../projects/images/icon_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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm	Tue Aug 31 14:13:15 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!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 >
-<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; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_to_process.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -0,0 +1,50 @@
+<!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 Process</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Attaching  to a Process</h2>
+<div>
+  <p>Use a <b>Symbian OS Attach to Process</b> launch configuration to attach the debugger to an already running Symbian OS process or thread on a target device. This is useful for debugging DLLs where the main process is unknown or for servers running in RAM in a client-server relationship where the client relies on the presence of the server process to operate.</p>
+  <p>One common debugging DLL use case is when the developer doesn't know which process calls the DLL. This makes it difficult to debug the DLL because you doesn't know which process to attach to nor start. Carbide enables DLL debugging  by simply attaching the DLL to any running process as long as the DLL is included in the <a href="../../reference/view_executables.htm">Executables</a> view.</p>
+  <p>You can also attach to a process in the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view when debugging.</p>
+  <p class="note"><b>NOTE</b> You cannot attach to a process running on the emulator. It must be a target device running the Symbian OS and the 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 any Running Process</h4>
+    <ol>
+      <li>In the <a href="../../reference/view_executables.htm">Executables</a> view, click the Import an executable file icon (<img src="../../images/icons/btn_import_executables.png" alt="Import an executable icon" width="18" height="15" align="absmiddle">) to add an executable to the Executables view for debugging.
+          <p>The executable added appears in the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> view under an <b>Executables</b> project. This group includes all executables listed in the <b>Executables</b> view that are not linked to any project in the workspace.</p>
+          <p align="center"><img src="../projects/images/attach_to_process_proj_explorer.png" alt="Project Explorer Executables project" width="267" height="267"></p>
+          <p class="figure">Figure 1 -<b> Executables list in Project Explorer view</b></p>
+          <p class="note"><b>NOTE</b> The executable must include symbolics in order for debugging to work.</p>
+      </li>
+      <li>Click Debug (<img src="../../projects/images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Configuration Launch Wizard</a>.</li>
+      <p>Select the Symbian OS Attach to Process launch configuration option and fill in the requested information.</p>
+      <p align="center"><img src="../projects/images/attach_to_process_launch_config.png" alt="Attach to Process launch config" width="641" height="312"></p>
+      <p class="figure">Figure 2 -<b> Attach to Process</b> launch configuration</p>
+      <li>Click Debug.</li>
+      <p>The <b>Attach to Process </b>dialog 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 3 -<b> Attach to Process</b> window </p>
+      <li>Select a process, click OK.</li>
+      <p>In this example we've linked the <span class="code">prefs.dll</span> program to the process <span class="code">BlackFlag.exe</span> on the device. The <b>Attach to Process </b>dialog closes. Open the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</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>
+<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>
+  <li><a href="../projects/prj_debug_dlls_any_process.htm">Debugging DLLs with any Process</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/attach_to_process_launch_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/attach_to_process_proj_explorer.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -20,7 +20,7 @@
 <h4>Creating a Default Launch Configuration</h4>
 <p class="note"><b>NOTE</b> Carbide only creates a new default launch configuration when it cannot find one in the project. If the project already contains a launch configuration, Carbide 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
+  <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="../../projects/images/icon_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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -14,7 +14,7 @@
   <li>If the DLL appears in the <a href="../../reference/view_executables.htm">Executables</a> view it can be debugged. Just <a href="../breakpoints/pgm_bp_setting.htm">set</a> breakpoints inside the DLL sources before you start the debug session. The next time  the  project is debugged, the DLL is loaded and made  available for debugging.</li>
 </ul>
 <blockquote>
-  <p class="note"><b class="note">NOTE</b> Breakpoints inside a DLL will not be <a href="../../concepts/breakpoints.htm">resolved</a> until the DLL is loaded into memory by the calling binary. </p>
+  <p class="note"><b class="note">NOTE</b> Breakpoints inside a DLL are not  <a href="../../concepts/breakpoints.htm">resolved</a> until the DLL is loaded into memory by the calling binary. </p>
 </blockquote>
 <ul>
   <li>If the DLL is not built by the project you can import the DLL by  clicking the<b> Import an executable file</b> icon (<img src="../../images/icons/btn_import_executables.png" width="18" height="15" align="absmiddle">) in the <a href="../../reference/view_executables.htm">Executables</a> view. Then, set your  breakpoints and start the  debug session.</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -22,7 +22,7 @@
     <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
+    <li>Click the Debug icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration</a> wizard
       <ol type="a">
         <li>Select the Application 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -32,7 +32,7 @@
 <p>At this point you can open sources files from the <b>Executables</b> view or project view in order to set breakpoints.</p>
 <h5>Related tasks</h5>
 <ul>
-  <li><a href="../processes/attach_debugger_to_process.htm">Attaching to a Symbian OS Process </a></li>
+  <li><a href="../processes/attach_to_process.htm">Attaching to a Symbian OS Process </a></li>
 </ul>
 <h5>Related references</h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Tue Aug 31 16:18:02 2010 -0500
@@ -14,7 +14,7 @@
   <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>By default, you can click the <b>Debug</b> icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) in the toolbar to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. This   creates a launch configuration for the project based on project information and any additional input required, like COM port selection. It is the recommended method for creating new launch configurations. Or, use the <a href="../../projects/launch/page_main.htm">Debug</a> window to create a customized  launch configuration. </p>
 <p align="center"><img src="../../reference/images/wnd_trk_debug_config.png" width="819" height="593" /></p>
 <p class="figure">Figure 1. Debug launch configuration for on-device debugging   (<i>Application TRK shown</i>)</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/index.xml	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/index.xml	Tue Aug 31 16:18:02 2010 -0500
@@ -13,7 +13,7 @@
 	</entry>
 
     <entry keyword="Attaching to a Symbian OS Process ">
-	   <topic href="html/tasks/processes/attach_debugger_to_process.htm" label="Attaching debugger to Symbian OS Process"/>
+	   <topic href="html/tasks/processes/attach_to_process.htm" label="Attaching debugger to Symbian OS Process"/>
 	</entry>
 
 <!-- B -->
@@ -491,7 +491,7 @@
 	</entry>
 
 	<entry keyword="Processes">
-	   <topic href="html/tasks/processes/attach_debugger_to_process.htm" label="Attaching debugger to Symbian OS Process"/>
+	   <topic href="html/tasks/processes/attach_to_process.htm" label="Attaching debugger to Symbian OS Process"/>
 	</entry>
 
     <entry keyword="Projects">
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Aug 31 14:13:15 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Aug 31 16:18:02 2010 -0500
@@ -31,6 +31,7 @@
 		  <topic label="Creating DLL Projects" 						href="html/projects/tutorials/new_proj_dll_example_01.htm" />
 		  <topic label="Building the DLL Project" 					href="html/projects/tutorials/new_proj_dll_example_02.htm" />
 		  <topic label="Debugging a DLL Project"					href="html/projects/tutorials/new_proj_dll_example_03.htm" />
+      	  <topic label="Debugging DLLs with Any Process"			href="html/tasks/projects/prj_debug_dlls_any_process.htm" />
 		</topic>
 		<topic label="Remote Target Debugging (Run-mode)"			href="html/projects/tutorials/run_mode_debug_example_00.htm" >
 		  <topic label="Connect remote device to PC" 				href="html/projects/tutorials/run_mode_debug_example_01.htm" />
@@ -278,7 +279,7 @@
     -->
         
       <topic href="html/tasks/projects/prj_debug_dlls.htm" label="Debugging DLLs"></topic>
-      <topic href="html/tasks/processes/attach_debugger_to_process.htm" label="Attaching to a Symbian OS Process"></topic>
+      <topic href="html/tasks/processes/attach_to_process.htm" label="Attaching to a Process"></topic>
       <topic href="html/tasks/start/carbide_debugging.htm" label="Debugging a Symbian OS Program"></topic>
       <topic href="html/reference/view_sym_os_data_overview.htm" label="Symbian OS Data View"></topic>
         
@@ -323,9 +324,11 @@
       </topic>
     </topic>
     <topic label="Debugging variations"                     href="html/concepts/debugger_about.htm" >
+      <topic label="Attaching to a Process"					href="html/tasks/processes/attach_to_process.htm" />
+      <topic label="Auto-Targeting of Executables"			href="html/concepts/autotargeting.htm" />
+      <topic label="Debugging DLLs"							href="html/tasks/projects/prj_debug_dlls.htm" />
+      <topic label="Debugging in ROM"		                href="html/tasks/projects/prj_debug_rom.htm" />
       <topic label="Emulation Debugging"			        href="html/concepts/emulators.htm" />
-      <topic label="Debugging DLLs"						href="html/tasks/projects/prj_debug_dlls.htm" />
-      <topic label="Debugging in ROM"		                href="html/tasks/projects/prj_debug_rom.htm" />
     </topic>
 
       <topic label="Troubleshooting" 						href="html/tasks/trk/trk_troubleshooting.htm"/>