BUG 10603 - removed sophia text references from 3.0
authorfturovic <frank.turovich@nokia.com>
Tue, 26 Jan 2010 13:41:56 -0600
changeset 819 8121a281245c
parent 816 d0f3375bb257
child 821 093070e1f6e0
child 826 71752005db5f
BUG 10603 - removed sophia text references from 3.0
core/com.nokia.carbide.cpp.doc.user/book.css
core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/stop_mode_cs.xml
core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml
core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml
core/com.nokia.carbide.cpp.doc.user/html/debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/breakpoints.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm
core/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/sophia.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_01.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_02.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_03.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm
core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_pref_code_style.htm
core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
core/com.nokia.carbide.cpp.doc.user/html/sos_references.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_jtag.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_launchcfg.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm
core/com.nokia.carbide.cpp.doc.user/index.xml
core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml
core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml
core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/book.css	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/book.css	Tue Jan 26 13:41:56 2010 -0600
@@ -5,30 +5,29 @@
 */
 
 /*	Add whitespace around entire display to avoid crowding edges of view 	*/
-/* 	20070523-Removed top margin size to close gap between location breadcrumbs and page title	*/
 html {
 	margin: 2px 10px 10px 10px;
 	}
 
-/* 	Set default font to serif style, 12-pt and plain	*/
+/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table {
-	font-family: Verdana, Helvetica, sans-serif;
-	font-size: 13px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 1.0em;
 	font-weight: normal;
 }
 
-/*	Use sans-serif fonts for all title styles	*/
 h1, h2, h3, h4, h5, h6, strong, em {
-	font-family: Verdana, Helvetica, sans-serif;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
 	color: #000000;	
 	}
 
-h1	{ font-size:20px }
-h2	{ font-size:18px }
-h3	{ font-size:16px }
-h4	{ font-size:14px }
-h5	{ font-size:13px }
-h6	{ font-size:12px }
+/* 20091007 - changed sizes to use em versus px */
+h1 { font-size: 1.3em }
+h2 { font-size: 1.2em }
+h3 { font-size: 1.1em }
+h4 { font-size: 1.0em }
+h5 { font-size: 0.9em }
+h6 { font-size: 0.8em }
 
 /*	For headlines at the top of a view, add space	*/
 /*	20090224-changed green fade to gold header image	*/
@@ -38,6 +37,10 @@
 	padding:10px 0px 10px 12px;	
 	}
 
+/* 20091007 SFO styling added */
+h1.NavTitle		{ font-size: 1.2em }
+h3	.NavListTitle 	{ font-size: 1.1em }
+
 li	{
 	margin-bottom:8px;	
 	margin-top:8px;
@@ -48,21 +51,22 @@
 	padding-top:10px;
 	margin-top:20px;
 	border-top:1px solid #999;
-	font-family: Verdana, Helvetica, sans-serif;
-	font-size: 11px;
-	color:#333;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
+	color: #333333;
 	}
 
 .listing	{
+	background-color: #ffe869;
 	font-family: "Courier New", Courier, mono;
+	font-size: 1.1em;
 	color: #000000;
-	background-color: #FFFFCC;
 	margin: 5px 0px;
 	}
 		
 .code, pre	{
 	font-family: "Courier New", Courier, mono;
-	font-size: 13px;
+	font-size: 1.1em;
 	color: #000000;
 	}
 
@@ -88,7 +92,6 @@
 table	{
 	border: solid #999 1px;
 	table-layout: auto;
-	font-size: 13px;
 	}
 
 td, th	{
@@ -97,11 +100,8 @@
 	vertical-align:top;
 	}
 	
-/*	20070522-replaced gray with green background to match gradiant color for title	*/
 th	{
-	background-color:#FFC550;	/* background-color:#acd79b;
-	background-color:#999;
-	color:#FFF; */
+	background-color: #ffd62c;
 	}
 
 div.ol.p	{
@@ -118,11 +118,9 @@
 	font-weight:normal;
 	}
 	
-/* Make all H4 and H5 items appear in bold gray against a light green background */
 div h5, div h4	{
 	padding:5px 0px 5px 12px;
-	background-color:#FDCB2F;
-	/* background-color: #EEE; */
+	background-color: #ffd62c;
 	font-weight:bold;
 	color: #000000;
 	}
@@ -130,8 +128,6 @@
 	
 /*	Notes stand out using a light top & bottom borders with dark gray text	*/
 p.note {
-	/* color: #03C; */
-	/* background-color: #FFFF99; */
 	color: #333;
 	padding: 5px;
 	margin-left: 1em;
@@ -143,11 +139,12 @@
 	
 /*	Figure/Listing/Table titles are centered and gray	*/
 p.figure {
-	color: #333;
+	color: #026690;
 	text-align: center;
 	font-weight: bold;
 	}
 
+
 /*	highly visible red background and white text for things that need fixing before release	*/
 /*  SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
 .fix	{
@@ -163,14 +160,14 @@
 	}
 	
 .titleSmall {
-	font-family: Helvetica, sans-serif;
-	font-size: 11px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.8em;
 	}
 
 	
 .plain {
-	font-family: Helvetica, sans-serif;
-	font-size: 12px;
+	font-family: Verdana, Ariel, Helvetica, sans-serif;
+	font-size: 0.9em;
 	font-style: normal;
 	line-height: normal;
 	font-weight: normal;
@@ -179,6 +176,6 @@
 	text-decoration: none;
 	}
 
-a:link 		{ color: #0033CC }
+a:link 		{ color: #026690 }
 a:visited	{ color: #555555 }
-a:hover 	{ color: #0033CC }
+a:hover 	{ color: #FFD62C }
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -16,11 +16,28 @@
 <h2>Carbide.c++ bugs fixed </h2>
 <p>This is a comprehensive list of bugs fixed by release: </p>
 <ul>
-  <li>Bugs Fixed in <a href="#bugs220">2.2.0</a></li>
-  <li><a href="#bugs210">2.1.0</a>, <a href="#bugs204">2.0.4</a>, <a href="#bugs203">2.0.3</a>, <a href="#bugs202"> 2.0.2</a>, <a href="#bugs200">2.0.0</a></li>
+  <li>Bugs Fixed in <a href="#bugs240">2.5.0</a></li>
+  <li><a href="#bugs240">2.4.0</a>, <a href="#bugs230">2.3.0</a>, <a href="#bugs220">2.2.0</a>, <a href="#bugs210">2.1.0</a>, <a href="#bugs204">2.0.4</a>, <a href="#bugs203">2.0.3</a>, <a href="#bugs202"> 2.0.2</a>, <a href="#bugs200">2.0.0</a></li>
   <li><a href="#bugs131">1.3.1</a>, <a href="#bugs130">1.3.0</a> , <a href="#bugs122">1.2.2</a>, <a href="#bugs121">1.2.1</a></li>
 </ul>
-<h3><a name="bugs220" id="bugs6"></a>Bugs Fixed in v2.2.0</h3>
+<h3><a name="bugs250" id="bugs9"></a>Bugs Fixed in v2.5.0</h3>
+<ul>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10282">10282</a> -  Fixed an issue that prevented updating of the source path in the Executables view when working from a subst drive and a project is open that contains the source file.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10396">10396</a> - Added reminder &quot;NOTE Always run the Help &gt; Check for Updates wizard and install all updates before attempting to install new software. This can prevent the occurrence of any dependency errors.&quot; to the <a href="tasks/start/carbide_updating.htm">Upgrading Carbide.c++</a> page.</li>
+</ul>
+<h3><a name="bugs240" id="bugs8"></a>Bugs Fixed in v2.4.0</h3>
+<ul>
+  
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9852">9852</a> - Fixed an issue that prevented the S60 GUI App template from building under SBSv2. </li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10308">10308</a> - The latest Qt plugins were converted to use P2 and now work in Carbide.</li>
+</ul>
+<h3><a name="bugs230" id="bugs6"></a>Bugs Fixed in v2.3.0</h3>
+<ul>
+  
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9818">9818</a> - Added support for Qt coding style to the Preferences &gt; C/C++ &gt; Code Style preference panel.</li>
+  <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9800">9800</a> - Fixed an issue where the Project Explorer view that would sometimes display empty source and include directories within a project even though the Symbian Project Navigator view displayed them.</li>
+</ul>
+<h3><a name="bugs220" id="bugs7"></a>Bugs Fixed in v2.2.0</h3>
 <ul>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=5391">5391</a> - C++ source hover background color is now customizable. See Window &gt; Preferences &gt; C/C++ &gt; Editor.</li>
   <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=9141">9141</a> - Fixed an issue when setting a breakpoint would force a refresh of the Executables view.</li>
@@ -369,7 +386,7 @@
   <li>326 - The Goto macro declaration now works</li>
   <li>1450 - Notification of missing Perl scripts/tools directory has been improved</li>
   <li>1470 - ARMV5 programs shold now display all  local variables </li>
-  <li>2793 - Forum Nokia site (www.forum.nokia.com/eclipse_downloads) updated to include v1.2 license information </li>
+  <li>2793 - Forum Nokia site (<a href="http://www.forum.nokia.com/">www.forum.nokia.com</a>) updated to include v1.2 license information </li>
   <li>3314 - Syntax highlighting and 'Find declaration/definition' now works for sources not included in MMPs </li>
   <li>3442 - Build All Configurations now also builds the test code too. You can disable this in the Carbide.c++ preferences. </li>
   <li>3446	- Error message improved when SDK Prefix File is not found in SDK properties </li>
@@ -453,7 +470,7 @@
   <li>3975	- The Variables view no longer displays strange  &quot;.sw&quot; variables<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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/stop_mode_cs.xml	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/stop_mode_cs.xml	Tue Jan 26 13:41:56 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	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml	Tue Jan 26 13:41:56 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	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Tue Jan 26 13:41:56 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/debugger.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -19,13 +19,13 @@
       <p align="right">&nbsp;</p>
       <p align="right">&nbsp;</p>
       <p align="right">&nbsp;</p>
-      <p class="titleSmall">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.<br>
+      <p class="titleSmall">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></p>
     </td>
   </tr>
   <tr>
     <td colspan="2"><h1 align="center">Carbide.c++ User Guide</h1>
-    <p align="center" class="titleSmall">Version 2.2.0, August, 2009</p></td>
+    <p align="center" class="titleSmall">Version 2.5.0, Jan, 2010</p></td>
   </tr>
 </table>
 <p align="center">&nbsp;</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/breakpoints.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/breakpoints.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -4,31 +4,63 @@
 <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>Breakpoints Overview</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<title>Breakpoints</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Breakpoints Overview </h2>
-<p>A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to suspend program execution. Breakpoints are shown in the UI both with the associated source code in an editor view as well as a dedicated <a href="viewing_breakpoints.htm">Breakpoints</a> view. </p>
-<p>When a breakpoint is encountered during program execution, the debugger suspends execution and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears so you can examine the executable's current state,  check register and variable values, and use the stepping commands to walk line by line through the program to verify its operation. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
-<p>The following topics cover various breakpoint concepts and actions: </p>
+<h2>Breakpoints </h2>
+<p>  A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to halt program execution when encountered by the debugger. After you set a breakpoint at a key point in the program, you can halt its execution, examine its current state, and check register and variable values. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
+<p>A project can have multiple breakpoints set in the source code files. All breakpoints  in a project are shown in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view. Breakpoints are enabled or disabled on the currently selected line within  a source code editor by selecting the <b>Run &gt; Toggle Breakpoint</b> menu option, right-clicking the marker bar in the editor and selecting <b>Toggle Breakpoint</b>, or by pressing <span class="code">CTRL-SHIFT-B</span>.</p>
+<p>You can set a breakpoint on any executable line of code that the debugger can resolve. Lines containing comments and other non executable code cannot be assigned a breakpoint as they are normally stripped from the  compiled   binary. The debugger must load  the symbols for a module before it can attempt to resolve  breakpoints within the module. This is most easily done using the <a href="../reference/view_executables.htm">Executables</a> view to import a binary file, especially if the binary is not in the workspace. </p>
+<p>When the debugger attempts to resolve a breakpoint it will result in:</p>
 <ul>
-  <li><a href="viewing_breakpoints.htm">Viewing Breakpoints</a></li>
-  <li><a href="resolving_breakpoints.htm">Breakpoint status indicators </a> </li>
-  <li><a href="toggling_breakpoints.htm">Enabling, Disabling and Removing Breakpoints</a></li>
-  <li><a href="properties_breakpoints.htm">Breakpoint properties </a>
-    <ul>
-      <li><a href="temporary_breakpoints.htm">Creating temporary breakpoints</a> </li>
-      <li><a href="conditional_breakpoints.htm">Creating conditional breakpoints</a> </li>
-    </ul>
-  </li>
-  <li><a href="exporting_breakpoints.htm">Exporting</a> and <a href="importing_breakpoints.htm">importing</a> breakpoints</li>
-  <li><a href="../../reference/menus/hardware_breakpoints.htm">Toggle hardware breakpoints</a> </li>
+  <li><b>resolved</b> &#8212; the symbols for the module  are loaded  and the breakpoint  located in the executable that&#8217;s currently being debugged, circle icon changes to flagged icon </li>
+  <li><b>resolved and moved</b> &#8212;the breakpoint is not found in the executable at the specified point. Debugger moves breakpoint forward in the current function until a line is found that can be resolved. Breakpoint icon moved to source line matching new breakpoint location and changed to flagged icon.</li>
+  <li><b>unresolved</b>  &#8212;  if the symbols for the module  are not loaded or the breakpoint was not able to be set within the current function. This may indicate no executable code in the source line or a deadstripped function  not present in the executable. Breakpoint icon remains in unflagged state indicating unresolved status.</li>
 </ul>
-<h4>Other references</h4>
+<p>Breakpoints have enabled and disabled types as well as resolved and unresolved states. Table 1 explains the different breakpoint types and states.</p>
+<h5>Table 1 Breakpoint&mdash;type and states </h5>
+<table width="90%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="15%" scope="col">Type</th>
+    <th width="14%" scope="col">State</th>
+    <th width="14%" scope="col">Icon</th>
+    <th width="71%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td>Enabled</td>
+    <td><div align="center">Unresolved</div></td>
+    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" /></div></td>
+    <td>Indicates that the breakpoint is currently enabled but not located in the executable during a debug session. Debugger cannot halt program execution.</td>
+  </tr>
+  <tr>
+    <td>Enabled</td>
+    <td><div align="center">Resolved</div></td>
+    <td><div align="center"> <img src="../images/icons/breakpoints_enabled_icon.png" width="15" height="12" /></div></td>
+    <td>Indicates that the breakpoint is currently enabled and resolved for the source line. The debugger halts program execution at an enabled breakpoint. </td>
+  </tr>
+  <tr>
+    <td>Disabled</td>
+    <td><div align="center">Unresolved</div></td>
+    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_disabled_icon.png" width="12" height="11" /></div></td>
+    <td>Indicates that the breakpoint is currently disabled but not located in the executable during a debug session. The debugger does not halt program execution at a disabled breakpoint.</td>
+  </tr>
+  <tr>
+    <td>Disabled</td>
+    <td><div align="center">Resolved</div></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_disabled_icon.png" width="15" height="12" /></div></td>
+    <td>Indicates that the breakpoint is currently disabled and resolved for the source line. The debugger does not halt program execution at a disabled breakpoint.</td>
+  </tr>
+</table>
+<p>Other references </p>
 <ul>
-  <li>Debugging overview </li>
+  <li><a href="../reference/view_executables.htm">Executables view</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Clearing Breakpoints</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -5,20 +5,113 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Watchpoints Overview</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Watchpoints Overview </h2>
-<p>A <b>watchpoint</b> is a marker set on a specific memory location which is designed to suspend program execution when the value at that location changes. Watchpoints are closely related to breakpoints and are shown in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view. </p>
-<p>When a watchpoint is encountered during program execution, the debugger suspends execution and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears so you can examine the executable's current state,  check register and variable values, and use the stepping commands to walk line by line through the program to verify its operation. You can also change values and alter the flow of normal program execution. Setting watchpoints helps you debug your program and verify its efficiency.</p>
-<p>The following topics cover various breakpoint concepts and actions: </p>
+<p>  Use <em>watchpoints</em> (sometimes referred to as access breakpoints) to halt program execution when a specific global location is accessed. After you set a watchpoint at a key point in memory, you can halt program execution whenever that point in memory is written to or read from. You can then examine the call chain, check register and variable values, and step through your code. You can also change values and alter the flow of normal program execution.</p>
+<p>A watchpoint must be both enabled and resolved during a debug session in order to halt program execution. The  <a href="../reference/view_breakpoints.htm">Breakpoints view</a> indicates the status of any watchpoint using a set of common icons and checkmark status badge. These include:</p>
+<ul>
+  <li>An <b>enabled</b> watchpoint has a non-gray icon (<img src="../tasks/watchpoints/images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle" />) indicating that program execution  halts when encountered.</li>
+  <li>A <b>disabled</b> watchpoint displays a gray icon (<img src="../tasks/watchpoints/images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
+  <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../tasks/watchpoints/images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle" /> ) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
+</ul>
+<p>In effect, a watchpoint that is enabled by the user and resolved by the debugger during program launch can halt program execution. The table below shows the various states that cause the debugger to halt program execution: </p>
+<h5>Table 1 Watchpoint&mdash;stop execution chart </h5>
+<table width="50%"  border="0" align="left" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="32%" scope="col">Watchpoint</th>
+    <th width="32%" scope="col"><div align="center">Resolved</div></th>
+    <th width="36%" scope="col"><div align="center">Unresolved</div></th>
+  </tr>
+  <tr>
+    <th scope="col">Enabled</th>
+    <td><div align="center"><b>Stops execution </b></div></td>
+    <td><div align="center"><b>No</b></div></td>
+  </tr>
+  <tr>
+    <th scope="col">Disabled</th>
+    <td><div align="center"><b>No</b></div></td>
+    <td><div align="center"><b>No</b></div></td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>In addition, you can use these types of watchpoints:</p>
 <ul>
-  <li><a href="../breakpoints/viewing_breakpoints.htm">Viewing Breakpoints and Watchpoints</a> </li>
-  <li><a href="status_watchpoints.htm">Watchpoint Status Indicators</a></li>
-  <li><a href="setting_watchpoints.htm">Setting and Removing Watchpoints</a></li>
-  <li><a href="toggling_watchpoints.htm">Enabling and Disabling Watchpoints</a></li>
-  <li><a href="../breakpoints/exporting_breakpoints.htm">Exporting</a> and <a href="../breakpoints/importing_breakpoints.htm">importing</a> watchpoints</li>
+  <li><a href="../tasks/watchpoints/pgm_wpt_setting.htm">regular</a> watchpoints&mdash;halt program execution</li>
+  <li><a href="../tasks/watchpoints/pgm_wpt_conditional.htm">conditional</a> watchpoints&mdash;halt program execution after meeting a condition that you specify (same as for breakpoints)</li>
+</ul>
+<p>A watchpoint is equivalent to a memory breakpoint.</p>
+<p>Unlike a breakpoint, a watchpoint can detect when any part of your program affects memory. For example, if a write or write/read watchpoint is set, when the program writes a new value to the address or area of memory that has the watchpoint, the debugger suspends program execution.</p>
+<p class="note"><b>NOTE</b> You cannot set a watchpoint on a local variable, because the debugger cannot detect watchpoints for variables stored on the stack or in registers.</p>
+<h5>Table 2 Watchpoint&mdash;types and states </h5>
+<table width="90%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="14%" scope="col">Type</th>
+    <th width="14%" scope="col">State</th>
+    <th width="10%" scope="col">Icon</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td rowspan="2"><b>Write</b></td>
+    <td>enabled</td>
+    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_write_resolved.png" width="15" height="16" /></div></td>
+    <td><p>The watchpoint is activated for write access operations on the specific memory location and if resolved, will halt program execution on a write operation at the watchpoint. </p>
+    </td>
+  </tr>
+  <tr>
+    <td>disabled</td>
+    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_write_disabled.png" width="16" height="16" /></div></td>
+    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a write operation. </p>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2"><b>Read</b></td>
+    <td>enabled</td>
+    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_read_enabled.png" width="16" height="16" /></div></td>
+    <td><p>The watchpoint is activated for read access operations on the specific memory location and if resolved, will halt program execution on a read operation at the watchpoint. </p>
+    </td>
+  </tr>
+  <tr>
+    <td>disabled</td>
+    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_read_disabled.png" width="16" height="16" /></div></td>
+    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read operation. </p>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2"><b>Write/Read</b></td>
+    <td>enabled</td>
+    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_rw_enabled.png" width="16" height="16" /></div></td>
+    <td><p>The watchpoint is activated for both read and write access operations on the specific memory location and if resolved, will halt program execution  on any read or write operation at the watchpoint. </p>
+    </td>
+  </tr>
+  <tr>
+    <td>disabled</td>
+    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_rw_disabled.png" width="16" height="16" /></div></td>
+    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read or write operation. </p>
+    </td>
+  </tr>
+</table>
+<p>A project can have a different maximum number of watchpoints, depending on the build target. The IDE generally limits the acceptable range for watchpoints to memory that it can write-protect. This range also depends on the host and on the application. </p>
+<p>All set watchpoints appear in the <a href="../reference/view_breakpoints.htm">Breakpoints view</a>  list.</p>
+<h5>Related concepts</h5>
+<ul>
+  <li> <a href="breakpoints.htm">Breakpoints</a></li>
+</ul>
+<h5>Related tasks </h5>
+<ul>
+  <li><a href="../tasks/watchpoints/pgm_wpt_setting.htm">Setting Watchpoints</a></li>
+  <li><a href="../tasks/watchpoints/pgm_wpt_enable.htm">Enabling Watchpoints</a></li>
+  <li><a href="../tasks/watchpoints/pgm_wpt_disable.htm">Disabling Watchpoints</a></li>
+  <li><a href="../tasks/watchpoints/pgm_wpt_clearing.htm">Clearing Watchpoints</a></li>
+</ul>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../reference/view_breakpoints.htm">Breakpoints view</a> </li>
 </ul>
 <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/hints_tips.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -26,23 +26,19 @@
 <blockquote>
    <p>Use the <a href="reference/search/wnd_system_search.htm">System Search</a> feature in Carbide. Click <b>Search &gt; System...</b>, enter the search data, press Search. </p>
 </blockquote>
- <h5 class="note">How can I quickly open a .h file associated from the source file I am currently editing ? </h5>
+ <h5 class="note">How can I quickly open a .h file associated from the source file I am currently editing? </h5>
  <blockquote>
    <p>The CDT editor supports quick opening of associated .h files. To view the .h file, select the name of the .h file in the source you are currently editing and press F3 (Open Declaration). A new editor view will appear and display the .h file. </p>
 </blockquote>
  <h5 class="note">I can't locate the eclipse.ini file to modify the behavior of Carbide.c++, where can I find it? </h5>
  <blockquote>
-  <p>The <span class="code">eclipse.ini</span> file was renamed the <span class="code">carbide.c++.1.x.ini</span> file to keep the <span class="code">.exe</span> and <span class="code">.ini</span> files in sync. </p>
+  <p>The <span class="code">eclipse.ini</span> file was renamed the <span class="code">carbide.c++.2.x.ini</span> file to keep the <span class="code">.exe</span> and <span class="code">.ini</span> files in sync. </p>
 </blockquote>
  <h5 class="note"><a name="VMissues"></a>I can't launch Carbide.c++ due to &quot;Error occurred in initialization of VM, could not reserve enough space for object heap? </h5>
  <blockquote>
    <p>By default, the heap space set aside for Carbide is 1024MB. You can see this setting in the <span class="code">carbide.c++.1.x.ini</span> file as the line &quot;<span class="code">-Xmx1024m</span>&quot;. Some system may have limited VM space available so we suggest you try lowering the default amount to  &quot;<span class="code">-Xmx512m</span>&quot; and  relaunching Carbide. </p>
 </blockquote>
- <h5 class="note">I want to use CDT for other C/C++ development in Carbide.c++</h5>
- <blockquote>
-  <p>Carbide.c++ hides some CDT UI elements using capabilities.  We do this to avoid confusion as there are several things labeled C/C++ that don't really apply to Symbian development.  To show these items, you need to add the Eclipse SDK to your Carbide.c++ installation (download link:<span class="code"> www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.2.1-200609210945/eclipse-SDK-3.2.1-win32.zip</span>), and then enable it from the preferences (<b>Window > Preferences > General > Capabilities > Nokia Debug</b>).</p>
-</blockquote>
- <h5 class="note">When I press F1 in a dialog, the help pane isn't very helpful? </h5>
+<h5 class="note">When I press F1 in a dialog, the help pane isn't very helpful? </h5>
  <blockquote>
    <p>If the Help pane does not display   information specific to the page content, it may be because the page in the dialog doesn't have focus. This often occurs in a wizard page when nothing has been selected on the page. The help system has not  been told which  help content to display in the About section of the help pane. </p>
    <p class="note"><b>NOTE</b> The Dynamic help section usually displays the proper helpful links, just not as specific as the About section should display. </p>
@@ -89,22 +85,23 @@
  </blockquote>
  <h5>New debug launch configuration fields not filled in correctly upon creation </h5>
  <blockquote>
-   <p>See &quot;Debug icon not visible on executable in C/C++ Projects view&quot; to correct this issue. Once completed, try to create a debug launch configuration again. Click the New button in the Configuration window to create a new configuration with the correct project information. </p>
+   <p>See &quot;Debug icon not visible on executable in Project Explorer view&quot; to correct this issue. Once completed, try to create a debug launch configuration again. Click the New button in the Configuration window to create a new configuration with the correct project information. </p>
 </blockquote>
- <h5>Debug icon not visible on executable in C/C++ Projects view </h5>
- <blockquote>
-   <p>This is commonly caused when the binary parser is not set correctly in the project. To correct, open the project properties window (right-click project name in C/C++ Projects view and select Properties), expand the C/C++ Build section and click the Binary Parser tab in the C/C++ Build page. Now look for the PE Windows Parser option. If it's not checkmarked, checkmark it and click Apply. If it is already set then uncheck it and click Apply, then reapply a checkmark and click Apply. The debug icon should now appear.</p>
- </blockquote>
+ <h5>Debug icon not visible on executable in Project Explorer view </h5>
+<blockquote>
+   <p>This is commonly caused when the binary parser is not set correctly in the project. To correct, open the project properties window (right-click project name in Project Explorer view and select Properties), expand the C/C++ Build section and click the Binary Parser tab in the C/C++ Build page. Now look for the PE Windows Parser option. If it's not checkmarked, checkmark it and click Apply. If it is already set then uncheck it and click Apply, then reapply a checkmark and click Apply. The debug icon should now appear.</p>
+</blockquote>
 <h3><a name="connectivity" id="connectivity"></a>Connectivity</h3>
  <h5>Unable to connect to device using Bluetooth and debug it using TRK </h5>
 <blockquote>
   <p>When using Bluetooth to connect to a device there are several things that require correction, including:</p>
   <ul>
     <li>If using built-in Bluetooth under WinXP SP2,  ensure the manufacturer&#8217;s device drivers are installed and active. The default Microsoft drivers do not work correctly for debugging devices using TRK. For example, if using IBM Integrated Bluetooth on your computer, make sure you have the IBM drivers for the device. </li>
-    <li>Ensure the COM port used by Bluetooth is not commandeered by another process or device</li>
+    <li>Ensure the COM port used by Bluetooth is not commandeered by another process or device.</li>
+    <li>Ensure that you have the <a href="tasks/trk/trk_installation_instr.htm">latest version </a>of TRK on the target device.</li>
   </ul>
 </blockquote>
-<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Tue Jan 26 13:41:56 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	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm	Tue Jan 26 13:41:56 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	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -1,155 +1,155 @@
-<!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>, 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 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Tue Jan 26 13:41:56 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>, 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 (TRACE32 shown)</p>
 <h5>Table 3. Stop-mode Main page &mdash; items</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/sophia.htm	Tue Jan 26 11:44:24 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	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Tue Jan 26 13:41:56 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	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -50,13 +50,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 +97,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/projects/launch/wnd_debug_configuration.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -4,18 +4,17 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Debug dialog</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<title>Debug Window</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Debug dialog </h2>
-<p>Use the <b>Debug</b>  dialog to create, edit, and manage a project's <a href="launch_configs_overview.htm">launch configurations</a>. A <b>launch configuration</b> defines the settings used by the Carbide debugger to launch (Run) or debug programs. A project must have at least one  launch configuration in order to debug a project and can have many more. Projects that have no launch configuration  invoke the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> when either the <b>Run</b> or <b>Debug</b> command is selected. </p>
-<p>Select the <b>Run &gt; Debug Configuration...</b> menu option to open the <b>Debug</b> dialog.</p>
-<p>The tabs shown in the <b>Debug</b> dialog vary depending upon the  type of launch configuration highlighted in the configurations list. See <a href="launch_configs_overview.htm">Launch Configuration Overview</a> for more information on the various launch configuration types. </p>
-<p>Click <b>Debug</b> to start a new debug session using the selected launch configuration. </p>
-<p align="center" class="figure"><img src="../images/wnd_debug_emulation_launch_config.png" width="658" height="403"></p>
-<p align="center" class="figure"> Figure 1 - Debug dialog (Symbian OS Emulation configuration shown)</p>
-<h5>Table 1. Debug dialog &mdash; common items</h5>
+<h2>Debug Window</h2>
+<p>The <b>Debug</b> or launch configuration window provides C/C++ debugger options. A <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> defines the settings used by the Carbide debugger to launch and debug programs. A project must have at least one debug launch configuration in order to debug a project and can have many more. </p>
+<p>By default, Carbide creates a debug launch configuration the first time you launch the debugger based on current project settings. If additional information is required, like a port ID, the <a href="../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>  appears asking for the additional information. </p>
+<p>The tabs in the window vary depending upon the currently selected launch configuration.</p>
+<p align="center" class="figure"><img src="images/wnd_debug_overview.png" width="864" height="471"><br />
+Figure 1 - Debug or launch configuration window (Symbian OS emulation view)</p>
+<h5>Table 1. Debug window &mdash; common items</h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="7%" scope="col">Icon</th>
@@ -52,15 +51,30 @@
           <li>Filter Deleted/Unavailable Projects</li>
           <li>Filter Configuration Types</li>
           <li>Apply Window Working Set(s)</li>
-          <li><a href="../../reference/trk/panel_filter.htm">Filtering Preferences...</a></li>
+          <li><a href="trk/panel_filter.htm">Filtering Preferences...</a></li>
       </ul></td>
   </tr>
 </table>
-<h4>Other references</h4>
+<div class="step">
+  <h4>To open the Debug window </h4>
+  <ul>
+    <li>Select the Run &gt; Open Debug Dialog... menu item</li>
+  </ul>
+  <ol>
+    The Debug window (Figure 1) appears.</ol>
+  <ul>
+    <li>Select Run &gt; Open Run Dialog...  to open a Run window to create a launch configuration for a release build.</li>
+  </ul>
+</div>
+<h5>Other references</h5>
 <ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-  <li><a href="pages_overview.htm">Configuration Pages</a> </li>
+  <li><a href="perspective_debug.htm">Debug Perspective</a></li>
+  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  <li><a href="../projects/launch/emulation.htm">Emulator overview</a></li>
+  <li><a href="../projects/launch/run_mode.htm">Run-mode overview</a></li>
+  <li><a href="../projects/launch/stop_mode.htm">Stop-mode overview</a>  </li>
 </ul>
 <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Creating Qt Projects</h2>
-<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into S60. The wizard walks you through the process of defining and creating a Qt project.</p>
+<p>Use the <b>Qt Project</b> creation wizard to create new Qt-based projects  based on Qt SDKs integrated into Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
 <ol>
 <li><a href="qt_creating_projs_01.htm">Launch the New Qt Project Wizard</a></li>
 <li><a href="qt_creating_projs_02.htm">Select type of Qt project</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_01.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_01.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Importing Qt Projects</h2>
-<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects based on Qt SDKs integrated into S60. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
+<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects based on Qt SDKs integrated into Symbian. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
 <p>To import a Qt project:</p>
 <ol>
   <li><b>Launch the importer</b></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_02.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_02.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Importing Qt Projects</h2>
-<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects  based on Qt SDKs integrated into S60. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
+<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects  based on Qt SDKs integrated into Symbian. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
 <p>To import a Qt project:</p>
 <ol>
   <li><a href="qt_importing_projs_01.htm">Launch the importer</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_03.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_03.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Importing Qt Projects</h2>
-<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects   based on Qt SDKs integrated into S60. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
+<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects   based on Qt SDKs integrated into Symbian. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
 <p>To import a Qt project:</p>
 <ol>
   <li><a href="qt_importing_projs_01.htm">Launch the importer</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Importing Qt Projects</h2>
-<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects  based on Qt SDKs integrated into S60. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
+<p>Use the <b>Qt Project</b> import wizard to import  Qt-based projects  based on Qt SDKs integrated into Symbian. The wizard walks you through the process of importing a Qt project, stored as a <span class="code">.pro</span> file.</p>
 <p>To import a Qt project:</p>
 <ol>
   <li><a href="qt_importing_projs_01.htm">Launch the importer</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -24,7 +24,7 @@
 <ul>
   <li>Qt + Eclipse integration &#8212;  see the <a href="PLUGINS_ROOT/com.trolltech.qtcppintegrationhelp/doc/eclipse-integration.html">Qt Developer User Guide</a></li>
   <li>Qt SDK help  &#8212;  look in the <span class="code">qt_sdk_install/doc/html</span> directory of the Qt SDK</li>
-  <li>Qt support  &#8212; visit <a href="http://trolltech.com">trolltech.com</a> for more information</li>
+  <li>Qt information  &#8212; visit <a href="http://wiki.forum.nokia.com/index.php/Category:Qt">Forum Nokia Qt</a> wiki topic for more information</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -10,11 +10,11 @@
 <body bgcolor="#FFFFFF">
 <h2>Qt Development Setup</h2>
 <p>There are some prerequisites to using Qt projects within the Carbide environment. This includes downloading the correct SDKs, building <span class="code">qmake</span> to use the SDKs, and finally, building the libraries for your target environments. </p>
-<p>You should have the Qt SDK for S60 that works with the S60 SDK in order to develop applications with Carbide. These steps include:</p>
+<p>You should have the Qt SDK for Symbian that works with the S60 SDK in order to develop applications with Carbide. These steps include:</p>
 <ol type="a">
-  <li>Download  the <a href="http://trolltech.com/developer/technical-preview-qt-for-s60">Qt SDK for S60</a> package</li>
-  <li>Install the Qt SDK using the instructions found in the INSTALL file located in the Qt SDK for S60 folder, including:
-    <ol>
+  <li>Download  the <a href="http://qt.nokia.com/downloads/symbian-cpp">Qt SDK for Symbian</a> package</li>
+  <li>Install the Qt SDK using the instructions found in the <span class="code">INSTALL</span> file located in the Qt SDK for Symbian folder, including:
+  <ol>
         <ol>
           <li>Install needed IDE and SDKs</li>
           <li>Install Qt</li>
@@ -25,7 +25,7 @@
     </ol>
   </li>
 </ol>
-<p>Once  completed, you should be able to <a href="qt_importing_projs_01.htm">import</a> or create <a href="qt_creating_projs_01.htm">new</a> projects using the Qt SDK for S60.</p>
+<p>Once  completed, you should be able to <a href="qt_importing_projs_01.htm">import</a> or create <a href="qt_creating_projs_01.htm">new</a> projects using the Qt SDK for Symbian.</p>
 <h4>Other references</h4>
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -19,15 +19,25 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Remote Connections view</h2>
-<p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common  connection settings for remote agents. The columns include:</p>
+<p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common  connection settings for remote agents. Remote agents provide support for debugging, profiling, trace, and more. The connection types currently supported include:</p>
+<ul>
+  <li>Serial &mdash; mainly for boards with a serial interface</li>
+  <li>Bluetooth &mdash; available for  debug support </li>
+  <li>USB &mdash; available for both debug and trace support </li>
+  <li>Platform Simulator (PlatSim) &mdash; Nokia's device simulator</li>
+</ul>
+<p>The columns in the Remote Connections view include:</p>
 <ul>
   <li>Connection/Services - connection name defined by you and remote agent type</li>
   <li>Type - connection type, i.e. Bluetooth, USB, TCP/IP, etc.</li>
-  <li>Status - current connection status, i.e. Available, Not available, In Use, etc.</li>
+  <li>Status - current connection status, i.e. Available, Not accessible, Ready, etc.</li>
   <li>Description - provides information on the current connection test status.</li>
 </ul>
-<p align="center"><img src="../images/view_remote_connections.png" width="431" height="252"></p>
+<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">
@@ -58,10 +68,48 @@
     <td><p>Click to edit the selected remote connection.</p>    </td>
   </tr>
 </table>
+<h3>Remote Connections view Status icons</h3>
+<p>The following status indicators appear in the Remote Connections view: </p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="28%" scope="col">Item</th>
+    <th width="13%" scope="col">Icon</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Connection</strong></td>
+    <td><center>
+      <img src="../images/icon_rc_connection.png" width="16" height="16">
+    </center></td>
+    <td><p>Indicates an inactive remote connection setting.</p></td>
+  </tr>
+  <tr>
+    <td><strong>Not Active</strong></td>
+    <td><center>
+      <img src="../images/icon_rc_not_active.png" width="17" height="17">
+    </center></td>
+    <td>Indicates an inactive connection type.</td>
+  </tr>
+  <tr>
+    <td><strong>Ready / Available</strong></td>
+    <td><center>
+      <img src="../images/icon_rc_available.png" width="17" height="18">
+    </center></td>
+    <td><p>Indicates an active remote connection is ready or that a particular connection type is available.</p></td>
+  </tr>
+  <tr>
+    <td><b>Not Accessible</b></td>
+    <td><center>
+      <img src="../images/icon_rc_not_accessible.png" width="16" height="16">
+    </center>
+    </td>
+    <td>Cannot access the connection type within the connection setup.</td>
+  </tr>
+</table>
 <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>
@@ -115,9 +163,10 @@
 <h5>Related references</h5>
 <ul>
   <li><a href="../trk/wnd_on_device_setup.htm">On-Device Connections</a><a href="wnd_on_device_setup.htm"></a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
+  <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; 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.htm</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -48,8 +48,8 @@
   <li>Verify that you have the latest remote agent installed on a device</li>
 </ul>
 <p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 2. Serial Connection Setting page - Set Connection Settings tab</p>
+<p class="figure">Figure 2 - New Connection wizard Set Connection Settings tab</p>
+<p>Table 2. Bluetooth Setting page - Set Connection Settings tab</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="30%" scope="col">Item</th>
@@ -73,7 +73,7 @@
   </tr>
   <tr>
     <td><strong>Test Service Status</strong></td>
-    <td><p>Click <strong>Test Service Status</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Check TRK version operation requires more than a few seconds.</p>
+    <td><p>Click <strong>Initiate service testing</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Check TRK version operation requires more than a few seconds.</p>
         <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote agent version check.</p>
       <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
       <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
@@ -88,8 +88,8 @@
 <h3><strong><a name="INSTALL" id="INSTALL"></a>Install Remote Agents</strong> pane</h3>
 <p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
 <p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
+<p class="figure">Figure 2 - New Connection wizard Install remote agents tab</p>
+<p>Table 3. Bluetooth Setting page - Install Remote Agents tab</p>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="30%" scope="col">Item</th>
@@ -116,7 +116,7 @@
   <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
   <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<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/reference/view_symbian_kernel.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Tue Jan 26 13:41:56 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/reference/wnd_pref_code_style.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_pref_code_style.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -9,7 +9,7 @@
 	 <p>Carbide supports the use of code styles in projects via the C/C++  <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel. Use a code style profile to set specific smart typing features, like indentation, tabs or spaces, and many more options. There are several preset code styles like GNU, while Carbide supplies these  profiles:</p>
 	 <ul>
 	   <li><b>Symbian OS</b> &#8212; settings are based on the <a href="http://developer.symbian.com/main/downloads/papers/coding_stds/2003-01_SyOSCodStn.pdf">Symbian OS C++ coding standards</a> PDF </li>
-	   <li><b>S60</b> &#8212; settings are based on the <a href="http://www.forum.nokia.com/info/sw.nokia.com/id/577f8188-14b6-44f2-997e-28724145e726/S60_Platform_Cpp_Coding_Conventions_v2_0_en.pdf.html">S60 Platform: C++ Coding Conventions</a> PDF </li>
+	   <li><b>S60</b> &#8212; settings are based on the <a href="http://www.forum.nokia.com/document/Cpp_Developers_Library/?content=GUID-232258EC-D3B4-4D72-B12B-FFC34F070B4B_GUID-0B6641F4-8393-40B0-96A1-8BF96CB41134.html">S60 Platform: C++ Coding Conventions</a></li>
    </ul>
 	 <p>Setting a code style sets it for the entire workspace. When a new file is created the currently selected code style rules are applied as you edit the file. You can apply a set of rules to a previously created source file by opening it in an editor view, then right-clicking and choosing <b>Source &gt; Format</b> (<span class="code">CTRL+SHIFT+F</span>). </p>
 	 <p align="center"><img src="images/wnd_pref_code_styles.png" width="627" height="544" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -16,7 +16,7 @@
   </style>
 </head>
 <body bgcolor="#ffffff">
-<h2>Carbide.c++ Release Notes 2.2.0</h2>
+<h2>Carbide.c++ Release Notes 2.5.0</h2>
 <p>The Carbide.c++  is a comprehensive development tool suite for Symbian OS that is based on the Eclipse framework. The C++ Development Toolkit (CDT), provides the foundation for project and build tools management, as well as the primary interface for the debugger to communicate with the IDE. </p>
 <p>This is a collection of important information concerning last-minute
   changes and other topics that deserve special attention.&nbsp;Please
@@ -35,12 +35,27 @@
 Updating the CDT feature in Carbide.c++/Eclipse will wipe out our
 changes making the tools unusable!</p>
 <p> See the <a href="hints_tips.htm">Tips &amp; tricks</a> page for more helpful information.</p>
-<h3><a name="whatsNew" id="whatsNew2"></a>What's New in 2.2.0 </h3>
+<h3><a name="whatsNew" id="whatsNew2"></a>What's New in 2.5.0 </h3>
 <p>The following features for Symbian  development are provided within Carbide.c++:</p>
 <ul>
-  <li><b>Eclipse 3.5 </b>&#8212; The Eclipse 3.5 project (Galileo) provides the foundation, or integration platform, on which  Carbide.c++  is built. See <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">What's New in 3.5</a> for more information.</li>
+  <li><b>RVCT 4.0 (ARMv5)</b> supported</li>
+  <li><b>SmartInstaller for Qt</b> supported</li>
+</ul>
+<h4><a name="240" id="210222"></a>2.4.0</h4>
+<ul>
+  <li>    <span class="style5"><b>IMPORTANT WINSCW COMPILER</b></span> change - the WINSCW compiler 3.2.5 build 487  provides new name mangling to support critical exception handling. Without this change an exception can cause a program or system crash. For more information visit the <a href="http://developer.symbian.org/wiki/index.php/WINSCW_(build_version_information)">WINSCW</a> wiki page.</li>
+  <li><b>Qt Tools 1.6</b> now supported.</li>
+  <li>The <b>Run builds concurrently</b> option in the <a href="reference/wnd_build_prefs.htm">Builds</a> preference panel now supports up to 50 concurrent build jobs, up from 4.</li>
 </ul>
+<h4><a name="230" id="21022"></a>2.3.0</h4>
 <ul>
+  <li>P2 update services now supported. Updating Carbide.c++ should be more flexible and easier than before.</li>
+  <li>The official Qt code style is now included in the Code Style preference panel.</li>
+  <li>Single file compiles on Raptor are now supported.</li>
+</ul>
+<h4><a name="220" id="2102"></a>2.2.0</h4>
+<ul>
+  <li><b>Eclipse 3.5 </b>&#8212; The Eclipse 3.5 project (Galileo) provides the foundation, or integration platform, on which  Carbide.c++  is built. See <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">What's New in 3.5</a> for more information.</li>
   <li><b>CDT 6.0 </b>&#8212; The final version of CDT included as part of the Galileo release. See the <a href="http://wiki.eclipse.org/CDT/User/NewIn60">CDT 6.0 News and Noteworthy</a> page for more information.</li>
   <li><b>Java 6.0 </b>&#8212; Due to the above changes Carbide has also updated to use the Java Runtime Environment (JRE) 6.0. See <a href="http://java.sun.com/javase/6/webnotes/features.html">Java SE 6 Release Notes</a> page for more information.</li>
   <li><b>SBSv2 arguments field</b> - added a text field to the <a href="reference/wnd_build_prefs.htm">Build &gt; SBSv2</a> panel to allow parameter passing to Raptor builds.</li>
@@ -48,7 +63,7 @@
 </ul>
 <h4><a name="210" id="210"></a>2.1.0</h4>
 <ul>
-  <li><b>Performance inprovements</b> - the following areas of Carbide have been optimized to improve performance:
+  <li><b>Performance improvements</b> - the following areas of Carbide have been optimized to improve performance:
     <ul>
       <li><b>Importing large projects</b>   - Importing large projects is one of our primary points of performance improvements. When too many project roots were used the more source and include paths were brought into the project, up to an including entire SDKs. Generally, we found that once a project root contains over 15-20K files Carbide became extremely sluggish. We have improved some edge cases where project roots were calculated incorrectly and now include only what's really needed. </li>
       <li><b>Modifying Project Settings and Build Configuration Data</b>-    This is quite a significant improvement as modifying MMP files and switching build configurations are a couple of the most common operations done by end-users and because the time spent processing project and configuration data is done on the main thread, locking the UI. With optimization in one CDT function we were able to bring most project-related and configuration switch changes from 20 seconds to less than 3 seconds. You should also see improvements when saving MMP and INF files (the &quot;Refreshing Configuration Job&quot;). </li>
@@ -86,7 +101,7 @@
   <li><b>Executables view improvements</b> &#8212; The <a href="reference/view_executables.htm">Executables</a> view now supports the loading of some additional DLL cases to ensure that the DLLs you want to debug are available during a debug session. In addition,  a Remove button has been added to the view's toolbar that makes it easier for you to remove any executables from the list.</li>
   <li><b>More indexer improvements </b>&#8212; Speed improvements for code completion, syntax coloring, and much more.</li>
   <li><b>Remote Connections view</b> &#8212; A visual list of <a href="reference/trk/view_remote_connection.htm">remote connections</a> and their state for managing multiple and diverse device connections.</li>
-  <li><b>Partial upgrade SIS file support</b> &#8212; Carbide now supports the generation of partial upgrade  SIS/SISX files. This increases debugger turnaround by only generating new files for changes and uploading these smaller executables to the device.</li>
+  <li><b>Partial upgrade SIS file support</b> &#8212; Carbide now supports the generation of partial upgrade SIS/SISX files. This increases debugger turnaround by only generating new files for changes and uploading these smaller executables to the device.</li>
   <li><b>More Program Counter support </b>&#8212; Added a Move to Line command for the debugger that enables you to move the PC to a new line while debugging without executing any intermediate lines or resuming execution.</li>
   <li>Multiple<b> TRK</b> improvements including:
     <ul>
@@ -172,12 +187,13 @@
         <p><span class="code">JVM terminated, Return code = -1 </span></p>
         <p>or when running from eclipse.exe: </p>
         <p><span class="code">Error occurred during initialization of VM  Could not reserve enough space for object heap</span> </p>
-<p>The <a href="hints_tips.htm">solution</a> is to edit your <span class="code">Carbide.c++.1.x.ini</span> (or <span class="code">eclipse.ini</span> if launching Eclipsec.exe) and use a smaller value for the <span class="code">-Xmx </span>parameter to the JVM. </p>
+<p>The <a href="hints_tips.htm">solution</a> is to edit your <span class="code">Carbide.c++.2.x.ini</span> (or <span class="code">eclipse.ini</span> if launching <span class="code">Eclipsec.exe</span>) and use a smaller value for the <span class="code">-Xmx </span>parameter to the JVM. </p>
 <p class="note"><b>NOTE</b> In this scenario, Carbide.c++ performance may degrade.</p></td>
     </tr>
     <tr>
       <td style="vertical-align: top;">[4587] Unable to build  GCCE targets on Vista because of makefile error.</td>
-      <td style="vertical-align: top;">There are known tooling issues when building for the GCCE platform under Windows Vista that can prevent a GCCE build from occurring.  If you want to build for GCCE under S60 and UIQ you will need to manually update some files under<span class="style1"> \epoc32\tools\</span>. See the article <a href="http://wiki.forum.nokia.com/index.php/Windows_Vista">Windows Vista</a> for up-to-date workaround information.</td>
+      <td style="vertical-align: top;"><p>There are known tooling issues when building for the GCCE platform under Windows Vista that can prevent a GCCE build from occurring.  If you want to build for GCCE under S60 and UIQ you will need to manually update some files under<span class="style1"> \epoc32\tools\</span>. See the article <a href="http://wiki.forum.nokia.com/index.php/Windows_Vista">Windows Vista</a> for up-to-date workaround information.</p>
+      <p><b>UPDATE 2010</b>: SDKs still require patching to enable GCCE builds.</p></td>
     </tr>
     <tr bgcolor="#0071ff">
       <td colspan="2" bgcolor="#FFFFCC" style="vertical-align: top;">
@@ -196,10 +212,6 @@
       <td style="vertical-align: top;">When creating new folders, use File &gt; New &gt; Source Folder. This will add a folder and mark it a source folder. If you need to import copies of existing files (File &gt; Import &gt; File System) or link to existing sources (File &gt; New &gt; Folder with &quot;Link to folder in file system&quot;), then a normal folder will be created, not a source folder. If the folder is not underneath an existing source folder in the project, you will need to manually mark it as a source folder using the C/C++ Project Paths &gt; Source tab. </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">[3803] Occasionally a module is not expandable immediately after it's been imported in a project. </td>
-      <td style="vertical-align: top;">Workaround: Simply close and reopen the project using the context menu in the Project view.</td>
-    </tr>
-    <tr>
       <td style="vertical-align: top;">[3010] Bad synchronization in MMP editor for Linker definition file.</td>
       <td style="vertical-align: top;">  The templates for Symbian DLL projects do not define a <span class="code">DEFFILE</span> statement, for the case where a <span class="code">DEF</span> file is not needed or imports are not frozen. If you edit the <span class="code">DEF</span> filename through the MMP editor, it is not automatically conditioned for the current target. If you wish to define target-specific <span class="code">DEF</span> file names in the MMP editor, manually insert <span class="code">#ifdef...#endif</span> blocks, or first uncomment the <span class="code">#ifdef...#endif</span> block from the template, so that target-specific filenames will be properly updated.</td>
     </tr>
@@ -236,11 +248,7 @@
       <td style="vertical-align: top;"> If you are in doubt about the contents select the folder in question, then hit F5 to refresh the directory from the file system.</td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">Synergy 6.3 Installations will
-always crash Eclipse file navigation dialogs - The solution for this is
-to un-register cmexplorer.dll then reboot your machine. Un-registering
-this feature will only effect users that use Synergy integration to
-Windows Explorer. This issue is known to be fixed with Synergy 6.4.</td>
+      <td style="vertical-align: top;">Synergy 6.3 Installations will always crash Eclipse file navigation dialogs - The solution for this is to un-register cmexplorer.dll then reboot your machine. Un-registering this feature will only effect users that use Synergy integration to Windows Explorer. This issue is known to be fixed with Synergy 6.4.</td>
       <td style="vertical-align: top;">The un-register command is:<br />
       <br />
       <font size="-1"><span class="code"
@@ -258,10 +266,6 @@
  class="style8">BUILD/IMPORTER</span></div>      </td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">[3804] My application fails to start the first time I try to debug it using TRK. </td>
-      <td style="vertical-align: top;">Workaround: Launch the debug session again. </td>
-    </tr>
-    <tr>
       <td style="vertical-align: top;">[3809]<b> IMPORTANT</b>: You cannot import two projects into Carbide that have the same &quot;Root Directory&quot;.</td>
       <td style="vertical-align: top;"> If a .project file already exists in this location you either need to shorten or lengthen the &quot;Root Directory&quot; or delete the other project in the same location and try to import again.</td>
     </tr>
@@ -312,10 +316,6 @@
       <p> (2) As getting the OS data from crash debugger is time consuming (takes more than one minute in our test), auto-refresh of the data in Symbian OS Data view is disabled for crash debugger. You need to click the &quot;Refresh&quot; button to do a manual refreshing.</p></td>
     </tr>
     <tr>
-      <td style="vertical-align: top;">[2616] If you cast a variable to another type the details pane will still show the original type</td>
-      <td style="vertical-align: top;">No Workaround. </td>
-    </tr>
-    <tr>
       <td style="vertical-align: top;">[2960] The thread run control icons (step over, step in, run) are sometimes disabled after stepping</td>
       <td style="vertical-align: top;"> Click on the top frame of the suspended thread in the Debug view</td>
     </tr>
@@ -370,13 +370,9 @@
 </table>
 <h3><a name="support" id="support"></a>Technical support </h3>
 <p>The following support services are available:</p>
-<ul><li>Visit the <a href="http://discussion.forum.nokia.com/forum/forumdisplay.php?s=&amp;forumid=95">Forum Nokia Developer Discussion Board</a> for lively Carbide.c++ discussions </li>
-  <li>Forum Nokia Wiki - visit <a href="http://wiki.forum.nokia.com/index.php/Carbide.c++">wiki.forum.nokia.com/index.php/Carbide.c++</a> for updated information, downloads and tips </li>
-  <li>Customer feedback - send your comments and suggestions to <a href="mailto:feedback.carbide@nokia.com">feedback.carbide@nokia.com</a></li>
-  <li>Read the <a href="http://sw.nokia.com/id/d11442a8-4eb1-4c01-97f2-fd8be139b93f/Carbide_cpp_On_Device_Debugging_v1_0_en.pdf">Carbide.c++ On-device Debugging</a> whitepaper or an introduction to on-device debugging for S60 3rd Edition devices<br />
-  </li>
+<ul><li>Visit the <a href="http://web-dev.foundationhost.org/">Symbian Foundation</a> for Carbide.c++ and Symbian development information </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/sos_references.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/sos_references.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -13,13 +13,14 @@
  <p class="note"><b>NOTE</b> WINS (Visual Studio)
    SDKs are not supported. If you want to do emulation debugging you need a WINSCW SDK.</p>
  <ul>
+   <li>Symbian Developer (<a href="http://developer.symbian.org">http://developer.symbian.org</a>) </li>
+   <li>Symbian Foundation (<a href="http://www.symbian.org/">http://www.symbian.org/</a>) </li>
    <li><a href="http://forum.nokia.com">Forum Nokia</a></li>
    <li><a href="http://discussion.forum.nokia.com/forum/forumdisplay.php?f=95"> Carbide.c++ IDE and plug-ins</a> discussion forum</li>
-   <li>Symbian Foundation (<a href="http://www.symbian.org/">http://www.symbian.org/</a>) </li>
    <li><a href="http://www.newlc.com">newlc</a> - a Symbian OS C++ developer portal</li>
    <li><a href="http://www.allaboutsymbian.com/">allaboutsymbian</a> - a community site and portal for phones running the Symbian OS</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -23,13 +23,13 @@
   </ol>
 <div class="step">
 <h4><a name="runSDK" id="runSDK"> </a>Install an SDK</h4>
-<p>The following SDKs can be downloaded from forum Nokia at: <a href="http://forum.nokia.com/">http://forum.nokia.com/</a>.</p>
+<p>The following SDKs can be downloaded from forum Nokia at: <a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/</a>.</p>
 <ul>
   <li>Install at least one of the following SDKs:</li>
 <ul>
+  <li> Series 60 5.0</li>
   <li> Series 60 3.0</li>
   <li>Series80</li>
-  <li>UIQ 3.0</li>
   <li>Series 60 cust kits </li>
   <li>Techview Development kits
     </p>
@@ -37,7 +37,7 @@
 </ul>
 </ul>
 </div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<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	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Tue Jan 26 13:41:56 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	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_jtag.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -38,33 +38,12 @@
     <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>
+<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	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_launchcfg.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -1,301 +1,300 @@
-<!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}
+.style5 {font-size: 1em; font-family: Verdana, Ariel, Helvetica, sans-serif; }
+.style7 {font-size: 1em; font-weight: bold; }
+-->
+</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'll 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><span class="style7">Project</span></td>
+        <td><p>The project to associate with this debug launch configuration. Click Browse to select a different project.</p></td>
+      </tr>
+      <tr>
+        <td><span class="style7">Executable</span></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><span class="style5">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+          <p class="style5"><b>Trace32 Executable</b></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><span class="style5">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+          <p class="style5"><b>Trace32 Configuration File</b></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><span class="style5">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+          <p class="style5">
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            <b>Trace32 Initialization Script</b></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><span class="style5">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+          <p class="style5"><b>
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+            View messages between Carbide and Trace32</b></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="style5">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+        <p class="style5"><b>Target Initialization File</b></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 can specify the initialization file, which can be run after connecting to the target.</p></td>
+      </tr>
+      <tr>
+        <td>
+          <span class="style5">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+        <p class="style5"><b>Memory Configuration File</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="style5">
+          <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+        <p class="style5"><b>Reset target at the start of each debug session</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	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Tue Jan 26 13:41:56 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Tue Jan 26 13:41:56 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_requirements.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -58,7 +58,7 @@
     <th scope="row">Other Software </th>
     <td><p>A Symbian OS&#8482; SDK and Perl:</p>
       <ul>
-          <li>S60 Platform SDKs (<a href="http://forum.nokia.com/info/sw.nokia.com/id/4a7149a5-95a5-4726-913a-3c6f21eb65a5/S60-SDK-0616-3.0-mr.html">forum.nokia.com/main/resources/tools_and_sdks/carbide/</a>)
+          <li>S60 Platform SDKs (<a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/Tools_Docs_and_Code/</a>)
             <ul>
               <li>S60 5th Edition</li>
               <li>S60 3rd Edition, FP1</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -14,29 +14,35 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Updating Carbide.c++</h2>
-<p>Updates to Carbide.c++ current features are available using the <b>Software Updates</b> feature. </p>
-<p>Carbide is a collection of difference software projects combined into a working  environment for Symbian OS C/C++ development. At its base Carbide uses Eclipse and  CDT projects from <a href="http://www.eclipse.org/">Eclipse.org</a>. We then modify some of these base plug-ins to work with our Carbide plug-ins. This is important for you to know as any updates to those modified base plug-ins may cause Carbide to not work as intended. </p>
-<p class="note"><span class="style2"><b>IMPORTANT</b> We recommend that you  not install any updates for Carbide.c++ features except for those provided by Nokia via Software Update. Replacing any standard Eclipse plugin with an updated version from a non-Nokia update site  can result in Carbide.c++ no longer working as intended.</span></p>
+<p>Updates to Carbide.c++ current features are available using the <b class="step">Install New Software</b><b> </b>feature. This feature now makes use of the P2 provisioning system released in Eclipse 3.4 which provides a more robust updating mechanism for  currently installed features as well as the adding of new ones to the Carbide environment.</p>
+<p>Carbide is a collection of difference software projects combined into a working  environment for Symbian OS C/C++ development. At its base Carbide uses Eclipse and  CDT projects from <a href="http://www.eclipse.org/">Eclipse.org</a>. We then modify some of these base plug-ins to work with our Carbide plug-ins. This is important  to know as any updates to those modified base plug-ins may cause Carbide  not to work as intended. </p>
+<p class="note"><span class="style2"><b>IMPORTANT</b> We recommend that you  not install any updates for Carbide.c++ features except for those provided by Nokia via Install New Software. Replacing any standard Eclipse plugin with an updated version from a non-Nokia update site  can result in Carbide.c++ no longer working as intended.</span></p>
 <div class="step">
   <h4>Installing Carbide Updates</h4>
+  <p class="note"><b>NOTE</b> Always run the <b>Help &gt; Check for Updates</b> wizard and install all updates before attempting to install  new software. This can prevent the occurrence of any dependency errors.</p>
   <ol>
-    <li>Select <b class="step">Help &gt; Software Updates &gt; Find and Install...</b> to display the Install/Update dialog. Select &quot;Search for new features to install&quot; and click Next.
-  <p align="center"><img src="images/update_features.png" width="528" height="327" /></p>
-  <p class="figure">Figure 1 - Install/Update Dialog </p></li>
-  <li>Select the <b>Carbide.c++ Update Site</b> option and click <b>Finish</b>.
-  <p align="center"><img src="images/update_features2.png" width="600" height="566" /></p>
-  <p class="figure">Figure 2 - Update Sites </p></li>
-  <li>Select the <b>Carbide.c++ features to install, then click Next</b>
-    <p align="center"><img src="images/update_features3.png" width="600" height="523" /></p>
-  <p class="figure">Figure 3 - Search results showing Carbide features available</p>
-  </li>
-  <li>Accept with the license 
-    terms and click Next.
-    <p align="center"><img src="images/update_features4.png" width="600" height="523" /></p>
-  <p class="figure">Figure 4 - Update Sites </p></li>
-  <li>Select where the new feature should be installed, then  click <b>Finish</b>.
-    <p align="center"><img src="images/update_features5.png" width="600" height="523" /></p>
-  <p class="figure">Figure 5 - Update Sites </p></li>
+    <li>Select <b class="step">Help &gt; Install New Software...</b> to display the Available Software pane of the Install dialog. 
+      <p align="center"><img src="images/p2_available_sw.png" width="616" height="544"></p>
+      <p class="figure">Figure 1 - Install dialog - Available Software pane</p>
+      <ol type="a">
+        <li>Select an update site from the Work with drop down, or click Add... to enter a new site URL.</li>
+        <li>Click to select the items to update from the Name column.</li>
+        <li>Click Next</li>
+      </ol>
+    </li>
+    <li>In the Install Details pane select the specific items to install from those displayed, then click Next.
+      <p align="center"><img src="images/p2_install_details_01.png" width="555" height="560"></p>
+      <p class="figure">Figure 2 - Install dialog - Install Details pane</p>
+      </li>
+    <li>Review the items to install in the second Install Details pane<b>, then click Next.</b>
+      <p align="center"><img src="images/p2_install_details_02.png" width="555" height="560"></p>
+    <p class="figure">Figure 3 - Install dialog - second Install Details pane</p>
+      </li>
+    <li>Accept  the license 
+      terms, then click Finish.
+      <p align="center"><img src="images/p2_review_licenses.png" width="643" height="560"></p>
+    <p class="figure">Figure 4 - Install dialog -Review Licenses pane</p>
+      </li>
   </ol>
 </div>
 <p>Carbide downloads the selected features and installs them. You may need to relaunch Carbide.c++ to access the newly installed capabilities.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -15,7 +15,7 @@
   <li><b>Symbian OS System TRK</b> (<i>not available in the Developer Edition</i>) &#8212;used to run or debug applications or ROM code on a target device using the System TRK on-device debug agent. System TRK is an application that runs on reference boards and prototype phones and allows you to debug your executables. The debugger will download files to the phone prior to launching.</li>
 </ul>
 <p>By default, you can click the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) in the toolbar to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. This   creates a launch configuration for the project based on project information and any additional input required, like COM port selection. It is the recommended method for creating new launch configurations. Or, use the <a href="../../projects/launch/page_main.htm">Debug</a> window to create a customized  launch configuration. </p>
-<p align="center"><img src="../../reference/images/wnd_trk_debug_config.png" width="859" height="629" /></p>
+<p align="center"><img src="../../reference/images/wnd_trk_debug_config.png" width="819" height="593" /></p>
 <p class="figure">Figure 1. Debug launch configuration for on-device debugging   (<i>Application TRK shown</i>)</p>
 <div class="step">
   <h4>Defining a Customized  Launch Configuration </h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -6,15 +6,11 @@
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Installing On-device Debug Agents using Bluetooth</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {color: #FF0000}
--->
-</style>
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Installing On-device Debug Agents using Bluetooth </h2>
-<p>Use Bluetooth to install the on-device debug agent, either Application TRK or System TRK, as a SISX file, to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
+<p>Use Bluetooth to install the on-device debug agent, either Application TRK or System TRK, as a SISX file, to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. Application TRK is usable on both consumer and RnD versions of the device. System TRK is only usable on RnD devices.</p>
+<p>On some phones  it will be the <b>Installed</b> folder, on others it may be in <b>My Own </b>folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
 <p class="note"><b>NOTE</b> The following example shows how to install the SISX file from a PC running Windows XP SP2 using an internal Bluetooth device. The actions to install the SISX file may be different on your version of Windows. Refer to the OS documentation for information on transferring a file via a Bluetooth connection.</p>
 <div class="step">
   <h4>Installing an On-device Debug Agent using Bluetooth </h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -9,7 +9,8 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Installing On-device Debug Agents using PC Suite</h2>
-<p>Use the PC Suite software that came with your device (<a href="http://europe.nokia.com/A4144905">Nokia PC Suite</a> is one example) to install the on-device debug agent, either Application TRK or System TRK, as a SISX file, to enable on-device debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
+<p>Use the PC Suite software that came with your device (<a href="http://europe.nokia.com/A4144905">Nokia PC Suite</a> is one example) to install the on-device debug agent, either Application TRK or System TRK, as a SISX file, to enable on-device debugging. Application TRK is usable on both consumer and RnD versions of the device. System TRK is only usable on RnD devices.</p>
+<p>The installation location of the  on-device debug agent software varies based on the phone. On some phones  it will be the <b>Installed</b> folder, on others it may be in <b>My Own</b> folder. Refer to the documentation that came with the phone to learn where installed programs are stored. </p>
 <p>Using PC Suite you can install any TRK debug agent on the device  using  a Bluetooth or USB connection. </p>
 <p class="note"><b>NOTE</b> You can  use the connection software that came with your device to install the on-device debug agent SISX file. See your phone's operating manual for assistance on using it's software.</p>
 <div class="step">
@@ -50,7 +51,7 @@
   <li><a href="trk_connection_bluetooth.htm">Connecting via Bluetooth</a></li>
   <li><a href="trk_connection_usb.htm">Connecting via USB </a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<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/trk/trk_overview.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -22,6 +22,6 @@
   <li><a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup </a></li>
   <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<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/trk/trk_preconditions.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -9,21 +9,20 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Preconditions to On-Device Debugging</h2>
-<p>Before you can use on-device debugging to debug 3rd edition and UIQ devices, the following preconditions must be met.</p>
+<p>Before you can use on-device debugging to debug 3rd and 5th edition devices, the following preconditions must be met.</p>
 <div class="step">
   <h4>Verifying On-device Debugging Preconditions </h4>
   <ol>
     <li>Verify that your system has the following:
       <ul>
-        <li>S60 v3.x, UIQ 2.X or UIQ 3.X kit installed</li>
+        <li>S60 v3.x or S60 v5.x kit installed</li>
         <li>ActivePerl installed</li>
         <li>RVCT or GCCE compiler</li>
-        <li>USB or Bluetooth capable S60 3rd Edition or UIQ 3rd Edition device</li>
         <li>USB or Bluetooth support on your PC </li>
         <li>Nokia PC Suite (or equivilent software) for connecting and installing applications to the device </li>
       </ul>
     </li>
-    <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog for debugging  S60 5th edition and UIQ devices</li>
+    <li>Download and install the current TRK SISX file using the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog</li>
     <p>The Application TRK debug agents are stored If not, install it now using the <a href="../../projects/launch/wiz_new_launch_config.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
     <p class="note"><b>NOTE</b> The Application TRK versions included with Carbide is for CE versions of devices only. They are not intended for use with RnD devices. </p>
     <li>Specify the communication method with the on-target device during the debug session</li>
@@ -45,7 +44,7 @@
   <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth</a></li>
   <li><a href="trk_install_usb.htm">Installing On-device Debug Agents using USB </a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<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/trk/trk_start_sisx.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -43,7 +43,7 @@
   <ul>
     <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
   </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<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/trk/trk_start_sisx_usb.htm	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm	Tue Jan 26 13:41:56 2010 -0600
@@ -15,11 +15,9 @@
     <li>On the device
       <ol>
         <li>Launch Application TRK or System TRK program on the device</li>
-        <li></li>
+    	<li>Select PC-Suite from the USB Mode list</li>
       </ol>
     </li>
-    <li>Select PC-Suite from the USB Mode list</li>
-    <li>Launch the Application TRK program</li>
     <li>Halt the Bluetooth device search by pressing the Cancel soft key</li>
     <li>Click Options &gt; Settings &gt; Connection</li>
     <li>Change Connection type to USB and set connection options</li>
@@ -27,7 +25,7 @@
       <p align="center"><img src="images/trk_connection_options.png" width="211" height="250" />&nbsp;<img src="images/trk_usb_settings.png" width="211" height="250" /></p>
       <p class="figure">Figure 1 - Change connection type to USB and set connection options</p>
     </blockquote>
-    <li>Select Back and start the TRK again and you should be connected</li>
+    <li>Select Back and start  TRK again and you should be connected</li>
   </ol>
 </div>
   <h5>Related concepts</h5>
@@ -42,7 +40,7 @@
   <ul>
     <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
   </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<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/index.xml	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/index.xml	Tue Jan 26 13:41:56 2010 -0600
@@ -197,8 +197,9 @@
 
 	<entry keyword="debugger">
 	   <topic href="html/concepts/working_with_data.htm" label="Working with Debugger Data"/>
-	   <topic href="html/reference/launch_configs/emulator_debugger.htm" />
-	   <topic href="html/reference/launch_configs/page_trk_debugger.htm"/>
+	   <topic href="html/reference/projects/launch/emulation.htm" label="Emulator Launch Configuration" />
+	   <topic href="html/reference/projects/launch/run_mode.htm" label="Application TRK Launch Configuration" />
+	   <topic href="html/reference/projects/launch/stop_mode.htm" label="System TRK Launch Configuration" />
 	   <topic href="html/reference/debugger_settings.htm" label="Debugger Settings"/>
 	</entry>
 	
@@ -215,11 +216,11 @@
 	</entry>
 
 	<entry keyword="debug agent">
-	   <topic href="html/concepts/trk.htm"/>
-	   <topic href="html/tasks/trk/trk_overview.htm"/>
-	   <topic href="html/tasks/trk/trk_install_pcsuite.htm"/>
-	   <topic href="html/tasks/trk/trk_install_bluetooth.htm"/>
-	   <topic href="html/tasks/trk/trk_install_usb.htm"/>
+	   <topic href="html/concepts/trk.htm" label="On-device Debugging" />
+	   <topic href="html/tasks/trk/trk_overview.htm" label="TRK Overview" />
+	   <topic href="html/tasks/trk/trk_install_pcsuite.htm" label="PC Suite"/>
+	   <topic href="html/tasks/trk/trk_install_bluetooth.htm" label="Bluetooth"/>
+	   <topic href="html/tasks/trk/trk_install_usb.htm" label="USB"/>
 	</entry>
 
 	<entry keyword="Debug Perspective">
@@ -231,9 +232,9 @@
 	</entry>
 
 	<entry keyword="Debug window">
-	   <topic href="html/reference/wnd_debug_configuration.htm"/>
-	   <topic href="html/concepts/launch_configuration.htm"/>
-	   <topic href="html/tasks/projects/wiz_new_launch_config.htm"/>
+	   <topic href="html/reference/wnd_debug_configuration.htm" label="Debug window" />
+	   <topic href="html/concepts/launch_configuration.htm" label="Launch Configurations" />
+	   <topic href="html/tasks/projects/wiz_new_launch_config.htm" label="New Launch Configuration" />
 	</entry>
 
 	<entry keyword="dependency tracking">
@@ -305,7 +306,7 @@
 	</entry>
 
 	<entry keyword="Global Variables Window">
-	   <topic href="html/reference/view_global_variables.htm"/>
+	   <topic href="html/reference/view_global_variables.htm"  label="Global Variables Window" />
 	</entry>
 
 <!-- H -->
@@ -340,10 +341,9 @@
 	</entry>
 
 	<entry keyword="installation">
-	   <topic href="html/tasks/start/carbide_install.htm"/>
-	   <topic href="html/tasks/trk/trk_install_pcsuite.htm"/>
-	   <topic href="html/tasks/trk/trk_install_bluetooth.htm"/>
-	   <topic href="html/tasks/trk/trk_install_usb.htm"/>
+	   <topic href="html/tasks/trk/trk_install_pcsuite.htm" label="PC Suite"/>
+	   <topic href="html/tasks/trk/trk_install_bluetooth.htm" label="Bluetooth"/>
+	   <topic href="html/tasks/trk/trk_install_usb.htm" label="USB"/>
 	</entry>
 
 	<entry keyword="Installation Pane">
@@ -409,7 +409,7 @@
 	</entry>
 
 	<entry keyword="menus">
-	   <topic href="html/reference/menus/new_symbian_class.htm" />
+	   <topic label="Symbian OS C++ Class" href="html/reference/menus/new_symbian_class.htm" />
 	   <topic label="Symbian OS C++ Project" href="html/reference/menus/new_symbian_project.htm" />
 	   <topic href="html/reference/menus/open_cmd_window.htm" />
 	   <topic href="html/reference/menus/open_explorer_window.htm" />
@@ -510,7 +510,7 @@
 	</entry>
 
     <entry keyword="Projects">
-       <topic href="html/concepts/Projects.html"/>
+       <topic href="html/concepts/Projects.html" label="Projects" />
        <topic href="html/qt_help/qt_creating_projs_01.htm"/>
        <topic href="html/qt_help/qt_importing_projs_01.htm"/>
 	</entry>
@@ -592,7 +592,6 @@
 	</entry>
 
 	<entry keyword="SDK Support">
-	   <topic href="html/concepts/SDKSupport.html"/>
 	   <topic href="html/tasks/AddinganSDK.html" />
 	   <topic href="html/tasks/WorkingwithSDKs.html"/>
 	   <topic href="html/tasks/RmvngandVwngPropsosSDK.html" label="Viewing and Editing SDK Properties"/>
@@ -602,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>
@@ -656,7 +651,7 @@
 	</entry>
 
 	<entry keyword="System Browser View">
-	   <topic href="html/reference/view_system_browser.htm"/>
+	   <topic href="html/reference/view_system_browser.htm" label="System Browser" />
 	</entry>
 
 <!-- T -->
@@ -682,8 +677,8 @@
 	</entry>
 
 	<entry keyword="TRK" >
-		<topic href="html/concepts/trk.htm"/>
-		<topic href="html/tasks/trk/trk_overview.htm"/>
+		<topic href="html/concepts/trk.htm" label="On-device Debugging" />
+		<topic href="html/tasks/trk/trk_overview.htm" label="TRK Overview" />
 		<topic href="html/tasks/trk/trk_carbide_setup.htm" />
 		<topic href="html/tasks/start/carbide_example_trk.htm" />
 		<topic href="html/tasks/debugger/stop_mode_debug.htm" />
@@ -708,7 +703,7 @@
 <!-- V -->
 
 	<entry keyword="variables">
-	   <topic href="html/concepts/working_with_variables.htm" />
+	   <topic href="html/concepts/working_with_variables.htm" label="Working with Variables" />
 	   <topic href="html/debugger/variables/adding_variables.htm" />
 	   <topic href="html/debugger/variables/viewing_variables.htm" />
 	   <topic href="html/debugger/variables/variables.htm" />
@@ -727,16 +722,16 @@
 		<topic href="html/reference/view_disassembly.htm" />
 		<topic href="html/reference/view_executables.htm" />
 		<topic href="html/reference/view_expressions.htm" />
-		<topic href="html/reference/view_global_variables.htm" />
+		<topic href="html/reference/view_global_variables.htm" label="Global Variables Window" />
 		<topic href="html/reference/view_memory_wnd.htm" />
 		<topic href="html/reference/view_mifdef_editor.htm" />
 		<topic href="html/reference/view_module_wnd.htm" />
 	    <topic href="html/concepts/registers.htm" />
-	    <topic href="html/reference/view_signals_wnd.htm" />
+	    <topic href="html/reference/view_signals_wnd.htm" label="Symbols" />
 	    <topic href="html/reference/view_symbian_kernel.htm" />
 	    <topic href="html/reference/view_sym_proj_nav.htm" />
 	    <topic href="html/reference/view_symbian_kernel.htm" />
-	    <topic href="html/reference/view_system_browser.htm" />
+	    <topic href="html/reference/view_system_browser.htm" label="System Browser" />
 	    <topic href="html/reference/view_variables.htm" />
 	</entry>
 
--- a/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/tutorialsCarbideExtContent.xml	Tue Jan 26 13:41:56 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/intro/whatsnew_IntroExt.xml	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Tue Jan 26 13:41:56 2010 -0600
@@ -10,11 +10,11 @@
 		  
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
-       		label="Carbide.c++ Release Notes (2.2)" 
+       		label="Carbide.c++ Release Notes (2.5)" 
        		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
        		id="carbide-link" 
        		style-id="content-link">
-          	<text>Learn about what's new in Carbide.c++ for Symbian OS developers.</text>
+          	<text>Learn about what's new in Carbide.c++ for Symbian OS development.</text>
        		</link>
        	</group>
 		  
@@ -40,16 +40,6 @@
 
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
-       		label="Carbide.c++ News Reader (2.0.3)" 
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm" 
-       		id="carbide-link" 
-       		style-id="content-link">
-          	<text>Provides updates on the latest Carbide, Symbian, and S60 news.</text>
-       		</link>
-       	</group>
-
-		<group style-id="content-group" id="carbide-cpp">
-       		<link 
        		label="On-Device Connection (2.0)" 
        		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm" 
        		id="carbide-link" 
@@ -59,4 +49,5 @@
        	</group>
 
   	</extensionContent>
+
 </introContent>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Jan 26 11:44:24 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Jan 26 13:41:56 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" />