merge commit RCL_2_4
authortimkelly
Wed, 27 Jan 2010 10:34:50 -0600
branchRCL_2_4
changeset 830 ce9defbd72a6
parent 828 17e718655d73 (diff)
parent 829 0396114c1f2e (current diff)
child 832 b363199c7c6e
merge commit
--- a/core/com.nokia.carbide.cpp.doc.user/.project	Mon Jan 25 15:43:57 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.nokia.carbide.cpp.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
--- a/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/stop_mode_cs.xml	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/stop_mode_cs.xml	Wed Jan 27 10:34:50 2010 -0600
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<cheatsheet title="On-device Stop Mode Debugging Setup">
-	<intro>
-		<description>
-		Follow these steps to install on-device stop mode debug software and compilers, create ROM images, and define launch configurations.
-		</description> 
-	</intro> 
-	
-	<item title="Install necessary compilers, SDKs, and create ROM image files" href="/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm" >
-		<description>
-		Before you begin stop mode debugging, make sure all preconditions are met.
-		</description>
-	</item>
-	
-	<item title="Define a Trace32 or Sophia Launch Configuration" href="/com.nokia.carbide.cpp.doc.user/html/reference/wnd_Trace32_config.htm" >
-		<description>
-		Define debug launch configurations for the selected project.
-		</description>
-	</item>
-	
-</cheatsheet>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cheatsheet title="On-device Stop Mode Debugging Setup">
+	<intro>
+		<description>
+		Follow these steps to install on-device stop mode debug software and compilers, create ROM images, and define launch configurations.
+		</description> 
+	</intro> 
+	
+	<item title="Install necessary compilers, SDKs, and create ROM image files" href="/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm" >
+		<description>
+		Before you begin stop mode debugging, make sure all preconditions are met.
+		</description>
+	</item>
+	
+	<item title="Define a Trace32 Launch Configuration" href="/com.nokia.carbide.cpp.doc.user/html/reference/wnd_Trace32_config.htm" >
+		<description>
+		Define debug launch configurations for the selected project.
+		</description>
+	</item>
+	
+</cheatsheet>
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml	Wed Jan 27 10:34:50 2010 -0600
@@ -237,15 +237,6 @@
 		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
 	</context>
 
-	<!--  STOPMODE.SOPHIACONNECTION -->
-	<context id="stopmode_sophiaconnection" >
-		<description>Specify the settings for Sophia debugging.</description>
-		<topic label="Sophia Target Interface Support"    	href="html/reference/wnd_sophia_config.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-
 	<!--  STOPMODE.ROMIMAGE -->
 	<context id="stopmode_romimage" >
 		<description>Specify the ROM image details.</description>
@@ -287,12 +278,6 @@
 		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
 	</context>
 
-	<context id="wizard_sophia_page" >
-		<description>Specify Sophia configuration information.</description>
-		<topic label="Creating a Launch Configuration"				href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Symbian OS Sophia Target Interface Support"	href="html/reference/wnd_sophia_config.htm" />
-	</context>
-
 	<context id="wizard_trace32_page" >
 		<description>Specify Trace32 configuration information.</description>
 		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Wed Jan 27 10:34:50 2010 -0600
@@ -1,376 +1,370 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- =============================================================================== -->
-<!-- CONTEXT HELP FOR ECLIPSE DIALOGS AND PLUGINS USED BY CARBIDE                    -->
-<!-- Includes context help references for:                                           -->
-<!--    plugin="org.eclipse.debug.ui"                                                -->
-<!--    plugin="org.eclipse.ui"                                                      -->
-<!--    plugin="org.eclipse.ui.console"                                              -->
-<!--    plugin="org.eclipse.ui.ide"                                                  -->
-<!--    plugin="org.eclipse.ui.workbench"                                            -->
-<!-- =============================================================================== -->
-
-<contexts>
-
-<!-- =============================================================================== -->
-<!-- PLUGIN: org.eclipse.debug.ui                                                    -->
-<!-- =============================================================================== -->
-	
-	<!-- ============================================================== -->
-	<!-- DEBUG VIEW                                                     -->
-	<context id="debug_view_context" >
-		<description>The Debug view shows the target debugging information in a tree hierarchy.</description>
-		<topic label="Debug view"  						href="html/reference/view_debug.htm" />
-		<topic label="Controlling debugger execution"  	href="html/concepts/working_with_debugger.htm" />
-	</context>
-
-
-	<!-- ============================================================== -->
-	<!-- VARIABLES VIEW                                                 -->
-	<context id="variable_view_context" >
-		<description>Use the Variables view to manipulate the variables or variable hierarchy used in source code.</description>
-		<topic label="Variables view"             		href="html/reference/view_variables.htm" />
-		<topic label="Show Variables View"		  		href="html/tasks/variables/show_variables_view.htm" />
-		<topic label="Showing Global Variables"	  		href="html/tasks/variables/show_global_variables.htm" />
-	</context>
-
-	
-	<!-- ============================================================== -->
-	<!-- BREAKPOINTS VIEW                                               -->
-	<context id="breakpoint_view_context"  >
-		<description>Use the Breakpoints view to examine, enable or disable the breakpoints in one or more build configurations.</description>
-		<topic label="Breakpoints view"  					href="html/reference/view_breakpoints.htm" />
-		<topic label="Breakpoints" 				            href="html/concepts/breakpoints.htm" />
-	</context>
-
-
-	<!-- ============================================================== -->
-	<!-- EXPRESSIONS VIEW                                               -->
-	<context id="expression_view_context" >
-		<description>Use the Expressions view to monitor and manipulate variables, structures, and arrays.</description>
-		<topic label="Expressions view"  				href="html/reference/view_expressions.htm" />
-		<topic label="Adding Expressions" 				href="html/tasks/expressions/expr_adding.htm" />
-		<topic label="Editing Expressions" 				href="html/tasks/expressions/expr_editding.htm" />
-		<topic label="Removing Expressions" 			href="html/tasks/expressions/expr_removing.htm" />
-	</context>
-
-
-	<!-- LAUNCH CONFIGURATION VIEW 
-	<context id="launch_configuration_view_context" >
-		<description>Use the Launch view to </description>
-		<topic label="Launch Configuration view"  							href="html/reference/.htm" />
-	</context>
-   -->
-	
-	<!-- ============================================================== -->
-	<!-- REGISTERS VIEW                                                 -->
-	<context id="registers_view_context" >
-		<description>Use the Registers view to view general, FPU, and host-specific registers of the host computer, not the target device.</description>
-		<topic label="Registers view"  						href="html/reference/view_registers.htm" />
-		<topic label="Opening a Registers View"				href="html/tasks/registers/mem_reg_open_wnd.htm" />
-		<topic label="Viewing Registers"					href="html/tasks/registers/mem_reg_viewing.htm" />
-		<topic label="Changing Register Values"				href="html/tasks/registers/mem_reg_changing.htm" />
-	</context>
-
-		
-	<!-- ============================================================== -->
-	<!-- MEMORY VIEW                                                    -->
-	<context id="MemoryView_context" >
-		<description>Use the Memory view to inspect and change process memory.</description>
-		<topic label="Memory view"  							href="html/reference/view_memory_wnd.htm" />
-		<topic label="Adding Memory Monitors"					href="html/tasks/memory/memory_monitor_adding.htm" />
-		<topic label="Adding Memory Renderings"					href="html/tasks/memory/memory_rendering_adding.htm" />
-		<topic label="Removing Memory Monitors or Renderings"	href="html/tasks/memory/memory_monitor_removing.htm" />
-	</context>
-
-	<!-- SOURCES -->
-	<context id ="source_container_lookup_tab" >
-	   <description>Specify where the debugger should look for source files.</description>
-	   <topic label="Source" href="../org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm" />
-	</context>
-	
-	<!-- COMMON -->
-	<context id ="launch_configuration_dialog_common_tab ">
-	   <description>Specify where the debugger should store the debug configuration.</description>
-	   <topic label="Common"	href="../org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm" />
-	</context>
-
-	<context id="wizard_selection_page" >
-		<description>Select a launch type to create a launch configuration.</description>
-		<topic label="Creating a Launch Configuration"	href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Launch Configurations"			href="html/concepts/launch_configuration.htm" />
-		<topic label="Launch Configuration Filter"		href="html/reference/launch_configuration_filter.htm" />
-		<topic label="Carbide Project Settings"		    href="html/reference/build_properties/pane_project_settings.htm" />
-	</context>
-
-	<context id="wizard_summary_page" >
-		<description>Review launch configuration information.</description>
-		<topic label="Creating a Launch Configuration"	href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Launch Configurations"			href="html/concepts/launch_configuration.htm" />
-	</context>
-
-	<context id="wizard_sophia_page" >
-		<description>Specify Sophia configuration information.</description>
-		<topic label="Creating a Launch Configuration"				href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Symbian OS Sophia Target Interface Support"	href="html/reference/wnd_sophia_config.htm" />
-	</context>
-
-	<context id="wizard_trace32_page" >
-		<description>Specify Trace32 configuration information.</description>
-		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Symbian OS Trace32 Support"			href="html/reference/wnd_Trace32_config.htm" />
-	</context>
-
-	<context id="wizard_trk_connection_page" >
-		<description>Specify TRK connection information.</description>
-		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
-	</context>
-
-	<context id="wizard_rom_image_page" >
-		<description>Specify ROM image information.</description>
-		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Launch Configurations"				href="html/concepts/launch_configuration.htm" />
-	</context>
-
-	<context id="get_sis_info_dialog" >
-		<description>Specify SIS information.</description>
-		<topic label="Set PKG File for Build Configuration"		href="html/reference/build_properties/pane_pkg_config.htm" />
-		<topic label="Creating a Launch Configuration"			href="html/tasks/projects/prj_debug_config.htm" />
-	</context>
-	
-	<!-- PREFERENCE PAGES  -->
-
-	<!--
-	<context id="debug_preference_page_context" >
-	</context>
-	 -->
-
-	<!--
-	<context id="debug_action_groups_views_preference_page_context" >
-	</context>
-	 -->
-
-	<!--
-	<context id="launch_history_preference_page_context" >
-	</context>
-	 -->
-
-	<!--
-	<context id="simple_variable_preference_page_context" >
-	</context>
-	 -->
-
-
-	<!-- DIALOGS  -->
-
-	<!--
-	<context id="launch_configuration_properties_dialog" >
-	</context>
-	 -->
-
-	<!--
-	<context id="single_launch_configuration_dialog" >
-	</context>
-	 -->
-
-	<!--
-	<context id="variable_selection_dialog_context" >
-	</context>
-	 -->
-
-	<!--
-	<context id="edit_source_lookup_path_dialog" >
-	</context>
-	 -->
-
-	<!--
-	<context id="source_container_lookup_tab" >
-	</context>
-	 -->
-
-	<!--
-	<context id="edit_source_lookup_path_dialog" >
-	</context>
-	 -->
-
-	<!--
-	<context id="add_source_container_dialog" >
-	</context>
-	 -->
-
-	<!--
-	<context id="project_source_container_dialog" >
-	</context>
-	 -->
-
-	<!--
-	<context id="folder_source_container_dialog" >
-	</context>
-	 -->
-
-	<!--
-	<context id="archive_source_container_dialog" >
-	</context>
-	 -->
-
-	<!--
-	<context id="multiple_source_selection_dialog" >
-	</context>
-	 -->
-
-
-	<!-- PROPERTY PAGES  -->
-
-	<!--
-	<context id="process_property_page_context" >
-	</context>
-	 -->
-
-	
-	<!-- LAUNCH CONFIGURATION DIALOG PAGES  -->
-
-	<!-- ============================================================== -->
-	<!-- LAUNCH CONFIGURATION DIALOG                                    -->
-	<context id="launch_configuration_dialog" >
-		<description>Use the Debug or Run panels to create launch configurations for your applications.</description>
-		<topic label="Creating Launch Configurations"			href="html/tasks/projects/prj_debug_config.htm" />
-	</context>
-	 
-	<!--
-	<context id="launch_configuration_dialog_common_tab" >
-	</context>
-	 -->
-
-	<!--
-	<context id="launch_configuration_dialog_perspective_tab" >
-	</context>
-	 -->
-
-	<!--    -->
-	<context id="launch_configuration_dialog_environment_tab" >
-        <description>Use the environment pane to add or remove environment variables.</description>
-		<topic label="Environment pane"  				href="html/reference/emulator/wnd_emulator_overview.htm" />
-	</context>
-
-	
-	<!-- WORKING SET PAGE  -->
-
-	<!--
-	<context id="working_set_page_context" >
-	</context>
-	 -->	
-	
-	<!-- DEBUGGER EDITOR  -->
-
-	<!--
-	<context id="debugger_editor_no_source_common" >
-	</context>
-	 -->	
-
-		
-<!-- =============================================================================== -->
-<!-- PLUGIN: org.eclipse.ui                                                          -->
-<!-- =============================================================================== -->
-
-	<!-- ============================================================== -->
-	<!-- NEW WIZARD -->
-	<context id="new_wizard_selection_wizard_page_context" >
-		<description>Select the project, class, or file to create.</description>
-		<topic label="New Symbian OS ++ Projects" 				href="html/tasks/CreatingNewProjects.html"/>
-		<topic label="New Symbian OS C++ Classes"				href="html/tasks/projects/prj_adding_symbian_class.htm" />
-		<topic label="New Symbian OS MMP File"		        	href="html/reference/NewMMP_wizard.html" />
-	</context>
-
-
-	<!-- ============================================================== -->
-	<!-- IMPORT WIZARD                                                  -->
-	<context id="import_wizard_selection_wizard_page_context" >
-		<description>Select the type of file to import for debugging.</description>
-		<topic label="Importing Projects from a BLD.INF File"	href="html/tasks/ImportingProjects.html"/>
-		<topic label="Importing a Symbian Executable"  			href="html/reference/projects/prj_import_exe.htm" />
-		<topic label="Carbide.c++ Perspective" 					href="html/concepts/SymbianPerspective.html" />
-		<topic label="C/C++ Project and File Properties"		href="html/reference/ProjectPreferences.html" />
-	</context>
-
-    <context id="import_wizard_context">
-		<description>Import an executable for debugging.</description>
-		<topic label="Importing a Symbian Executable"  			href="html/tasks/projects/prj_import_exe.htm" />
-    </context>
-
-	
-	<!-- ============================================================== -->
-	<!-- EXPORT WIZARD                                                  -->
-	<context id="export_wizard_selection_wizard_page_context" >
-		<description>Use the Console view to show the output of a process and provide keyboard input to a process.</description>
-		<topic label="Console view"  			href="html/reference/view_log.htm" />
-	</context>
-
-	
-	<!-- PREFERENCE PANELS -->
-
-	<!-- KEYS
-	<context id="keys_preference_page_context" >
-		<description>Use the Console view to show the output of a process and provide keyboard input to a process.</description>
-		<topic label="Console view"  			href="html/reference/view_log.htm" />
-	</context>
-	-->
-	
-
-<!-- =============================================================================== -->
-<!-- PLUGIN: org.eclipse.ui.console                                                  -->
-<!-- =============================================================================== -->
-	
-	<!-- ============================================================== -->
-	<!-- CONSOLE VIEW                                                   -->
-	<context id="console_view_context" >
-		<description>Use the Console view to show the output of a process and provide keyboard input to a process.</description>
-		<topic label="Console view"  			href="html/reference/view_log.htm" />
-	</context>
-
-	<!-- PREFERENCE PANEL 
-	<context id="console_preference_page_context" >
-	</context>
-	 -->
-	
-	
-<!-- =============================================================================== -->
-<!-- PLUGIN: org.eclipse.ui.ide                                                      -->
-<!-- =============================================================================== -->
-	
-	<!-- ============================================================== -->
-	<!-- NEW PROJECT WIZARD PAGE                                        -->
-	<context id="new_project_wizard_page_context" >
-		<description>Select the project type to create.</description>
-		<topic label="Creating New Projects"		href="html/tasks/CreatingNewProjects.html" />
-	</context>
-
-	
-<!-- =============================================================================== -->
-<!-- PLUGIN: org.eclipse.ui.workbench                                                -->
-<!-- =============================================================================== -->
-	
-	<!-- CONFIGURATION DETAILS CONTROL -->
-	<context id="system_summary_dialog_context" >
-		<description>Configuration details of this Carbide.c++ installation. May include useful information that should be included with a bug report.</description>
-	</context>
-
-	<!-- FEATURE DETAILS CONTROL
-	<context id="about_features_dialog_context" >
-		<description>This dialog shows configuration details for this Carbide.c++ installation.</description>
-	</context>
-    -->
-	
-	<!-- PLUG-IN DETAILS CONTROL
-	<context id="about_plugins_dialog_context" >
-		<description>This dialog shows configuration details of this Carbide.c++ installation.</description>
-	</context>
-    -->
-	
-	<!-- ? DETAILS CONTROL
-	<context id="about_plugins_dialog_context" >
-		<description>2.This dialog shows configuration details of this Carbide.c++ installation.</description>
-	</context>
-	 -->
-
-
-</contexts>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- =============================================================================== -->
+<!-- CONTEXT HELP FOR ECLIPSE DIALOGS AND PLUGINS USED BY CARBIDE                    -->
+<!-- Includes context help references for:                                           -->
+<!--    plugin="org.eclipse.debug.ui"                                                -->
+<!--    plugin="org.eclipse.ui"                                                      -->
+<!--    plugin="org.eclipse.ui.console"                                              -->
+<!--    plugin="org.eclipse.ui.ide"                                                  -->
+<!--    plugin="org.eclipse.ui.workbench"                                            -->
+<!-- =============================================================================== -->
+
+<contexts>
+
+<!-- =============================================================================== -->
+<!-- PLUGIN: org.eclipse.debug.ui                                                    -->
+<!-- =============================================================================== -->
+	
+	<!-- ============================================================== -->
+	<!-- DEBUG VIEW                                                     -->
+	<context id="debug_view_context" >
+		<description>The Debug view shows the target debugging information in a tree hierarchy.</description>
+		<topic label="Debug view"  						href="html/reference/view_debug.htm" />
+		<topic label="Controlling debugger execution"  	href="html/concepts/working_with_debugger.htm" />
+	</context>
+
+
+	<!-- ============================================================== -->
+	<!-- VARIABLES VIEW                                                 -->
+	<context id="variable_view_context" >
+		<description>Use the Variables view to manipulate the variables or variable hierarchy used in source code.</description>
+		<topic label="Variables view"             		href="html/reference/view_variables.htm" />
+		<topic label="Show Variables View"		  		href="html/tasks/variables/show_variables_view.htm" />
+		<topic label="Showing Global Variables"	  		href="html/tasks/variables/show_global_variables.htm" />
+	</context>
+
+	
+	<!-- ============================================================== -->
+	<!-- BREAKPOINTS VIEW                                               -->
+	<context id="breakpoint_view_context"  >
+		<description>Use the Breakpoints view to examine, enable or disable the breakpoints in one or more build configurations.</description>
+		<topic label="Breakpoints view"  					href="html/reference/view_breakpoints.htm" />
+		<topic label="Breakpoints" 				            href="html/concepts/breakpoints.htm" />
+	</context>
+
+
+	<!-- ============================================================== -->
+	<!-- EXPRESSIONS VIEW                                               -->
+	<context id="expression_view_context" >
+		<description>Use the Expressions view to monitor and manipulate variables, structures, and arrays.</description>
+		<topic label="Expressions view"  				href="html/reference/view_expressions.htm" />
+		<topic label="Adding Expressions" 				href="html/tasks/expressions/expr_adding.htm" />
+		<topic label="Editing Expressions" 				href="html/tasks/expressions/expr_editding.htm" />
+		<topic label="Removing Expressions" 			href="html/tasks/expressions/expr_removing.htm" />
+	</context>
+
+
+	<!-- LAUNCH CONFIGURATION VIEW 
+	<context id="launch_configuration_view_context" >
+		<description>Use the Launch view to </description>
+		<topic label="Launch Configuration view"  							href="html/reference/.htm" />
+	</context>
+   -->
+	
+	<!-- ============================================================== -->
+	<!-- REGISTERS VIEW                                                 -->
+	<context id="registers_view_context" >
+		<description>Use the Registers view to view general, FPU, and host-specific registers of the host computer, not the target device.</description>
+		<topic label="Registers view"  						href="html/reference/view_registers.htm" />
+		<topic label="Opening a Registers View"				href="html/tasks/registers/mem_reg_open_wnd.htm" />
+		<topic label="Viewing Registers"					href="html/tasks/registers/mem_reg_viewing.htm" />
+		<topic label="Changing Register Values"				href="html/tasks/registers/mem_reg_changing.htm" />
+	</context>
+
+		
+	<!-- ============================================================== -->
+	<!-- MEMORY VIEW                                                    -->
+	<context id="MemoryView_context" >
+		<description>Use the Memory view to inspect and change process memory.</description>
+		<topic label="Memory view"  							href="html/reference/view_memory_wnd.htm" />
+		<topic label="Adding Memory Monitors"					href="html/tasks/memory/memory_monitor_adding.htm" />
+		<topic label="Adding Memory Renderings"					href="html/tasks/memory/memory_rendering_adding.htm" />
+		<topic label="Removing Memory Monitors or Renderings"	href="html/tasks/memory/memory_monitor_removing.htm" />
+	</context>
+
+	<!-- SOURCES -->
+	<context id ="source_container_lookup_tab" >
+	   <description>Specify where the debugger should look for source files.</description>
+	   <topic label="Source" href="../org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm" />
+	</context>
+	
+	<!-- COMMON -->
+	<context id ="launch_configuration_dialog_common_tab ">
+	   <description>Specify where the debugger should store the debug configuration.</description>
+	   <topic label="Common"	href="../org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm" />
+	</context>
+
+	<context id="wizard_selection_page" >
+		<description>Select a launch type to create a launch configuration.</description>
+		<topic label="Creating a Launch Configuration"	href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Launch Configurations"			href="html/concepts/launch_configuration.htm" />
+		<topic label="Launch Configuration Filter"		href="html/reference/launch_configuration_filter.htm" />
+		<topic label="Carbide Project Settings"		    href="html/reference/build_properties/pane_project_settings.htm" />
+	</context>
+
+	<context id="wizard_summary_page" >
+		<description>Review launch configuration information.</description>
+		<topic label="Creating a Launch Configuration"	href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Launch Configurations"			href="html/concepts/launch_configuration.htm" />
+	</context>
+
+	<context id="wizard_trace32_page" >
+		<description>Specify Trace32 configuration information.</description>
+		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Symbian OS Trace32 Support"			href="html/reference/wnd_Trace32_config.htm" />
+	</context>
+
+	<context id="wizard_trk_connection_page" >
+		<description>Specify TRK connection information.</description>
+		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
+	</context>
+
+	<context id="wizard_rom_image_page" >
+		<description>Specify ROM image information.</description>
+		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Launch Configurations"				href="html/concepts/launch_configuration.htm" />
+	</context>
+
+	<context id="get_sis_info_dialog" >
+		<description>Specify SIS information.</description>
+		<topic label="Set PKG File for Build Configuration"		href="html/reference/build_properties/pane_pkg_config.htm" />
+		<topic label="Creating a Launch Configuration"			href="html/tasks/projects/prj_debug_config.htm" />
+	</context>
+	
+	<!-- PREFERENCE PAGES  -->
+
+	<!--
+	<context id="debug_preference_page_context" >
+	</context>
+	 -->
+
+	<!--
+	<context id="debug_action_groups_views_preference_page_context" >
+	</context>
+	 -->
+
+	<!--
+	<context id="launch_history_preference_page_context" >
+	</context>
+	 -->
+
+	<!--
+	<context id="simple_variable_preference_page_context" >
+	</context>
+	 -->
+
+
+	<!-- DIALOGS  -->
+
+	<!--
+	<context id="launch_configuration_properties_dialog" >
+	</context>
+	 -->
+
+	<!--
+	<context id="single_launch_configuration_dialog" >
+	</context>
+	 -->
+
+	<!--
+	<context id="variable_selection_dialog_context" >
+	</context>
+	 -->
+
+	<!--
+	<context id="edit_source_lookup_path_dialog" >
+	</context>
+	 -->
+
+	<!--
+	<context id="source_container_lookup_tab" >
+	</context>
+	 -->
+
+	<!--
+	<context id="edit_source_lookup_path_dialog" >
+	</context>
+	 -->
+
+	<!--
+	<context id="add_source_container_dialog" >
+	</context>
+	 -->
+
+	<!--
+	<context id="project_source_container_dialog" >
+	</context>
+	 -->
+
+	<!--
+	<context id="folder_source_container_dialog" >
+	</context>
+	 -->
+
+	<!--
+	<context id="archive_source_container_dialog" >
+	</context>
+	 -->
+
+	<!--
+	<context id="multiple_source_selection_dialog" >
+	</context>
+	 -->
+
+
+	<!-- PROPERTY PAGES  -->
+
+	<!--
+	<context id="process_property_page_context" >
+	</context>
+	 -->
+
+	
+	<!-- LAUNCH CONFIGURATION DIALOG PAGES  -->
+
+	<!-- ============================================================== -->
+	<!-- LAUNCH CONFIGURATION DIALOG                                    -->
+	<context id="launch_configuration_dialog" >
+		<description>Use the Debug or Run panels to create launch configurations for your applications.</description>
+		<topic label="Creating Launch Configurations"			href="html/tasks/projects/prj_debug_config.htm" />
+	</context>
+	 
+	<!--
+	<context id="launch_configuration_dialog_common_tab" >
+	</context>
+	 -->
+
+	<!--
+	<context id="launch_configuration_dialog_perspective_tab" >
+	</context>
+	 -->
+
+	<!--    -->
+	<context id="launch_configuration_dialog_environment_tab" >
+        <description>Use the environment pane to add or remove environment variables.</description>
+		<topic label="Environment pane"  				href="html/reference/emulator/wnd_emulator_overview.htm" />
+	</context>
+
+	
+	<!-- WORKING SET PAGE  -->
+
+	<!--
+	<context id="working_set_page_context" >
+	</context>
+	 -->	
+	
+	<!-- DEBUGGER EDITOR  -->
+
+	<!--
+	<context id="debugger_editor_no_source_common" >
+	</context>
+	 -->	
+
+		
+<!-- =============================================================================== -->
+<!-- PLUGIN: org.eclipse.ui                                                          -->
+<!-- =============================================================================== -->
+
+	<!-- ============================================================== -->
+	<!-- NEW WIZARD -->
+	<context id="new_wizard_selection_wizard_page_context" >
+		<description>Select the project, class, or file to create.</description>
+		<topic label="New Symbian OS ++ Projects" 				href="html/tasks/CreatingNewProjects.html"/>
+		<topic label="New Symbian OS C++ Classes"				href="html/tasks/projects/prj_adding_symbian_class.htm" />
+		<topic label="New Symbian OS MMP File"		        	href="html/reference/NewMMP_wizard.html" />
+	</context>
+
+
+	<!-- ============================================================== -->
+	<!-- IMPORT WIZARD                                                  -->
+	<context id="import_wizard_selection_wizard_page_context" >
+		<description>Select the type of file to import for debugging.</description>
+		<topic label="Importing Projects from a BLD.INF File"	href="html/tasks/ImportingProjects.html"/>
+		<topic label="Importing a Symbian Executable"  			href="html/reference/projects/prj_import_exe.htm" />
+		<topic label="Carbide.c++ Perspective" 					href="html/concepts/SymbianPerspective.html" />
+		<topic label="C/C++ Project and File Properties"		href="html/reference/ProjectPreferences.html" />
+	</context>
+
+    <context id="import_wizard_context">
+		<description>Import an executable for debugging.</description>
+		<topic label="Importing a Symbian Executable"  			href="html/tasks/projects/prj_import_exe.htm" />
+    </context>
+
+	
+	<!-- ============================================================== -->
+	<!-- EXPORT WIZARD                                                  -->
+	<context id="export_wizard_selection_wizard_page_context" >
+		<description>Use the Console view to show the output of a process and provide keyboard input to a process.</description>
+		<topic label="Console view"  			href="html/reference/view_log.htm" />
+	</context>
+
+	
+	<!-- PREFERENCE PANELS -->
+
+	<!-- KEYS
+	<context id="keys_preference_page_context" >
+		<description>Use the Console view to show the output of a process and provide keyboard input to a process.</description>
+		<topic label="Console view"  			href="html/reference/view_log.htm" />
+	</context>
+	-->
+	
+
+<!-- =============================================================================== -->
+<!-- PLUGIN: org.eclipse.ui.console                                                  -->
+<!-- =============================================================================== -->
+	
+	<!-- ============================================================== -->
+	<!-- CONSOLE VIEW                                                   -->
+	<context id="console_view_context" >
+		<description>Use the Console view to show the output of a process and provide keyboard input to a process.</description>
+		<topic label="Console view"  			href="html/reference/view_log.htm" />
+	</context>
+
+	<!-- PREFERENCE PANEL 
+	<context id="console_preference_page_context" >
+	</context>
+	 -->
+	
+	
+<!-- =============================================================================== -->
+<!-- PLUGIN: org.eclipse.ui.ide                                                      -->
+<!-- =============================================================================== -->
+	
+	<!-- ============================================================== -->
+	<!-- NEW PROJECT WIZARD PAGE                                        -->
+	<context id="new_project_wizard_page_context" >
+		<description>Select the project type to create.</description>
+		<topic label="Creating New Projects"		href="html/tasks/CreatingNewProjects.html" />
+	</context>
+
+	
+<!-- =============================================================================== -->
+<!-- PLUGIN: org.eclipse.ui.workbench                                                -->
+<!-- =============================================================================== -->
+	
+	<!-- CONFIGURATION DETAILS CONTROL -->
+	<context id="system_summary_dialog_context" >
+		<description>Configuration details of this Carbide.c++ installation. May include useful information that should be included with a bug report.</description>
+	</context>
+
+	<!-- FEATURE DETAILS CONTROL
+	<context id="about_features_dialog_context" >
+		<description>This dialog shows configuration details for this Carbide.c++ installation.</description>
+	</context>
+    -->
+	
+	<!-- PLUG-IN DETAILS CONTROL
+	<context id="about_plugins_dialog_context" >
+		<description>This dialog shows configuration details of this Carbide.c++ installation.</description>
+	</context>
+    -->
+	
+	<!-- ? DETAILS CONTROL
+	<context id="about_plugins_dialog_context" >
+		<description>2.This dialog shows configuration details of this Carbide.c++ installation.</description>
+	</context>
+	 -->
+
+
+</contexts>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -21,7 +21,6 @@
   <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>
@@ -32,6 +31,6 @@
   <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -15,7 +15,6 @@
   <li><a href="run_mode.htm">Application TRK</a></li>
   <li><a href="attach_process.htm">Attach to Process</a></li>
   <li><a href="emulation.htm">Emulation</a></li>
-  <li><a href="sophia.htm">Sophia (STI)</a></li>
   <li><a href="stop_mode.htm">System TRK</a></li>
   <li><a href="trace32.htm">Trace32</a></li>
 </ul>
@@ -23,6 +22,6 @@
 <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -1,155 +1,154 @@
-<!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 Debugger panes</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugger panes</h2>
-<p>The options shown in the <b>Debugger</b> page differ based upon the type of launch configuration. Generally, the options fall into these choices: </p>
-<ul>
-  <li><a href="#emulator_mode">Emulation Debugger page</a> (Emulation) </li>
-  <li><a href="#trk_runmode">Run-mode Debugger page</a> (Application TRK) </li>
-  <li><a href="#trk_stopmode">Stop-mode Debugger page</a> (System TRK, Trace32, Sophia, Attach to Process) </li>
-</ul>
-<h3><a name="emulator_mode" id="emulator_mode"></a>Emulation Debugger page </h3>
-<p>The <b>Symbian OS <a href="emulation.htm">Emulation</a></b> launch configurations the <b>Debugger</b> page to specify  entry point breaks and which  logs to output to the Console view.</p>
-<p align="center"><img src="images/page_debugger_emulation.png" width="638" height="205"></p>
-<p class="figure">Figure 1 - Debugger page showing emulation options </p>
-<h5>Table 1. Debugger page &mdash; emulation options </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Option</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Break at entry point </b></td>
-    <td>Select to halt program execution at a specified
-      function or address. Enter the desired function
-      name or address in the corresponding field. If you
-      enter an address, ensure that it is correct and within
-      your program.</td>
-  </tr>
-  <tr>
-    <td><b>View program output </b></td>
-    <td><p>Enable to direct standard output messages to the   Emulation Program Output Console in the <a href="../../reference/view_log.htm">Console</a> view. </p>
-        <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToFile</span> must also be set to <span class="code">1</span>.</p></td>
-  </tr>
-  <tr>
-    <td><b>View emulator output </b></td>
-    <td><p>Enable to  output emulator messages to the   Emulator  Output Console in the Console view. </p>
-        <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToDebugger</span> must also be set to&nbsp;<span class="code">1</span>.</p></td>
-  </tr>
-  <tr>
-    <td><b>View Windows system messages </b></td>
-    <td>Enable to  output Windows system messages to the   Windows System Messages Console in the Console view. </td>
-  </tr>
-</table>
-<h3><a name="trk_runmode" id="trk_runmode"></a>Run-mode Debugger page </h3>
-<p>In a run-mode launch configuration like <b><a href="run_mode.htm">Application TRK</a></b>, you can specify an entry break point and how messages are handled as well as define the default instruction set. </p>
-<p align="center"><img src="images/page_debugger_run_mode.png" width="686" height="247"></p>
-<p class="figure">Figure 2 - Debugger page showing run-mode options  </p>
-<h5>Table 2. Debugger page &mdash; run-mode  options </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Option</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><p><b>Break at entry point</b></p>    </td>
-    <td><p>When checked, break at the specified entry point entered into the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
-  </tr>
-  <tr>
-    <td><b>View program output </b></td>
-    <td><p>Enable to direct standard output messages to the   <b>TRK Program Output Console</b> in the <a href="../../reference/view_log.htm">Console</a> view. </p>
-      <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToFile</span> must also be set to <span class="code">1</span>.</p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>View messages between Carbide and debug agent </b></td>
-    <td><p>When checked, show the communications between Carbide and the target device in  the <b> TRK Communication Log Console</b> of the Console view.  </p>
-      <p class="note"><b>NOTE</b> You can pin the TRK Communication Log view so that it does not lose focus. </p></td>
-  </tr>
-  <tr>
-    <td><b>Message retry delay (ms) </b></td>
-    <td>Enter the delay time in milliseconds (ms) between 100 and 10000 the debugger should wait for a response. The default Message Retry Delay value is 2000. </td>
-  </tr>
-  <tr>
-    <td><p><b>Default Instructon Set </b></p>        </td>
-    <td><p>Specifies the default instruction set to use if the debugger cannot determine the processor mode in order to set breakpoints and to disassemble code. The options are: </p>
-        <ul>
-          <li>Auto (examine code at  current PC location) </li>
-          <li>ARM (32-bit) </li>
-          <li>THUMB (16-bit) </li>
-        </ul>
-      <p>By default the Instruction Set option uses ARM 32-bit.</p></td>
-  </tr>
-</table>
-<h3><a name="trk_stopmode" id="trk_stopmode"></a>Stop-mode Debugger page </h3>
-<p>In  stop-mode launch configurations like <b><a href="stop_mode.htm">System TRK</a></b>, <b><a href="trace32.htm">Trace32</a></b>,  <b><a href="sophia.htm">Sophia</a></b>, and <a href="attach_process.htm"><b>Attach to Process</b></a>, use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
-<p align="center"><img src="images/page_debugger_stop_mode.png" width="642" height="401"></p>
-<p class="figure">Figure 3 - Debugger page showing stop-mode options  </p>
-<h5>Table 3. Debugger page &mdash; stop-mode  options </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="25%" scope="col">Group</th>
-    <th width="38%" scope="col">Option</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><p><b>Break at entry point</b></p></td>
-    <td><p>When checked, break at the specified entry point entered into the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
-  </tr>
-  <tr>
-    <td rowspan="5"><b>Startup Options </b></td>
-    <td><b>Soft attach </b></td>
-    <td>Enable the <b>Soft attach</b> option to attach a debug session to a target and debug from the specified start address instead of the target's default start address. When enabled the downloaded image option is ignored. </td>
-  </tr>
-  <tr>
-    <td><b>Debug from start address </b></td>
-    <td>Enable the <b>Debug from start addres</b>s option to debug from the target's default start address. </td>
-  </tr>
-  <tr>
-    <td><b>Run from start address </b></td>
-    <td>Enable the <b>Run from start addres</b>s option to run from the target's default start address. </td>
-  </tr>
-  <tr>
-    <td><b>Start address (hex) </b></td>
-    <td>Enter in hexidecimal format (<span class="code">0x0</span>) the starting address to use during the debug session. </td>
-  </tr>
-  <tr>
-    <td><b>Reset target at the start of each debug session </b></td>
-    <td>Forces the Carbide IDE to reset the target at the start of each debug session. This ensures that the debugging session uses the most up-to-date program code.</td>
-  </tr>
-  
-  <tr>
-    <td><b>Target Options </b></td>
-    <td><b>Target Processor </b></td>
-    <td>A drop down with a list of all supported processors. The process selection should help in determining the memory model. This will in turn help determine the base address and the offsets for the Symbian OS kernel aware information.</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><b>Target initialization file </b></td>
-    <td><p>Check this box to have the debugger run an initialization script when the debug session starts. For example, if a target device requires initialization for the debugger to be able to read and write memory or registers, you can specify an initialization script here.</p>
-    <p> Click Browse to select a script file using a standard file selection dialog box. When using T32, most of the initialization is done in the CMM script file. With other debug protocols like Sophia, you can specify the initialization file, which can be run after connecting to the target. </p></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td><b>Memory configuration file </b></td>
-    <td>Controls whether the debugger uses a memory configuration file when a debug session starts. The Carbide debugger uses this configuration file to know which memory is accessible, readable, and writable on the target.</td>
-  </tr>
-</table>
-
-<h4>Other references</h4>
-<ul>
-  <li><a href="run_mode.htm">Application TRK  Launch Configuration</a></li>
-  <li><a href="emulation.htm">Emulation  Launch Configuration</a></li>
-  <li><a href="stop_mode.htm">System TRK  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>Carbide Debugger panes</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
+<body bgcolor="#FFFFFF">
+<h2>Debugger panes</h2>
+<p>The options shown in the <b>Debugger</b> page differ based upon the type of launch configuration. Generally, the options fall into these choices: </p>
+<ul>
+  <li><a href="#emulator_mode">Emulation Debugger page</a> (Emulation) </li>
+  <li><a href="#trk_runmode">Run-mode Debugger page</a> (Application TRK) </li>
+  <li><a href="#trk_stopmode">Stop-mode Debugger page</a> (System TRK, Trace32, Attach to Process) </li>
+</ul>
+<h3><a name="emulator_mode" id="emulator_mode"></a>Emulation Debugger page </h3>
+<p>The <b>Symbian OS <a href="emulation.htm">Emulation</a></b> launch configurations the <b>Debugger</b> page to specify  entry point breaks and which  logs to output to the Console view.</p>
+<p align="center"><img src="images/page_debugger_emulation.png" width="638" height="205"></p>
+<p class="figure">Figure 1 - Debugger page showing emulation options </p>
+<h5>Table 1. Debugger page &mdash; emulation options </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Option</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Break at entry point </b></td>
+    <td>Select to halt program execution at a specified
+      function or address. Enter the desired function
+      name or address in the corresponding field. If you
+      enter an address, ensure that it is correct and within
+      your program.</td>
+  </tr>
+  <tr>
+    <td><b>View program output </b></td>
+    <td><p>Enable to direct standard output messages to the   Emulation Program Output Console in the <a href="../../reference/view_log.htm">Console</a> view. </p>
+        <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToFile</span> must also be set to <span class="code">1</span>.</p></td>
+  </tr>
+  <tr>
+    <td><b>View emulator output </b></td>
+    <td><p>Enable to  output emulator messages to the   Emulator  Output Console in the Console view. </p>
+        <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToDebugger</span> must also be set to&nbsp;<span class="code">1</span>.</p></td>
+  </tr>
+  <tr>
+    <td><b>View Windows system messages </b></td>
+    <td>Enable to  output Windows system messages to the   Windows System Messages Console in the Console view. </td>
+  </tr>
+</table>
+<h3><a name="trk_runmode" id="trk_runmode"></a>Run-mode Debugger page </h3>
+<p>In a run-mode launch configuration like <b><a href="run_mode.htm">Application TRK</a></b>, you can specify an entry break point and how messages are handled as well as define the default instruction set. </p>
+<p align="center"><img src="images/page_debugger_run_mode.png" width="686" height="247"></p>
+<p class="figure">Figure 2 - Debugger page showing run-mode options  </p>
+<h5>Table 2. Debugger page &mdash; run-mode  options </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Option</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><p><b>Break at entry point</b></p>    </td>
+    <td><p>When checked, break at the specified entry point entered into the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
+  </tr>
+  <tr>
+    <td><b>View program output </b></td>
+    <td><p>Enable to direct standard output messages to the   <b>TRK Program Output Console</b> in the <a href="../../reference/view_log.htm">Console</a> view. </p>
+      <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToFile</span> must also be set to <span class="code">1</span>.</p>
+    </td>
+  </tr>
+  <tr>
+    <td><b>View messages between Carbide and debug agent </b></td>
+    <td><p>When checked, show the communications between Carbide and the target device in  the <b> TRK Communication Log Console</b> of the Console view.  </p>
+      <p class="note"><b>NOTE</b> You can pin the TRK Communication Log view so that it does not lose focus. </p></td>
+  </tr>
+  <tr>
+    <td><b>Message retry delay (ms) </b></td>
+    <td>Enter the delay time in milliseconds (ms) between 100 and 10000 the debugger should wait for a response. The default Message Retry Delay value is 2000. </td>
+  </tr>
+  <tr>
+    <td><p><b>Default Instructon Set </b></p>        </td>
+    <td><p>Specifies the default instruction set to use if the debugger cannot determine the processor mode in order to set breakpoints and to disassemble code. The options are: </p>
+        <ul>
+          <li>Auto (examine code at  current PC location) </li>
+          <li>ARM (32-bit) </li>
+          <li>THUMB (16-bit) </li>
+        </ul>
+      <p>By default the Instruction Set option uses ARM 32-bit.</p></td>
+  </tr>
+</table>
+<h3><a name="trk_stopmode" id="trk_stopmode"></a>Stop-mode Debugger page </h3>
+<p>In  stop-mode launch configurations like <b><a href="stop_mode.htm">System TRK</a></b>, <b><a href="trace32.htm">Trace32</a></b>,<b> </b>and <a href="attach_process.htm"><b>Attach to Process</b></a>, use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
+<p align="center"><img src="images/page_debugger_stop_mode.png" width="642" height="401"></p>
+<p class="figure">Figure 3 - Debugger page showing stop-mode options  </p>
+<h5>Table 3. Debugger page &mdash; stop-mode  options </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="25%" scope="col">Group</th>
+    <th width="38%" scope="col">Option</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><p><b>Break at entry point</b></p></td>
+    <td><p>When checked, break at the specified entry point entered into the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
+  </tr>
+  <tr>
+    <td rowspan="5"><b>Startup Options </b></td>
+    <td><b>Soft attach </b></td>
+    <td>Enable the <b>Soft attach</b> option to attach a debug session to a target and debug from the specified start address instead of the target's default start address. When enabled the downloaded image option is ignored. </td>
+  </tr>
+  <tr>
+    <td><b>Debug from start address </b></td>
+    <td>Enable the <b>Debug from start addres</b>s option to debug from the target's default start address. </td>
+  </tr>
+  <tr>
+    <td><b>Run from start address </b></td>
+    <td>Enable the <b>Run from start addres</b>s option to run from the target's default start address. </td>
+  </tr>
+  <tr>
+    <td><b>Start address (hex) </b></td>
+    <td>Enter in hexidecimal format (<span class="code">0x0</span>) the starting address to use during the debug session. </td>
+  </tr>
+  <tr>
+    <td><b>Reset target at the start of each debug session </b></td>
+    <td>Forces the Carbide IDE to reset the target at the start of each debug session. This ensures that the debugging session uses the most up-to-date program code.</td>
+  </tr>
+  
+  <tr>
+    <td><b>Target Options </b></td>
+    <td><b>Target Processor </b></td>
+    <td>A drop down with a list of all supported processors. The process selection should help in determining the memory model. This will in turn help determine the base address and the offsets for the Symbian OS kernel aware information.</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><b>Target initialization file </b></td>
+    <td><p>Check this box to have the debugger run an initialization script when the debug session starts. For example, if a target device requires initialization for the debugger to be able to read and write memory or registers, you can specify an initialization script here.</p>
+    <p> Click Browse to select a script file using a standard file selection dialog box. When using T32, most of the initialization is done in the CMM script file. With other debug protocols you  specify the initialization file, which can be run after connecting to the target. </p></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><b>Memory configuration file </b></td>
+    <td>Controls whether the debugger uses a memory configuration file when a debug session starts. The Carbide debugger uses this configuration file to know which memory is accessible, readable, and writable on the target.</td>
+  </tr>
+</table>
+
+<h4>Other references</h4>
+<ul>
+  <li><a href="run_mode.htm">Application TRK  Launch Configuration</a></li>
+  <li><a href="emulation.htm">Emulation  Launch Configuration</a></li>
+  <li><a href="stop_mode.htm">System TRK  Launch Configuration </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -13,7 +13,7 @@
 <ul>
   <li><a href="#emulator_mode">Emulation Main page</a> (Emulation) </li>
   <li><a href="#run_mode">Run-mode Main page</a> (Application TRK) </li>
-  <li><a href="#stop_mode">Stop-Mode Main page</a> (System TRK, Sophia, Trace32) </li>
+  <li><a href="#stop_mode">Stop-Mode Main page</a> (System TRK, Trace32) </li>
 </ul>
 <h3><a name="emulator_mode" id="emulator_mode"></a>Emulation Main page </h3>
 <p>The <b>Symbian OS <a href="emulation.htm">Emulation</a></b> launch configuration uses the <b>Main</b> page to define the process to be launched by the emulator. </p>
@@ -88,7 +88,7 @@
   </tr>
 </table>
 <h3><a name="stop_mode" id="stop_mode"></a>Stop-mode Main page </h3>
-<p>The <b>Symbian OS <a href="stop_mode.htm">System TRK</a>, <a href="sophia.htm">Sophia</a></b>, and <b><a href="trace32.htm">Trace32</a> </b> launch configurations uses the <b>Main</b> page to defines the project and the executable to launch on the target device. </p>
+<p>The <b>Symbian OS <a href="stop_mode.htm">System TRK</a></b> and <b><a href="trace32.htm">Trace32</a> </b> launch configurations uses the <b>Main</b> page to defines the project and the executable to launch on the target device. </p>
 <p align="center"><img src="images/page_main_stop_mode.png" width="556" height="301"></p>
 <p class="figure">Figure 3. Main page (<i>TRACE32 shown</i>)</p>
 <h5>Table 3. Stop-mode Main page &mdash; items</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/sophia.htm	Mon Jan 25 15:43:57 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<!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	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -9,7 +9,7 @@
 
 <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>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="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>
@@ -26,6 +26,6 @@
 <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -32,8 +32,7 @@
       <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>
+      </ul>    </td>
   </tr>
   <tr>
     <td><b>Application TRK and System TRK</b></td>
@@ -50,13 +49,6 @@
     </ul>    </td>
   </tr>
   <tr>
-    <td><b>Sophia STI</b></td>
-    <td><ul>
-      <li><a href="#SOPHIA">Sophia Initialization Settings</a></li>
-      <li><a href="#ROM_IMG">Symbian ROM Image  Settings</a></li>
-    </ul>    </td>
-  </tr>
-  <tr>
     <td><b>Attach to Process</b></td>
     <td><ul>
       <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
@@ -104,21 +96,16 @@
 <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="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="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>This page  appears when creating a Trace32 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>
+<p class="figure">Figure 10 - Symbian ROM Image  Settings page</p>
 <h5>Other references</h5>
 <ul>
   <li><a href="../../projects/launch/launch_configs_overview.htm">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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -35,6 +35,9 @@
 </ul>
 <p align="center"><img src="../images/view_remote_connections.png" width="588" height="177"></p>
 <p class="figure">Figure 1 - Remote Connections view</p>
+<p>When the view is closed or another perspective opened, a small display item appears in the lower-left corner of the perspective. Click the connection name to  open the drop-down menu where you can open the Remote Connections view or switch between  connections.</p>
+<p align="center"><img src="../images/tab_remote_conns.png"></p>
+<p class="figure">Figure 2. Remote Connections tab </p>
 <h3>Remote Connections view toolbar icons</h3>
 <p>The following commands appear on the toolbar within the Remote Connections view: </p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
@@ -106,7 +109,7 @@
 <h3>Remote Connections view context menu options</h3>
 <p>Based on the current selection, one or more of the following commands appear on the context menu when you right-click within the Remote Connections view. For example, if no connections are defined, only the <b>New Connection</b> command is available on the context menu. Right-click on a connection name and the additional <b>Enable Service Testing</b> and <b>Disable Service Testing</b> are available.</p>
 <p align="center"><img src="../images/context_menu_remote_conn_view.png" width="211" height="104"></p>
-<p class="figure">Figure 2 - Remote Connections context menu</p>
+<p class="figure">Figure 3 - Remote Connections context menu</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="30%" scope="col">Item</th>
@@ -163,7 +166,7 @@
   <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a></li>
   <li><a href="../../tasks/trk/trk_plug_n_play_01.htm">Plug-n-Play TRK Setup</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>
+<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.htm</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -52,7 +52,7 @@
   <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 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 applies to both TRK (run mode) and Trace32 (stop mode).</p>
     </td>
   </tr>
   <tr valign="top">
@@ -108,7 +108,7 @@
   <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -8,14 +8,14 @@
 </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>This example shows how to create and build an application and debug it on a device using JTAG debug software and Lauterbach hardware.</p>
 <p>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>Create a <a href="../../projects/launch/wiz_new_launch_config.htm">launch configuration</a> for <a href="../../projects/launch/trace32.htm">Trace32</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>
@@ -29,9 +29,8 @@
 <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_jtag.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_jtag.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -1,70 +1,49 @@
-<!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>Installing JTAG</h2>
-<div class="step">
-  <h4>Install the JTAG Software</h4>
-  <h5>Using Lauterbach Hardware </h5>
-  <ol>
-    <li>Program Lauterbach with Proper License</li>
-    <p>You will need a Trace32 (Lauterbach), a USB cable, and a Lauterbach power supply. You will need to program the Lauterbach with licenses for the particular processors you will be targeting.</p>
-    <p>Older Lauterbachs have Xscale for Lubbock and ARM9 for H2/Renesas licenses installed on them already. Newer Lauterbachs should have ARM9 for H2/Renesas and ARM11 for H4 licenses installed on them already. If you don’t have the proper license installed on the Lauterbach for the processor you want to work with, you will receive an error when launching a debug session.</p>
-    <li> Run the Trace32 Installer
-      <ul>
-        <li>Run the <span class="code">Setup.bat</span> file. During installation select the following options:<br /><br />
-        <b>Product Type:</b> In-Circuit Debugger<br />
-          <b>ICD interface Type:</b> USB Interface<br />
-          <b>Selection of license for new software:</b> License key not necessary<br />
-          <b>CPU selection:</b> ICD ARM7 ARM9 ARM10 ARM11 ICD XSCALE</li>
-	  </ul>
-    </li>
-    <li>Install the USB Drivers </li>
-    <ol type="a">
-      <li>Place a Trace32 CD into the host machine.</li>
-    <li>Plug in the USB connector from the Lauterbach into the host machine.</li>
-    <li>Once the host machine detects the connection, install the drivers from the CD.</li>
-    </ol>
-    <li>Copy Trace32 License File to T32 Folder</li>
-    <p>The newer Lauterbachs require a license file in the T32 folder. Copy the trace32 license file called license.t32 to your C:\T32 folder.</p>
-
-    <li>Copy Trace32 Configuration File</li>
-    <p>For H4 board: Copy the trace32 configuration file for the non-ARM11 processor, called config_arm11.t32, to your C:\T32 folder. You can also modify the default config_arm11.t32 file. This file needs to be modified to specify the port number and also enable T32 to support debugger commands outside T32. Carbide.c++ provides specific T32 config files in the support folder. The default config file will be called carbideconfig.t32.</p>
-    <li>Set up the Board</li>
-    <p>Power up the board. You should now be able to download the image.</p>
-  </ol>
-
-  <h5>Using Sophia Hardware </h5>
-  <ol>
-    <li>If needed, install the following Watchpoint debugger software:<br />
-    <p>Watchpoint ARM9<br />
-      Watchpoint ARM11<br />
-      CodeWarrior - Watchpoint Connection tool<br />
-      Driver for USB dongle for STI ARM<br />
-      Watchpoint ARM9 Help Files</p></li>
-    <li>Setup Watchpoint</li>
-    <p>Copy and unzip Watchpoint project and initialization files to any directory on your PC.</p>
-    <li>Establish Target Connection
-      <ol type="a">
-        <li>Plug USB dongle into your PC, and install the drivers if necessary.</li>
-      <li>Connect Sophia EJ-Debug JTAG device to the Jtag on the mother board (make sure SW3-7 is off) and to PC via USB cable.</li>
-      <li>When Windows prompts you for a driver, navigate to your WATCHPOINT\US_ARM9 or WATCHPOINT\US_ARM11 installation.</li>
-      <li>Open the WatchPoint project file. If it launches successfully, you have established a connection.</li>
-      </ol>
-    <p>After successfully opening the project file, make sure that for the H4 target, the Jtag clock is set to 8.33MHz. This can be done from the Resource menu of WatchPoint. Select the ‘ICE Configuration’ option and then select the ‘Clock’ tab. Check the 8.33 MHz radio button and apply the settings.</p>
-    </li>
-  </ol>
-</div>
-<h5>Related Tasks</h5>
-<ul>
-  <li><a href="stop_mode_debug_precond.htm">Stop Mode On-Device Debugging Preconditions</a></li>
-  <li><a href="stop_mode_debug_launchcfg.htm">Defining a Stop Mode Debug 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=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>Installing JTAG</h2>
+<div class="step">
+  <h4>Install the JTAG Software</h4>
+  <h5>Using Lauterbach Hardware </h5>
+  <ol>
+    <li>Program Lauterbach with Proper License</li>
+    <p>You will need a Trace32 (Lauterbach), a USB cable, and a Lauterbach power supply. You will need to program the Lauterbach with licenses for the particular processors you will be targeting.</p>
+    <p>Older Lauterbachs have Xscale for Lubbock and ARM9 for H2/Renesas licenses installed on them already. Newer Lauterbachs should have ARM9 for H2/Renesas and ARM11 for H4 licenses installed on them already. If you don’t have the proper license installed on the Lauterbach for the processor you want to work with, you will receive an error when launching a debug session.</p>
+    <li> Run the Trace32 Installer
+      <ul>
+        <li>Run the <span class="code">Setup.bat</span> file. During installation select the following options:<br /><br />
+        <b>Product Type:</b> In-Circuit Debugger<br />
+          <b>ICD interface Type:</b> USB Interface<br />
+          <b>Selection of license for new software:</b> License key not necessary<br />
+          <b>CPU selection:</b> ICD ARM7 ARM9 ARM10 ARM11 ICD XSCALE</li>
+	  </ul>
+    </li>
+    <li>Install the USB Drivers </li>
+    <ol type="a">
+      <li>Place a Trace32 CD into the host machine.</li>
+    <li>Plug in the USB connector from the Lauterbach into the host machine.</li>
+    <li>Once the host machine detects the connection, install the drivers from the CD.</li>
+    </ol>
+    <li>Copy Trace32 License File to T32 Folder</li>
+    <p>The newer Lauterbachs require a license file in the T32 folder. Copy the trace32 license file called license.t32 to your C:\T32 folder.</p>
+
+    <li>Copy Trace32 Configuration File</li>
+    <p>For H4 board: Copy the trace32 configuration file for the non-ARM11 processor, called config_arm11.t32, to your C:\T32 folder. You can also modify the default config_arm11.t32 file. This file needs to be modified to specify the port number and also enable T32 to support debugger commands outside T32. Carbide.c++ provides specific T32 config files in the support folder. The default config file will be called carbideconfig.t32.</p>
+    <li>Set up the Board</li>
+    <p>Power up the board. You should now be able to download the image.</p>
+  </ol>
+</div>
+<h5>Related Tasks</h5>
+<ul>
+  <li><a href="stop_mode_debug_precond.htm">Stop Mode On-Device Debugging Preconditions</a></li>
+  <li><a href="stop_mode_debug_launchcfg.htm">Defining a Stop Mode Debug Configuration</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_launchcfg.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_launchcfg.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -1,301 +1,280 @@
-<!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> Defining a Stop Mode Debug Configuration</h2>
-<p>After installing all necessary software such as Perl, JTAG, compilers, Devkits and SDKs and creating your project, you will need to define a Debug launch configuration for your project. For this example, we will define a Trace32 launch configuration. For new projects that do not have a launch configuration, a New Launch Configuration Wizard will appear and allow you to define settings. You can also cancel the wizard and define a launch configuration from the following instructions.</p>
-<div class="step">
-  <h4>Define a Launch Configuration </h4>
-  <ol>
-    <li>Access the Debug window
-      <ol type="a">
-        <li>If necessary, import a project's  .mmp or .inf file in Carbide.c++.</li>
-          <li>Select the Project in the C/C++ Project view that you want to debug.</li>
-          <li>Select the Run &gt; Debug… menu option to display the Debug launch configuration window.</li>
-          <li>Define a debug launch configuration to communicate with the on-device debug agent or protocol interface.</li>
-          <li>In the Debug window, define the type of debug launch configuration to use when debugging programs on the target device.</li>
-      </ol>
-  </li>
-    <p align="center"><img src="images/Debug_Config_window.png" width="704" height="455" /></p>
-    <p align="left" class="figure">Figure 1 - Debug Configurations</p>
-    <p>Select either a Symbian OS Sophia or Symbian OS Trace32 configuration type for stop mode on-device debugging and click the New launch configuration icon. The following pages require review and possible option settings:</p>
-    <ul>
-      <li> Main - defines the project to be launched on the target device</li>
-        <li>Connection - specifies the method used to transfer files to the target device</li>
-        <li> Debugger - provides control over entry points, message handling, and instruction set default settings</li>
-        <li> ROM Image- specifies startup options and ROM log and image files </li>
-        <li>Source - specifies the source lookup paths </li>
-    <li>Common - specifies general launch configuration settings </li>
-    </ul>
-    <p>Click <b>Debug</b> after all the preference panels have been set. The Debug window closes and the Carbide.c++ debugger begins a debugging session using the new configuration. The next time you click the Debug icon, this debug launch configuration is used to start a debug session.</p>
-    <li>Define Main Tab Settings</li>
-    <p>The Main pane shown in Figure 2 defines the project to be launched on the target device. Table 1 defines the fields.</p>
-    <p><img src="images/Debug_Config_main.png" width="836" height="555" /></p>
-    <p class="figure">Figure 2 - Debug Window - Main Tab</p>
-    <p>Table 1. Main pane</p>
-    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
-      <tr>
-        <th width="38%" scope="col">Item</th>
-        <th width="62%" scope="col">Explanation</th>
-      </tr>
-      <tr>
-        <td>Project</td>
-        <td><p>The project to associate with this debug launch configuration. Click Browse to select a different project.</p></td>
-      </tr>
-      <tr>
-        <td>Executable</td>
-        <td><span
- style="font-weight: normal;">This is the name of the executable that is linked to the project. </span>Click <b>Browse</b> to select a different executable.</td>
-      </tr>
-    </table>
-    <p></p>
-    <li> Define Connection Tab Settings</li>
-    <p><img src="images/Debug_Config_connection.png" width="804" height="309" /></p>
-    <p class="figure">Figure 3 -  Debug Window - Connection Tab</p>
-    <p>Table 2 - Connection pane</p>
-    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
-      <tr>
-        <th width="38%" scope="col">Item</th>
-            <th width="62%" scope="col">Explanation</th>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Trace32 Executable</b></font></font></p></td>
-            <td><p>Specify the path to the Trace32 executable. The default path assumes that the Trace32 executable is installed in the default location: C:\T32\T32marm.exe.</p></td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Trace32 Configuration File</b></font></font></p></td>
-            <td>Specify the path to the config.t32 file or other custom configuration file. The default path assumes that the Trace32 configuration file is installed in the default location: C:\T32\config.t32.
-              <p>For arm11 processors copy the trace32 configuration file for non-ARM11 processor (config_arm11.t32) to your C:\T32 folder and specify it in the edit box.</p>
-              <p>You can modify the config.t32 file to support UDP (User Datagram Protocol) connections by adding the following lines: <br />
-                PBI=USB<br />
-                RCL=NETASSIST<br />
-                PACKLEN=1024<br />
-                PORT=20000</p></td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <b>Trace32 Initialization Script</b></font></font></p></td>
-            <td><p>Specify the path to the initialization <span class="code">cmm</span> file. This script will be run in T32 after connecting to T32. You can specify your own scripts for the targets used.</p></td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><b><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            </font></b><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>View messages between Carbide and Trace32</b></font></font></p></td>
-            <td>Enable to log communications with Trace32 to the console window.</td>
-      </tr>
-    </table>
-	<p></p>
-    <li>Define Debugger Tab Settings</li>
-    <p align="center"><img src="images/Debug_Config_debugger.png" width="594" height="297" /></p>
-    <p class="figure">Figure 4 - Debug Window - Debugger tab</p>
-    <p>Table 3 -  Debugger pane</p>
-    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
-      <tr>
-        <th width="38%" scope="col">Item</th>
-        <th width="62%" scope="col">Explanation</th>
-      </tr>
-      <tr>
-        <td><b>Break at entry point</b></td>
-        <td><p>When checked, break at the specified entry point entered in the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
-      </tr>
-      <tr>
-        <td><b>Target Processor </b></td>
-        <td>A drop down with a list of all supported processors.  The process selection should help in determining the memory model. This will in turn help determine the base address and the offsets for the Symbian OS kernel aware information.</td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Target Initialization File</b></font></font></p></td>
-        <td><p>Check this box to have the debugger run an initialization script when the debug session starts. For example, if a target device requires initialization for the debugger to be able to read and write memory or registers, you can specify an initialization script here. Click Browse to select a script file using a standard file selection dialog box.</p>
-            <p>When using T32, most of the initialization is done in the CMM script file. With other debug protocols like Sophia, you can specify the initialization file, which can be run after connecting to the target.</p></td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <p><b><font size="2" style="font-size: 9pt"><font face="Georgia, serif">Memory Configuration File</font></font></b></p></td>
-        <td>Controls whether the debugger uses a memory configuration file when a debug session starts. The Carbide debugger uses this configuration file to know which memory is accessible, readable, and writable on the target.</td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <p><b><font size="2" style="font-size: 9pt"><font face="Georgia, serif">Reset target at the start of each debug session</font></font></b></p></td>
-        <td>Forces the Carbide IDE to reset the target at the start of each debug session. This ensures that the debugging session uses the most up-to-date program code.</td>
-      </tr>
-      <tr>
-        <td><p><b>Default Instructon Set </b></p></td>
-        <td><p>Specifies the default instruction set to use if the debugger cannot determine the processor mode in order to set breakpoints and to disassemble code. This can happen at addresses for which we have no symbolic information. The debugger uses the mode when setting breakpoints and disassembling code. The options are:</p>
-            <ul>
-              <li>Auto (examine code at current PC location) </li>
-              <li>ARM (32-bit) </li>
-              <li>THUMB (16-bit) </li>
-            </ul>
-            <p>By default the Instruction Set option uses ARM 32-bit.</p></td>
-      </tr>
-    </table>
-    <p></p>
-    <li>Define ROM Image Tab</li>
-    <p align="center"><img src="images/Debug_Config_ROM.png" width="594" height="481" /></p>
-    <p class="figure">Figure 5 - Debug Window - ROM Image Tab</p>
-    <p>Table 4 - ROM Image pane</p>
-    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
-      <tr>
-        <th width="38%" scope="col">Item</th>
-        <th width="62%" scope="col">Explanation</th>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Start Address</b></font></font></p></td>
-        <td><p>Enter the physical address in memory where the Symbian OS start code begins execution. This address is target-specific. The address should be in hexadecimal format with the 0x prefix. For example, 0x8000000 is a valid entry.</p>
-          <p class="note"><b>NOTE</b> The address entered in this field must match the start address specified in the source code used to build the Symbian OS ROM image to be debugged. The Start address must match the Download address.</p></td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Debug from Start address</b></font></font></p></td>
-        <td>Select this option to have the debugger halt the program at the address specified in Start Address once the target initialization is done and the OS is downloaded; if the user has chosen to download the OS. You can then step through start-up code or run the target in bare-board mode.</td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Run from start address</b></font></font></p></td>
-        <td>Select this option to have the debugger start the code at the address specified in Start Address once the target initialization is done. If you have breakpoints set, the debugger stops at the first breakpoint encountered. You can click the Break button to halt the device.</td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-              </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Symbian ROM Log file</b></font></font></p></td>
-        <td>Check the Parse ROM Log File option and specify the information that the debugger needs in order to show detailed stack information, set breakpoints, and show source level debugging information for ROM images. In the first text field, browse to or enter the full path and name of the log file that corresponds to the ROM image on the target device. This log file is generated by default when the ROM image is built.</td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-              <b>Symbian OS Kit EPOC32 Directory</b></font></font></p></td>
-        <td class="note"><p>Specifies the epoc32 directory in which the ROM image and log files are stored. Since the log file may not contain full paths to the ROM components on the host PC, you need to enter this epoc32 directory.</p>
-            <p class="note"><b>NOTE</b> Always include the epoc32 folder in this path.</p></td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-              </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Log unresolved modules</b></font></font></p></td>
-        <td class="note"><p>Check this box to have the debugger output a list of components from the specified ROMBUILD log file that do not have debugger symbolic information. The list is displayed in the debugger console window at the beginning of the debug session.</p>
-            <p class="note"><b>NOTE</b> You cannot perform source-level debugging on components that do not include symbolic information.</p></td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <p><b><font size="2" style="font-size: 9pt">
-              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-              </font></b><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-              <b>Debug non-XIP Executables</b></font></font></p></td>
-        <td><p>Check this box to debug a project, or a dynamically loaded module, that is loaded from NAND-Flash or other removable media (MMC, memory stick, etc.) at run time and executed in RAM. Use this option to debug modules that work fine when executed in place as part of the ROM image, but sometimes fail when placed in NAND-Flash or other removable media.</p>
-            <p class="note"> <b>NOTE</b> Selecting this option will affect debugging performance. When the debugger needs to load a module (DLL, EXE, etc.) it will stop the target, read information from it, then restart it.</p></td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><b><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            </font></b><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Symbian ROM Image</b></font></font></p></td>
-        <td>Controls the logging of communication with Trace32. Enable to log communications with Trace32 to the console window.</td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Download Address (hex) </b></font></font></p></td>
-        <td><p>Enter the physical address in memory at which the debugger should place the ROM image. This address is target-specific. The address should be in hexadecimal format with the 0x prefix. For example, 0x000FFF00 is a valid entry.</p>
-          <p class="note"> <b>NOTE</b> The address entered in this field must match the download address specified in the source code used to build the Symbian OS ROM image to be debugged. If you leave this field blank, the debugger does not download the ROM image to the device at the beginning of the debug session. The Download address must match the Start address.</p></td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Ask for download at the start of each debug session</b></font></font></p></td>
-        <td>Check this box to have the debugger display a dialog box at the beginning of every debug session that lets you choose whether or not you want the debugger to download the ROM image to the device.</td>
-      </tr>
-    </table>
-    <p>&nbsp;</p>
-  </ol>
-    <h3>Sophia Target Interface Connection</h3>
-    <p>The following Connection pane is specific to the Sophia Target Interface and is shown in a Sophia Launch Configuration only. Other panes are same as Trace32 panes.</p>
-    <p align="center"><img src="images/Debug_Config_sophia.png" width="819" height="305" /></p>
-    <p class="figure">Figure 6 - Sophia Connection Window</p>
-    <p>Table 5 -  Sophia Connection Window</p>
-    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
-      <tr>
-        <th width="38%" scope="col">Item</th>
-        <th width="62%" scope="col">Explanation</th>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            </font></font><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Sophia Target Interface (WTI.dll) location</b></font></font></p></td>
-        <td>Specifies the location of a Sophia dll that the debugger will load and interface with in order to communicate with the Sophia JTAG interface. The preference panel will try to determine this value from the registry or some other means and auto fill it when possible.</td>
-      </tr>
-      <tr>
-        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <b>EJ_Debug Type </b></font></font></p></td>
-        <td><p>Sophia Systems' EJ-Debug is a compact, USB-powered JTAG emulator. Select the EJ_Debug type. Options include:</p>
-          <ul>
-            <li>Auto (automatically detects target CPU) </li>
-            <li>ARM9 (target CPU) </li>
-            <li>ARM11 (target CPU)</li>
-            <li>ARM9_11 (target CPU)</li>
-            <li>ARM7_9_11 (target CPU)</li>
-        </ul></td>
-      </tr>
-      <tr>
-        <td><b>JTAG TCLK Frequency</b></td>
-        <td>Select the JTAG TCLK frequency. Options include:
-          <ul>
-            <li>Auto</li>
-            <li>33 MHz</li>
-            <li>16 MHz</li>
-            <li>8 MHz</li>
-            <li>500 KHz </li>
-        </ul></td>
-      </tr>
-      <tr>
-        <td><b>View messages between Carbide and STI</b></td>
-        <td>The View Messages between Carbide and STI check box allows you to specify if the debug protocol messages between Carbide and STI should be logged in a Communication Log console window.</td>
-      </tr>
-    </table>
-
-</div>
-<h5>Related Tasks</h5>
-<ul>
-  <li><a href="stop_mode_debug_precond.htm">Stop Mode On-Device Debugging Preconditions</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"/>
+<style type="text/css">
+<!--
+.style1 {font-size: 1em}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF" dir="ltr">
+<h2> Defining a Stop Mode Debug Configuration</h2>
+<p>After installing all necessary software such as Perl, JTAG, compilers, Devkits and SDKs and creating your project, you will need to define a Debug launch configuration for your project. For this example, we will define a Trace32 launch configuration. For new projects that do not have a launch configuration, a New Launch Configuration Wizard will appear and allow you to define settings. You can also cancel the wizard and define a launch configuration from the following instructions.</p>
+<div class="step">
+  <h4>Define a Launch Configuration </h4>
+  <ol>
+    <li>Access the Debug window
+      <ol type="a">
+        <li>If necessary, import a project's  .mmp or .inf file in Carbide.c++.</li>
+          <li>Select the Project in the C/C++ Project view that you want to debug.</li>
+          <li>Select the Run &gt; Debug… menu option to display the Debug launch configuration window.</li>
+          <li>Define a debug launch configuration to communicate with the on-device debug agent or protocol interface.</li>
+          <li>In the Debug window, define the type of debug launch configuration to use when debugging programs on the target device.</li>
+      </ol>
+  </li>
+    <p align="center"><img src="images/Debug_Config_window.png" width="704" height="455" /></p>
+    <p align="left" class="figure">Figure 1 - Debug Configurations</p>
+    <p>Select either a Symbian OS Trace32 configuration type for stop mode on-device debugging and click the New launch configuration icon. The following pages require review and possible option settings:</p>
+    <ul>
+      <li> Main - defines the project to be launched on the target device</li>
+        <li>Connection - specifies the method used to transfer files to the target device</li>
+        <li> Debugger - provides control over entry points, message handling, and instruction set default settings</li>
+        <li> ROM Image- specifies startup options and ROM log and image files </li>
+        <li>Source - specifies the source lookup paths </li>
+    <li>Common - specifies general launch configuration settings </li>
+    </ul>
+    <p>Click <b>Debug</b> after all the preference panels have been set. The Debug window closes and the Carbide.c++ debugger begins a debugging session using the new configuration. The next time you click the Debug icon, this debug launch configuration is used to start a debug session.</p>
+    <li>Define Main Tab Settings</li>
+    <p>The Main pane shown in Figure 2 defines the project to be launched on the target device. Table 1 defines the fields.</p>
+    <p><img src="images/Debug_Config_main.png" width="836" height="555" /></p>
+    <p class="figure">Figure 2 - Debug Window - Main Tab</p>
+    <p>Table 1. Main pane</p>
+    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
+      <tr>
+        <th width="38%" scope="col">Item</th>
+        <th width="62%" scope="col">Explanation</th>
+      </tr>
+      <tr>
+        <td>Project</td>
+        <td><p>The project to associate with this debug launch configuration. Click Browse to select a different project.</p></td>
+      </tr>
+      <tr>
+        <td>Executable</td>
+        <td><span
+ style="font-weight: normal;">This is the name of the executable that is linked to the project. </span>Click <b>Browse</b> to select a different executable.</td>
+      </tr>
+    </table>
+    <p></p>
+    <li> Define Connection Tab Settings</li>
+    <p><img src="images/Debug_Config_connection.png" width="804" height="309" /></p>
+    <p class="figure">Figure 3 -  Debug Window - Connection Tab</p>
+    <p>Table 2 - Connection pane</p>
+    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
+      <tr>
+        <th width="38%" scope="col">Item</th>
+            <th width="62%" scope="col">Explanation</th>
+      </tr>
+      <tr>
+        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Trace32 Executable</b></font></font></p></td>
+            <td><p>Specify the path to the Trace32 executable. The default path assumes that the Trace32 executable is installed in the default location: C:\T32\T32marm.exe.</p></td>
+      </tr>
+      <tr>
+        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>Trace32 Configuration File</b></font></font></p></td>
+            <td>Specify the path to the config.t32 file or other custom configuration file. The default path assumes that the Trace32 configuration file is installed in the default location: C:\T32\config.t32.
+              <p>For arm11 processors copy the trace32 configuration file for non-ARM11 processor (config_arm11.t32) to your C:\T32 folder and specify it in the edit box.</p>
+              <p>You can modify the config.t32 file to support UDP (User Datagram Protocol) connections by adding the following lines: <br />
+                PBI=USB<br />
+                RCL=NETASSIST<br />
+                PACKLEN=1024<br />
+                PORT=20000</p></td>
+      </tr>
+      <tr>
+        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          <p><font face="Georgia, serif"><font size="2" style="font-size: 9pt">
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            <b>Trace32 Initialization Script</b></font></font></p></td>
+            <td><p>Specify the path to the initialization <span class="code">cmm</span> file. This script will be run in T32 after connecting to T32. You can specify your own scripts for the targets used.</p></td>
+      </tr>
+      <tr>
+        <td><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          <p><b><font size="2" style="font-size: 9pt">
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            </font></b><font face="Georgia, serif"><font size="2" style="font-size: 9pt"><b>View messages between Carbide and Trace32</b></font></font></p></td>
+            <td>Enable to log communications with Trace32 to the console window.</td>
+      </tr>
+    </table>
+	<p></p>
+    <li>Define Debugger Tab Settings</li>
+    <p align="center"><img src="images/Debug_Config_debugger.png" width="594" height="297" /></p>
+    <p class="figure">Figure 4 - Debug Window - Debugger tab</p>
+    <p>Table 3 -  Debugger pane</p>
+    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
+      <tr>
+        <th width="38%" scope="col">Item</th>
+        <th width="62%" scope="col">Explanation</th>
+      </tr>
+      <tr>
+        <td><b>Break at entry point</b></td>
+        <td><p>When checked, break at the specified entry point entered in the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
+      </tr>
+      <tr>
+        <td><b>Target Processor </b></td>
+        <td>A drop down with a list of all supported processors.  The process selection should help in determining the memory model. This will in turn help determine the base address and the offsets for the Symbian OS kernel aware information.</td>
+      </tr>
+      <tr>
+        <td>
+          <span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+        <p class="style1"><font face="Georgia, serif"><b>Target Initialization File</b></font></p></td>
+        <td><p>Check this box to have the debugger run an initialization script when the debug session starts. For example, if a target device requires initialization for the debugger to be able to read and write memory or registers, you can specify an initialization script here. Click Browse to select a script file using a standard file selection dialog box.</p>
+            <p>When using T32, most of the initialization is done in the CMM script file. With other debug protocols you  specify the initialization file, which can be run after connecting to the target.</p></td>
+      </tr>
+      <tr>
+        <td>
+          <span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+        <p class="style1"><b><font face="Georgia, serif">Memory Configuration File</font></b></p></td>
+        <td>Controls whether the debugger uses a memory configuration file when a debug session starts. The Carbide debugger uses this configuration file to know which memory is accessible, readable, and writable on the target.</td>
+      </tr>
+      <tr>
+        <td>
+          <span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+        <p class="style1"><b><font face="Georgia, serif">Reset target at the start of each debug session</font></b></p></td>
+        <td>Forces the Carbide IDE to reset the target at the start of each debug session. This ensures that the debugging session uses the most up-to-date program code.</td>
+      </tr>
+      <tr>
+        <td><p><b>Default Instructon Set </b></p></td>
+        <td><p>Specifies the default instruction set to use if the debugger cannot determine the processor mode in order to set breakpoints and to disassemble code. This can happen at addresses for which we have no symbolic information. The debugger uses the mode when setting breakpoints and disassembling code. The options are:</p>
+            <ul>
+              <li>Auto (examine code at current PC location) </li>
+              <li>ARM (32-bit) </li>
+              <li>THUMB (16-bit) </li>
+            </ul>
+            <p>By default the Instruction Set option uses ARM 32-bit.</p></td>
+      </tr>
+    </table>
+    <p></p>
+    <li>Define ROM Image Tab</li>
+    <p align="center"><img src="images/Debug_Config_ROM.png" width="594" height="481" /></p>
+    <p class="figure">Figure 5 - Debug Window - ROM Image Tab</p>
+    <p>Table 4 - ROM Image pane</p>
+    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
+      <tr>
+        <th width="38%" scope="col">Item</th>
+        <th width="62%" scope="col">Explanation</th>
+      </tr>
+      <tr>
+        <td><span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+          <p class="style1"><font face="Georgia, serif">
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            <b>Start Address</b></font></p></td>
+        <td><p>Enter the physical address in memory where the Symbian OS start code begins execution. This address is target-specific. The address should be in hexadecimal format with the 0x prefix. For example, 0x8000000 is a valid entry.</p>
+          <p class="note"><b>NOTE</b> The address entered in this field must match the start address specified in the source code used to build the Symbian OS ROM image to be debugged. The Start address must match the Download address.</p></td>
+      </tr>
+      <tr>
+        <td><span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+          <p class="style1"><font face="Georgia, serif">
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            <b>Debug from Start address</b></font></p></td>
+        <td>Select this option to have the debugger halt the program at the address specified in Start Address once the target initialization is done and the OS is downloaded; if the user has chosen to download the OS. You can then step through start-up code or run the target in bare-board mode.</td>
+      </tr>
+      <tr>
+        <td><span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+          <p class="style1"><font face="Georgia, serif">
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            <b>Run from start address</b></font></p></td>
+        <td>Select this option to have the debugger start the code at the address specified in Start Address once the target initialization is done. If you have breakpoints set, the debugger stops at the first breakpoint encountered. You can click the Break button to halt the device.</td>
+      </tr>
+      <tr>
+        <td><span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            </span>
+          <p class="style1"><font face="Georgia, serif">
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            <b>Symbian ROM Log file</b></font></p></td>
+        <td>Check the Parse ROM Log File option and specify the information that the debugger needs in order to show detailed stack information, set breakpoints, and show source level debugging information for ROM images. In the first text field, browse to or enter the full path and name of the log file that corresponds to the ROM image on the target device. This log file is generated by default when the ROM image is built.</td>
+      </tr>
+      <tr>
+        <td><span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            </span>
+          <p class="style1"><font face="Georgia, serif">
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              <b>Symbian OS Kit EPOC32 Directory</b></font></p></td>
+        <td class="note"><p>Specifies the epoc32 directory in which the ROM image and log files are stored. Since the log file may not contain full paths to the ROM components on the host PC, you need to enter this epoc32 directory.</p>
+            <p class="note"><b>NOTE</b> Always include the epoc32 folder in this path.</p></td>
+      </tr>
+      <tr>
+        <td><span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            </span>
+          <p class="style1"><font face="Georgia, serif">
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            <b>Log unresolved modules</b></font></p></td>
+        <td class="note"><p>Check this box to have the debugger output a list of components from the specified ROMBUILD log file that do not have debugger symbolic information. The list is displayed in the debugger console window at the beginning of the debug session.</p>
+            <p class="note"><b>NOTE</b> You cannot perform source-level debugging on components that do not include symbolic information.</p></td>
+      </tr>
+      <tr>
+        <td><span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            </span>
+          <p class="style1"><b>
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              </b><font face="Georgia, serif">
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              <b>Debug non-XIP Executables</b></font></p></td>
+        <td><p>Check this box to debug a project, or a dynamically loaded module, that is loaded from NAND-Flash or other removable media (MMC, memory stick, etc.) at run time and executed in RAM. Use this option to debug modules that work fine when executed in place as part of the ROM image, but sometimes fail when placed in NAND-Flash or other removable media.</p>
+            <p class="note"> <b>NOTE</b> Selecting this option will affect debugging performance. When the debugger needs to load a module (DLL, EXE, etc.) it will stop the target, read information from it, then restart it.</p></td>
+      </tr>
+      <tr>
+        <td><span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+          <p class="style1"><b>
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            </b><font face="Georgia, serif">
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            <b>Symbian ROM Image</b></font></p></td>
+        <td>Controls the logging of communication with Trace32. Enable to log communications with Trace32 to the console window.</td>
+      </tr>
+      <tr>
+        <td><span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+          <p class="style1"><font face="Georgia, serif"><b>Download Address (hex) </b></font></p></td>
+        <td><p>Enter the physical address in memory at which the debugger should place the ROM image. This address is target-specific. The address should be in hexadecimal format with the 0x prefix. For example, 0x000FFF00 is a valid entry.</p>
+          <p class="note"> <b>NOTE</b> The address entered in this field must match the download address specified in the source code used to build the Symbian OS ROM image to be debugged. If you leave this field blank, the debugger does not download the ROM image to the device at the beginning of the debug session. The Download address must match the Start address.</p></td>
+      </tr>
+      <tr>
+        <td><span class="style1">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+          <p class="style1"><font face="Georgia, serif"><b>Ask for download at the start of each debug session</b></font></p></td>
+        <td>Check this box to have the debugger display a dialog box at the beginning of every debug session that lets you choose whether or not you want the debugger to download the ROM image to the device.</td>
+      </tr>
+    </table>
+  </ol>
+</div>
+<h5>Related Tasks</h5>
+<ul>
+  <li><a href="stop_mode_debug_precond.htm">Stop Mode On-Device Debugging Preconditions</a></li>
+</ul>
+
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -16,7 +16,7 @@
 <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>Install JTAG software and drivers for <a href="http://www.lauterbach.com">Trace32</a>  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>
@@ -25,8 +25,7 @@
 <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>
+<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/processes/images/sos_processes_choose_thread.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -18,15 +18,14 @@
   <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>
+  <li>In Trace32 you must specify the ROM log file in the ROM Image tab of the <a href="../../projects/launch/trace32.htm">Trace32</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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm	Wed Jan 27 10:34:50 2010 -0600
@@ -16,11 +16,11 @@
 <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>Open the <span class="code">\src\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><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, the application is installed on the 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>
--- a/core/com.nokia.carbide.cpp.doc.user/index.xml	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/index.xml	Wed Jan 27 10:34:50 2010 -0600
@@ -601,10 +601,6 @@
 	   <topic href="html/tasks/start/carbide_deploying.htm" label="Uploading"/>
 	</entry>
 
-	<entry keyword="Sophia">
-	   <topic href="html/projects/launch/sophia.htm"/>
-	</entry>
-
 	<entry keyword="Starting the Debugger">
 	   <topic href="html/tasks/debugger/work_debug_act_start.htm"/>
 	</entry>
--- a/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml	Wed Jan 27 10:34:50 2010 -0600
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<introContent>
-
-	<extensionContent 
-		id="com.nokia.carbide.cpp.doc.user-tutorials" 
-		name="Carbide.c+ Development" 
-		alt-style="carbide.properties" 
-		style="carbide.css" 
-		path="tutorials/@">
-		
-		<group label="Carbide.c++ Development" id="carbide-cpp" style-id="content-group">
-		
-			<link 
-				label="Create an application emulator debug example" 
-				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm"  
-				id="carbide-sample" 
-				style-id="content-link">
-				<text>Learn how to create, build, and debug a program for the emulator called HelloCarbide using Carbide project templates.</text>
-			</link>
-			
-			<link 
-				label="Create a simple DLL example" 
-				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/concepts/SampleExampleProjectCreate.html"  
-				id="carbide-sample" 
-				style-id="content-link">
-				<text>Learn how to create a simple “Test1” DLL project.</text>
-			</link>
-			
-			<link 
-				label="Create a run mode debugging application" 
-				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm"  
-				id="carbide-sample" 
-				style-id="content-link">
-				<text>Learn how create and build an application and debug it on a device using the App TRK on-device debug agent.</text>
-			</link>
-
-			<link 
-				label="Create a stop mode debugging application" 
-				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm"  
-				id="carbide-sample" 
-				style-id="content-link">
-				<text>Learn how to create and build an application and debug it on a device using JTAG debug software on Lauterbach or Sophia hardware.</text>
-			</link>
-
-			<link 
-				label="Using soft attach for on-device debugging example" 
-				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm"  
-				id="carbide-sample" 
-				style-id="content-link">
-				<text>Learn how to use soft attach to debug an image flashed to ROM or on a memory card.</text>
-			</link>
-			
-		</group>
-	</extensionContent>
-	
-</introContent>
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<introContent>
+
+	<extensionContent 
+		id="com.nokia.carbide.cpp.doc.user-tutorials" 
+		name="Carbide.c+ Development" 
+		alt-style="carbide.properties" 
+		style="carbide.css" 
+		path="tutorials/@">
+		
+		<group label="Carbide.c++ Development" id="carbide-cpp" style-id="content-group">
+		
+			<link 
+				label="Create an application emulator debug example" 
+				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm"  
+				id="carbide-sample" 
+				style-id="content-link">
+				<text>Learn how to create, build, and debug a program for the emulator called HelloCarbide using Carbide project templates.</text>
+			</link>
+			
+			<link 
+				label="Create a simple DLL example" 
+				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/concepts/SampleExampleProjectCreate.html"  
+				id="carbide-sample" 
+				style-id="content-link">
+				<text>Learn how to create a simple “Test1” DLL project.</text>
+			</link>
+			
+			<link 
+				label="Create a run mode debugging application" 
+				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm"  
+				id="carbide-sample" 
+				style-id="content-link">
+				<text>Learn how create and build an application and debug it on a device using the App TRK on-device debug agent.</text>
+			</link>
+
+			<link 
+				label="Create a stop mode debugging application" 
+				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm"  
+				id="carbide-sample" 
+				style-id="content-link">
+				<text>Learn how to create and build an application and debug it on a device using JTAG debug software on Lauterbach hardware.</text>
+			</link>
+
+			<link 
+				label="Using soft attach for on-device debugging example" 
+				url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm"  
+				id="carbide-sample" 
+				style-id="content-link">
+				<text>Learn how to use soft attach to debug an image flashed to ROM or on a memory card.</text>
+			</link>
+			
+		</group>
+	</extensionContent>
+	
+</introContent>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Jan 27 10:34:50 2010 -0600
@@ -155,7 +155,6 @@
         <topic label="Application TRK"				href="html/projects/launch/run_mode.htm" />
         <topic label="Attach to Process"			href="html/projects/launch/attach_process.htm" />
         <topic label="Emulation"					href="html/projects/launch/emulation.htm" />
-        <topic label="Sophia (STI)"					href="html/projects/launch/sophia.htm" />
         <topic label="System TRK"					href="html/projects/launch/stop_mode.htm" />
         <topic label="Trace32"						href="html/projects/launch/trace32.htm" />
         <anchor id="launch_config_ANCHOR"/>
@@ -306,15 +305,6 @@
           <topic label="Source" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm" />
           <topic label="Commmon" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm/" />
         </topic>
-        <topic label="3. Sophia Target Interface Support" 	href="html/projects/launch/sophia.htm" >
-          <topic label="Main" 							href="html/projects/launch/page_main.htm" />
-          <topic label="Connection" 						href="html/projects/launch/page_connection.htm" />
-          <topic label="Debugger" 						href="html/projects/launch/page_debugger.htm" />
-          <topic label="ROM Image" 						href="html/projects/launch/page_rom_image.htm" />
-          <topic label="Executables" 						href="html/projects/launch/page_executables.htm" />
-          <topic label="Source" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm" />
-          <topic label="Commmon" 							href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm/" />
-        </topic>
         <topic label="4. Using Soft Attach"	 href="html/tasks/debugger/soft_attach_debug.htm" />
       </topic>
       <topic label="Building a ROM Image File"            href="html/reference/ROM_build_settings.html" />
--- a/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java	Mon Jan 25 15:43:57 2010 -0600
+++ b/core/com.nokia.carbide.cpp.featureTracker/src/com/nokia/carbide/cpp/internal/featureTracker/FeatureUseTrackerConsts.java	Wed Jan 27 10:34:50 2010 -0600
@@ -25,7 +25,6 @@
 	public static final String CARBIDE_APPDEP = "Carbide_AppDep"; // dependency explorer
 	public static final String CARBIDE_CODESCANNER = "Carbide_CodeScanner";
 	public static final String CARBIDE_TRACE32 = "Carbide_Trace32";
-	public static final String CARBIDE_SOPHIAWTI = "Carbide_SophiaWTI";
 	public static final String CARBIDE_OST_TRACE = "Carbide_OST_Trace";
 	public static final String CARBIDE_IDE = "Carbide_IDE"; // did user launch IDE
 	public static final String CARBIDE_INTERNALONLY = "Carbide_InternalOnly"; // many carbide extensions
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/STICommLogConsoleFactory.java	Mon Jan 25 15:43:57 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-package com.nokia.cdt.debug.cw.symbian;
-
-import org.eclipse.ui.console.*;
-
-/**
- * Console factory is used to show the console from the Console view "Open Console"
- * drop-down action. This factory is registered via the org.eclipse.ui.console.consoleFactory 
- * extension point. 
- * 
- * @since 3.1
- */
-public class STICommLogConsoleFactory implements IConsoleFactory {
-
-	public STICommLogConsoleFactory() {
-	}
-	
-	public void openConsole() {
-		SymbianPlugin.getDefault().openSTICommLogConsole(true);
-	}
-}
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Mon Jan 25 15:43:57 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SettingsData.java	Wed Jan 27 10:34:50 2010 -0600
@@ -78,7 +78,6 @@
 	public static final String LaunchConfig_SysTRK = PREFIX + ".LaunchConfig_SysTRK"; //$NON-NLS-1$
 	public static final String LaunchConfig_CrashDebugger = PREFIX + ".LaunchConfig_CrashDebugger"; //$NON-NLS-1$
 	public static final String LaunchConfig_Trace32 = PREFIX + ".LaunchConfig_Trace32"; //$NON-NLS-1$
-	public static final String LaunchConfig_SophiaSTI = PREFIX + ".LaunchConfig_SophiaSTI"; //$NON-NLS-1$
 
 	public static final String ATTR_originalName = "originalName"; //$NON-NLS-1$
 
@@ -97,7 +96,6 @@
 	public static final String APP_TRK_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "appTRKLaunch"; //$NON-NLS-1$
 	public static final String SYS_TRK_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "systemTRKLaunch"; //$NON-NLS-1$
 	public static final String ATTACH_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "attachLaunch"; //$NON-NLS-1$
-	public static final String STI_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "stiLaunch"; //$NON-NLS-1$
 	public static final String T32_LAUNCH_TYPE_ID = LAUNCH_TYPE_PREFIX + "t32Launch"; //$NON-NLS-1$
 
 	//================ Shadowed CW Preference Panels =================================
@@ -135,14 +133,6 @@
 	public static final String spn_Trace32Conn_LogOption= SPN(spn_Trace32Conn, "Trace32LogOption"); //$NON-NLS-1$	
 	public static final String spn_Trace32Conn_BootConfigArgs= SPN(spn_Trace32Conn, "Trace32BootConfigArgs"); //$NON-NLS-1$
 	
-	//	---< STI Connection Panel> -------------------
-	public static final String spn_SophiaSTIConn= "Sophia Target Interface Connection"; //$NON-NLS-1$
-	
-	public static final String spn_SophiaSTIConn_DllPath= SPN(spn_SophiaSTIConn, "SophiaTargetInterfaceDllPath"); //$NON-NLS-1$
-	public static final String spn_SophiaSTIConn_LogOption= SPN(spn_SophiaSTIConn, "STILogOption"); //$NON-NLS-1
-	public static final String spn_SophiaSTIConn_JtagClock= SPN(spn_SophiaSTIConn,	"STIJTAGClock"); //$NON-NLS-1
-	public static final String spn_SophiaSTIConn_StiEmulatorType= SPN(spn_SophiaSTIConn,	"STIJTAGType"); //$NON-NLS-1
-
 	//================= End of Shadowed panels ===========================================
 
 	public static final String TARGET_PATH_INCLUDES_FILENAME = "TARGET_PATH_INCLUDES_FILENAME"; //$NON-NLS-1$
@@ -611,7 +601,7 @@
 		{
 			configuration.setAttribute( PreferenceConstants.J_PN_IsSystemModeDebug, false );
 		}
-		else // others like T32, Sophia and crash debugger.
+		else // others like T32 and crash debugger.
 			configuration.setAttribute( PreferenceConstants.J_PN_IsSystemModeDebug, true );	
 	}
 
@@ -758,8 +748,7 @@
 			setFileTransferTab(configuration, project);
 		}
 
-		if (settingsGroup.equals(LaunchConfig_Trace32) ||
-				settingsGroup.equals(LaunchConfig_SophiaSTI))
+		if (settingsGroup.equals(LaunchConfig_Trace32))
 		{
 			setStopModeMainTab(configuration, project);
 			setStopModeDebuggerTab(configuration, project);
@@ -837,26 +826,6 @@
 					""); //$NON-NLS-1$
 		}
 	
-		if (settingsGroup.equals(LaunchConfig_SophiaSTI)) {
-			configuration.setAttribute( SettingsData.spn_SophiaSTIConn_DllPath, "C:\\CarbideIF_ARM\\WTI.dll"); //$NON-NLS-1$
-			configuration.setAttribute( SettingsData.spn_SophiaSTIConn_JtagClock, "Auto"); //$NON-NLS-1$
-			configuration.setAttribute( SettingsData.spn_SophiaSTIConn_LogOption, false);
-			configuration.setAttribute( SettingsData.spn_SophiaSTIConn_StiEmulatorType, "Auto"); //$NON-NLS-1$
-			
-			// Stop mode debugging using STI : specify Sophia STI debugger protocol plugin.
-			//
-			ConnectionTypeInfo connTI = new ConnectionTypeInfo(
-					"Carbide Sophia STI", // Internal ID //$NON-NLS-1$
-					"Sophia STI Configuration", // Display name. //$NON-NLS-1$
-					"Sophia Target Interface Connection"); // Pref panel name
-
-			DebuggerCommonData.setLaunchConfigConnSettings(
-					configuration,
-					connTI, 
-					"Sophia Target Interface Plugin", //$NON-NLS-1$
-					""); //$NON-NLS-1$
-		}
-		
 		// Add the Symbian OS SDK Mapping.
 		addSymbianSDKMapping(project, configuration);
 
@@ -986,8 +955,7 @@
 			ILaunchConfigurationType configurationType = configuration.getType();
 			String id = configurationType.getIdentifier();
 			return id.equals(T32_LAUNCH_TYPE_ID) ||
-			id.endsWith("T32Launch")||//$NON-NLS-1$
-			id.equals(STI_LAUNCH_TYPE_ID);
+			id.endsWith("T32Launch"); //$NON-NLS-1$
 		} catch (CoreException e) {
 		}
 		
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java	Mon Jan 25 15:43:57 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/SymbianPlugin.java	Wed Jan 27 10:34:50 2010 -0600
@@ -45,7 +45,6 @@
 	private final String commMessagesConsoleName = "TRK Communication Log"; //$NON-NLS-1$
 	private final String t32CommMessagesConsoleName = "Trace32 Communications Log"; //$NON-NLS-1$
 	private final String symbianRomLogMessagesConsoleName = "Rom Log File Messages";
-	private final String STICommMessagesConsoleName = "Sophia Target Interface Console"; //$NON-NLS-1$
 	public static final String DebugTraceMessagesConsoleName = "Emulator Output"; //$NON-NLS-1$
 	
 	public static final String DebugTraceLaunchSetting = "DebugTraceLaunchSetting"; //$NON-NLS-1$
@@ -154,10 +153,6 @@
 		openConsole(symbianRomLogMessagesConsoleName, clearConsole);
 	}
 	
-	public void openSTICommLogConsole(boolean clearConsole) {
-		openConsole(STICommMessagesConsoleName, clearConsole);
-	}
-	
 	public void openDebugTraceConsole(boolean clearConsole) {
 		openConsole(DebugTraceMessagesConsoleName, clearConsole);
 	}
--- a/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml	Mon Jan 25 15:43:57 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml	Wed Jan 27 10:34:50 2010 -0600
@@ -60,17 +60,6 @@
             sourcePathComputerId="com.nokia.cdt.debug.cw.symbian.CarbideSourcePathComputer">
       </launchDelegate>
       
-      <launchDelegate
-            name="Symbian OS Sophia"
-            delegate="com.nokia.cdt.internal.debug.launch.SophiaSTILaunchDelegate"
-            delegateDescription="Launch a classic Symbian OS Trace32 debug session."          
-            modes="debug"
-            type="com.nokia.cdt.debug.launch.stiLaunch"
-            id="com.nokia.cdt.debug.launch.stiLaunchDelegate"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="com.nokia.cdt.debug.cw.symbian.CarbideSourcePathComputer">
-      </launchDelegate>
-  
    </extension>
 
    <extension
@@ -106,12 +95,6 @@
             id="com.nokia.cdt.debug.launch.t32Launch">
       </launchConfigurationType>
       
-      <launchConfigurationType
-            name="Symbian OS Sophia"
-            public="true"
-            id="com.nokia.cdt.debug.launch.stiLaunch">
-      </launchConfigurationType>
-  
    </extension>
    
   <extension
@@ -142,12 +125,6 @@
             configTypeID="com.nokia.cdt.debug.launch.t32Launch"
             id="com.nokia.cdt.debug.launch.t32LaunchImage">
       </launchConfigurationTypeImage>
-      
-      <launchConfigurationTypeImage
-            icon="icons/launch_config_file_16x16.png"
-            configTypeID="com.nokia.cdt.debug.launch.stiLaunch"
-            id="com.nokia.cdt.debug.launch.stiLaunchImage">
-      </launchConfigurationTypeImage>
     </extension>
 
    <extension
@@ -195,15 +172,6 @@
       </launchConfigurationTabGroup>
     </extension>
     
-    <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            type="com.nokia.cdt.debug.launch.stiLaunch"
-            class="com.nokia.cdt.internal.debug.launch.ui.SophiaConfigurationTabGroup"
-            id="com.nokia.cdt.debug.launch.SophiaLaunchTabGroup">
-      </launchConfigurationTabGroup>
-    </extension>
-
  
     <extension
          point="org.eclipse.debug.ui.launchShortcuts">
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/SophiaSTILaunchDelegate.java	Mon Jan 25 15:43:57 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,183 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch;
-
-import java.io.File;
-
-import org.eclipse.cdt.core.IBinaryParser.IBinaryObject;
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.debug.core.ICDebugConfiguration;
-import org.eclipse.cdt.debug.core.cdi.ICDISession;
-import org.eclipse.cdt.launch.internal.ui.LaunchMessages;
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-
-import com.freescale.cdt.debug.cw.CWException;
-import com.freescale.cdt.debug.cw.core.cdi.Session;
-import com.freescale.cdt.debug.cw.core.cdi.model.Target;
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.debug.cw.symbian.SymbianPlugin;
-
-import cwdbg.PreferenceConstants;
-
-public class SophiaSTILaunchDelegate extends NokiaAbstractLaunchDelegate {
-
-	public void launch(ILaunchConfiguration config, 
-					   String mode,
-					   ILaunch launch, 
-					   IProgressMonitor monitor) throws CoreException {
-		
-
-		// See comment at definition of the "mutex" for why this "synchronized".		
-		synchronized(Session.sessionStartStopMutex()) {
-
-	        if (monitor == null) {
-	            monitor = new NullProgressMonitor();
-	        }
-
-	        monitor.beginTask(LaunchMessages.getString("LocalRunLaunchDelegate.Launching_Local_C_Application"), 10); //$NON-NLS-1$
-	        // check for cancellation
-	        if (monitor.isCanceled()) {
-	            return;
-	        }
-	        try {
-	            monitor.worked(1);
-	            IPath exePath = verifyProgramPath(config);
-	            ICProject project = verifyCProject(config);
-	            IBinaryObject exeFile = verifyBinary(project, exePath);
-	            String arguments[] = getProgramArgumentsArray(config);
-
-				// See comment for this method for more.
-	            SettingsData.setInternalPreferences(config, SettingsData.LaunchConfig_SophiaSTI);
-	            			
-	            // set the default source locator if required
-	            setDefaultSourceLocator(launch, config);
-
-	            if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-	                // debug mode
-	                ICDebugConfiguration debugConfig = getDebugConfig(config);
-	                ICDISession dsession = null;
-	                String debugMode = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE,
-	                        ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN);
-	                if (debugMode.equals(ICDTLaunchConfigurationConstants.DEBUGGER_MODE_RUN)) {
-	                    dsession = debugConfig.createDebugger().createDebuggerSession(launch, exeFile,
-	                            new SubProgressMonitor(monitor, 8));
-
-						assert(dsession instanceof Session);
-						Session cwDebugSession = (Session)dsession;
-
-						doAdditionalSessionSetup(cwDebugSession);
-						
-						IPath[] otherExecutables = getOtherExecutables(project, exePath, config, monitor);
-						{
-							try {
-								monitor.worked(1);
-								
-								// if enabled in the prefs, show the console view(s)
-								if (config.getAttribute(SettingsData.spn_SophiaSTIConn_LogOption, false)) {
-									SymbianPlugin.getDefault().openSTICommLogConsole(true);
-								}
-								if (config.getAttribute(PreferenceConstants.J_PN_LogUnresolved, false)) {
-									SymbianPlugin.getDefault().openSymbianRomLogConsole(true);
-								}
-								
-								config = synchronizeWithProjectAccessPaths(project, config);
-								
-								File wd = getWorkingDirectory(config);
-								Target target = cwDebugSession.launchExecutable(launch, config, exeFile, otherExecutables, arguments, wd, getEnvironmentAsProperty(config), monitor, project, getTargetLabel(exeFile.getName()), true);
-								ATFLaunchSupport.saveDebugTargetFromLaunchDelegate(target.getCoreModelTarget());
-
-							} catch (CoreException e) {
-								Session session = (Session)dsession;
-								session.cleanupAfterLaunchFailure();
-								throw e;
-							} catch (Exception e) {
-								Session session = (Session)dsession;
-								session.debuggingStopped(null);
-								this.abort(e.getLocalizedMessage(), null, 0);
-							}
-						}
-	                }
-	            }
-	            else if (mode.equals(ILaunchManager.RUN_MODE)) {
-	                // Run the program.
-	            	// Connect to DE, download and launch the program, close debug session.
-	                ICDebugConfiguration debugConfig = getDebugConfig(config);
-	                ICDISession dsession = null;
-	                
-	                // Set up communication with DE.
-	                dsession = debugConfig.createDebugger().createDebuggerSession(launch, exeFile,
-	                            new SubProgressMonitor(monitor, 8));
-
-	                // Launch the program through the DE.
-	                Session cwDebugSession = (Session)dsession;
-					cwDebugSession.launchExecutable(
-											launch, 
-											config, 
-											exeFile, 
-											new IPath[0], 
-											arguments, 
-											null, 
-											getEnvironmentAsProperty(config), 
-											monitor, 
-											project, 
-											"",  //$NON-NLS-1$
-											false  /* run instead of debug */);
-					
-					// The above call would throw exception on error. So it must have succeeded 
-					// if control gets here. Show success message in a dialog.
-		    		//
-		    		// get the name of the executable that's launched instead of, say, the DLL name if
-		    		// exeFile is a DLL.
-		    		final String exeLaunched = config.getAttribute(PreferenceConstants.J_PN_RemoteProcessToLaunch, exeFile.toString());
-					Display display = Display.getCurrent();
-					if (display == null) {
-						display = Display.getDefault();
-					}
-					
-					display.syncExec(new Runnable() {
-						public void run() {
-							MessageDialog.openInformation(
-								CUIPlugin.getActiveWorkbenchShell(),
-								LaunchMessages.getString("CarbideCPPLaunchDelegate.DebuggerName"),  //$NON-NLS-1$
-								LaunchMessages.getString("TRKLaunchDelegate.runSucceed") + //$NON-NLS-1$
-							           "\n\t\"" + exeLaunched + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-						}
-					});
-	            }
-	        } catch (CWException e) {
-	        	if (! monitor.isCanceled()) // don't throw on user cancellation
-	        		e.printStackTrace();
-			} catch (CoreException e) {
-	        	if (! monitor.isCanceled()) // don't throw on user cancellation
-	        		throw e;
-			} finally {
-	            monitor.done();
-	        }
-		} // end of synchronized.
-	}
-}
\ No newline at end of file
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/LaunchTabHelpIds.java	Mon Jan 25 15:43:57 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/LaunchTabHelpIds.java	Wed Jan 27 10:34:50 2010 -0600
@@ -60,8 +60,6 @@
 	
 	public static final String STOP_MODE_T32_CONNECTION = HelpID_Prefix + "stopmode_t32connection"; //$NON-NLS-1$
 	
-	public static final String STOP_MODE_SOPHIA_CONNECTION = HelpID_Prefix + "stopmode_sophiaconnection"; //$NON-NLS-1$
-	
 	public static final String STOP_MODE_ROM_IMAGE = HelpID_Prefix + "stopmode_romimage"; //$NON-NLS-1$
 	
 	public static final String RUN_MODE_ROM_LOG_FILE = HelpID_Prefix + "runmode_romlogfile"; //$NON-NLS-1$
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/SophiaConfigurationTabGroup.java	Mon Jan 25 15:43:57 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.ui;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.*;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-
-public class SophiaConfigurationTabGroup extends
-		AbstractLaunchConfigurationTabGroup {
-
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-				new StopModeMainTab(),				
-				new SophiaTargetInterfaceTab(),
-				new StopModeDebuggerTab(),
-				new SymbianExceptionsTab(),
-				new RomImageTab(),
-				new ExecutablesTab(false),
-				new SourceLookupTab(),
-				new CommonTab() 
-			};
-			setTabs(tabs);
-	}
-	
-	
-	/**
-	 * Set default for all preferences related to this launch configuration.
-	 * 
-	 * @see ILaunchConfigurationTabGroup#setDefaults(ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-		// Call this to make sure options on those CDT common tabs such as "Common"
-		// and "Source" have correct default.
-		super.setDefaults(config);
-
-		// Get the current selected project in C project view.
-		IProject project = LaunchPlugin.getSelectedProject();
-
-		SettingsData.setDefaults(config, SettingsData.LaunchConfig_SophiaSTI, project);
-	}
-}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/SophiaTargetInterfaceTab.java	Mon Jan 25 15:43:57 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,237 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.ui;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cdt.internal.debug.launch.LaunchPlugin;
-
-import org.eclipse.cdt.launch.ui.CLaunchConfigurationTab;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.PlatformUI;
-
-import java.io.File;
-
-public class SophiaTargetInterfaceTab extends CLaunchConfigurationTab {
-
-	// Radio Buttons
-
-	// Boolean widgets
-	private Button viewMessages;
-	private Combo jtagClockCombo;
-	private Text text;
-	private Combo emulatorTypeCombo;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		setControl(comp);
-		
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), LaunchTabHelpIds.STOP_MODE_SOPHIA_CONNECTION);
-		
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		comp.setLayout(topLayout);
-
-		//createVerticalSpacer(comp, 2);
-		//createSymbolicsLoadingGroup(comp, 2);
-		//createVerticalSpacer(comp, 2);
-		//createBooleanGroup(comp, 2);
-
-		final Label sophiaTargetInterfaceLabel = new Label(comp, SWT.NONE);
-		sophiaTargetInterfaceLabel.setText(Messages.getString("SophiaTargetInterfaceTab.0")); //$NON-NLS-1$
-		
-		sophiaTargetInterfaceLabel.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.10")); //$NON-NLS-1$
-		new Label(comp, SWT.NONE);
-
-		text = new Text(comp, SWT.BORDER);
-		text.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		text.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.10")); //$NON-NLS-1$
-		text.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		final Button browseButton = new Button(comp, SWT.NONE);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-
-				public void widgetSelected(SelectionEvent evt) {
-					FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-					dialog.setText(Messages.getString("SophiaTargetInterfaceTab.7")); //$NON-NLS-1$
-					dialog.setFilterExtensions(new String[] {"*.dll*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-					dialog.setFilterNames(new String[] {Messages.getString("SophiaTargetInterfaceTab.8"), Messages.getString("SophiaTargetInterfaceTab.9")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-					String result = dialog.open();
-					if (result != null && new File(result).exists()) {
-						text.setText(result);
-						updateLaunchConfigurationDialog();
-					}
-				}
-			});
-	
-		browseButton.setText(Messages.getString("SophiaTargetInterfaceTab.1")); //$NON-NLS-1$
-		
-		final Label jtagTypeLabel = new Label(comp, SWT.NONE);
-		jtagTypeLabel.setText(Messages.getString("SophiaTargetInterfaceTab.11")); //$NON-NLS-1$
-		jtagTypeLabel.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.12")); //$NON-NLS-1$
-		new Label(comp, SWT.NONE);
-
-		emulatorTypeCombo = new Combo(comp, SWT.READ_ONLY);
-		emulatorTypeCombo.setItems(new String[] {Messages.getString("SophiaTargetInterfaceTab.13"), Messages.getString("SophiaTargetInterfaceTab.14"), Messages.getString("SophiaTargetInterfaceTab.15"), Messages.getString("SophiaTargetInterfaceTab.16"), Messages.getString("SophiaTargetInterfaceTab.17")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		emulatorTypeCombo.setText(Messages.getString("SophiaTargetInterfaceTab.13")); //$NON-NLS-1$
-		emulatorTypeCombo.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, true, false));
-		emulatorTypeCombo.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.12")); //$NON-NLS-1$
-		
-		emulatorTypeCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		new Label(comp, SWT.NONE);
-		
-		final Label jtagRtckLabel = new Label(comp, SWT.NONE);
-		jtagRtckLabel.setText(Messages.getString("SophiaTargetInterfaceTab.19")); //$NON-NLS-1$
-		jtagRtckLabel.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.20")); //$NON-NLS-1$
-		new Label(comp, SWT.NONE);
-
-		jtagClockCombo = new Combo(comp, SWT.READ_ONLY);
-		jtagClockCombo.setItems(new String[] {Messages.getString("SophiaTargetInterfaceTab.13"), Messages.getString("SophiaTargetInterfaceTab.22"), Messages.getString("SophiaTargetInterfaceTab.23"), Messages.getString("SophiaTargetInterfaceTab.24"), Messages.getString("SophiaTargetInterfaceTab.25")}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		jtagClockCombo.setText(Messages.getString("SophiaTargetInterfaceTab.13")); //$NON-NLS-1$
-		jtagClockCombo.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, true, false));
-		jtagClockCombo.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.20")); //$NON-NLS-1$
-		
-		jtagClockCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		
-		new Label(comp, SWT.NONE);
-
-		viewMessages = new Button(comp, SWT.CHECK);
-		viewMessages.setLayoutData(new GridData());
-		viewMessages.setText(Messages.getString("SophiaTargetInterfaceTab.27")); //$NON-NLS-1$
-		viewMessages.setToolTipText(Messages.getString("SophiaTargetInterfaceTab.18")); //$NON-NLS-1$
-		
-		viewMessages.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				updateLaunchConfigurationDialog();
-			}
-		});
-		new Label(comp, SWT.NONE);
-
-		Dialog.applyDialogFont(parent);
-		checkControlState();
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy config) {
-	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {
-			text.setText(configuration.getAttribute( SettingsData.spn_SophiaSTIConn_DllPath, "C:\\CarbideIF_ARM\\WTI.dll")); //$NON-NLS-1$
-			jtagClockCombo.setText(configuration.getAttribute( SettingsData.spn_SophiaSTIConn_JtagClock, "Auto")); //$NON-NLS-1$
-			viewMessages.setSelection(configuration.getAttribute( SettingsData.spn_SophiaSTIConn_LogOption, false));
-			emulatorTypeCombo.setText(configuration.getAttribute(SettingsData.spn_SophiaSTIConn_StiEmulatorType, Messages.getString("SophiaTargetInterfaceTab.13"))); //$NON-NLS-1$
-			checkControlState();
-			
-		} catch (CoreException e) {
-			LaunchPlugin.log(e);
-		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-
-		configuration.setAttribute( SettingsData.spn_SophiaSTIConn_DllPath, text.getText());
-		configuration.setAttribute( SettingsData.spn_SophiaSTIConn_JtagClock, jtagClockCombo.getText());
-		configuration.setAttribute( SettingsData.spn_SophiaSTIConn_LogOption, viewMessages.getSelection());
-		configuration.setAttribute( SettingsData.spn_SophiaSTIConn_StiEmulatorType, emulatorTypeCombo.getText());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return Messages.getString("SophiaTargetInterfaceTab.4"); //$NON-NLS-1$
-	}
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return LaunchImages.get(LaunchImages.IMG_VIEW_CONNECTION_TAB);
-	}
-
-	protected void checkControlState()
-	{
-	}
-	
-	public boolean isValid(ILaunchConfiguration config) {
-		
-		setErrorMessage(null);
-		setMessage(null);
-
-		boolean result = super.isValid(config);
-		if (result){
-			String pcPath = text.getText().trim();
-			if (pcPath.length() < 1) {
-				setErrorMessage(Messages.getString("SophiaTargetInterfaceTab.5")); //$NON-NLS-1$
-				return false;
-			} else {
-				if (!new File(pcPath).exists()) {
-					setErrorMessage(Messages.getString("SophiaTargetInterfaceTab.6")); //$NON-NLS-1$
-					result = false;
-				}
-			}
-		}
-		return result;
-	}
-
-	@Override
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
-		super.activated(workingCopy);
-		
-		// forces page to get focus so that help works without having to select some control first.
-		getControl().setFocus();
-	}
-}
\ No newline at end of file
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties	Mon Jan 25 15:43:57 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties	Wed Jan 27 10:34:50 2010 -0600
@@ -176,32 +176,6 @@
 RunModeMainTab.7=Remote process to launch must be an absolute path.
 RunModeMainTab.8=The project associated with this launch configuration.
 RunModeMainTab.NoConnectionError=A valid remote connection must be selected. If none exist, create a new one.
-SophiaTargetInterfaceTab.0=Sophia Target Interface (WTI.dll) location
-SophiaTargetInterfaceTab.1=Browse
-SophiaTargetInterfaceTab.10=The absolute path on your PC of the Carbide C++ interface to Sophia JTAG emulator (wti.dll)
-SophiaTargetInterfaceTab.11=EJ_Debug Type
-SophiaTargetInterfaceTab.12=Select the type of your Sophia JTAG emulator
-SophiaTargetInterfaceTab.13=Auto
-SophiaTargetInterfaceTab.14=ARM9
-SophiaTargetInterfaceTab.15=ARM11
-SophiaTargetInterfaceTab.16=ARM9_11
-SophiaTargetInterfaceTab.17=ARM7_9_11
-SophiaTargetInterfaceTab.18=This lets you see the debug command messages between the Carbide debugger and Sophia JTAG emulator
-SophiaTargetInterfaceTab.19=JTAG TCLK Frequency
-SophiaTargetInterfaceTab.2=STI Target Configuration File
-SophiaTargetInterfaceTab.20=Select desired JTAG TCLK Frequency (Some boards don't support highest or 'Auto' settings)
-SophiaTargetInterfaceTab.22=33 MHz
-SophiaTargetInterfaceTab.23=16 MHz
-SophiaTargetInterfaceTab.24=8 MHz
-SophiaTargetInterfaceTab.25=500 KHz
-SophiaTargetInterfaceTab.27=View messages between Carbide and STI
-SophiaTargetInterfaceTab.3=Browse
-SophiaTargetInterfaceTab.4=Connection
-SophiaTargetInterfaceTab.5=STI DLL not specified
-SophiaTargetInterfaceTab.6=STI DLL specified does not exist
-SophiaTargetInterfaceTab.7=Select Sophia Target Interface library (WTI.dll)
-SophiaTargetInterfaceTab.8=Dynamic Link Libraries
-SophiaTargetInterfaceTab.9=All Files
 StopModeDebuggerTab.0=Break at entry point\:
 StopModeDebuggerTab.1=When enabled the debugger will automatically set a breakpoint at the function specified.
 StopModeDebuggerTab.10=Target Initialization files (*.cfg)
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java	Mon Jan 25 15:43:57 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchCreationWizard.java	Wed Jan 27 10:34:50 2010 -0600
@@ -188,12 +188,6 @@
 			wizards.add(trace32Wizard);
 		}
 
-		SophiaLaunchWizard sophiaWizard = new SophiaLaunchWizard(mmps, exes, defaultExecutable, project, configurationName);
-		if (sophiaWizard.supportsMode(mode)) {
-			sophiaWizard.addPages();
-			wizards.add(sophiaWizard);
-		}
-
 		AttachTRKLaunchWizard attachTRKWizard = new AttachTRKLaunchWizard(mmps, exes, defaultExecutable, project, configurationName);
 		if (attachTRKWizard.supportsMode(mode)) {
 			attachTRKWizard.addPages();
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardHelpIds.java	Mon Jan 25 15:43:57 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/LaunchWizardHelpIds.java	Wed Jan 27 10:34:50 2010 -0600
@@ -34,8 +34,6 @@
 
 	public static final String WIZARD_SUMMARY_PAGE = HelpID_Prefix + "wizard_summary_page"; //$NON-NLS-1$
 
-	public static final String WIZARD_SOPHIA_PAGE = HelpID_Prefix + "wizard_sophia_page"; //$NON-NLS-1$
-
 	public static final String WIZARD_TRACE32_PAGE = HelpID_Prefix + "wizard_trace32_page"; //$NON-NLS-1$
 
 	public static final String WIZARD_STOP_MODE_ROM_IMG_PAGE = HelpID_Prefix + "wizard_stop_mode_rom_img_page"; //$NON-NLS-1$
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SophiaLaunchWizard.java	Mon Jan 25 15:43:57 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.wizard;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-
-public class SophiaLaunchWizard extends AbstractLaunchWizard {
-
-    private BuildOptionsSelectionPage fBuildOptionsSelectionPage;
-    private SophiaWizardPage fSophiaPage;
-    private StopModeRomImageWizardPage fRomImgPage;
-    
-	private boolean hasFinished = false;
-
-	public SophiaLaunchWizard(List<IPath> mmps, List<IPath> exes, IPath defaultExecutable, IProject project, String configurationName) {
-		super(project, configurationName, mmps, exes, defaultExecutable, true, false);
-		setWindowTitle(Messages.getString("SophiaLaunchWizard.1")); //$NON-NLS-1$
-    }
-
-	@Override
-	public String getLaunchTypeID() {
-		return SettingsData.STI_LAUNCH_TYPE_ID;
-	}
-
-	@Override
-	public boolean supportsCategory(String categoryId) {
-		return categoryId.equals(BOARD_CATEGORY_ID);
-	}
-
-	public boolean performFinish() {
-    	hasFinished = true;
-    	return true;
-    }
- 
-    public void addPages() {
-    	super.addPages();
-    	fBuildOptionsSelectionPage = new BuildOptionsSelectionPage();
-    	fSophiaPage = new SophiaWizardPage(this);
-    	fRomImgPage = new StopModeRomImageWizardPage(this);
-        addPage(fBuildOptionsSelectionPage);
-        addPage(fSophiaPage);
-        addPage(fRomImgPage);
-        addPage(getSummaryPage());
-    }
-
-    public String toString() {
-    	return Messages.getString("SophiaLaunchWizard.2"); //$NON-NLS-1$
-    }
-    
-    public String getDescription() {
-    	return Messages.getString("SophiaLaunchWizard.3"); //$NON-NLS-1$
-    }
-    
-    public ILaunchConfigurationWorkingCopy createLaunchConfiguration(IPath mmpPath, IPath exePath, IPath processToLaunchTargetPath) {
-    	// if we haven't finished then don't create anything
-    	if (!hasFinished) {
-    		return null;
-    	}
-
-    	ILaunchConfigurationWorkingCopy config = null;
-    	try {
-    		// create our config
-    		config = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(SettingsData.STI_LAUNCH_TYPE_ID).newInstance(null, getConfigName());
-    		
-    		// set the default values
-    		SettingsData.setDefaults(config, SettingsData.LaunchConfig_SophiaSTI, getProject(), mmpPath, exePath);
-    		
-    		// now let the wizard pages update values 
-    		fBuildOptionsSelectionPage.updateConfiguration(config);
-    		fSophiaPage.updateConfiguration(config);
-    		fRomImgPage.updateConfiguration(config);
-    		
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return config;
-    }
-}
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SophiaWizardPage.java	Mon Jan 25 15:43:57 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,226 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-package com.nokia.cdt.internal.debug.launch.wizard;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.eclipse.cdt.utils.ui.controls.ControlFactory;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-import com.nokia.cdt.debug.cw.symbian.SettingsData;
-import com.nokia.cpp.internal.api.utils.core.Check;
-
-import cwdbg.PreferenceConstants;
-
-public class SophiaWizardPage extends WizardPage {
-    		
-    private boolean isDisposed = false;
-    
-	private Label sophiaSTIDLLLabel;
-	private Text sophiaSTIDLLPath;
-	private Button sophiaSTIDLLBrowse;
-	private String sophiaSTIDLL;
-
-	private Label targetInitFileLabel;
-	private Text targetInitFilePath;
-	private Button targetInitFileBrowse;
-	private String targetInitFile;
-
-	private Combo processorsList;
-	private int selectedProcIndex;
-
-	private final ISummaryTextItemContainer summaryTextItemContainer;
-	
-    public SophiaWizardPage(ISummaryTextItemContainer summaryTextItemContainer) {
-        super(Messages.getString("SophiaWizardPage.0")); //$NON-NLS-1$
-		Check.checkArg(summaryTextItemContainer);
-		this.summaryTextItemContainer = summaryTextItemContainer;
-        setPageComplete(false);
-        setTitle(Messages.getString("SophiaWizardPage.0")); //$NON-NLS-1$
-        setDescription(Messages.getString("SophiaWizardPage.1")); //$NON-NLS-1$
-    }
-    public void dispose() {
-    	isDisposed = true;
-    	sophiaSTIDLL = sophiaSTIDLLPath.getText().trim();
-    	targetInitFile = targetInitFilePath.getText().trim();
-    	selectedProcIndex = processorsList.getSelectionIndex();
-    	super.dispose();
-    }
-    
-
-	/*
-     * @see IDialogPage#createControl(Composite)
-     */
-    public void createControl(Composite parent) {
-        Composite composite = new Composite(parent, SWT.NULL);
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 3;
-        composite.setLayout(layout);
-        
-        GridData data = new GridData();
-        composite.setLayoutData(data);
-
-        sophiaSTIDLLLabel = new Label(composite, SWT.NONE);
-		sophiaSTIDLLLabel.setText(Messages.getString("SophiaWizardPage.2")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		sophiaSTIDLLLabel.setLayoutData(data);
-		sophiaSTIDLLLabel.setToolTipText(Messages.getString("SophiaWizardPage.3")); //$NON-NLS-1$
-		sophiaSTIDLLLabel.setData(".uid", "SophiaWizardPage.sophiaSTIDLLLabel");
-
-		sophiaSTIDLLPath = new Text(composite, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);	
-		data.horizontalSpan = 2;
-		sophiaSTIDLLPath.setLayoutData(data);
-		sophiaSTIDLLPath.setToolTipText(Messages.getString("SophiaWizardPage.3")); //$NON-NLS-1$
-		sophiaSTIDLLPath.setData(".uid", "SophiaWizardPage.sophiaSTIDLLPath");
-		
-		sophiaSTIDLLBrowse = ControlFactory.createPushButton(composite, Messages.getString("SophiaWizardPage.13")); //$NON-NLS-1$
-		sophiaSTIDLLBrowse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("SophiaWizardPage.4")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.dll*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("SophiaWizardPage.5"), Messages.getString("SophiaWizardPage.6")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					sophiaSTIDLLPath.setText(result);					
-				}
-			}
-		});
-		sophiaSTIDLLBrowse.setData(".uid", "SophiaWizardPage.sophiaSTIDLLBrowse");
-
-		targetInitFileLabel = new Label(composite, SWT.NONE);
-		targetInitFileLabel.setText(Messages.getString("SophiaWizardPage.7")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		targetInitFileLabel.setLayoutData(data);
-		targetInitFileLabel.setToolTipText(Messages.getString("SophiaWizardPage.8")); //$NON-NLS-1$
-		targetInitFileLabel.setData(".uid", "SophiaWizardPage.targetInitFileLabel");
-
-		targetInitFilePath = new Text(composite, SWT.BORDER);
-		data = new GridData(GridData.FILL_HORIZONTAL);	
-		data.horizontalSpan = 2;
-		targetInitFilePath.setLayoutData(data);
-		targetInitFilePath.setToolTipText(Messages.getString("SophiaWizardPage.8")); //$NON-NLS-1$
-		targetInitFilePath.setData(".uid", "SophiaWizardPage.targetInitFilePath");
-		
-		targetInitFileBrowse = ControlFactory.createPushButton(composite, Messages.getString("SophiaWizardPage.13")); //$NON-NLS-1$
-		targetInitFileBrowse.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent evt) {
-				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
-
-				dialog.setText(Messages.getString("SophiaWizardPage.9")); //$NON-NLS-1$
-				dialog.setFilterExtensions(new String[] {"*.cfg*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$
-				dialog.setFilterNames(new String[] {Messages.getString("SophiaWizardPage.10"), Messages.getString("SophiaWizardPage.6")}); //$NON-NLS-1$ //$NON-NLS-2$
-
-				String result = dialog.open();
-				if (result != null && new File(result).exists()) {
-					targetInitFilePath.setText(result);					
-				}
-			}
-		});
-		targetInitFileBrowse.setData(".uid", "SophiaWizardPage.targetInitFileBrowse");
-
-		final Label processorsLabel = new Label(composite, SWT.NONE);
-		processorsLabel.setText(Messages.getString("SophiaWizardPage.11")); //$NON-NLS-1$
-		data = new GridData();
-		data.horizontalSpan = 3;
-		processorsLabel.setLayoutData(data);
-		processorsLabel.setToolTipText(Messages.getString("SophiaWizardPage.12")); //$NON-NLS-1$
-		processorsLabel.setData(".uid", "SophiaWizardPage.processorsLabel");
-		
-		processorsList = new Combo(composite, SWT.READ_ONLY);
-		processorsList.setItems(new String[] { "ARM920T", "ARM926TEJ", "ARM1136EJ-S", "OMAP3xx", "OMAP15xx", "OMAP16xx", "OMAP24xx", "OMAP34xx", "Generic" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-		processorsList.select(8); //by default, select the generic 
-		data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 3;
-		processorsList.setLayoutData(data);
-		processorsList.setToolTipText(Messages.getString("SophiaWizardPage.12")); //$NON-NLS-1$
-		processorsList.setData(".uid", "SophiaWizardPage.processorsList");
-		
-		setControl(composite);
-        Dialog.applyDialogFont(parent);
-        setPageComplete(true);
-    }
-    
-    void updateConfiguration(ILaunchConfigurationWorkingCopy config) {
-    	if (isDisposed) {
-    		if (sophiaSTIDLL.length()>0 && new File(sophiaSTIDLL).exists()) {
-    			config.setAttribute(SettingsData.spn_SophiaSTIConn_DllPath, sophiaSTIDLL);
-    		} 
-    		
-    		if (targetInitFile.length()>0 && new File(targetInitFile).exists()) {
-    			config.setAttribute(PreferenceConstants.J_PN_TargetInitFilePath, targetInitFile);
-    			config.setAttribute(PreferenceConstants.J_PN_RunTargetInitFile, true);
-    		} 
-  
-    		config.setAttribute(PreferenceConstants.J_PN_TargetProcessor, selectedProcIndex);
-    	} else {    		
-    		if ((sophiaSTIDLLPath.getText().trim().length()>0) && (new File(sophiaSTIDLLPath.getText().trim()).exists())) {
-    			config.setAttribute(SettingsData.spn_SophiaSTIConn_DllPath, sophiaSTIDLLPath.getText());
-    		}
-    		
-      		if (targetInitFilePath.getText().trim().length()>0 && new File(targetInitFilePath.getText().trim()).exists()) {
-    			config.setAttribute(PreferenceConstants.J_PN_TargetInitFilePath, targetInitFilePath.getText().trim());
-    			config.setAttribute(PreferenceConstants.J_PN_RunTargetInitFile, true);
-    		}    
-
-    		config.setAttribute( PreferenceConstants.J_PN_TargetProcessor, processorsList.getSelectionIndex());
-    	}
-    }
-
-    public void setVisible(boolean visible) {
-    	super.setVisible(visible);
-    	if (!visible) {
-    		summaryTextItemContainer.putSummaryTextItem("SophiaTargetInterface",  //$NON-NLS-1$
-    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-    						Messages.getString("SophiaWizardPage.2"), //$NON-NLS-1$
-    						sophiaSTIDLLPath.getText() } ));
-    		summaryTextItemContainer.putSummaryTextItem("TargetInitFile",  //$NON-NLS-1$
-    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-    						Messages.getString("SophiaWizardPage.7"), //$NON-NLS-1$
-    						targetInitFilePath.getText() } ));
-    		summaryTextItemContainer.putSummaryTextItem("TargetProcessor",  //$NON-NLS-1$
-    				MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$
-    						Messages.getString("SophiaWizardPage.11"), //$NON-NLS-1$
-    						processorsList.getItem(processorsList.getSelectionIndex()) } ));
-    	}
-    }
-    
-    @Override
-    public void performHelp() {
-		PlatformUI.getWorkbench().getHelpSystem().displayHelp(LaunchWizardHelpIds.WIZARD_SOPHIA_PAGE);
-    }
-}
\ No newline at end of file
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties	Mon Jan 25 15:43:57 2010 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties	Wed Jan 27 10:34:50 2010 -0600
@@ -48,23 +48,6 @@
 MainExecutableSelectionWizardPage.SelectExectuableTitle=Select Exectuable To Launch
 MainExecutableSelectionWizardPage.UsePathLabel.device=Specify device path of remote process to launch
 MainExecutableSelectionWizardPage.UsePathLabel.device.ToolTip=The specified process will be launched on the phone
-SophiaLaunchWizard.1=New Sophia STI Launch Configuration
-SophiaLaunchWizard.2=Sophia STI Launch Configuration
-SophiaLaunchWizard.3=Sophia STI is an external debugger that Carbide debugger communicates with, to debug any Symbian OS module on a target using a JTAG connection.
-SophiaWizardPage.0=Sophia Initialization Settings
-SophiaWizardPage.1=Choose the Sophia WTI DLL, the target initialization file and the processor for initializing the target through Sophia STI.
-SophiaWizardPage.10=Initialization Files (*.cfg) 
-SophiaWizardPage.11=Target Processor\:
-SophiaWizardPage.12=Choose the target processor from the list
-SophiaWizardPage.13=Browse...
-SophiaWizardPage.2=Sophia Target Interface (WTI.DLL)\:
-SophiaWizardPage.3=Choose the Sophia's WTI.DLL which is used by the Carbide debugger to connect to the target through Sophia target interface.
-SophiaWizardPage.4=Choose the Sophia Target Interface (WTI.DLL) library 
-SophiaWizardPage.5=DLL files (.dll)
-SophiaWizardPage.6=All files
-SophiaWizardPage.7=Target Initialization File\:
-SophiaWizardPage.8=Choose the target initialization file which is run by the Carbide debugger after connecting to the target.
-SophiaWizardPage.9=Choose the target initialization file 
 StopModeRomImageWizardPage.0=Symbian ROM Image Settings
 StopModeRomImageWizardPage.1=Choose either soft attach or debug from start option. With soft attach option, you can start debugging without changing the state of the target. Specify the ROM log file for debugging Symbian OS components.
 StopModeRomImageWizardPage.10=All Files