merge from default C3_BUILDER_WORK
authortimkelly
Wed, 11 Aug 2010 11:52:30 -0500
branchC3_BUILDER_WORK
changeset 1805 1d57e533b09e
parent 1804 c13983cc5630 (current diff)
parent 1798 1c8169798acd (diff)
child 1808 88695467fd04
child 1811 b1772bf1197b
merge from default
core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/trace32.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_sdk_preferencea.html
core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/AddinganSDK.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm
core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java
debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java
project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService2.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService2.java	Wed Aug 11 11:52:30 2010 -0500
@@ -225,4 +225,9 @@
 	public void setDeviceOS(String familyName, Version version) {
 		// @deprecated
 	}
+
+
+	public void setDeviceOS(String familyName, String version) {
+		// empty implementation
+	}
 }
\ No newline at end of file
Binary file core/com.nokia.carbide.cpp.compiler.doc.user/html/images/mwccsym2_version.png has changed
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/new_features.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/new_features.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -15,6 +15,11 @@
 <h2>New Features &amp; Bug Fixes</h2>
 <p>A list of bug fixes for the compiler and linker can be found in the <span class="code">Symbian_x86_BuildTools_Notes.txt</span> file located in the <span class="code">&lt;Carbide_Install_Dir&gt;\x86Build\Release_Notes</span> directory. The latest build information is always available on the Symbian Foundation Wiki under <a href="http://developer.symbian.org/wiki/index.php/Category:C/C++/WINSCW">WINSCW (build version information)</a>.</p>
 <p>This reference has new and updated topics:</p>
+<h5>3.2.5 Build 490</h5>
+<ul>
+    <li>Fixed an ordering issue when spilling byte instructions and only the EBX and EDI registers are available.</li>
+</ul>
+<h5></h5>
 <h5>3.2.5 Build 489</h5>
 <ul>
     <li>Corrected an issue that prevented compiling of files with different case handling across different OS systems.</li>
--- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/version.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/version.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -10,7 +10,7 @@
 <h2>Verifying the Compiler Version</h2>
 <p>To determine what version of the Carbide.c++ compiler you are using, follow the steps below.</p>
 <p class="note"><b>NOTE</b> The Carbide.c++ compiler is stored in <span class="code">&lt;Carbide_Install_Dir&gt;\x86Build\Symbian_Tools\Command_Line_Tools</span>.</p>
-<p align="center"><img src="../images/mwccsym2_version.png" width="709" height="199"></p>
+<p align="center"><img src="../images/mwccsym2_version.png" width="737" height="294"></p>
 <p class="figure">Figure 1. Getting compiler version using Command Prompt.</p>
 <div class="step">
   <h4>From the Carbide IDE</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/META-INF/MANIFEST.MF	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/META-INF/MANIFEST.MF	Wed Aug 11 11:52:30 2010 -0500
@@ -5,4 +5,5 @@
 Bundle-Version: 1.4.0.qualifier
 Bundle-Vendor: Nokia
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help
+Require-Bundle: org.eclipse.help,
+ org.eclipse.ui.cheatsheets
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -12,7 +12,7 @@
 	ul > li {font-weight: normal }
   </style>
 </head>
-<body bgcolor="#ffffff">
+<body >
 <h2>Carbide.c++ bugs fixed </h2>
 <p>This is a comprehensive list of bugs fixed by release: </p>
 <ul>
@@ -21,9 +21,12 @@
 </ul>
 <h3><a name="bugs300" id="bugs10"></a>Bugs Fixed in v3.0.0</h3>
 <ul>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10833">10755</a> - The News Reader has transformed into the Carbide Portal which no longer causes any slowdowns until its accessed.</li>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10833">10833</a> - Fixed an ordering issue when spilling byte instructions and only the EBX and EDI registers are available.</li>
+    <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10833"> 11239</a> - Fixed an issue that caused variables to display incorrectly during a debug session. </li>
     <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11563">11563</a> - The Build Project dialog now also shows the project name. </li>
 </ul>
-<h4><a name="bugs260" id="bugs2"></a>v2.7.0</h4>
+<h4><a name="bugs270" id="bugs2"></a>v2.7.0</h4>
 <ul>
     
     <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10267">11222</a> - You can now disable device discovery in the <strong>Remote Connection</strong> view to avoid conflicts between different connection protocols within Carbide. </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/getStarted_cs.xml	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/getStarted_cs.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<cheatsheet title="Getting Started">
+<cheatsheet title="Creating and debugging an application project">
    <intro>
-      <description>
-         Follow these steps to create a Symbian OS project and debug it using the S60 EPOC Emulator.
-      </description>
+ Follow these steps to create and debug a Symbian project and using an emulator. using the S60 EPOC Emulator.
    </intro>
    <item title="Verify a Symbian SDK is available" dialog="true" skip="true" href="/com.nokia.carbide.cpp.doc.user/html/reference/SDKPreferences.html">
       <description>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_customize_cmd_group.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cheatsheet
+      title="Customize Code Styles">
+`	<intro>
+		Intro text
+	</intro>
+	<item
+       title="one">
+		<description>
+     one
+			
+		</description>
+		<command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.ui.wizards.new.project)" confirm="false">
+		</command>
+	</item>
+</cheatsheet>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_customize_code_styles.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cheatsheet
+      title="Customize Code Styles">
+`	<intro>
+		Intro text
+	</intro>
+	<item
+       title="one">
+		<description>
+			one
+		</description>
+		<command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.ui.wizards.new.project)" confirm="false">
+		</command>
+	</item>
+</cheatsheet>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_customize_editors.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cheatsheet
+      title="Customize Editors">
+`	<intro>
+		Intro text
+	</intro>
+	<item
+       title="one">
+		<description>
+			one
+		</description>
+		<command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.ui.wizards.new.project)" confirm="false">
+		</command>
+	</item>
+</cheatsheet>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_customize_export_settings.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cheatsheet
+      title="Share my Settings">
+`	<intro>
+		Intro text
+	</intro>
+	<item
+       title="one">
+		<description>
+     one
+			
+		</description>
+		<command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.ui.wizards.new.project)" confirm="false">
+		</command>
+	</item>
+</cheatsheet>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_customize_key_commands.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cheatsheet
+      title="Customize Key Commands">
+`	<intro>
+		Intro text
+	</intro>
+	<item
+       title="one">
+		<description>
+			one
+		</description>
+		<command serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.ui.wizards.new.project)" confirm="false">
+		</command>
+	</item>
+</cheatsheet>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/arm_registers.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/arm_registers.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,39 +1,39 @@
-<!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>ARM Registers</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>ARM Registers</h2>
-<p>  Registers are the register contents of the central processing unit (CPU) of the targeted device. When debugging projects on a device, only the target device registers are visible, for example the ARM registers. The ARM microprocessor has 16 general-purpose registers. THUMB has eight general-purpose registers, R0-R7, and access to the high registers, R8-R15. Note that registers R0 through R3 hold the first four words of incoming arguments. The microprocessor constructs remaining arguments in the calling function's argument build area, which does not provide space into which R0 through R3 can be spilled.</p>
-<p>Three registers are best left for special uses. These are:</p>
-<ul>
-  <li>R13 for stack operations</li>
-  <li>R14 is the link register (it is used for storing return addresses in the construction of sub routines)</li>
-  <li>R15 is the program counter (PC)</li>
-</ul>
-<p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with Application TRK, you cannot change the LR, SP, and CPSR registers.</p>
-<p class="note"><b>NOTE</b> When opening the Registers view, the list of available registers will vary depending upon the target devices being debugged. </p>
-<p align="center"><img src="images/ARM_registers.PNG" width="648" height="276" /></p>
-<p align="left" class="figure">Figure 1 - ARM Registers </p>
-<h5>Related concepts <b></b></h5>
-<ul>
-  <li><a href="registers.htm">Emulator  Registers </a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-      <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
-      <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
-</ul>
-    <h5>Related references <b></b></h5>
-<ul>
-  <li><a href="../reference/view_registers.htm">View  Registers</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.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>ARM Registers</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>ARM Registers</h2>
+<p>  Registers are the register contents of the central processing unit (CPU) of the targeted device. When debugging projects on a device, only the target device registers are visible, for example the ARM registers. The ARM microprocessor has 16 general-purpose registers. THUMB has eight general-purpose registers, R0-R7, and access to the high registers, R8-R15. Note that registers R0 through R3 hold the first four words of incoming arguments. The microprocessor constructs remaining arguments in the calling function's argument build area, which does not provide space into which R0 through R3 can be spilled.</p>
+<p>Three registers are best left for special uses. These are:</p>
+<ul>
+  <li>R13 for stack operations</li>
+  <li>R14 is the link register (it is used for storing return addresses in the construction of sub routines)</li>
+  <li>R15 is the program counter (PC)</li>
+</ul>
+<p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with Application TRK, you cannot change the LR, SP, and CPSR registers.</p>
+<p class="note"><b>NOTE</b> When opening the Registers view, the list of available registers will vary depending upon the target devices being debugged. </p>
+<p align="center"><img src="images/ARM_registers.PNG" width="648" height="276" /></p>
+<p align="left" class="figure">Figure 1 - ARM Registers </p>
+<h5>Related concepts <b></b></h5>
+<ul>
+  <li><a href="registers.htm">Emulator  Registers </a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+      <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
+      <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
+</ul>
+    <h5>Related references <b></b></h5>
+<ul>
+  <li><a href="../reference/view_registers.htm">View  Registers</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/concepts/autotargeting.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Auto-Targeting of Executables</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Auto-Targeting of Executables</h2>
 <p>In run-mode  the Carbide debugger now supports the auto-targeting of processes that are already running or are created during the execution of the debug session. Previously, the debugger forced users to explicitly attach to a running process. Now, the debugger attempts to target all the EXEs specified in the <a href="../projects/launch/page_executables.htm">Executables</a> tab of the launch configuration. </p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Breakpoints Overview</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Breakpoints Overview</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Active Build Configuration</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Active  Build Configuration</h2>
 <p>Use the <b>Active  Configuration</b> option in the <a href="../reference/build_properties/prop_carb_build_config.htm">Carbide Build Configurations</a> panel to specify the build target. Since a project can contain one or more build targets, the active  configuration defines  which build configuration to use when the project is run or debugged. A launch configuration consists of the following:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_system.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_system.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Build System Overview</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Build System Overview </h2>
 <p>The Carbide.c++ build system provides a wrapper around the standard Symbian OS build process utilizing component description files (bld.inf) and project definition files (.mmp files). Because the Carbide.++ build system provides a visual view into this system, it will be useful for new developers to the Symbian OS to become familiar with the basic Symbian OS build process. Further information on the Symbian OS build system can be found in the <a href="http://developer.symbian.com/main/oslibrary/osdocs/index.jsp">Symbian Developer Library</a> under the <b>Build Tools Guide</b> and <b>Build Tools Reference</b> sections. If you are already familiar with the Symbian OS build system then you should feel right at home with the Carbide.c++ builder user interface. </p>
 <p>In Carbide.c++, as in the Symbian OS, a project is described by a <span class="code">bld.inf</span> file. Hence, all projects must start with a <span class="code">bld.inf</span> file. Carbide.c++ supports either building all components of a project (including extension makefiles) or only building selected sub-components. This gives the developer the granularity to either build all of a project&#8217;s dependencies or, if you are working on very large projects, only building a small sub-component of a larger project. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -12,10 +12,10 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Supported Target Types</h2>
 <p> Carbide.c++ supports a variety of build targets based upon the SDKs and which version of the Carbide tools used by the project. The table below identifies which build targets are possible for a specific SDK.</p>
-<p class="note"><b>NOTE</b> Check the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences</a> page to see if an SDK you have installed and whether its build configurations are supported.</p>
+<p class="note"><b>NOTE</b> Check the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences</a> page to see if an SDK you have installed and whether its build configurations are supported.</p>
 <h5>Table 1. Supported  target types for all versions of Carbide.c++ </h5>
 <table width="87%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/carbide_projects.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/carbide_projects.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,22 +1,22 @@
-<!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.c++ Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide.c++ Projects</h2>
-<p>Carbide.c++ can import <span class="code">.INF</span> files to create projects. Once imported, those files are forgotten and all changes made to a Carbide.c++ project, like adding files or libraries, are handled by the IDE itself either using the <b>File &gt; New</b>, <b>File &gt; Import</b>, or the <a href="../reference/ProjectPreferences.html">Properties</a> for project window.</p>
-<p>Carbide.c++ can not export changes back to an  <span class="code">.INF</span> file.</p>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting Build Configuartions</a></li>
-  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!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.c++ Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Carbide.c++ Projects</h2>
+<p>Carbide.c++ can import <span class="code">.INF</span> files to create projects. Once imported, those files are forgotten and all changes made to a Carbide.c++ project, like adding files or libraries, are handled by the IDE itself either using the <b>File &gt; New</b>, <b>File &gt; Import</b>, or the <a href="../reference/ProjectPreferences.html">Properties</a> for project window.</p>
+<p>Carbide.c++ can not export changes back to an  <span class="code">.INF</span> file.</p>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting Build Configuartions</a></li>
+  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,9 +7,9 @@
 <title>Common Debugging Actions</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Common Debugging Actions</h2>
-<p>  This section explains how to perform common debugging actions within the <a href="../reference/perspective_debg.htm">Debug</a> perspective to correct source-code errors, control program execution, and observe memory behavior:</p>
+<p>  This section explains how to perform common debugging actions within the <a href="../reference/perspective_debug.htm">Debug</a> perspective to correct source-code errors, control program execution, and observe memory behavior:</p>
 <ul>
   <li><a href="../debugger/debug/cmds_starting.htm">Start</a> the debugger</li>
   <li>Step <a href="../debugger/debug/cmds_stepping.htm">into</a>, <a href="../debugger/debug/cmds_stepping.htm">out</a> of, or <a href="../debugger/debug/cmds_stepping.htm">over</a> routines</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/concepts.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Concepts</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Concepts</h2>
 <p>This section of the User Guide provides an overview of the main concepts in
 Carbide to create and build programs for Symbian OS. </p>
@@ -28,7 +28,6 @@
   <li><a href="build_targets.htm">Build Targets</a></li>
   <li><a href="macros_carbide.htm">Carbide Macros</a></li>
   <li><a href="contextual_menus.htm">Context menu support</a></li>
-  <li><a href="dependency_tracking.htm">Dependency Tracking</a></li>
   <li><a href="emulators.htm">Emulation Debugging</a></li>
   <li><a href="ext_build_support.htm">External Builds Support</a></li>
   <li><a href="../projects/launch/launch_configs_overview.htm">Launch Configurations</a></li>
@@ -37,6 +36,7 @@
   <li><a href="ngage_projects.htm">N-Gage Projects</a></li>
   <li><a href="trk.htm">On-device Debugging</a></li>
   <li><a href="precompiled_headers.htm">Precompiled Headers</a></li>
+  <li><a href="sbsv2.htm">Symbian Build System</a> (SBSv2)</li>
   <li><a href="registers.htm">Registers</a></li>
   <li><a href="../tasks/WorkingwithSDKs.html">SDK Support</a></li>
   <li><a href="cvs.htm">Software Configuration Management </a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/contextual_menus.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Context Menus</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Context Menus</h2>
 <p>  A context menu provides a shortcut to frequently used menu commands. The available menu commands change, based on the context of the selected item. For example, the <a href="../debugger/breakpoints/viewing_breakpoints.htm">Breakpoints</a> view uses commands that differ from the Editor view. </p>
 <p>Sample uses of the context menu for different tasks include:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/cvs.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/cvs.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,12 +7,12 @@
 <title>Software Configuration Management</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Software Configuration Management (SCM) </h2>
 <p>The <strong>Carbide.c++</strong> tools are built on top of the <strong>Eclipse</strong> and <strong>CDT</strong> open source projects (<a href="http://www.eclipse.org">eclipse.org</a>). Carbide can use several popular <a href="http://en.wikipedia.org/wiki/Software_configuration_management">software configuration management</a> systems including:</p>
 <ul>
     <li><a href="http://en.wikipedia.org/wiki/Apache_Subversion">Apache Subversive</a></li>
-    <li><a href="tp://www.nongnu.org/cvs/">CVS</a> (<em>plug-in included with Carbide</em>)</li>
+    <li><a href="http://www.nongnu.org/cvs/">CVS</a> (<em>plug-in included with Carbide</em>)</li>
     <li><a href="http://en.wikipedia.org/wiki/Git_(software)">Git</a></li>
     <li><a href="http://en.wikipedia.org/wiki/Clearcase">IBM Rational Clearcase</a></li>
     <li><a href="http://en.wikipedia.org/wiki/Mercurial">Mercurial</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/data_viewer_plugins.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/data_viewer_plugins.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Data Viewer Plug-ins</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Data Viewer Plug-ins</h2>
 <p>  Data Viewers are plug-ins that include an user interface to show a custom view of data. These plug-ins are often platform specific. Data editors are data viewers that also let you modify and write data.</p>
 <p>The IDE will keep a registry of plug-ins that can view particular types. The plug-ins will register themselves with the IDE and indicate which formats and platforms they support. When a variable or memory address is selected, you can choose the plugin from the Data menu.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>About the Carbide Debugger</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>About the Carbide.c++ Debugger</h2>
 <p>  A debugger controls program execution and shows the internal operation of a computer program. Use the debugger to find problems while the program executes. Also use the debugger to observe how a program uses memory to complete tasks.</p>
 <p>The Carbide.c++ debugger provides these levels of control over a computer program:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/emulators.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/emulators.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,37 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Emulation Debugging</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Emulation Debugging </h2>
-<p>Symbian SDKs include an emulator that runs Symbian OS on a
-  Microsoft Windows host computer. The emulator provides the full range of Symbian OS
-  functionality, letting you do most development tasks on a single desktop computer. The 
-  emulator and the software you build for it with the Carbide.c++ software run natively on the Intel x86 family of processors.</p>
-<p> In many cases, you can build and debug a complete application using the emulator, then test the application on the actual device. There are cases however, where you cannot use
-  the emulator, such as when developing device drivers that access hardware on a device.</p>
-<p>For more information about the emulator, please see the documentation that came with
-  your SDK under: <b>Developer Library &gt; Tools and Utilities &gt; Emulator</b>.</p>
-<p> You will find an emulator to use with Carbide.c++  in:</p>
-<blockquote>
-  <p class="code">C:\Symbian\&lt;version&gt;\&lt;sdk&gt;\Epoc32\release\winscw\udeb</p>
-</blockquote>
-<p>where <span class="code">Symbian</span> is the path containing the subdirectories and version number of the Symbian OS SDK.</p>
-<p class="note"><b>NOTE</b> The first time you launch an emulator it may take some time to appear. Remember that it is implementing the operating system on the target device and that some setup time is required. </p>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/projects/prj_debug_console.htm">Debugging Applications</a></li>
-  <li><a href="../tasks/projects/prj_debug_dlls.htm">Debugging DLLs</a></li>
-  <li>I<a href="../tasks/projects/prj_import_exe.htm">mporting Executables for Debugging </a></li>
-</ul>
-<div class="step">
-  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</div>
-</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>Emulation Debugging</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Emulation Debugging </h2>
+<p>Symbian SDKs include an emulator that runs Symbian OS on a
+  Microsoft Windows host computer. The emulator provides the full range of Symbian OS
+  functionality, letting you do most development tasks on a single desktop computer. The 
+  emulator and the software you build for it with the Carbide.c++ software run natively on the Intel x86 family of processors.</p>
+<p> In many cases, you can build and debug a complete application using the emulator, then test the application on the actual device. There are cases however, where you cannot use
+  the emulator, such as when developing device drivers that access hardware on a device.</p>
+<p>For more information about the emulator, please see the documentation that came with
+  your SDK under: <b>Developer Library &gt; Tools and Utilities &gt; Emulator</b>.</p>
+<p> You will find an emulator to use with Carbide.c++  in:</p>
+<blockquote>
+  <p class="code">C:\Symbian\&lt;version&gt;\&lt;sdk&gt;\Epoc32\release\winscw\udeb</p>
+</blockquote>
+<p>where <span class="code">Symbian</span> is the path containing the subdirectories and version number of the Symbian OS SDK.</p>
+<p class="note"><b>NOTE</b> The first time you launch an emulator it may take some time to appear. Remember that it is implementing the operating system on the target device and that some setup time is required. </p>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/projects/prj_debug_console.htm">Debugging Applications</a></li>
+  <li><a href="../tasks/projects/prj_debug_dlls.htm">Debugging DLLs</a></li>
+</ul>
+<div class="step">
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/ext_build_support.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/ext_build_support.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>External Builds Support</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>External Builds Support</h2>
 <p>  The Carbide IDE  performs the following tasks on external makefiles:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/fpu_registers.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/fpu_registers.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>FPU Registers</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>FPU Registers</h2>
 <p>The FPU Registers are the register contents of the floating-point unit (FPU) of the host computer. The exact listing of these registers depends on the host FPU and current build target.</p>
 <h5>Related concepts <b></b></h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/general_registers.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/general_registers.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>General Registers</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>General Registers</h2>
 <p> The General Registers are the register contents of the central processing unit (CPU) of the host computer. The exact listing of these registers depends on the host CPU and current build target.</p>
 <h5>Related concepts <b></b></h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/host_registers.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/host_registers.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Host Registers</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Host-specific Registers</h2>
 <p>The Registers view also lists additional register contents for registers specific to the host. The exact listing of these registers depends on the host computer and current build target. </p>
 <h5>Related concepts <b></b></h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/macros_carbide.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/macros_carbide.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide Macros</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Carbide Macros</h2>
 <p> Carbide.c++ supports the macro <span class="code">_CARBIDE_CPP_</span> during the preprocessing of <span class="code">.mmp</span> and <span class="code">.inf</span> files. Use this macro in those files to include Carbide specific files during the preprocessing stage that are never recognized outside of the Carbide.c++ IDE.</p>
 <p>For example within your <span class="code">.mmp</span> or <span class="code">.inf</span> file:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/mmpfiles.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/mmpfiles.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,22 +1,22 @@
-<!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>MMP Files</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>MMP Files </h2>
-<p>Symbian projects are defined by an <code class="code">.mmp</code> file which specifies the essential elements of the project.  All details of the project lifecycle are handled by the IDE. There is no editable makefile the user can edit to modify the build behavior of the project.</p>
-<h5>Related reference</h5>
-<ul>
-  <li><a href="../reference/MMP_Editor.html">MMP Editor</a> </li>
-</ul>
-<div class="step">
-  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</div>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>MMP Files</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>MMP Files </h2>
+<p>Symbian projects are defined by an <code class="code">.mmp</code> file which specifies the essential elements of the project.  All details of the project lifecycle are handled by the IDE. There is no editable makefile the user can edit to modify the build behavior of the project.</p>
+<h5>Related reference</h5>
+<ul>
+  <li><a href="../reference/MMP_Editor.html">MMP Editor</a> </li>
+</ul>
+<div class="step">
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</div>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -6,9 +6,9 @@
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>N-Gage Projects</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script language="JavaScript" src="../reference/perspective_debug.htm"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>N-Gage Projects</h2>
 <p>Carbide.c++ supports the importing of N-Gage projects. However, there are some process issues that effect how you can debug game projects on devices. The following provides a high level overview of the process you should follow to successfully import, build, deploy, and debug an N-Gage game on a device. </p>
 <h4>Importing N-Gage projects</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/precompiled_headers.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/precompiled_headers.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Precompiled Headers </title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Precompiled Headers </h2>
 <p>Precompiled header support is available for Symbian OS projects that use the Nokia x86
 compiler. Precompiled header files use the <span class="code">.pch++ </span>extension and are only supported by emulator targets. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,35 +1,35 @@
-<!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>Registers</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Registers</h2>
-<p>  Registers are the register contents of the central processing unit (CPU) of the host computer or the targeted device. When debugging projects using the emulator, only the host computer x86 registers are visible in the <a href="../reference/view_registers.htm">Registers</a> view. When debugging projects on a device, only the target device registers are visible. </p>
-<p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with Application TRK, you cannot change the LR and SP registers.</p>
-<p align="center"><img src="images/view_registers.png" width="463" height="260"></p>
-<p class="figure">Figure 1. Registers view with possible register types</p>
-<p>The types of registers can include:</p>
-<ul>
-  <li><b>general</b> &#8212; the register contents of the central processing unit (CPU) of the host computer</li>
-  <li><b>FPU</b> &#8212; register contents of the floating-point unit (FPU) of the host computer</li>
-  <li><b>MMX</b> &mdash; 64-bit MultiMedia eXtension (MMX) registers</li>
-  <li><b>SSE</b> &mdash; 128-bit Streaming SIMD Extension registers</li>
-  <li><b>host-specific</b>&#8212;additional register contents for registers specific to the host (for example ARM registers)</li>
-</ul>
-<p class="note"><b>NOTE</b> When opening the Registers view, the list of available registers will vary depending upon the target devices being debugged. </p>
-<h5>Other  references <b></b></h5>
-    <ul>
-  <li><a href="../reference/view_registers.htm">Registers</a> view</li>
-  <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening a Registers View</a></li>
-  <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a> </li>
-  <li><a href="arm_registers.htm">ARM Registers </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.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>Registers</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Registers</h2>
+<p>  Registers are the register contents of the central processing unit (CPU) of the host computer or the targeted device. When debugging projects using the emulator, only the host computer x86 registers are visible in the <a href="../reference/view_registers.htm">Registers</a> view. When debugging projects on a device, only the target device registers are visible. </p>
+<p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with Application TRK, you cannot change the LR and SP registers.</p>
+<p align="center"><img src="images/view_registers.png" width="463" height="260"></p>
+<p class="figure">Figure 1. Registers view with possible register types</p>
+<p>The types of registers can include:</p>
+<ul>
+  <li><b>general</b> &#8212; the register contents of the central processing unit (CPU) of the host computer</li>
+  <li><b>FPU</b> &#8212; register contents of the floating-point unit (FPU) of the host computer</li>
+  <li><b>MMX</b> &mdash; 64-bit MultiMedia eXtension (MMX) registers</li>
+  <li><b>SSE</b> &mdash; 128-bit Streaming SIMD Extension registers</li>
+  <li><b>host-specific</b>&#8212;additional register contents for registers specific to the host (for example ARM registers)</li>
+</ul>
+<p class="note"><b>NOTE</b> When opening the Registers view, the list of available registers will vary depending upon the target devices being debugged. </p>
+<h5>Other  references <b></b></h5>
+    <ul>
+  <li><a href="../reference/view_registers.htm">Registers</a> view</li>
+  <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening a Registers View</a></li>
+  <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a> </li>
+  <li><a href="arm_registers.htm">ARM Registers </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/sbsv2.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Symbian Build System (SBSv2)</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body >
+<h2><strong>Symbian</strong> Build System (SBSv2)</h2>
+<p>Carbide.c++ v3.x fully supports the <strong>Symbian Build System</strong> (SBSv2) for building Symbian executables. Codenamed RAPTOR, SBSv2 is also designed to overcome several limitations in GNU Make, including: </p>
+<ul>
+    <li>modularity and code re-use</li>
+    <li>separation of interface and implementation</li>
+    <li>extensibility</li>
+    <li>testability</li>
+</ul>
+<p>In addition, SBSv2:</p>
+<ul>
+    <li>is supported on the Windows and Linux operating systems</li>
+    <li>is more scalable than previous systems</li>
+    <li>supports incremental and parallel builds</li>
+    <li>offers more flexibility in build configurations</li>
+    <li>offers an overall 20% speed improvement</li>
+</ul>
+<p>SBSv2 also supports the use of build variants. A variant  is basically something which modifies a build. For example, a variant could be the standard ARMv5 build with Demand Paging functions enabled. Already defined variants are found in the <strong>Build &gt; SBSv2</strong> preference panel.</p>
+<p class="note"><strong>NOTE</strong> Carbide no longer supports the ABLD system. Use Carbide.c++ v2.7 instead if you require SBSv1 support.</p>
+<p>Preferences  for configuring SBSv2 is found  by clicking <strong>Window &gt; Preferences &gt; Carbide.c++</strong>:</p>
+<ul>
+    <li><a href="../reference/pref_carb_build.htm">Build &gt; SBSv2</a> &ndash; control general build options like clean, test components, dependency tracking, concurrent build jobs, build behavior, and emulator options</li>
+    <li><a href="../tasks/sdks/sdk_platform_filter.htm">Build Configuration Filtering</a> &ndash; controls which platforms are visible when creating new projects or build configurations.</li>
+    <li><a href="../reference/pref_carb_symbian_sdk.htm">Symbian SDKs</a> &ndash;  control which installed SDKs are available to projects during project creation or importing.</li>
+</ul>
+<p>Every project also has a set of SBSv2 properties to customize: </p>
+<ul>
+    <li><a href="../reference/build_properties/prop_carb_project_settings.htm">Properties for <em>project</em> &gt; Carbide.c++ &gt; Project Settings</a> &ndash; specifies whether all components or selected subcomponents listed in a build information file (<span class="code">bld.inf</span>) should be built for the currently selected project.</li>
+</ul>
+<p>For more information on SBSv2, see the Symbian Foundation's wiki article <a href="http://developer.symbian.org/wiki/index.php/Introduction_to_RAPTOR">Introduction to RAPTOR</a> and others.</p>
+<h5>Other References</h5>
+<ul>
+  <li><a href="concepts.htm">Concepts</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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/symbol_hints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/symbol_hints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Symbol Hint</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Symbol Hint</h2>
 <p>  The symbol hint shows information about variable values. This information appears automatically while the debugger is active.<br />
 Select the Show variable values in the source code option in the Display Settings preference panel to use the symbol hint.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/symbolic_files_about.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/symbolic_files_about.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>About Symbolics Files</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>About Symbolics Files</h2>
 <p>A symbolics file contains debugging information that the IDE generates for a computer program. The debugger uses this information to control program execution. For example, the debugger uses the symbolics file to find the source code that corresponds to the executing object code of the computer program.</p>
 <p>Symbolics files contain this information:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/symbols_pkg.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/symbols_pkg.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Symbols, .pkg</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Symbols, .pkg </h2>
 <p>Carbide.c++ supports the following specific symbols in <span class="code">.pkg</span> files:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/templates.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/templates.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Project Templates</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Project Templates</h2>
 <p>Carbide.c++ provides many common  templates to quickly create projects using specific SDKs or feature sets. Every template provides basic support for a specific type of project including sources, libraries, resources, etc. The type and number of templates available are controlled by the SDKs you have  enabled. </p>
 <h4>Table 1. Available project templates</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/thread_cond_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/thread_cond_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Setting a thread-specific conditional breakpoint</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Setting a Thread-specific Conditional Breakpoint</h2>
 <p>Carbide's debugger supports thread-specific breakpoints. Depending on what the protocol supports, there are several different ways it's supported. You can setup a special condition on a breakpoint. Enter <span class="code">mwThreadID == threadID</span>, where <span class="code">mwThreadID</span> is a keyword recognized by the core debugger and <span class="code">threadID</span> is the number that represents the ID of the thread that you want to stop.<br />
 </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/trk.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/trk.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -4,20 +4,20 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>On-device Debugging</title>
+<title>TRK On-device Debugging</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
-<h2>On-device Debugging</h2>
-<p>The on-device debug agent (Application TRK or System TRK) is a program that enables on-device debugging of  phone prototypes, reference boards, and retail phones. An on-device debug agent is a program that is installed on a phone or reference board. It communicates with the debugger using a serial-over-Bluetooth or serial-over-USB connection. Through this serial communication, the on-device debug agent acts as the interface between the Carbide.c++ debugger and the target device. An on-device debug agent provides: </p>
+<body >
+<h2>TRK On-device Debugging</h2>
+<p>The on-device TRK remote agent (Application TRK or System TRK) is a program that enables on-device debugging of  phone prototypes, reference boards, and retail phones. An on-device debug agent is a program that is installed on a phone or reference board. It communicates with the debugger using a serial-over-Bluetooth or serial-over-USB connection. Through this serial communication, the on-device debug agent acts as the interface between the Carbide.c++ debugger and the target device. An on-device debug agent provides: </p>
 <ul>
   <li>Debug agent running on Symbian OS</li>
   <li>Provides a stable &amp; integrated interface to Symbian OS</li>
   <li>Used to debug applications on actual devices</li>
   <li>Can be built-in to the OS image or installed as a .sis file</li>
 </ul>
-<p>Using the on-device debug agent, one can use the Carbide.c++ IDE to debug programs running on phone hardware, making the debugging process much easier. The on-device debug agent works on all S60 3rd Edition devices, UIQ 3rd Edition devices, and Symbian TechView devkits.</p>
-<p>The Application TRK debug agents are stored online and can be downloaded and installed using the <a href="../reference/trk/wnd_new_connection_wizard.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
+<p>Using the on-device remote agent, one can use the Carbide.c++ IDE to debug programs running on phone hardware, making the debugging process much easier. The on-device debug agent works on all Nokia Qt SDK, Symbian^3, and Symbian TechView devkits.</p>
+<p>The Application TRK remote agents are stored online and can be downloaded and installed using the <a href="../reference/trk/wnd_new_connection_wizard.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
 <p>Some of the key benefits to using an on-device debug agent include:</p>
 <ul>
   <li>Easy debugging via serial interface (Bluetooth, USB, IrDA, etc)</li>
@@ -30,7 +30,6 @@
   <li><b>System TRK</b>&#8212;
   supports both application and limited ROM debugging (includes application executables and limited ROM based components (i.e. no device drivers) and available to original equipment manufacturers (OEM) for device creation and customization</li>
 </ul>
-<p class="note"><b>NOTE</b> The type of on-device debug agent you have is based upon which  Carbide.c++ product you have licensed. System TRK is only available with the Professional or OEM version of the product. </p>
 <h5>Related tasks</h5>
 <ul>
   <li><a href="../tasks/trk/trk_overview.htm">On-device Debugging Overview</a> </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/watchpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/watchpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,17 +7,17 @@
 <title>Watchpoints Overview</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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>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="../reference/perspective_debug.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>
 <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="../reference/perspective_debug.htm">Viewing Breakpoints and Watchpoints</a> </li>
+  <li><a href="../reference/perspective_debug.htm">Watchpoint Status Indicators</a></li>
+  <li><a href="../debugger/watchpoints/setting_watchpoints.htm">Setting and Removing Watchpoints</a></li>
+  <li><a href="../reference/perspective_debyg.htm">Enabling and Disabling Watchpoints</a></li>
+  <li><a href="http://www.nongnu.org/cvs/">Exporting</a> and <a href="http://www.nongnu.org/cvs/">importing</a> watchpoints</li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/work_mcore_debug.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/work_mcore_debug.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Multi-core Debugging</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Multi-core Debugging</h2>
 <p>    The IDE allows simultaneous debugging of multiple projects. This feature provides multi-core debugging capability for some embedded processors. By configuring each project to operate on a single core, the IDE can debug multiple cores by debugging multiple projects.</p>
 <p>Configuring multi-core debugging involves these tasks</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_data.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_data.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Working with Debugger Data</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Working with Debugger Data</h2>
 <p>  This section explains how to work with data that the Carbide.c++ debugger generates. The following windows show various types of debugger data.</p>
 <ul><li><a href="../reference/view_console.htm">Console view</a> &mdash;shows messages generated during the debugging session</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debugger Program Execution</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debugger Program Execution </h2>
 <p>  This section explains how to work with the debugger in the Carbide IDE to control program execution. The main component of the debugger is the <a href="../reference/perspective_debug.htm">Debug perspective</a>, which shows these items:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_memory.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_memory.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Working with Memory</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Working with Memory</h2>
 <p>  This section explains how to work with memory in a debugging session. Topics include:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Controlling Program Execution</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Controlling Program Execution</h2>
 <p>This section explains how to use breakpoints, breakpoint actions, and watchpoints to manipulate execution of your program in the Carbide&trade; IDE:</p>
 <ul>
@@ -27,7 +27,7 @@
 <h5>Related references </h5>
 <ul>
   <li><a href="../reference/view_breakpoints.htm">Breakpoints View</a> </li>
-  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm">Breakpoint Actions</a> Preferences</li>
+  <li><a href="../reference/perspective_debug.htm">Breakpoint Actions</a> Preferences</li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_variables.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_variables.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -13,7 +13,7 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Working with Variables</h2>
 <p>  This section explains how to work with variables in a Carbide&trade; IDE debugging session. The following windows show various types of information about variables.</p>
 <ul>
@@ -26,7 +26,7 @@
   <li><a href="../reference/view_variables.htm">Variables View</a> </li>
   <li><a href="../tasks/variables/set_variable_formats.htm">Setting Variable Formats</a></li>
   <li><a href="../tasks/variables/show_variables_view.htm">Opening a Variables View</a></li>
-  <li><a href="../tasks/variables/show_global_variables.htm">Showing Global Variables</a></li>
+  <li><a href="../reference/perspective_debug.htm">Showing Global Variables</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -15,10 +15,10 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Workspace Information </h2>
 <p>A workspace is the default place to store and create resources like projects, folders, and files. These are then presented to the user in a perspective which enables the presentation and manipulation of the stored resources.</p>
-<p>When Carbide is launched it asks for a workspace to open (Figure 1). As you can have multiple workspaces, all independent from each other, choosing the workspace containing the projects to work on is important. Projects within a workspace are  shown in the Carbide workbench within the <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/cnav.htm">Project Explorer</a> and <a href="../reference/view_proj_explorer.htm">C/C++ Project</a> views. When you create a new project it is automatically added to the currently open workspace. You can import existing projects into a workspace from INF files.</p>
+<p>When Carbide is launched it asks for a workspace to open (Figure 1). As you can have multiple workspaces, all independent from each other, choosing the workspace containing the projects to work on is important. Projects within a workspace are  shown in the Carbide workbench within the <a href="../debugger/variables/viewing_variables.htm">Project Explorer</a> and <a href="../reference/view_proj_explorer.htm">C/C++ Project</a> views. When you create a new project it is automatically added to the currently open workspace. You can import existing projects into a workspace from INF files.</p>
 <p align="center"><img src="images/wnd_workspace_launcher.png" alt="Workspace Launcher dialog" width="630" height="291"></p>
 <p class="figure">Figure 1. Workspace Launcher dialog</p>
 <p class="note"><span class="style1">WARNING</span> Bld.inf imported projects are not copied, so do not delete the contents when deleting the project.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -377,8 +377,8 @@
 	
 	<!-- Carbide.c++ > SDK Preferences panel -->
 	<context id="sdk_prefs_page" >
-		<description>Use the SDK Preferences page to Add or remove SDKs, or edit SDK properties</description>
-		<topic label="SDK Preferences"  					href="html/reference/SDKPreferences.html" />
+		<description>Use the Symbian SDKs page to Add or remove SDKs, or edit SDK properties</description>
+		<topic label="Symbian SDKs"  						href="html/reference/pref_carb_symbian_sdk.htm" />
 		<topic label="Adding SDKs" 							href="html/tasks/sdks/sdk_add.htm" />
 		<topic label="Searching SDKs" 						href="html/tasks/sdks/sdk_search.htm" />
 		<topic label="Viewing SDK Properties" 				href="html/tasks/sdks/sdk_view_properties.htm" />
@@ -390,13 +390,14 @@
 		<description>Use the SDK Add dialog to Add SDKs to current project</description>
 		<topic label="Add SDK"			        href="html/tasks/sdks/sdk_add.htm" />
 		<topic label="SDK Properties"			href="html/tasks/sdks/sdk_view_properties.htm" />
+		<topic label="Symbian SDKs"  						href="html/reference/pref_carb_symbian_sdk.htm" />
 	</context>
 
 	<!-- SDK Preferences panel: SDK Properties dialog -->
 	<context id="sdk_properties_dialog" >
 		<description>Use the SDK Properties window to examine the properties associated with the currently selected SDK in the SDK Preferences panel.</description>
 		<topic label="SDK Properties"				href="html/tasks/sdks/sdk_view_properties.htm" />
-		<topic label="SDK Preferences"				href="html/reference/SDKPreferences.html" />
+		<topic label="Symbian SDKs"  						href="html/reference/pref_carb_symbian_sdk.htm" />
 		<topic label="Adding Symbian Custom Kits"	href="html/tasks/sdks/sdk_add_custkits.htm" />
 	</context>
 
@@ -404,7 +405,7 @@
 	<context id="sdk_platform_filter_page" >
 		<description>Use the SDK Platform Filter window to show only platforms related to selected SDK.</description>
 		<topic label="Platform Filtering Preferences"		href="html/tasks/sdks/sdk_platform_filter.htm" />
-		<topic label="SDK Preferences"						href="html/reference/SDKPreferences.html" />
+		<topic label="Symbian SDKs"  						href="html/reference/pref_carb_symbian_sdk.htm" />
 	</context>
 
 	<!-- New Symbian OS Project wizard > Symbian OS SDKs page -->
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -122,12 +122,6 @@
 		<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" />
@@ -333,6 +327,17 @@
 		<topic label="Project Settings"					href="html/reference/build_properties/pane_project_settings.htm" />
 	</context>
 	
+
+	<!-- ============================================================== -->
+	<!-- PREFERENCE PANELS                                              -->
+	
+	<!-- QT - ADDED for 3.0 -->
+	<context id="preference_dialog_context" >
+		<label>Qt</label>
+		<topic label="Qt preferences"  		href="html/qt_help/qt_pref_panel.htm" />
+	</context>
+
+
 	
 	<!-- PREFERENCE PANELS -->
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,34 +1,34 @@
-<!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>Breakpoints Overview</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>
-<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>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li>Debugging overview </li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.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>Breakpoints Overview</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<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>
+<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>
+</ul>
+<h4>Other references</h4>
+<ul>
+  <li>Debugging overview </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/debugger/breakpoints/conditional_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/conditional_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Creating Conditional Breakpoints </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2> Creating Conditional Breakpoints </h2>
 <p>Use the <b>Properties for Breakpoint  &gt; Common &gt; Conditional</b> option to create conditional breakpoints. Where regular breakpoints  suspend execution each time they are hit, a condition breakpoint evaluates an expression to determine if it is true or not. If the expression evaluates true, then program execuation is suspended and the <a href="../../reference/perspective_debug.htm">Debug</a> perpective shown. If the expression evaluates to false, execution continues. </p>
 <p align="center"><img src="../images/option_condition.png" width="434" height="202"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/exporting_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/exporting_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Exporting Breakpoints and Watchpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2> Exporting Breakpoints and Watchpoints</h2>
 <p>Use the <b>Export Breakpoints</b> command to export selected breakpoints and watchpoints to a  file with a <span class="code">.bkpt</span> extension. All the breakpoints set in the source files of the  project and the watchpoints are listed in the <b>Export Breakpoints</b> dialog. Click the specific breakpoints and watchpoints to export or use <b>Select All</b> to include all of them. Specify the destination file name and folder, then click <b>Finish</b>. </p>
 <p align="center"><img src="../images/wnd_export_breakpoints.png" width="438" height="496"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/importing_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/importing_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Importing Breakpoints and Watchpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2> Importing Breakpoints and Watchpoints</h2>
 <p>Use the <b>Import Breakpoints</b> command to import a <span class="code">.bkpt</span> file containing breakpoint and watchpoint data and apply it to the current project. Right-click in the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view and select <b>Import Breakpoints...</b> from the context menu. You have the options of updating all existing breakpoints with the stored data or simply creating a working set containing the imported data. </p>
 <p align="center"><img src="../images/wnd_import_breakpoints.png" width="438" height="415"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/properties_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/properties_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,12 +7,12 @@
 <title>Breakpoints Properties</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Breakpoints Properties</h2>
 <p>Use the <b>Properties for Breakpoint</b> window to examine and modify  a specific breakpoints properties. By setting certain options its possible to create both <a href="conditional_breakpoints.htm">conditional</a> and <a href="temporary_breakpoints.htm">temporary</a> breakpoints. </p>
 <p>The pages available include:</p>
 <ul>
-  <li><b>Actions</b> - define one or more specific <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm">breakpoint actions</a> like playing a sound or showing an alert message to this breakpoint </li>
+  <li><b>Actions</b> - define one or more specific <a href="properties_breakpoints.htm">breakpoint actions</a> like playing a sound or showing an alert message to this breakpoint </li>
   <li><b>Common</b> - shows common  information including the class, breakpoint type, file location, and other attributes associated with the breakpoint. </li>
 </ul>
 <p align="center"><img src="../images/wnd_properties_breakpoints.png" width="628" height="544"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/resolving_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/resolving_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Breakpoint Status Indicators </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2> Breakpoint Status Indicators </h2>
 <p>Breakpoints must be located and resolved by the debugger before they can be hit. When a breakpoint is hit in the module, the debugger halts program execution and displays the state of the program in the <a href="../../reference/perspective_debug.htm">Debug</a> perspective. </p>
 <p>To hit a breakpoint during a debug session, the debugger must first load the symbols for an executable module and then attempt to resolve the breakpoints within the loaded module. Any module listed into the <a href="../../reference/view_executables.htm">Executables</a> view is available for loading by  a debug session. If a module is not present in the Executable view you'll need to import it before the debugger to load and resolve any breakpoints within that module. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/temporary_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/temporary_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Creating Temporary Breakpoints and Watchpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2> Creating Temporary Breakpoints and Watchpoints</h2>
 <p>Use the <b>Properties for Breakpoint  &gt; Common &gt; Ignore Count </b> option to create temporary breakpoints or watchpoints. Where regular breakpoints  or watchpoints suspend execution each time they are hit, a temporary one is removed once it is hit. The default value is 0, which suspends program execution each time the breakpoint or watchpoint are hit. </p>
 <p>To set a temporary breakpoint or watchpoint, change the value of <b>Ignore count</b> to 1. The first time the breakpoint or watchpoint is hit execution is suspended, while any subsequent hits are ignored. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/toggling_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/toggling_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,9 +7,9 @@
 <title>Enabling, Disabling and Removing Breakpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2> Enabling, Disabling and Removing Breakpoints </h2>
-<p>Use the <b>Toggle Breakpoint</b> command  (<span class="code">Ctrl+Shift+B</span>) to set a regular breakpoint in an <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_editor_view.htm">Editor</a>  or  <a href="../../reference/view_disassembly.htm">Disassembly</a> view. Only a single breakpoint can exist on a source code line. A regular breakpoint suspends program execution when it is hit, or executed, during a debug session. The debugger executes the line of source code that contains the regular breakpoint, then opens the <a href="../../reference/perspective_debug.htm">Debug</a> perspective to allow examination and modification.</p>
+<p>Use the <b>Toggle Breakpoint</b> command  (<span class="code">Ctrl+Shift+B</span>) to set a regular breakpoint in an <a href="properties_breakpoints.htm">Editor</a>  or  <a href="../../reference/view_disassembly.htm">Disassembly</a> view. Only a single breakpoint can exist on a source code line. A regular breakpoint suspends program execution when it is hit, or executed, during a debug session. The debugger executes the line of source code that contains the regular breakpoint, then opens the <a href="../../reference/perspective_debug.htm">Debug</a> perspective to allow examination and modification.</p>
 <p>If a regular breakpoint already exists on the  selected line, as indicated by the enabled breakpoint badge (<img src="../../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" align="baseline">) in the marker bar,  use <b>Toggle Breakpoint</b> to remove the breakpoint.</p>
 <h4>Enabling and Disabling breakpoints</h4>
 <p>Once a source line is selected in an editor or Disassembly view, the methods of toggling breakpoints to be enabled of disabled include: </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/viewing_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/viewing_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Viewing Breakpoints and Watchpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Viewing Breakpoints and Watchpoints </h2>
 <p>Use the <b>Breakpoints</b> view (Figure 1) to <a href="properties_breakpoints.htm">examine</a> a project's breakpoints and watchpoints, <a href="toggling_breakpoints.htm">toggle</a> individual breakpoints  between enabled and disabled, set <a href="conditional_breakpoints.htm">conditional</a> breakpoints, <a href="exporting_breakpoints.htm">export</a> and <a href="importing_breakpoints.htm">import</a> breakpoints, or remove them from one or more build configurations. </p>
 <p>The <b>Breakpoints</b> view is available in the <a href="../../reference/perspective_debug.htm">Debug</a> perspective by default. To open it in another perspective, use the <b>Window &gt; Show View &gt; Breakpoints</b> menu option. Once open you have  control over breakpoint states and how they are shown. For example: </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_other.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_other.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debugging Overview</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Other Useful Commands</h2>
 <p>The <a href="viewing_debug.htm">Debug</a> view has a few other commands that are useful under some debugging situations:</p>
 <h4>Disconnecting from a process</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_reposition_pc.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_reposition_pc.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -15,7 +15,7 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Repositioning the Program Counter</h2>
 <p>Once you've <a href="cmds_resuming.htm">suspended</a> a program debug session, the <a href="../../reference/view_disassembly.htm">Disassembly</a> view provides commands for move or reposition the program counter (PC). These command include:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_resuming.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_resuming.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Suspending and Resuming a Debug Session</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Suspending and Resuming a Debug Session</h2>
 <p>Once you've started a debug session, the <a href="viewing_debug.htm">Debug</a><b> </b>view provides controls to both suspend and resume program execution under debugger control. The following items describe the commands for:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Starting and Terminating a Debug Session</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Starting  and Terminating a Debug Session</h2>
 <p>Once you've started a debug session, the <b>Debug</b> view provides controls to both terminate and restart the session. The following items describe the commands for:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_stepping.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_stepping.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Stepping Over, Into, and Out of Routines</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Stepping Over, Into, and Out of Routines</h2>
 <p>Once you've <a href="cmds_resuming.htm">suspended</a> a program debug session, the <a href="viewing_debug.htm">Debug</a> view provides controls to walk through program code, including commands for:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/debug.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/debug.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debugging Overview</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debugging Overview </h2>
 <p>The Debug view provides an overview of the debug session as it relates to the executing program.</p>
 <p>The following topics cover various breakpoint concepts and actions: </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/viewing_debug.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/viewing_debug.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debug view</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debug view </h2>
 <p>The <b>Debug</b> view provides an overview of the debug session as it relates to the executing program. The target debugging information is shown in a tree hierarchy. The  items that appear there include:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_expressions.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_expressions.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,36 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Adding and Removing Expressions</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Adding and Removing Expressions</h2>
-<p>An <i>expression</i> is a snippet of code that is evaluated to produce a value. In Carbide they are defined using C/C++ expressions. Some expressions may need to be evaluated at a specific location in the program so that its variables can be referenced. Adding more expressions  to the <a href="viewing_expressions.htm">Expressions</a> view list can slow down the automatic display as each must be evaluated to update its value. To manage large lists of expressions, use the <b>Enable</b> and <b>Disable</b> options in the context menu to control which expressions are automatically evaluated.</p>
-<p>You  add  expressions in the <b>Add Watch Expression</b> dialog  using a variety of views, including <a href="../../reference/view_expressions.htm">Expressions</a>, <a href="../../reference/view_variables.htm">Variables</a>, and editor views. Right-click in the view and select the <b>Add Watch Expression...</b> command from the context menu.</p>
-<p align="center"><img src="../images/wnd_add_watch_expr.png"></p>
-<p class="figure">Figure 1. Add Watch Expression dialog</p>
-<p>You can enter any valid C/C++ expression, for example:</p>
-<blockquote>
-  <p class="code">2 + 2<br>
-    myVariable + 8<br>
-    &amp;myVariable<br>
-    myClass.myMemberVar<br>
-    etc.</p>
-</blockquote>
-<p>are all valid expressions that the Expressions view can monitor and display. However, an expression cannot call a function or execute code. The following example will not work:</p>
-<blockquote>
-  <p class="code">std:strlen(&quot;Hello&quot;); </p>
-</blockquote>
-<h4>Removing Expressions</h4>
-<p>Right-click the expression in the Expressions view and select the <b>Remove</b> menu option. This removes the selected expression from the Expression list.</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.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>Adding and Removing Expressions</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Adding and Removing Expressions</h2>
+<p>An <i>expression</i> is a snippet of code that is evaluated to produce a value. In Carbide they are defined using C/C++ expressions. Some expressions may need to be evaluated at a specific location in the program so that its variables can be referenced. Adding more expressions  to the <a href="viewing_expressions.htm">Expressions</a> view list can slow down the automatic display as each must be evaluated to update its value. To manage large lists of expressions, use the <b>Enable</b> and <b>Disable</b> options in the context menu to control which expressions are automatically evaluated.</p>
+<p>You  add  expressions in the <b>Add Watch Expression</b> dialog  using a variety of views, including <a href="../../reference/view_expressions.htm">Expressions</a>, <a href="../../reference/view_variables.htm">Variables</a>, and editor views. Right-click in the view and select the <b>Add Watch Expression...</b> command from the context menu.</p>
+<p align="center"><img src="../images/wnd_add_watch_expr.png"></p>
+<p class="figure">Figure 1. Add Watch Expression dialog</p>
+<p>You can enter any valid C/C++ expression, for example:</p>
+<blockquote>
+  <p class="code">2 + 2<br>
+    myVariable + 8<br>
+    &amp;myVariable<br>
+    myClass.myMemberVar<br>
+    etc.</p>
+</blockquote>
+<p>are all valid expressions that the Expressions view can monitor and display. However, an expression cannot call a function or execute code. The following example will not work:</p>
+<blockquote>
+  <p class="code">std:strlen(&quot;Hello&quot;); </p>
+</blockquote>
+<h4>Removing Expressions</h4>
+<p>Right-click the expression in the Expressions view and select the <b>Remove</b> menu option. This removes the selected expression from the Expression list.</p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Adding and Removing Global Variables</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Adding and Removing Global Variables </h2>
 <p>The <a href="viewing_variables.htm">Variables</a> view can also display global variables used by the program. Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. There you can select one or more global variables to display in the Variables view, clickiing <b>OK</b> when done. </p>
 <p align="center"><img src="../images/wnd_global_variables.png" alt="Global Variables window" width="359" height="452"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/editing_expressions.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/editing_expressions.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,35 +1,35 @@
-<!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>Editing Expressions</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Editing Expressions </h2>
-<p>Use the <b>Edit Watch Expression</b> dialog to change a previously defined expression. Right-click in the <a href="viewing_expressions.htm">Expressions</a> view and select the <b>Edit Watch Expression...</b> command from the context menu. When editing an expression, the same rules used to create it apply. Mainly, the edited expression must be a valid C/C++ expression that evaluates to a value and does not call a function nor execute code.</p>
-<p>Use the <b>Enable</b> control to set whether this expression should be automatically evaluated during a debug session.</p>
-<p align="center"><img src="../images/wnd_edit_watch_expr.png"></p>
-<p class="figure">Figure 1. Edit Watch Expression dialog</p>
-<p>You can enter any valid C/C++ expression, for example:</p>
-<blockquote>
-  <p class="code">2 + 2<br>
-    myVariable + 8<br>
-    &amp;myVariable<br>
-    myClass.myMemberVar<br>
-    etc.</p>
-</blockquote>
-<p>are all valid expressions that the Expressions view can monitor and display. However, an expression cannot call a function or execute code. The following example will not work:</p>
-<blockquote>
-  <p class="code">std:strlen(&quot;Hello&quot;); </p>
-</blockquote>
-<h5>Other references</h5>
-<ul>
-  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
-License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.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>Editing Expressions</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Editing Expressions </h2>
+<p>Use the <b>Edit Watch Expression</b> dialog to change a previously defined expression. Right-click in the <a href="viewing_expressions.htm">Expressions</a> view and select the <b>Edit Watch Expression...</b> command from the context menu. When editing an expression, the same rules used to create it apply. Mainly, the edited expression must be a valid C/C++ expression that evaluates to a value and does not call a function nor execute code.</p>
+<p>Use the <b>Enable</b> control to set whether this expression should be automatically evaluated during a debug session.</p>
+<p align="center"><img src="../images/wnd_edit_watch_expr.png"></p>
+<p class="figure">Figure 1. Edit Watch Expression dialog</p>
+<p>You can enter any valid C/C++ expression, for example:</p>
+<blockquote>
+  <p class="code">2 + 2<br>
+    myVariable + 8<br>
+    &amp;myVariable<br>
+    myClass.myMemberVar<br>
+    etc.</p>
+</blockquote>
+<p>are all valid expressions that the Expressions view can monitor and display. However, an expression cannot call a function or execute code. The following example will not work:</p>
+<blockquote>
+  <p class="code">std:strlen(&quot;Hello&quot;); </p>
+</blockquote>
+<h5>Other references</h5>
+<ul>
+  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/variables.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/variables.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Variables and Expressions Overview </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Variables and Expressions Overview </h2>
 <p>Variables are symbols used in programs to store values or expressions that can change during the life of the program. Being able to view a variable's value is helpful when debugging a program. Expressions are the result of one or more variables being combined to produce a result based on the variable values and the way they are calculated. Variables are shown in the <a href="viewing_variables.htm">Variables</a> view while expressions are shown in the <a href="viewing_expressions.htm">Expressions</a> view.</p>
 <p>The following  cover various variable and expression concepts and actions: </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_expressions.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_expressions.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -12,7 +12,7 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Viewing Expressions </h2>
 <p>The <b>Expressions</b> view allows manipulation of  expressions. An <i>expression</i> is a snippet of code that is evaluated to produce a value. In Carbide they are defined using C/C++ expressions. Some expressions may need to be evaluated at a specific location in the program so that its variables can be referenced. </p>
 <p>The Expressions view displays these panes: </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Viewing Variables</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Viewing Variables </h2>
 <p>The <b>Variables</b> view allows manipulation of project  variables and the variable hierarchy used in the source code. For example, you can change the variable format, change a variable value, add watch expressions, or add global variables. </p>
 <p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled. The default view shows the variables list and include the Name and Value for all the variables within scope. In addition, when you select a variable its value is also shown in a different pane within the view.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/setting_watchpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/setting_watchpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Setting and Removing Watchpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Setting and Removing Watchpoints</h2>
 <p>You create a watchpoint to monitor a value in a specified memory location. The debugger halts program execution on the line of source code that triggered the watchpoint. This is different than a breakpoint, which halts program execution prior to executing the line of source code on which the breakpoint is set.</p>
 <h4>Setting watchpoints</h4>
@@ -37,8 +37,8 @@
       <td><p>Check the appropriate access type to trigger  the watchpoint for the specified memory location. This setting is shown as a unique icon in the Breakpoints view next to the listed watchpoint. The following list shows the resolved version of the icons used to indicate the type of watchpoint set:</p>
         <ul>
           <li>Read only (<img src="../images/icon_watchpoint_read_resolved.png" width="18" height="13" align="absmiddle">)</li>
-          <li>Write only (<img src="../../tasks/watchpoints/images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle">)</li>
-          <li>Read/Write (<img src="../../tasks/watchpoints/images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle">)</li>
+          <li>Write only (<img src="setting_watchpoints.htm" width="15" height="16" align="absmiddle">)</li>
+          <li>Read/Write (<img src="setting_watchpoints.htm" width="16" height="16" align="absmiddle">)</li>
       </ul></td>
     </tr>
 </table>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/status_watchpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/status_watchpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Watchpoint Status Indicators</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Watchpoint Status Indicators</h2>
 <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="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view indicates the status of any watchpoint using a set of common icons and checkmark status badge. These include:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/toggling_watchpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/toggling_watchpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Enabling and Disabling Watchpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Enabling and Disabling Watchpoints</h2>
 <p>In the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view use the checkboxes that appear next to a watchpoint to enable or disable that watchpoint. When enabled, if the value in the watchpoint location changes per the read/write condition, then program execution is suspended. If the watchpoint is disabled and the value changes, no action is taken by the debugger.</p>
 <h4>Enabling Watchpoints</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,10 +7,10 @@
 <title>Watchpoints Overview</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Watchpoints Overview </h2>
 <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>
+<p>A watchpoint must be both enabled and resolved during a debug session in order to halt program execution. The  <a href="toggling_watchpoints.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="../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="../images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
@@ -40,8 +40,8 @@
 <p>&nbsp;</p>
 <p>In addition, you can use these types of watchpoints:</p>
 <ul>
-  <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>
+  <li><a href="setting_watchpoints.htm">regular</a> watchpoints&mdash;halt program execution</li>
+  <li><a href="setting_watchpoints.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>
@@ -95,21 +95,21 @@
   </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>
+<p>All set watchpoints appear in the <a href="toggling_watchpoints.htm">Breakpoints view</a>  list.</p>
 <h5>Related concepts</h5>
 <ul>
-  <li> <a href="breakpoints.htm">Breakpoints</a></li>
+  <li> <a href="toggling_watchpoints.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="setting_watchpoints.htm">Setting Watchpoints</a></li>
+  <li><a href="toggling_watchpoints.htm">Enabling Watchpoints</a></li>
+  <li><a href="toggling_watchpoints.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>
+  <li><a href="toggling_watchpoints.htm">Breakpoints view</a> </li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
   <title>Customizing Launch Configurations</title>
   <link rel="StyleSheet" href="../../../book.css" type="text/css" />
 </head>
-<body bgcolor="#ffffff">
+<body >
 <h2>Customizing Launch Configurations</h2>
 <p>Use the <a href="wnd_debug_configuration.htm">Debug</a> dialog to customize launch configurations previously created in a project, or to create new launch configurations. Ideally, you should create new launch configurations using the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. Doing this will ensure that the project's default launch configuration is valid and can successfully launch a  debug session. However, not all default launch configurations satisfy all the needs of a project, so being able to modify a launch configuration's options can allow you to customize how the project is launched and debugged based on the needs of that project. </p>
 <p>There are two methods for setting up a launch configuration, including:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -22,7 +22,6 @@
   <li><b><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.debug.crashdebugger/html/view.html">Symbian OS Crash Debugger</a></b> &#8212; used to launch an interactive command-line session with the Symbian OS crash debugger when the device crashes </li>
   <li><b><a href="emulation.htm">Symbian OS Emulation</a> </b>&#8212; used to run or debug executables on an emulator. </li>
   <li><b><a href="stop_mode.htm">Symbian OS System TRK</a></b> &#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> &#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>
 <h4>Other references</h4>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Launch Configuration Filtering</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Launch Configuration Filtering </h2>
 <p>Use the  <b>Launch Configurations </b> preference panel to  filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs.  </p>
 <p align="center"><img src="images/filter_launch_config.png" width="682" height="587" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_types.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -16,7 +16,6 @@
   <li><a href="attach_process.htm">Attach to Process</a></li>
   <li><a href="emulation.htm">Emulation</a></li>
   <li><a href="stop_mode.htm">System TRK</a></li>
-  <li><a href="trace32.htm">Trace32</a></li>
 </ul>
 <h4>Other references</h4>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_connection.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_connection.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide Connection page</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Connection page</h2>
 <p>The <b>Connection</b> page  specifies the method used to transfer files to the target device. Once a Serial Port type is chosen, the remaining options contain default values for the specific connection type. Users can change these remaining options to match the target device's communication specifications. </p>
 <p align="center"><span class="figure"><img src="images/page_connection.png" width="598" height="224"></span></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_debugger.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -6,13 +6,13 @@
 <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">
+<body >
 <h2>Debugger panes</h2>
 <p>The options shown in the <b>Debugger</b> page differ based upon the type of launch configuration. Generally, the options fall into these choices: </p>
 <ul>
   <li><a href="#emulator_mode">Emulation Debugger page</a> (Emulation) </li>
   <li><a href="#trk_runmode">Run-mode Debugger page</a> (Application TRK) </li>
-  <li><a href="#trk_stopmode">Stop-mode Debugger page</a> (System TRK, Trace32, Attach to Process) </li>
+  <li><a href="#trk_stopmode">Stop-mode Debugger page</a> (System TRK, 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>
@@ -88,7 +88,7 @@
   </tr>
 </table>
 <h3><a name="trk_stopmode" id="trk_stopmode"></a>Stop-mode Debugger page </h3>
-<p>In  stop-mode launch configurations like <b><a href="stop_mode.htm">System TRK</a></b>, <b><a href="trace32.htm">Trace32</a></b>,<b> </b>and <a href="attach_process.htm"><b>Attach to Process</b></a>, use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
+<p>In  stop-mode launch configurations like <b><a href="stop_mode.htm">System TRK</a></b>,<b> </b>and <a href="attach_process.htm"><b>Attach to Process</b></a>, use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
 <p align="center"><img src="images/page_debugger_stop_mode.png" width="642" height="401"></p>
 <p class="figure">Figure 3 - Debugger page showing stop-mode options  </p>
 <h5>Table 3. Debugger page &mdash; stop-mode  options </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_exceptions.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_exceptions.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide x86 Exceptions page</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>x86 Exceptions page </h2>
 <p>  Use the <b>x86 Exceptions</b> page in the <a href="emulation.htm">Emulation</a> launch configuration to set  the x86 exceptions  the debugger should catch. If you want the debugger to catch all the exceptions, enable all of the options in this page. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you want to handle.</p>
 <p align="center"><img src="images/page_exceptions.png" width="627" height="270" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_file_transfer.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_file_transfer.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide File Transfer page</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>File Transfer page</h2>
 <p>The <b>File Transfer</b> page displays an auto-populated list of files for <a href="stop_mode.htm">System TRK</a> that the IDE transfers to the target device at the start of each launch. For RnD device images, the target location for files is normally <span class="code">c:\sys\bin</span> or another protected area. For production device images <a href="run_mode.htm">Application TRK</a> does not support the transfer of files to <span class="code">c:\sys\bin</span> or other protected areas.</p>
 <p>Users can add, edit, or delete files in the list and sort   by clicking on a column header. By default, any file added is automatically checked for downloading to the device. Users can uncheck a file to remove it from the download list without removing the file itself. System TRK users can  use this panel to download any type of file, like bitmaps, HTML, sounds, and more, to the phone and applicable to Application TRK for transfering any files outside of the installation file.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_installation.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_installation.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Installation page</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Installation page</h2>
 <p>The  <b>Installation</b> page specifies the .sis file to install on the target device when using <a href="run_mode.htm">Application TRK</a>. This is required when using the TRK debug agent with 9.x based SDK&rsquo;s.</p>
 <p align="center"><img src="images/page_installation.png" width="686" height="284" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,13 +7,13 @@
 <title>Carbide Main page </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Main page </h2>
 <p>The options shown in the <b>Main</b> page differ based upon the type of launch configuration. Generally, the options fall into these choices: </p>
 <ul>
   <li><a href="#emulator_mode">Emulation Main page</a> (Emulation) </li>
   <li><a href="#run_mode">Run-mode Main page</a> (Application TRK) </li>
-  <li><a href="#stop_mode">Stop-Mode Main page</a> (System TRK, Trace32) </li>
+  <li><a href="#stop_mode">Stop-Mode Main page</a> (System TRK) </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,9 +88,9 @@
   </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></b> and <b><a href="trace32.htm">Trace32</a> </b> launch configurations uses the <b>Main</b> page to defines the project and the executable to launch on the target device. </p>
+<p>The <b>Symbian OS <a href="stop_mode.htm">System TRK</a></b> launch configurations uses the <b>Main</b> page to defines the project and the executable to launch on the target device. </p>
 <p align="center"><img src="images/page_main_stop_mode.png" width="556" height="301"></p>
-<p class="figure">Figure 3. Main page (<i>TRACE32 shown</i>)</p>
+<p class="figure">Figure 3. Main page</p>
 <h5>Table 3. Stop-mode Main page &mdash; items</h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_image.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_image.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide ROM Image page</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>ROM Image page </h2>
 <p>Use the <b>ROM Image</b> page in a <a href="stop_mode.htm">System TRK</a> launch configuration to define startup options and ROM image download information.</p>
 <p align="center"><img src="images/page_rom_image.png" width="583" height="327"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide Configuration Pages</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Configuration Pages</h2>
 <p>The  pages in the <a href="wnd_debug_configuration.htm">Debug</a> dialog used to set options for the various launch configurations include: </p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -9,7 +9,7 @@
 
 <body>
 <h2>System TRK  Launch Configuration (Stop-mode) </h2>
-<p>Select the <b>Symbian OS System TRK </b> launch configuration 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>Select the <b>Symbian OS System TRK </b> launch configuration provides C/C++ stop-mode debug options that use a JTAG interface when a Symbian OS launch configuration is created. The  settings included in these launch configuration are a combination of Carbide, CDT, and Eclipse options. </p>
 <p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create the System TRK launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt;  Debug As</b> menu option to open the <b>Debug</b> dialog. Select the System 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/trace32.htm	Wed Aug 11 11:18:20 2010 -0500
+++ /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>Trace32 Launch Configuration</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2> Trace32 Launch Configuration</h2>
-<p>Select the <b>Symbian OS Trace32 </b> launch configuration to debug any Symbian OS module on a target using a JTAG connection. The external Trace32 debugger communicates with the  Carbide debugger and enables stop mode debugging of the target device. </p>
-<p>If  the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> was used to create a Trace32 launch configuration no changes are usually needed. To modify the  launch configuration settings, select the <b>Run &gt; Debug As</b> menu option to open the <b>Debug</b> dialog. Select the Trace32 configuration and click a tab to set specific options. Click <b>Apply</b> to save any option modifications. Click <b>Debug</b> to launch a debugging session using the new settings.</p>
-<p align="center"><img src="../images/wnd_debug_trace32_launch_config.png" width="832" height="640"></p>
-<p class="figure">Figure 1. Trace32 launch configuration in the Debug dialog </p>
-<p>The Trace32 launch configuration panes include: </p>
-<ul>
-  <li>The <a href="page_main.htm">Main</a> tab defines the project to be launched. Enter the name of the project in the Project field, and the executable name in the Executable field.</li>
-  <li>The <a href="page_connection.htm">Connection</a> tab</li>
-  <li>The <a href="page_debugger.htm">Debugger</a> tab defines debug configurations, such as entry point to begin debugging and target options.</li>
-  <li>The <a href="page_rom_image.htm">ROM Image</a> tab allows you to define startup options and ROM image download information.</li>
-  <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> tab (<i>standard CDT page</i>)  defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 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	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
   <title>New Launch Configuration Wizard</title>
   <link rel="StyleSheet" href="../../../book.css" type="text/css" />
 </head>
-<body bgcolor="#ffffff">
+<body >
 <h2>New Launch Configuration Wizard </h2>
 <p>The <b>New Launch Configuration Wizard</b> launches when no launch configuration exists for a project. Wherever possible the <b>New Launch Configuration </b> wizard gathers the information from the project and asks additional questions based on the type of launch configuration chosen. For example, a launch configuration using Application TRK requires different information than  one targeted for System TRK. </p>
 <table width="700"  border="0" cellpadding="2" cellspacing="0">
@@ -42,13 +42,6 @@
     </ul>    </td>
   </tr>
   <tr>
-    <td><b>Trace32</b></td>
-    <td><ul>
-      <li><a href="#TRACE32">Trace32 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>
@@ -91,16 +84,6 @@
 <p>If you checkmark <b> Advanced settings</b>, the <a href="../../reference/wnd_debug_configuration.htm">Debug</a> dialog appears instead of launching the project. This enables you to make additional changes to the new launch configuration before starting the debug session. By design and intent, this should seldom be required for the initial launch. </p>
 <p align="center"><img src="../../images/icons/wiz_launch_config_finish.png" width="438" height="533"></p>
 <p class="figure">Figure 8 - New Launch Configuration page </p>
-<h3><a name="TRACE32" id="TRACE32"></a>Trace32 Initialization Settings</h3>
-<p>Use the <b>Trace32 Initialization Settings</b> page to specify the <a href="trace32.htm">initialization</a> script and target processor of the target device.Enter the Trace32 Initialization Script and choose the Target Processor, then click <b>Next</b>. </p>
-<p> This page only appears when creating a Trace32 launch configuration. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_trace32.png" width="438" height="533"></p>
-<p class="figure">Figure 9 - <b>Trace32 Initialization Settings</b> page </p>
-<h3><a name="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 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 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -5,14 +5,14 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Debug Configurations Window</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debug Configurations Window</h2>
-<p>The <b>Debug Configurations</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 <b>Debug Configurations</b> or launch configuration window provides C/C++ debugger options. A <a href="wiz_new_launch_config.htm">launch configuration</a> defines the settings used by the Carbide debugger to launch and debug programs. A project must have at least one debug launch configuration in order to debug a project and can have many more. </p>
+<p>By default, Carbide creates a debug launch configuration the first time you launch the debugger based on current project settings. If additional information is required, like a port ID, the <a href="wnd_config_launch_config.htm">New Launch Configuration Wizard</a>  appears asking for the additional information. </p>
 <p>The tabs in the window vary depending upon the currently selected launch configuration.</p>
-<p align="center"><img src="images/wnd_debug_overview.png" width="872" height="548"></p>
+<p align="center"><img src="images/wnd_debug_overview.png" width="864" height="471"></p>
 <p align="center" class="figure">  Figure 1 - Debug or launch configuration window (Symbian OS emulation view)</p>
 <h5>Table 1. Debug Configuration window &mdash; common items</h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
@@ -51,7 +51,7 @@
           <li>Filter Deleted/Unavailable Projects</li>
           <li>Filter Configuration Types</li>
           <li>Apply Window Working Set(s)</li>
-          <li><a href="trk/panel_filter.htm">Filtering Preferences...</a></li>
+          <li><a href="wiz_new_launch_config.htm">Filtering Preferences...</a></li>
       </ul></td>
   </tr>
 </table>
@@ -68,9 +68,9 @@
 </div>
 <h5>Other references</h5>
 <ul>
-  <li><a href="perspective_debug.htm">Debug Perspective</a></li>
-  <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  <li><a href="../projects/launch/emulation.htm">Emulator overview</a></li>
+  <li><a href="../../debugger/debug/viewing_debug.htm">Debug Perspective</a></li>
+  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  <li><a href="../../tasks/sdks/sdk_platform_filter.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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>DLL Projects Tutorial</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>DLL Projects Tutorial</h2>
 <p>In this example we show how to create a  project for a DLL (Dynamic Linked Library) using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
 <ol>
@@ -15,7 +15,7 @@
     <li><a href="new_proj_from_template_02.htm">Building</a> an executable based on the project sources</li>
     <li><a href="new_proj_dll_example_03.htm">Debugging</a> the DLL using  the Carbide debugger</li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../../sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h4>Other references</h4>
 <ul>
     <li><a href="new_proj_from_template_00.htm">Emulator Application Projects</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_01.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_01.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Creating DLL Projects Tutorial</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Creating DLL Projects Tutorial</h2>
 <p>In this example we show how to create a  project for a DLL (Dynamically Linked Library) using one of the built-in Carbide templates, build it, then attach to another program for debugging. The steps to do this include:</p>
 <ol>
@@ -15,7 +15,7 @@
     <li><a href="new_proj_dll_example_02.htm">Building</a> the DLL object code based on the project sources</li>
     <li><a href="new_proj_dll_example_03.htm">Debugging</a> the DLL using  the Carbide debugger</li>
     </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../../sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <hr>
 <p>In this tutorial you'll create a simple DLL project using the <strong>New Symbian OS C++ Project</strong> wizard, attach it to the HelloWorld project created <a href="new_proj_from_template_00.htm">here</a>, then debug it.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_02.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_02.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Building the DLL Project Tutorial</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Building the  DLL Project Tutorial</h2>
 <p>In this example we show how to create a  project for a DLL (Dynamic Linked Library) using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_03.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_03.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debugging a DLL Project Tutorial</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debugging a  DLL Project Tutorial</h2>
 <p>In this example we show how to create a  project for a DLL (Dynamic Linked Library) using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Emulator Application Projects Tutorial</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Emulator Application Projects Tutorial</h2>
 <p>In this example we show how to create a new project using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
 <ol>
@@ -16,7 +16,7 @@
     <li><a href="new_proj_from_template_03.htm">Defining</a> a launch configuration for running or debugging the application</li>
     <li><a href="new_proj_from_template_04.htm">Controlling and debugging</a> the running program using  the Carbide debugger</li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../../sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h4>Other references</h4>
 <ul><li><a href="new_proj_from_template_00.htm">DLL Projects</a></li>
     <li><a href="run_mode_debug_example_00.htm">Remote Target Debugging (Run-mode)</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_01.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_01.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Creating New Projects from Templates</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Creating New Projects from Templates</h2>
 <p>In this example we show how to create a new project using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_03.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_03.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Defining a launch configuration</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Defining a launch configuration</h2>
 <p>In this example we show how to create a new project using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -6,7 +6,7 @@
 <title>Launching and debugging an executable </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2><strong>Launching and debugging an executable </strong></h2>
 <p>In this example we show how to create a new project using one of the built-in Carbide templates, how to build it into an executable, and how to launch the debugger to verify program accuracy. The steps to do this include:</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Remote Target Debugging (Run-mode) Tutorial</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Remote Target Debugging (Run-mode) Tutorial</h2>
 <p>In this example we demonstrate how to debug applications on a remote device using the Application TRK remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_01.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_01.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Connect target device to PC Tutorial</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2><strong>Connect  target device to PC</strong></h2>
 <p>In this example we demonstrate how to debug applications on a remote device using the Application TRK remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_02.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_02.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -6,7 +6,7 @@
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Install TRK remote agent Tutorial</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Install TRK remote agent</h2>
 <p>In this example we demonstrate how to debug applications on a remote device using the Application TRK remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Configure project for debugging Tutorial</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Configure project for debugging</h2>
 <p>In this example we demonstrate how to debug applications on a remote device using the Application TRK remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debug project on target device Tutorial</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debug project on target device</h2>
 <p>In this example we demonstrate how to debug applications on a remote device using the Application TRK remote debug agent. This enables you to test  programs on the actual device it will operate on while observing its behavior using the Carbide debugger. The steps to do this include:</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Preference Panel</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
 <ol>
@@ -18,7 +18,7 @@
   <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Launch the New Qt Project Wizard</b></h3>
 <p>Select the <b>File &gt; New &gt; New Qt Project</b> menu item to open the <b>New Qt Symbian OS C++ Project</b> dialog.</p>
 <p align="center"><img src="images/qt_wiz_01_project_type.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Preference Panel</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
 <ol>
@@ -18,7 +18,7 @@
   <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3>Select type of Qt project</h3>
 <p>Use the<b> Select a type of project</b> page in the <b>New Qt Project Wizard</b> to choose a Qt project template that will be used to generate the new project, then click <b>Next</b>. Note that the templates shown are filtered to </p>
 <p align="center"><img src="images/qt_wiz_01_project_type.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Preference Panel</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
 <ol>
@@ -19,7 +19,7 @@
   <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Enter project name and  location</b></h3>
 <p>Use the <b>New Qt Symbian OS C++ Project</b> page in the <b>Qt Project Wizard</b> to define the projects name and where it should be saved, then click <b>Next</b>. In Qt projects, the name of the project folder must match the project name. </p>
 <p align="center"><img src="images/qt_wiz_02_project_name.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Preference Panel</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
 <ol>
@@ -20,7 +20,7 @@
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
 <p class="note"><b>NOTE</b> If everything is built correctly, the <span class="code">QtCore.lib</span> should be in your SDK's <span class="code">&lt;platform&gt; &lt;target&gt; UDEB</span> directory.  If this library is missing, then the SDK will not show up as a supported SDK-target in the build configurations. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Select SDKs for build targets</b></h3>
 <p>Use the <b>Build Targets</b> page of the <b>Qt Project Wizard</b> to select one or more Qt SDKs to include in the project, then click <b>Next</b>.</p>
 <p align="center"><img src="images/qt_wiz_03_build_targets.png"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Preference Panel</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
 <ol>
@@ -19,7 +19,7 @@
   <li><b>Select Qt modules to include in project</b></li>
   <li><a href="qt_creating_projs_06.htm">Set application UID</a></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Select Qt modules to include in project</b></h3>
 <p>Use the <b>Qt Modules</b> page to select one or more Qt modules to include with the project, then click <b>Next</b>.</p>
 <p align="center"><img src="images/qt_wiz_04_qt_modules.png" width="500" height="500"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Preference Panel</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 Symbian. The wizard walks you through the process of defining and creating a Qt project.</p>
 <ol>
@@ -18,7 +18,7 @@
   <li><a href="qt_creating_projs_05.htm">Select Qt modules to include in project</a></li>
   <li><b>Set application UID</b></li>
 </ol>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3><b>Set application UID</b></h3>
 <p>Use the <b>Basic Settings</b> page of the <b>Qt Project Wizard </b>to define an Application UID to the executable. Click <b>Random</b> to generate a  unique UID for program testing purposes. Click <b>Finish</b> when ready to create the project.</p>
 <p align="center"><img src="images/qt_wiz_05_basic_settings.png"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_01.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_01.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Importing Qt Projects</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_02.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_02.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Importing Qt Projects</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_03.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_03.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Importing Qt Projects</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Importing Qt Projects</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 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>
@@ -18,7 +18,7 @@
   <li><b>Choose build targets</b></li>
 </ol>
 <p class="note"><b>NOTE</b> If everything is built correctly, the <span class="code">QtCore.lib</span> should be in your SDK's <span class="code">&lt;platform&gt; &lt;target&gt; UDEB</span> directory.  If this library is missing, then the SDK will not show up as a supported SDK-target in the build configurations. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="../tasks/sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <h3>Select .pro file to import</h3>
 <p>Use the<b> Build Targets </b> page in the <b>File Import Wizard</b> to select which SDKs and build configurations to associate with the project,  then click <b>Finish</b>. The <span class="code">.pro</span> file is imported and a new project created in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> view.</p>
 <p align="center"><img src="images/qt_import_03_build_targets.png"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Projects Overview</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Qt Projects Overview </h2>
 <p>Carbide supports the creation, importing, development, and debugging of programs based upon Qt.</p>
 <p>The following  topics are covered for Qt: </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_perspectives.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_perspectives.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Projects Overview</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Qt Perspective </h2>
 <p>The Qt C/C++ perspective defines a set of common views that make developing Qt programs faster and easier. It is essentially the same as the <a href="../concepts/CarbidePerspective.html">Carbide C/C++ perspective</a> except that the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view is removed, and the following views  added: </p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_pref_panel.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_pref_panel.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Preference Panel</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Qt Preference Panel</h2>
 <p>The <b>Qt</b> preference panel provides global settings for Qt-based projects. Use it to add, edit, remove, and assign the default Qt version for projects.</p>
 <p align="center"><img src="images/qt_pref_panel.png" width="627" height="544"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_properties.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_properties.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Project Properties</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Qt Project Properties</h2>
 <p>The <b>Qt Properties</b> panel provides project-level settings for Qt projects. Qmake will be invoked whenever the <span class="code">.pro</span> file changes so that the <span class="code">bld.inf </span>and <span class="code">.mmp</span> file will always be in sync.</p>
 <p align="center"><img src="images/qt_project_properties.png" width="682" height="544"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Qt Development Setup</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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 <strong>Nokia Qt SDK 1.0</strong> in order to develop Qt applications with Carbide. These steps include:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Wed Aug 11 11:52:30 2010 -0500
@@ -7,11 +7,11 @@
    <h2>INF Editor - Overview Tab</h2>
    
    <p>
-   The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's .INF file. You can view the .inf file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
+   The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's <span class="code">.INF</span> file. You can view the <span class="code">.INF</span> file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
 <p>
 	  The INF Editor is shown when an INF  file is
    opened from the <a href="view_proj_explorer.htm">Project Explorer</a> view or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
-   <p align="center"><img src="images/inf_editor_overview.png" width="656" height="563" /></p>
+   <p align="center"><img src="images/inf_editor_overview.png" width="727" height="626" /></p>
    <p align="left" class="figure">Figure 1 - INF Editor</p>
    <p></p>
    <table cellpadding="2" cellspacing="0"
@@ -22,14 +22,14 @@
 			 <p>
 				Add components such as MMP and make files to be part of the normal build process.</p>
 			 <ul>
-			   <li>Create New MMP File - creates a new  MMP file at the bottom of the Component list.</li>
-			   <li>Add Existing MMP File - imports a MMP file at the bottom of the Component list.</li>
-			   <li>Add Existing Makefile - adds a make file to the bottom of the Component list. </li>
-			   <li>Edit - Select a component and click Edit to apply the Tidy attribute or specify the Build as ARM option.</li>
-			   <li>Open - Select a component and click Open to open the component in an editor window.</li>
-			   <li>Up - Select a component and click Up to move the component up in the list.</li>
-			   <li>Down - Select a component and click Down to move the component down in the list.</li>
-			   <li>Remove - Select a component and click Remove to remove the component from the build process.</li>
+			   <li><a href="NewMMP_wizard.html">Create New MMP File</a> - creates a new  MMP file at the bottom of the Component list.</li>
+			   <li><a href="INF_Editor_addedit_mmp.html">Add Existing MMP File</a> - imports a MMP file at the bottom of the Component list.</li>
+			   <li><a href="INF_Editor_addedit_make.html">Add Existing Makefile</a> - adds a smake file to the bottom of the Component list. </li>
+			   <li><a href="INF_Editor_addedit_mmp.html">Edit</a> - Select a component and click Edit to apply the Tidy attribute or specify the Build as ARM option.</li>
+			   <li><a href="INF_Editor_file.html">Open</a> - Select a component and click Open to open the component in an editor window.</li>
+			   <li><strong>Up</strong> - Select a component and click Up to move the component up in the list.</li>
+			   <li><strong>Down</strong> - Select a component and click Down to move the component down in the list.</li>
+			   <li><strong>Remove</strong> - Select a component and click Remove to remove the component from the build process.</li>
 			 </ul></td></tr><tr valign="top"><td class="Cell">
 			 <p>
 				<b>Test Components</b> 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_make.html	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_make.html	Wed Aug 11 11:52:30 2010 -0500
@@ -1,47 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>INF Editor - Create/Edit Make</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>INF Editor - Create / Edit Makefile Entry</h2>
-   
-   <p align="left">The <b>Add Makefile entry</b> dialog (figure 1) is used to add a makefile to the build process. Enter or browse to the make file in the File path field and, if desired, apply the Tidy attribute or specify the Build as ARM option to the make file. </p>
-   <p align="center"><img src="images/inf_editor_addMake.png" width="600" height="210" /></p>
-	 <p align="left" class="figure">Figure 1 - Add/Edit makefile entry</p>
-	 <h5>Table 1. Add/Edit Makefile entry &mdash; items</h5>
-	 <table width="796"
-border="0" cellpadding="2" cellspacing="0">
-       <tr valign="top">
-         <th width="186" class="Cell">Name</th>
-         <th width="600" class="Cell">Function</th>
-       </tr>
-	   <tr valign="top">
-	     <td class="Cell"><p> <b>File path</b></p></td>
-	     <td class="Cell"><p>Type the path and filename for the makefile to create or click Browse to set a path.</p>         </td>
-       </tr>
-	   <tr valign="top">
-	     <td class="Cell"><p><b>Tidy</b> </p></td>
-	     <td class="Cell"><p>Specify the tidy attribute if the release that an .mmp file defines is internal to your component and not required by other components or for your component to execute.</p></td>
-       </tr>
-	   <tr valign="top">
-	     <td class="Cell"><b>Build as ARM</b></td>
-	     <td class="Cell">Specifies the <span class="code">build_as_arm</span> statement, which instructs an ARMV5 build to build the project for the ARM instruction set and not the THUMB instruction set.</td>
-       </tr>
-	   <tr valign="top">
-	     <td class="Cell"><b>Makefile format</b></td>
-	     <td class="Cell">Set the format of the makefile to be created.</td>
-       </tr>
-     </table>
-	 <h5>Other references</h5>
-	 <ul>
-      <li><a href="INF_Editor.html">INF Editor</a></li>
-      <li><a href="INF_Editor_exports.html">INF Editor - Exports</a></li>
-    </ul>
-  
-   
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head>
+<title>INF Editor - Create/Edit Make</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>INF Editor - Create / Edit Makefile Entry</h2>
+   
+   <p align="left">The <b>Add Makefile entry</b> dialog (figure 1) is used to add a makefile to the build process. Enter or browse to the make file in the File path field and, if desired, apply the Tidy attribute or specify the Build as ARM option to the make file. </p>
+   <p align="center"><img src="images/inf_editor_addMake.png" width="600" height="210" /></p>
+	 <p align="left" class="figure">Figure 1 - Add/Edit makefile entry</p>
+	 <h5>Table 1. Add/Edit Makefile entry &mdash; items</h5>
+	 <table width="796"
+border="0" cellpadding="2" cellspacing="0">
+       <tr valign="top">
+         <th width="186" class="Cell">Name</th>
+         <th width="600" class="Cell">Function</th>
+       </tr>
+	   <tr valign="top">
+	     <td class="Cell"><p> <b>File path</b></p></td>
+	     <td class="Cell"><p>Type the path and filename for the makefile to create or click <strong>Browse</strong> to set a path.</p>         </td>
+       </tr>
+	   <tr valign="top">
+	     <td class="Cell"><p><b>Tidy</b> </p></td>
+	     <td class="Cell"><p>Specify the tidy attribute if the release that an <span class="code">.mmp</span> file defines is internal to your component and not required by other components or for your component to execute.</p></td>
+       </tr>
+	   <tr valign="top">
+	     <td class="Cell"><b>Build as ARM</b></td>
+	     <td class="Cell">Specifies the <span class="code">build_as_arm</span> statement, which instructs an ARMV5 or later build to build the project for the ARM instruction set and not the THUMB instruction set.</td>
+       </tr>
+	   <tr valign="top">
+	     <td class="Cell"><b>Makefile format</b></td>
+	     <td class="Cell">Set the format of the makefile to be created.</td>
+       </tr>
+     </table>
+	 <h5>Other references</h5>
+	 <ul>
+      <li><a href="INF_Editor.html">INF Editor</a></li>
+      <li><a href="INF_Editor_exports.html">INF Editor - Exports</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>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_mmp.html	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_mmp.html	Wed Aug 11 11:52:30 2010 -0500
@@ -1,43 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>INF Editor - Add/Edit MMP</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>INF Editor - Add / Edit MMP File Entry</h2>
-   
-      The <b>Add MMP file entry</b> dialog (figure 1) is used to add a mmp file and, if desired, apply the Tidy attribute or specify the Build as ARM option to the mmp file. 
-     <p align="center"><img src="images/inf_editor_addMMP.png" width="600" height="180" /></p>
-   <p align="left" class="figure">Figure 1 - Add MMP File Entry</p>
-	 <h5>Table 1. Add MMP file entry &mdash; items</h5>
-	 <table width="796"
-border="0" cellpadding="2" cellspacing="0">
-       <tr valign="top">
-         <th width="186" class="Cell">Name</th>
-         <th width="600" class="Cell">Function</th>
-       </tr>
-       <tr valign="top">
-         <td class="Cell"><p> <b>File path</b></p></td>
-         <td class="Cell"><p>Type the path and filename for the MMP file to create or click Browse to set a path.</p></td>
-       </tr>
-       <tr valign="top">
-         <td class="Cell"><p><b>Tidy</b> </p></td>
-         <td class="Cell"><p>Specify the tidy attribute if the release that an .mmp file defines is internal to your component and  not required by other components or for your component to execute.</p></td>
-       </tr>
-       <tr valign="top">
-         <td class="Cell"><b>Build as ARM</b></td>
-         <td class="Cell">Specifies the <span class="code">build_as_arm</span> statement, which instructs an ARMV5 build to  build the project for the ARM instruction set and not the THUMB instruction set.</td>
-       </tr>
-     </table>
-   <h5>Other references</h5>
-	 <ul>
-      <li><a href="INF_Editor.html">INF Editor</a> </li>
-      <li><a href="INF_Editor_exports.html">INF Editor - Exports</a></li>
-    </ul>
-  
-   
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head>
+<title>INF Editor - Add/Edit MMP</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>INF Editor - Add / Edit MMP File Entry</h2>
+   
+      The <b>Add MMP File Entry</b> dialog (figure 1) is used to add a mmp file and apply the Tidy, Manual, and Support attributes. 
+      <p align="center"><img src="images/inf_editor_addMMP.png" width="600" height="200" /></p>
+   <p align="left" class="figure">Figure 1 - Add MMP File Entry</p>
+	 <h5>Table 1. Add MMP file entry &mdash; items</h5>
+	 <table width="796"
+border="0" cellpadding="2" cellspacing="0">
+       <tr valign="top">
+         <th width="186" class="Cell">Name</th>
+         <th width="600" class="Cell">Function</th>
+       </tr>
+       <tr valign="top">
+         <td class="Cell"><p> <b>File path</b></p></td>
+         <td class="Cell"><p>Type the path and filename for the MMP file to create or click Browse to set a path.</p></td>
+       </tr>
+       <tr valign="top">
+         <td class="Cell"><p><b>Tidy</b> </p></td>
+         <td class="Cell"><p>Specify the tidy attribute if the release that an .mmp file defines is internal to your component and  not required by other components or for your component to execute.</p></td>
+       </tr>
+       <tr valign="top">
+           <td class="Cell"><strong>Manual</strong></td>
+           <td class="Cell">Checkmark to indicate a test that requires manual interaction to complete.</td>
+       </tr>
+       <tr valign="top">
+           <td class="Cell"><strong>Support</strong></td>
+           <td class="Cell">Checkmark to not include the test in a batch file.</td>
+       </tr>
+     </table>
+   <h5>Other references</h5>
+	 <ul>
+      <li><a href="INF_Editor.html">INF Editor</a> </li>
+      <li><a href="INF_Editor_exports.html">INF Editor - Exports</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>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Wed Aug 11 11:52:30 2010 -0500
@@ -9,7 +9,7 @@
 <h2>Symbian OS SDKs</h2>
 </div>
 <div class="Bodytext">
-<p> You can set the SDKs and Build Configurations in this page. The available SDKs shown are determined by the settings in the <a href="pref_carb_sdk_preferencea.html">SDK Preferences</a> page. </p>
+<p> You can set the SDKs and Build Configurations in this page. The available SDKs shown are determined by the settings in the <a href="pref_carb_sdk_preference.html">SDK Preferences</a> page. </p>
 <div class="Figure">
 <p align="center" class="Image"><img src="../images/step4.png" width="500" height="500"><br>
 </p>
@@ -53,7 +53,7 @@
   <h5>Related references</h5>
   <ul>
 <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
-<li><a href="pref_carb_sdk_preferencea.html">SDK Preferences</a></li>
+<li><a href="pref_carb_sdk_preference.html">SDK Preferences</a></li>
   </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <title>Arguments page</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Arguments page </h2>
 <p>  The <b>Arguments </b> pane allows you to add arguments to  the <span class="code">bldmake</span> and <span class="code">abld</span> processes for the project. Carbide passes the arguments entered here to the command line tools during the build process. By default, the majority of  arguments are left blank. </p>
 <p class="note"><b>NOTE</b> Always refer to the <a href="http://developer.symbian.com/main/oslibrary/osdocs/index.jsp">Symbian Developer Library</a> to learn which arguments are supported by the project's SDK. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <title>Environment Variables</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Environment Variables</h2>
 <p>  The <b>Environment Variables </b> pane allows you to view the current User and System environment variables that will be used  when any abld command is invoked. User variables are modified or added when a process is invoked. Read only system variables  are listed. Variables and values in bold  are items that have been modified from their default values.</p>
 <p>Some variables have special meaning, including:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <title>Paths and Symbols </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Paths and Symbols </h2>
 <p>  The <b>Paths and Symbols  </b> pane shows the paths and symbols used to the build the project index. This is a read-only list based on the setting of the <b>Build configuration for the indexer</b> option in the <b>C/C++ General</b> &gt; <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_prop_general_idx.htm">Indexer</a> panel. Carbide now caches the paths and symbols which persist between debug sessions. If any of the files like bld.inf, MMP, or any of their <span class="code">include</span> files change, the list is automatically recalculated and CDT notified. </p>
 <p>To change what appears in the list:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sbsv2.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sbsv2.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <title>SBSv2 page</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>SBSv2 page </h2>
 <p>  The <b>SBSv2 </b> pane allows you to define which build configuration variant to use when building a project. This tab is only visible for SBSv2 projects. The possible variants are listed in the <span class="code">variant_configs.xml</span> file.</p>
 <p class="note"><b>WARNING</b>	The project's MMP file must include the <span class="code">FEATUREVARIANT</span> settings.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>SIS Builder</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>SIS Builder </h2>
 <p>The<b> SIS Builder</b> pane is used to specify one or more .PKG  and .SIS file options to create  application and patch .SIS files. These settings apply to the currently selected Configuration. </p>
 <p>The SIS Builder list includes these columns:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>PKG File Settings</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Set PKG File for  Build Configuration</h2>
 <p>The <b>Set PKG File for  Build Configuration</b> dialog appears when an <strong>Application TRK</strong> build configuration does not include a PKG file. Use it to assign a PKG file to the project's current build configuration that will be used to create a project's SIS installation file. If you define a launch configuration used for on-device debugging with the TRK debug agent, you will need to specify a PKG file for the project. A PKG file primarily provides a list of program and resource files to install on the device.</p>
 <p align="center"><img src="../images/set_pkg.png" width="544" height="359" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_build_config.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_build_config.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <title>Build Configurations</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Build Configurations </h2>
 <p>Use the <b> Build Configurations</b> panel to specify the project's <a href="../../concepts/build_configurations.htm">active build configuration</a> and its related build properties.  </p>
 <p align="center"><img src="../images/carbide_build_config.png" width="786" height="693" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_macro_settings.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_macro_settings.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Macro Settings</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2> Macro Settings</h2>
 <p>  The <b> Macro Settings</b> properties page allows you to specify a file containing macros that CDT  uses to parse the source code. </p>
 <p align="center"><img src="../images/carbide_macro_settings.png" width="786" height="476"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_project_settings.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/prop_carb_project_settings.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -12,7 +12,7 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Project Settings</h2>
 <p>  Use the <b>Project Settings </b>window to specify whether all components or selected subcomponents listed in a build information file (bld.inf) should be built for the currently selected project. You can also specify whether to perform a <span class="code">clean</span> or <span class="code">reallyclean</span> command on the project before building a project.</p>
 <p align="center"><img src="../images/carbide_proj_settings.png" width="672" height="679" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/wnd_sis_properties.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>SIS Properties </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>SIS Properties </h2>
 <p> Use the<b> SIS Properties</b> dialog to specify SIS file creation and signing options for the selected SIS file included in the project. </p>
 <p align="center"><img src="../images/wnd_sis_properties.png" width="455" height="452" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/debugger_settings.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/debugger_settings.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debugger Settings</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debugger Settings</h2>
 <p>The Carbide.c++ debugger settings include:</p>
 <ul>
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/inf_editor_addMMP.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/inf_editor_addMake.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/inf_editor_overview.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_symbian_sdks.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_ad_sdk.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configuration_filter.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configuration_filter.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Launch Configuration Filtering</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Launch Configuration Filtering </h2>
 <p>Use the  <b>Launch Configuration </b> preference panel to  filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> window. This allows you to manage which configuration types are shown. By default, all launch configurations are shown. To open click the <strong>Windows &gt; Preferences &gt; Run/Debug &gt; Launching &gt; Launch Configurations</strong> option.</p>
 <p>To hide specific launch configurations, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that should be hidden in the <b>Run</b> and <b>Debug</b> dialogs. As shown in Figure 1, all the configurations  checked and won't appear in the configurations list, including Snapshot Albums. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/memory_rendering_options.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/memory_rendering_options.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Memory Rendering Options</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Memory Rendering Options</h2>
 <p>You can configure the <strong>Memory Rendering</strong> pane to display data in the memory location in a variety of ways. The following options are visible on the context menu for the Memory Rendering pane. </p>
 <p>Right-click to select an option shown in Table 1. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <title>ABLD Actions</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>ABLD Actions </h2>
 <p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under  <b>Symbian Build &gt; ABLD</b> or by right-clicking a project or file in the <a href="../view_proj_explorer.htm">Project Explorer</a>, <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a>, and <a href="../view_disassembly.htm">Disassembly</a> views and choosing <b>ABLD &gt; <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
 <p align="center"><img src="../images/menu_symb_abld.png" width="890" height="204"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Build All Configurations</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Build All Configurations </h2>
 <p>Select a project in the  <a href="../view_proj_explorer.htm">Project Explorer</a>  or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Build Package File</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Build Package (.pkg) File</h2>
 <p>Select a <span class="code">.PKG</span> file in a project&prime;s <em>/sis</em> folder in the <a href="../view_proj_explorer.htm">Project Explorer</a> view and right-click to display the context menu. Select <b>Symbian Build &gt; Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The <a href="../view_console.htm">Console</a> view displays the processing output.  The .sis and .sisx files will appear in the project's <em>/sis</em> folder.</p>
 <p align="center"><img src="../images/build_pkg_file.png" width="543" height="117" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -6,7 +6,7 @@
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Build Symbian Component</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Build Symbian Component </h2>
 <p>Select a .mmp or .mk  file in the <a href="../view_proj_explorer.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then right-click and select<b> Symbian Build &gt; Build Symbian Component</b> (<span class="code">CTRL+ALT+P</span>) to build the selected component file or makefile. You can also right-click the file in an editor view to use the same option. </p>
 <p align="center"><img src="../images/build_symbian_comp.png" width="580" height="197" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Clean Symbian Component</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Clean Symbian Component </h2>
 <p>You can select a MMP or MK  file in the <a href="../view_proj_explorer.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view and right-click to select <b>Symbian Build &gt; Clean Symbian Component</b> (<span class="code">CTRL+ALT+X</span>) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to use the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
 <p align="center"><img src="../images/clean_symbian_comp.png" width="580" height="200" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Compile</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Compile</h2>
 <p>Select a .c, .cpp, or .cia source file in the <a href="../view_proj_explorer.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, right-click the file and choose <b> Symbian Build &gt; Compile</b> (<span class="code">CTRL+ALT+C</span>) to compile it. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The build progress is displayed in the Console view.</p>
 <p align="center"><img src="../images/menu_symb_compile.png" alt="Compile source" width="580" height="231"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Freeze Exports </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Freeze Exports </h2>
 <p>Right-click  a project in the <a href="../view_proj_explorer.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Symbian Build &gt; Freeze Exports</b>. This command calls the appropriate <b>abld</b> command  and a .def file is generated. This  enables released versions of DLLs to freeze their exports, ensuring backward compatibility of a library.</p>
 <p align="center"><img src="../images/menu_symb_freeze_exports.png" width="543" height="115"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Freeze Symbian Component</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Freeze Symbian Component </h2>
 <p>Right-click  a Symbian OS MMP file in the <a href="../view_proj_explorer.htm">Project Explorer</a>, or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Symbian Build &gt; Freeze Symbian  Component</b> (<span class="code">CTRL+ALT+F</span>). You can also right-click the file in an editor view to use the same option. This command only freezes the selected MMP file and not the entire project.</p>
 <p align="center"><img src="../images/menu_symb_freeze_comp.png" width="580" height="201"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/hardware_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/hardware_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Toggle HW Breakpoint </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Toggle HW Breakpoint </h2>
 <p>Use the <b>Toggle HW Breakpoint</b> command  in stop-mode debugging to set or unset a hardware breakpoint on a device that supports hardware breakpoints. The debugger treats hardware breakpoints  exactly like software breakpoints for purposes of debugging. If the device does not support hardware breakpoints, toggling the command will do nothing. </p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide Menu Items </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Carbide Menus </h2>
 <p>Carbide has several menu options unique to developing Symbian OS applications and other shortcuts. Most project related commands are grouped under the Symbian Build option in context menus, while others appear under specific menus like Run or Project. </p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_cmd_window.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_cmd_window.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Open Command Window</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Open Command Window</h2>
 <p>Launches a Microsoft Windows <b>Command Prompt </b>  window set to the chosen project or file's directory. </p>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Show in Explorer</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Show in Explorer</h2>
 <p>Launches a Microsoft Windows <b>Explorer</b> window that shows the chosen project or file directory and its location on the hard disk.</p>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Preprocess</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Preprocess</h2>
 <p>Right-click to select a .c, .cpp, or .cia source file in the <a href="../view_proj_explorer.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view,  and choose <b> Symbian Build &gt; Preprocess </b>  to preprocess the file. You define the preprocess command in the <a href="../pref_carb_preprocess.htm">Preprocess preference panel</a>. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The preprocess progress is displayed in the <a href="../view_console.htm">Console</a> view.</p>
 <p align="center"><img src="../images/menu_symb_preprocess.png" alt="Preprocess menu option" width="580" height="202"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/panel_debug_exceptions.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/panel_debug_exceptions.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>x86 Exceptions Pane</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>x86 Exceptions Pane </h2>
 <p>  The <b>Debug</b> or launch configuration windows <b>x86 Exceptions</b> pane lists all the exceptions that the debugger is able to catch. If you want the debugger to catch all the exceptions, enable all of the options in this view. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you prefer to handle.</p>
 <p align="center"><img src="images/panel_debug_x86_exceptions.png" width="627" height="270" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debug perspective</h2>
 <p>The Carbide.c++ <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.debug.ui.DebugPerspective)")'>
 Debug</a> perspective is where you debug programs running on an emulator or  a target device. The default views include:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_build.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_build.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -13,7 +13,7 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Build preferences</h2>
 <p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage)")'> Build
 </a> page in the <b>Preferences</b> window provides global preferences to control general build options like clean, test components, dependency tracking, concurrent build jobs, build behavior, and emulator options.</p>
@@ -101,8 +101,8 @@
   <tr>
     <td><b>Clean level </b></td>
     <td>Select the level of clean when cleaning a project.
-      <p><strong>abld clean</strong> erases all files created by a corresponding abld target   command (all intermediate files created during compilation and all executables and import libraries created by the linker) </p>
-      <p><strong>abld reallyclean</strong> does what abld clean does, and also removes files   exported by abld export and makefiles generated by abld makefile, or the abld   test equivalents</p></td>
+      <p><strong>sbs clean</strong> erases all files created by a corresponding sbs target   command (all intermediate files created during compilation and all executables and import libraries created by the linker) </p>
+      <p><strong>sbs reallyclean</strong> does what sbs clean does, and also removes files   exported by sbs export and makefiles generated by sbs makefile, or the sbs   test equivalents</p></td>
   </tr>
   <tr>
     <td><b>Keep going </b></td>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_cpp.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_cpp.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Carbide.c++ preferences</h2>
 <p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.project.ui.preferences.CarbidePreferencePage)")'>
 Carbide.c++</a> panel in the <b>Preferences</b> window provides an option to keep your projects updated when you add or create files. Figure&nbsp;1 shows the Carbide.c++ preference panel.</p>
@@ -54,7 +54,7 @@
 <h5>Related references</h5>
 <ul>
   <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
-  <li><a href="pref_carb_sdk_preferencea.html">SDK Preferences</a></li>
+  <li><a href="pref_carb_sdk_preference.html">SDK Preferences</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_debugger.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_debugger.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Carbide.c++ Debugger preferences</h2>
 <p>The <b>Debug</b> &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.cdt.debug.cw.symbian.ui.GlobalSettings)")'>
 Carbide.c++ Debugger</a> preference panel provides global debugger settings for the Carbide.c++ tools. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_diagnostic_logs.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_diagnostic_logs.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Diagnostic Logs  preferences</h2>
 <p>The <b>Diagnostic Logs</b> page in the <b>Preferences</b> window provides the ability to activate and save debugger log files in the project. When activated, the debugger generates an XML file containing useful debugger event information that can facilitate the locating and erradication of bugs in a project. </p>
 <p class="note"><b>NOTE</b> When logging is activated the performance of the debugger will be reduced as the log information is generated. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_preprocess.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_preprocess.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Preprocess preferences</h2>
 <p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.builder.utils.ui.PreprocessPreferencePage)")'> Preprocess</a> page in the <b>Preferences</b> window provides global settings for the Carbide preprocessor. </p>
 <p align="center"><img src="images/prefs_preprocess.png" width="645" height="551" /></p>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_sdk_preference.html	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,74 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>SDK Preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<style type="text/css">
+<!--
+.style2 {
+	color: #FF0000;
+	font-weight: bold;
+}
+.style3 {color: #EE0000}
+-->
+</style>
+</head>
+   <body>
+   <div class="Head1">
+<h2>SDK Preferences (<span class="style3">deprecated</span>)</h2>
+</div>
+Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)")'>
+SDK Preferences</a> page in the <b>Preferences</b> window to control which installed SDKs are available to projects during an import.  To
+	 access SDK preferences preference panel, select <b>Window &gt; Preferences &gt; Carbide.c++ &gt; SDK Preferences</b>. 
+	 <p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project.  If the SDK you have installed is not recognized, you may still be able to add it to the Discovered Symbian OS SDK list. See <a href="../tasks/start/carbide_requirements.htm">Carbide.c++ Requirements</a> for a list of supported SDKs. </p>
+   <p class="note"><b>NOTE</b> This panel serves as a <span class="code">devices.xml</span> file editor. The <span class="code">devices.xml</span> file stores information about the installed SDKs used for Symbian OS development.</p>
+   <div class="Figure">
+
+	  <p align="center" class="Image"><img src="../images/SDKPreferences.png" width="696" height="583" alt="SDK preferences panel" /></p>
+     <p align="center" class="figure">Figure 1. SDK Preferences preference panel </p>
+   </div>
+   <table cellpadding="2" cellspacing="0"
+border="0">
+	 <tr valign="top"><th width="221" class="Cell">Name</th><th width="584" class="Cell">Function</th></tr>
+         <tr valign="top">
+           <td class="Cell"><b>Available Symbian OS SDK's</b></td>
+           <td class="Cell"><p>Lists all the installed and recognized SDKs supported by the IDE. Only SDKs supported by the IDE are included in the list. </p>
+             <p>Checked SDKs indicate build configurations available for creating projects. Unchecked SDKs are not displayed when creating new projects. </p>
+             <p>SDKs shown in <span class="style2">red</span>  indicate  a problem, usually no <span class="code">EPOCROOT</span> or missing build configurations. </p>
+           <p>Click on a SDK name to see its EPOCROOT location and build configuration status in the SDK Information area. </p></td>
+        </tr>
+         <tr valign="top">
+           <td class="Cell"><b>Remove SDK </b></td>
+           <td class="Cell">Click to remove the selected SDK from the Available Symbian OS SDK's list. </td>
+         </tr>
+         <tr valign="top">
+           <td class="Cell"><b>Add New SDK </b></td>
+           <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_add.htm">add</a> an SDK to the <b>Available Symbian OS SDKs</b> list.</p>           </td>
+     </tr>
+         <tr valign="top">
+           <td class="Cell"><b>SDK Properties</b></td>
+           <td class="Cell"><p>Click to view and edit the <a href="../tasks/sdks/sdk_view_properties.htm">properties</a> of the currently selected SDK in the <b>Available Symbian OS SDKs</b> list.</p>           </td>
+     </tr>
+         <tr valign="top">
+           <td class="Cell"><b>Listen for devices.xml changes outside of Carbide </b></td>
+           <td class="Cell">Enable of have  Carbide  issue an alert prompting you to rescan your SDKs when changes to the <span class="code">devices.xml</span> file are made outside of  Carbide. When disabled the <span class="code">devices.xml</span> file is not scanned for changes. </td>
+         </tr>
+         <tr valign="top">
+           <td class="Cell"><p><b>Rescan All SDKs</b></p>           </td>
+           <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_search.htm">rescan</a>  the drive  for newly installed SDKs. The devices.xml file is scanned for SDKs and the list of available SDKs is updated if the devices.xml file has changed.</p>
+             <p class="note"><b>NOTE</b> Carbide.c++ scans for available SDKs each time it is started.</p></td>
+        </tr>
+   </table>
+   <h5>Related tasks</h5>
+	 <ul>
+       
+       <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
+       <li><a href="../tasks/sdks/sdk_add.htm">Adding an SDK</a></li>
+       <li><a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</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>
+   
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_sdk_preferencea.html	Wed Aug 11 11:18:20 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>SDK Preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-<style type="text/css">
-<!--
-.style2 {
-	color: #FF0000;
-	font-weight: bold;
-}
--->
-</style>
-</head>
-   <body>
-   <div class="Head1">
-<h2>SDK Preferences</h2>
-</div>
-Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)")'>
-SDK Preferences</a> page in the <b>Preferences</b> window to control which installed SDKs are available to projects during an import.  To
-	 access SDK preferences preference panel, select <b>Window &gt; Preferences &gt; Carbide.c++ &gt; SDK Preferences</b>. 
-	 <p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project.  If the SDK you have installed is not recognized, you may still be able to add it to the Discovered Symbian OS SDK list. See <a href="../tasks/start/carbide_requirements.htm">Carbide.c++ Requirements</a> for a list of supported SDKs. </p>
-   <p class="note"><b>NOTE</b> This panel serves as a <span class="code">devices.xml</span> file editor. The <span class="code">devices.xml</span> file stores information about the installed SDKs used for Symbian OS development.</p>
-   <div class="Figure">
-
-	  <p align="center" class="Image"><img src="../images/SDKPreferences.png" width="696" height="583" alt="SDK preferences panel" /></p>
-     <p align="center" class="figure">Figure 1. SDK Preferences preference panel </p>
-   </div>
-   <table cellpadding="2" cellspacing="0"
-border="0">
-	 <tr valign="top"><th width="221" class="Cell">Name</th><th width="584" class="Cell">Function</th></tr>
-         <tr valign="top">
-           <td class="Cell"><b>Available Symbian OS SDK's</b></td>
-           <td class="Cell"><p>Lists all the installed and recognized SDKs supported by the IDE. Only SDKs supported by the IDE are included in the list. </p>
-             <p>Checked SDKs indicate build configurations available for creating projects. Unchecked SDKs are not displayed when creating new projects. </p>
-             <p>SDKs shown in <span class="style2">red</span>  indicate  a problem, usually no <span class="code">EPOCROOT</span> or missing build configurations. </p>
-           <p>Click on a SDK name to see its EPOCROOT location and build configuration status in the SDK Information area. </p></td>
-        </tr>
-         <tr valign="top">
-           <td class="Cell"><b>Remove SDK </b></td>
-           <td class="Cell">Click to remove the selected SDK from the Available Symbian OS SDK's list. </td>
-         </tr>
-         <tr valign="top">
-           <td class="Cell"><b>Add New SDK </b></td>
-           <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_add.htm">add</a> an SDK to the <b>Available Symbian OS SDKs</b> list.</p>           </td>
-     </tr>
-         <tr valign="top">
-           <td class="Cell"><b>SDK Properties</b></td>
-           <td class="Cell"><p>Click to view and edit the <a href="../tasks/sdks/sdk_view_properties.htm">properties</a> of the currently selected SDK in the <b>Available Symbian OS SDKs</b> list.</p>           </td>
-     </tr>
-         <tr valign="top">
-           <td class="Cell"><b>Listen for devices.xml changes outside of Carbide </b></td>
-           <td class="Cell">Enable of have  Carbide  issue an alert prompting you to rescan your SDKs when changes to the <span class="code">devices.xml</span> file are made outside of  Carbide. When disabled the <span class="code">devices.xml</span> file is not scanned for changes. </td>
-         </tr>
-         <tr valign="top">
-           <td class="Cell"><p><b>Rescan All SDKs</b></p>           </td>
-           <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_search.htm">rescan</a>  the drive  for newly installed SDKs. The devices.xml file is scanned for SDKs and the list of available SDKs is updated if the devices.xml file has changed.</p>
-             <p class="note"><b>NOTE</b> Carbide.c++ scans for available SDKs each time it is started.</p></td>
-        </tr>
-   </table>
-   <h5>Related tasks</h5>
-	 <ul>
-       
-       <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
-       <li><a href="../tasks/AddinganSDK.html">Adding an SDK</a></li>
-       <li><a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</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>
-   
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_symbian_sdk.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>Symbian SDK</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<style type="text/css">
+<!--
+.style2 {
+	color: #FF0000;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+   <body>
+<h2>Symbian SDKs</h2>
+Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)")'>
+Symbian SDK</a> page in the <b>Preferences</b> window to control which installed SDKs are available to projects during an import.  To
+	 access SDK preferences preference panel, select <b>Window &gt; Preferences &gt; Carbide.c++ &gt; Symbian SDKs</b>. 
+   <p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project.  If the SDK you have installed is not recognized, you may still be able to add it to the Discovered Symbian OS SDK list. See <a href="../tasks/start/carbide_requirements.htm">Carbide.c++ Requirements</a> for a list of supported SDKs. </p>
+   <p class="note"><b>NOTE</b> This panel serves as a <span class="code">devices.xml</span> file editor. The <span class="code">devices.xml</span> file stores information about the installed SDKs used for Symbian OS development.</p>
+
+	  <p align="center" class="Image"><img src="images/prefs_symbian_sdks.png" alt="Symbian SDKs preference panel" width="719" height="525"></p>
+     <p align="center" class="figure">Figure 1. Symbian SDKs preference panel </p>
+   <table width="800" border="0" cellpadding="2" cellspacing="0">
+   <tr valign="top"><th width="221" class="Cell">Name</th><th width="584" class="Cell">Function</th></tr>
+         <tr valign="top">
+           <td class="Cell"><b>Symbian SDK's</b></td>
+           <td class="Cell"><p>Lists all the installed and recognized SDKs supported by the IDE. Only SDKs supported by the IDE are included in the list. </p>
+             <p>Checked SDKs indicate build configurations available for creating projects. Unchecked SDKs are not displayed when creating new projects. </p>
+             <p>SDKs shown in <span class="style2">red</span>  indicate  a problem, usually no <span class="code">EPOCROOT</span> or missing build configurations. </p>
+           <p>Click on a SDK name to see its EPOCROOT location and build configuration status in the SDK Information area. </p></td>
+        </tr>
+         <tr valign="top">
+             <td class="Cell"><b>Add </b></td>
+             <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_add.htm">add</a> an SDK to the <b>Available Symbian OS SDKs</b> list.</p></td>
+         </tr>
+         <tr valign="top">
+           <td class="Cell"><b>Delete </b></td>
+           <td class="Cell">Click to remove the selected SDK from the Available Symbian OS SDK's list. </td>
+         </tr>
+         <tr valign="top">
+           <td class="Cell"><b>Properties</b></td>
+           <td class="Cell"><p>Click to view and edit the <a href="../tasks/sdks/sdk_view_properties.htm">properties</a> of the currently selected SDK in the <b>Available Symbian OS SDKs</b> list.</p>           </td>
+     </tr>
+         <tr valign="top">
+           <td class="Cell"><p><b>Rescan All SDKs</b></p>           </td>
+           <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_search.htm">rescan</a>  the drive  for newly installed SDKs. The devices.xml file is scanned for SDKs and the list of available SDKs is updated if the devices.xml file has changed.</p>
+             <p class="note"><b>NOTE</b> Carbide.c++ scans for available SDKs each time it is started.</p></td>
+        </tr>
+   </table>
+   <h5>Related tasks</h5>
+	 <ul>
+       
+       <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
+       <li><a href="../tasks/sdks/sdk_add.htm">Adding an SDK</a></li>
+       <li><a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</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>
+   
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_x86_exceptions.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_x86_exceptions.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Unsetting Built-in Environment</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Unsetting Built-in Environment</h2>
 <p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand(&quot;org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage)&quot;)'> Build</a> page in the <b>Preferences</b> window provides an option   to use the local x86 build tools for each emulator build. A directory named x86Build at the root of the product installation contains the build tools, libraries, and <span class="code">env_update.exe</span> file.</p>
 <p>Uncheck the &quot;Use built-in Nokia x86 environment variables for WINSCW builds&quot; option if you do not want to use the built-in compiler.</p>
@@ -17,7 +17,7 @@
 <h5>Related references</h5>
 <ul>
   <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
-  <li><a href="pref_carb_sdk_preferencea.html">SDK Preferences</a></li>
+  <li><a href="pref_carb_sdk_preference.html">SDK Preferences</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/reference.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/reference.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Reference</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Reference</h2>
-<p>  This section provides reference information on the Carbide IDE including:</p>
-<ul>
-  <li><a href="debugger_settings.htm">Debugger settings</a> &mdash; shows the Carbide debugger setting panels used to control debug sessions </li>
-  <li><a href="view_expressions.htm">Expression views</a> &mdash; shows how to work with expressions in a debugging session</li>
-  <li><a href="view_variables.htm">Variable views</a> &mdash; shows how to work with variables in a debugging session</li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.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>Reference</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Reference</h2>
+<p>  This section provides reference information on the Carbide IDE including:</p>
+<ul>
+  <li><a href="debugger_settings.htm">Debugger settings</a> &mdash; shows the Carbide debugger setting panels used to control debug sessions </li>
+  <li><a href="view_expressions.htm">Expression views</a> &mdash; shows how to work with expressions in a debugging session</li>
+  <li><a href="view_variables.htm">Variable views</a> &mdash; shows how to work with variables in a debugging session</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/reference/search/pref_system_search.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/search/pref_system_search.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>System Search preferences</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>System Search preferences </h2>
 <p>Use the <b>System Search</b> preference panel to control  System Search behaviors. Choose <b>Window &gt; Preferences &gt; System Search</b> to open  the System Search preference panel. </p>
 <p align="center"><img src="../images/wnd_system_search_prefs.png" width="635" height="554"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/search/view_system_search.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/search/view_system_search.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>System Search view</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>System Search view </h2>
 <p>The <b>System Search</b> view displays the results of a search based on the criteria used in the <a href="wnd_system_search.htm">System Search</a> page. This view (Figure 1) appears automatically when a directory search is performed. You can also open it using the <b>Window &gt; Show View &gt; Other...</b> option where it is found in the Show View dialog under the System Search category. </p>
 <p align="center"><img src="../images/view_system_search.png" width="841" height="223"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/search/wnd_system_search.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/search/wnd_system_search.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>System Search</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>System Search </h2>
 <p>Use the <b>System Search</b> page of the <b>Search</b> window to perform a textual search of files by directory, on   your  hard drive. This enables you to search for files inside directories located outside of the project workspace. In addition, there are additional search choices including:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/exporting_remote_conns.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/exporting_remote_conns.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -9,7 +9,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Exporting Remote Connections</h2>
 <p>You can export remote connection settings for sharing and import  settings created by others using the  Import/Export commands.</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/importing_remote_conns.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/importing_remote_conns.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -9,7 +9,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Importing Remote Connections</h2>
 <p>You can export remote connection settings for sharing and import  settings created by others using the  Import/Export commands.</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Filter Preferences</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2> Launch Configuration Filters</h2>
 <p>The    Launch Configuration Filters Preference window provides additional options for filtering out the launch configurations that appear in the list of configurations.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>TRK Panel Overview</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>TRK Pane Overview</h2>
 <p>When debugging a remote device using TRK, the following panes appear in the launch configuration window: </p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -17,7 +17,7 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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. Remote agents provide support for debugging, profiling, trace, and more. The connection types currently supported include:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,49 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Install Remote Agents pane</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Install Remote Agents</h2>
-<p>Use  the <strong>Install remote agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
-<p align="center"><img src="../images/tab_new_conn_install_agent.png" width="464" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Install remote agents page</p>
-<p>Table 1. Install Remote Agents pane</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 5.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.2.6. </p>
-        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
-  </tr>
-  <tr>
-    <td><strong>Save</strong></td>
-    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
-  </tr>
-  <tr>
-    <td><strong>Install</strong></td>
-    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install remote agents list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
-      <p class="note"><b>NOTE</b> Drivers installed by PC Suite or Ovi Suite are required in order for Install to download a remote agent onto the target device.</p>
-    <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite or Ovi Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
-  </tr>
-</table>
-<p></p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
-  <li><a href="#CONN_SET">Test Connection</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
-  License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Install Remote Agents pane</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body >
+<h2>Install Remote Agents</h2>
+<p>Use  the <strong>Install remote agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
+<p align="center"><img src="../images/tab_new_conn_install_agent.png" width="464" height="554"></p>
+<p class="figure">Figure 2 - New Connection wizard Install remote agents page</p>
+<p>Table 1. Install Remote Agents pane</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Install remote agents</strong></td>
+    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 5.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 3.2.6. </p>
+        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
+  </tr>
+  <tr>
+    <td><strong>Save</strong></td>
+    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
+  </tr>
+  <tr>
+    <td><strong>Install</strong></td>
+    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install remote agents list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
+      <p class="note"><b>NOTE</b> Drivers installed by PC Suite or Ovi Suite are required in order for Install to download a remote agent onto the target device.</p>
+    <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite or Ovi Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
+  </tr>
+</table>
+<p></p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
+  <li><a href="#CONN_SET">Test Connection</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/reference/trk/wnd_new_conn_settings_pane.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_settings_pane.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -9,7 +9,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Install Remote Agents pane</h2>
 <p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
 <p align="center"><img src="../images/tab_new_conn_install_agent.png" alt="" width="464" height="554"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -9,7 +9,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Adding, Editing, and Deleting Connections</h2>
 <p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common remote connection settings.</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -9,7 +9,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Editing connections</h2>
 <p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common remote connection settings.</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,61 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Setup Connection</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setup Connection</h2>
-<p>Use the <b>Edit Connection</b> page to assign a connection type, name, and connection settings to the new connection setup.</p>
-<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
-<p class="figure">Figure 1 - New Connection wizard Setup Connection tab</p>
-<p>Table 1. Setup Connection page - options</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="28%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Connection Type</strong></td>
-    <td><p>Select the type of connection and its supported services from the drop down list of options. The types of connections include:</p>
-      <ul>
-        <li>Bluetooth - serial port connection through Bluetooth</li>
-        <li>Serial - serial port connection through a COM serial port</li>
-        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
-      </ul>
-      <p>And the supported services may include:</p>
-      <ul>
-        <li>TRK</li>
-        <li>Tracing</li>
-        <li>and others</li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><strong>Connection Name</strong></td>
-    <td><p>Enter a name for the connection.</p>    </td>
-  </tr>
-  <tr>
-    <td><strong>Connection Settings</strong></td>
-    <td><p>Shows a list of services supported by the connection type chosen.</p>
-      <ul>
-        <li>Bluetooth - serial port connection through Bluetooth</li>
-        <li>Serial - serial port connection through a COM serial port</li>
-        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
-    </ul></td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="#CONN_SET">Test Connection</a></li>
-  <li><a href="#INSTALL">Install Remote Agents</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Setup Connection</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body >
+<h2>Setup Connection</h2>
+<p>Use the <b>Edit Connection</b> page to assign a connection type, name, and connection settings to the new connection setup.</p>
+<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
+<p class="figure">Figure 1 - New Connection wizard Setup Connection tab</p>
+<p>Table 1. Setup Connection page - options</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="28%" scope="col">Item</th>
+    <th width="59%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Connection Type</strong></td>
+    <td><p>Select the type of connection and its supported services from the drop down list of options. The types of connections include:</p>
+      <ul>
+        <li>Bluetooth - serial port connection through Bluetooth</li>
+        <li>Serial - serial port connection through a COM serial port</li>
+        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
+      </ul>
+      <p>And the supported services may include:</p>
+      <ul>
+        <li>TRK</li>
+        <li>Tracing</li>
+        <li>and others</li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><strong>Connection Name</strong></td>
+    <td><p>Enter a name for the connection.</p>    </td>
+  </tr>
+  <tr>
+    <td><strong>Connection Settings</strong></td>
+    <td><p>Shows a list of services supported by the connection type chosen.</p>
+      <ul>
+        <li>Bluetooth - serial port connection through Bluetooth</li>
+        <li>Serial - serial port connection through a COM serial port</li>
+        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
+    </ul></td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
+  <li><a href="#CONN_SET">Test Connection</a></li>
+  <li><a href="#INSTALL">Install Remote Agents</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/reference/trk/wnd_on_device_check_tab.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,58 +1,58 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Test Connection</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Test Connection</h2>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote service installed on the device with the latest version available for Carbide. A remote service is any software on the device that can communicate with Carbide. This includes TRK, Trace, Performance Investigator, and other services. In this pane you can:</p>
-<ul><li>Set  the device OS used by the device and supported by the remote service</li>
-  <li>Verify that Carbide can communicate with the remote service via the chosen connection setting</li>
-  <li>Verify that you have the latest version of the remote service  installed on the device</li>
-</ul>
-<p>Options presented may differ based on the type of connection setting  chosen.</p>
-<p align="center"><img src="../images/tab_new_conn_test_conn.png" width="464" height="554"></p>
-<p class="figure">Figure 1 - Test Connection  pane in the New Connection dialog </p>
-<h5>Table 1<span class="figure"> Test Connection </span> pane &mdash; items</h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Device OS </strong></td>
-    <td><p>A dropdown list of device OSes that are supported by the TRK debug agent  software. Select the OS used by the device before running a check. </p>    </td>
-  </tr>
-  <tr>
-    <td><strong>Select a service to test</strong></td>
-    <td>Select the remote service type to query on the remote device.</td>
-  </tr>
-  <tr>
-    <td><b>Initiate service testing</b></td>
-    <td><p>Click <b>Initiate service testing</b> to query the  remote 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 when the 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 service version check.</p>
-      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
-      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
-      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
-      <ul>
-        <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
-        <li><strong>Service not responding</strong> - this indicates that the COM port is open but the remote service is not responding. First, verify that remote service is up and running on the device. Second, the remote service may be listening on a different COM port, so choose another named COM port and try again.</li>
-      </ul>      </td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
-  <li><a href="#INSTALL">Install	Remote Agents</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
-  License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Test Connection</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body >
+<h2>Test Connection</h2>
+<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote service installed on the device with the latest version available for Carbide. A remote service is any software on the device that can communicate with Carbide. This includes TRK, Trace, Performance Investigator, and other services. In this pane you can:</p>
+<ul><li>Set  the device OS used by the device and supported by the remote service</li>
+  <li>Verify that Carbide can communicate with the remote service via the chosen connection setting</li>
+  <li>Verify that you have the latest version of the remote service  installed on the device</li>
+</ul>
+<p>Options presented may differ based on the type of connection setting  chosen.</p>
+<p align="center"><img src="../images/tab_new_conn_test_conn.png" width="464" height="554"></p>
+<p class="figure">Figure 1 - Test Connection  pane in the New Connection dialog </p>
+<h5>Table 1<span class="figure"> Test Connection </span> pane &mdash; items</h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><strong>Device OS </strong></td>
+    <td><p>A dropdown list of device OSes that are supported by the TRK debug agent  software. Select the OS used by the device before running a check. </p>    </td>
+  </tr>
+  <tr>
+    <td><strong>Select a service to test</strong></td>
+    <td>Select the remote service type to query on the remote device.</td>
+  </tr>
+  <tr>
+    <td><b>Initiate service testing</b></td>
+    <td><p>Click <b>Initiate service testing</b> to query the  remote 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 when the 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 service version check.</p>
+      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
+      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
+      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
+      <ul>
+        <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
+        <li><strong>Service not responding</strong> - this indicates that the COM port is open but the remote service is not responding. First, verify that remote service is up and running on the device. Second, the remote service may be listening on a different COM port, so choose another named COM port and try again.</li>
+      </ul>      </td>
+  </tr>
+</table>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
+  <li><a href="#INSTALL">Install	Remote Agents</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/reference/trk/wnd_on_device_setup.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>On-Device Connections</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>On-Device Connections </h2>
-<p>Use the <strong>New Connection</strong> wizard to verify and update Carbide software services on a device. Click the <strong>Help &gt; On-Device Connections...</strong> menu option to open. Current services available include TRK, Tracing, and others. The following tabs are present:</p>
-<ul>
-  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a> - define connection type, name and settings</li>
-  <li><a href="#CONN_SET">Test Connection</a> - verify connection operates as intended</li>
-  <li><a href="#INSTALL">Install	Remote Agents</a> - download and install remote agents</li>
-</ul>
-<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
-<p class="figure">Figure 1 - New Connection dialog</p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
-  <li><a href="#CONN_SET">Test Connection</a></li>
-  <li><a href="#INSTALL">Install	Remote Agents</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
-  License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>On-Device Connections</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body >
+<h2>On-Device Connections </h2>
+<p>Use the <strong>New Connection</strong> wizard to verify and update Carbide software services on a device. Click the <strong>Help &gt; On-Device Connections...</strong> menu option to open. Current services available include TRK, Tracing, and others. The following tabs are present:</p>
+<ul>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a> - define connection type, name and settings</li>
+  <li><a href="#CONN_SET">Test Connection</a> - verify connection operates as intended</li>
+  <li><a href="#INSTALL">Install	Remote Agents</a> - download and install remote agents</li>
+</ul>
+<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
+<p class="figure">Figure 1 - New Connection dialog</p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
+  <li><a href="#CONN_SET">Test Connection</a></li>
+  <li><a href="#INSTALL">Install	Remote Agents</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/reference/view_breakpoints.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_breakpoints.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Breakpoints View</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Breakpoints View </h2>
 <p>Use the <b>Breakpoints</b> view to <a href="../tasks/breakpoints/pgm_bp_setting.htm">set</a>, <a href="../tasks/breakpoints/pgm_bp_view_props.htm">examine</a>, <a href="../tasks/breakpoints/pgm_bp_enable.htm">enable</a>,  <a href="../tasks/breakpoints/pgm_bp_disable.htm">disable</a>, and <a href="../tasks/breakpoints/pgm_bp_clearing.htm">remove</a> breakpoints and <a href="../tasks/watchpoints/pgm_watchpoints.htm">watchpoints</a> in one or more <a href="../concepts/build_configurations.htm">build configurations</a>. Table 1  explains items in the view.</p>
 <p align="center"><img src="images/view_breakpoints.png" width="544" height="264" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_portal.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_portal.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide Portal  view</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Carbide Portal  view</h2>
 <p>The <strong>Carbide Portal</strong>  view provides a single point of information on Carbide news, new releases, additional extensions, and support. The<strong> Carbide Portal</strong><strong> </strong>view is shown by clicking <strong>Help &gt; Carbide Portal</strong>.</p>
 <p align="center"><img src="images/view_carbide_portal.png" width="765" height="507"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_console.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_console.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Console View</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Console view </h2>
 <p>  The <b>Console</b> view display<span><span>s the output of a process and allows you to provide keyboard input to a process</span></span>. There are numerous consoles available, see the Open Console dropdown list for those available to you. Most are enabled from various project panels in Carbide. </p>
 <p align="center"><img src="../images/views/view_console_build.png" width="778" height="203" /></p>
@@ -55,7 +55,6 @@
         <li>New Emulation Program Output Console</li>
         <li>New TRK Program Output Console</li>
         <li>New TRK Communications Log Console</li>
-        <li>New Trace32 Communications Log Console</li>
         <li>New Symbian Rom Log Console</li>
         <li>New Emulator Output Console</li>
         <li>CVS</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_disassembly.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -15,7 +15,7 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Disassembly View</h2>
 <p>  When debugging your application, the <b>Disassembly</b> view shows the loaded program as assembler instructions. When you use the Disassembly view, you can do the following tasks:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Executables view</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Executables view </h2>
 <p>  The <b>Executables</b> view provides a dynamic list of executables and their related source files. The Executables view makes it easy to:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Expressions Window</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Expressions View </h2>
 <p>  Use the <b>Expressions</b> view to monitor and manipulate:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_install_extensions.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_install_extensions.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Install Extensions view</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Install Extensions  view</h2>
 <p>The <strong>Install Extensions</strong> view enables the user to locate and install Carbide plug-ins into a core Carbide.c++ installation. The Install Extensions view links to an online site that lists  available plug-ins for installation. Plug-ins are grouped by type for </p>
 <p>The <strong>Install Extensions</strong> view appears as part of the <a href="../concepts/CarbidePerspective.html">C/C++ Perspective</a>. It can be added to a perspective by clicking <strong>Window &gt; Show View &gt; Install Extensions</strong>.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Memory view</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Memory view </h2>
 <p>  Use the <b>Memory</b> view to inspect and change process memory. You can address memory using expressions such as:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_module.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_module.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Modules View</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Modules View</h2>
 <p>The <b>Modules</b> view displays a list of modules loaded while debugging your program. The listed modules can be selected to show related information. You can open the Modules view in the <a href="../concepts/CarbidePerspective.html">Carbide C/C++</a> perspective by selecting <b>Window &gt; Show view &gt; Other...</b>, then expand the Debug folder and select Modules. In the <a href="perspective_debug.htm">Debug</a> perspective select <b>Window &gt; Show view &gt; Modules</b>.</p>
 <p>The Modules view is only loaded during a debug session and closes when the debug session ends. Select the running man icon to list the Type, Symbols, and Symbols file for the executable. Select the stack of books icon to list the Type, Symbols, Symbols file, and Base address for the shared library. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_proj_explorer.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_proj_explorer.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Project Explorer View</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Project Explorer view </h2>
 <p>  The <b>Project Explorer</b> view (Figure 1) display<span><span>s  relevant C/C++ projects located in the current workspace using a tree structure</span></span>. Use this view to manage all the projects located in the current workspace. The view is customizable and takes advantage of working sets. </p>
 <p>The content of a project is dependent upon how it was created in the workspace.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_registers.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_registers.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,63 +1,63 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Registers View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Registers View</h2>
-<p>  The <b>Registers</b> view reveals a hierarchical view of general, FPU, and host-specific registers of the host computer or target device. You can use the Register view to perform these tasks:</p>
-<ul>
-  <li>expand the hierarchical items in the window and <a href="../tasks/registers/mem_reg_viewing.htm">view</a> their contents</li>
-  <li>select and <a href="../tasks/registers/mem_reg_changing.htm">modify</a> register values</li>
-  <li><a href="../tasks/registers/mem_reg_data_views.htm">view</a> documentation for individual registers (depending on the register)</li>
-</ul>
-<p>Figure 1 shows a sample Registers view.</p>
-<p align="center"><img src="images/view_registers.png" width="367" height="370"></p>
-<p class="figure">Figure 1 - Registers View </p>
-<h5>Table 1. <span class="figure">Registers</span> view&mdash;items </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="34%" scope="col">Item</th>
-    <th width="14%" scope="col">Icons</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Show Type Names </b></td>
-    <td><div align="center"><img src="../images/icons/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
-    <td>Toggles the display of type names in the <span class="figure">Registers</span> view. </td>
-  </tr>
-  <tr>
-    <td><b>Show Logical Structure </b></td>
-    <td><div align="center"><img src="../images/icons/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
-    <td>Not available in C/C++ yet. </td>
-  </tr>
-  <tr>
-    <td><b>Collapse All </b></td>
-    <td><div align="center"><img src="../images/icons/var_collapse_all_icon.png" width="17" height="18" /></div></td>
-    <td>Collapses all expanded variables into the top level. </td>
-  </tr>
-</table>
-<p align="left">For more information, see the <b>C/C++ Development User Guide &gt; Reference &gt; Debug View &gt; Registers view</b>. </p>
-<div class="step">
-  <h4>To open a Registers view </h4>
-  <ul>
-    <li>Click Window &gt; Show View &gt; Registers </li>
-    <p>A Registers view appears.</p>
-  </ul>
-</div>
-<h5>Other references </h5>
-<ul>
-  <li><a href="../concepts/registers.htm">Registers</a></li>
-  <li><a href="../concepts/arm_registers.htm">ARM Registers</a></li>
-  <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
-  <li><a href="../tasks/registers/mem_reg_viewing.htm">Viewing Register Values </a></li>
-  <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</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>
+<!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>Registers View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Registers View</h2>
+<p>  The <b>Registers</b> view reveals a hierarchical view of general, FPU, and host-specific registers of the host computer or target device. You can use the Register view to perform these tasks:</p>
+<ul>
+  <li>expand the hierarchical items in the window and <a href="../tasks/registers/mem_reg_viewing.htm">view</a> their contents</li>
+  <li>select and <a href="../tasks/registers/mem_reg_changing.htm">modify</a> register values</li>
+  <li><a href="../tasks/registers/mem_reg_data_views.htm">view</a> documentation for individual registers (depending on the register)</li>
+</ul>
+<p>Figure 1 shows a sample Registers view.</p>
+<p align="center"><img src="images/view_registers.png" width="367" height="370"></p>
+<p class="figure">Figure 1 - Registers View </p>
+<h5>Table 1. <span class="figure">Registers</span> view&mdash;items </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="14%" scope="col">Icons</th>
+    <th width="52%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Show Type Names </b></td>
+    <td><div align="center"><img src="../images/icons/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
+    <td>Toggles the display of type names in the <span class="figure">Registers</span> view. </td>
+  </tr>
+  <tr>
+    <td><b>Show Logical Structure </b></td>
+    <td><div align="center"><img src="../images/icons/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
+    <td>Not available in C/C++ yet. </td>
+  </tr>
+  <tr>
+    <td><b>Collapse All </b></td>
+    <td><div align="center"><img src="../images/icons/var_collapse_all_icon.png" width="17" height="18" /></div></td>
+    <td>Collapses all expanded variables into the top level. </td>
+  </tr>
+</table>
+<p align="left">For more information, see the <b>C/C++ Development User Guide &gt; Reference &gt; Debug View &gt; Registers view</b>. </p>
+<div class="step">
+  <h4>To open a Registers view </h4>
+  <ul>
+    <li>Click Window &gt; Show View &gt; Registers </li>
+    <p>A Registers view appears.</p>
+  </ul>
+</div>
+<h5>Other references </h5>
+<ul>
+  <li><a href="../concepts/registers.htm">Registers</a></li>
+  <li><a href="../concepts/arm_registers.htm">ARM Registers</a></li>
+  <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
+  <li><a href="../tasks/registers/mem_reg_viewing.htm">Viewing Register Values </a></li>
+  <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Signals view</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Signals view</h2>
 <p>  The Signals view of the Debug perspective lets you view the signals defined on the selected debug target and how the debugger handles each one. Figure 1 shows the Signals view.</p>
 <p align="center"><img src="../images/views/view_signals.png" width="500" height="205" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Symbian Project Navigator  view</h2>
 <p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.project.ui.views.SymbianProjectNavigatorView)")'>Symbian Project Navigator</a> view shows all files that belong to the
 current build configuration. This view lists the Symbian projects in your current workspace and their corresponding *.inf file (typically <span class="code">bld.inf</span>). The *.inf file contains the related MMP project files, which are also listed in a tree structure.  You can collapse or expand the list for each MMP to see which sources  belong to each MMP.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Symbian OS Data view</h2>
 <p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.debug.kernelaware.ui.SymbianOSView)")'>Symbian OS Data</a> view displays the processes and threads for the suspended debug session based on the selection in the <a href="../debugger/debug/viewing_debug.htm">Debug</a> view. Read-only data is displayed for ARM build configurations. To open the Symbian OS Data view select<b> Window &gt; Show View &gt; Symbian OS Data</b> when the <a href="perspective_debug.htm">Debug</a> perspective is visible or select <b>Window &gt; Show View &gt; Other...</b>, then expand the Carbide.c++ folder and select <b>Symbian OS Data</b> when the <a href="../concepts/CarbidePerspective.html">Carbide C/C++ perspective</a> is visible. Click <b>Ok</b> to display the Symbian OS Data window (Figure 1).</p>
 <p class="note"><b>NOTE</b> The Symbian OS Data view works with the debugger and will only display data during a live debug session. The Symbian OS Data view is not supported for emulator debugging, and will not show anything during emulator debug.</p>
@@ -55,7 +55,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 applies to both TRK (run mode) and 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 TCF (stop mode).</p>
     </td>
   </tr>
   <tr valign="top">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Variables View</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Variables View </h2>
 <p>The <b>Variables</b> view allows manipulation of the variables or variable hierarchy used in source code. For example, you can change the variable format, change a variables value, add watchpoints, and add global variables. In addition to the standard C/C++, Symbian, and the Qt data types: <span class="code">QString</span>, <span class="code">QByteArray</span>, <span class="code">QSet</span>, <span class="code">QHash</span>, <span class="code">QMap</span>, <span class="code">QVector</span>, <span class="code">QList</span>, <span class="code">QLinkedList</span> and <span class="code">Qvariant</span>.</p>
 <p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled.</p>
@@ -73,7 +73,7 @@
 <h5>Related tasks</h5>
 <ul>
   <li><a href="../tasks/variables/show_variables_view.htm">Showing the Variables View</a> </li>
-  <li><a href="../tasks/variables/show_global_variables.htm">Showing Global Variables</a> </li>
+  <li><a href="perspective_debug.htm">Showing Global Variables</a> </li>
 </ul>
 <h5>Related References </h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/views.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/views.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Working with Memory</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Working with Memory</h2>
 <p>  This section explains how to work with variables in a Carbide.c++ debugging session. The following views show various types of information about variables:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/views_overview.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/views_overview.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide Views</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Carbide Views</h2>
 <p>  Here are all the views available within the Carbide IDE and debugging environments.</p>
 <h4>Carbide C/++ perspective views:</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide Debug dialog</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_import_bitmaps.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_import_bitmaps.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Import Bitmaps</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Import Bitmaps</h2>
 <p>Use the <b>Import</b>  window to import bitmap resources from the file system. </p>
 <p align="center"><img src="../images/wnd_import_bitmaps.png" width="543" height="584" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -9,7 +9,7 @@
   <link href="../book.css" rel="stylesheet" type="text/css" />
   <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#ffffff">
+<body >
 <h2>Carbide.c++ Release Notes 3.0.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
@@ -19,7 +19,6 @@
   issues. </p>
 <ul>
   <li><a href="#whatsNew">What's new </a></li>
-  <li><a href="#beta">User notes</a></li>
   <li><a href="bugs_fixed.htm">K</a><a href="#issues">nown issues</a></li>
   <li><a href="bugs_fixed.htm">Bug Fixes</a></li>
   <li><a href="#support">Technical support</a> </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/AddinganSDK.html	Wed Aug 11 11:18:20 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Adding an SDK</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <div class="Head1">
-<h2>Adding an SDK</h2>
-</div>
-	  
-	 <p>
-		The Symbian OS plug-ins can usually detect when a SDK has been installed,
-		as described in <a href="WorkingwithSDKs.html">SDK Support</a>.</p>
-	 <p>
-		To do this: 
-	 </p>
-	 <ol> 
-		<li> 
-		  <p>
-			 Click <b>Window &gt; Preferences</b> to open the Preferences window, then select SDK Preferences in the Carbide.c++ group
-		  to show the page for SDKs.</p> 
-	   </li> 
-		<div class="Figure">
-
-			 <p class="Image"><img src="../images/SDKPreferences.png" width="696" height="583" /></p>
- 
-		  
-</div> 
-		<li><p>Click <b>Add New SDK</b> to <a href="sdks/sdk_add.htm">add</a> a specific SDK or Rescan All SDKs to <a href="sdks/sdk_search.htm">search</a> the installed SDKs and add them to the Available Symbian OS SDKs list.</p>
-		</li> 
-		<li><p>Click OK to save the settings.</p></li>
-	 </ol>
-	 <p><img src="../images/related_tasks.png" width="115" height="14" /></p>
-	 <ul>
-<li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
-<li><a href="RmvngandVwngPropsosSDK.html">SDK Properties</a></li>
-   </ul>
-   <img src="../images/related_references.png" width="115" height="14" />
-<ul>
-       <li><a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences</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>
-   
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <h2>Creating New Symbian OS C++ Projects</h2>
   <div class="Bodytext">
     <p>New  projects are created using the <b>New Project Wizard</b>. Carbide includes a number of templates that make creating projects for different SDKs and executables quick and easy.</p>
-    <p class="note"><b>NOTE</b> You must have  at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
+    <p class="note"><b>NOTE</b> You must have  at least one recognized SDK installed before you can create a project. See the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have is not recognized, you may still be able to <a href="sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
     <p class="note"><b>NOTE</b> When creating or importing projects the sources and SDK must be on the same drive. This is due to many of the internal SDK tools using an implicit working drive to calculate paths (e.g. \epoc32\tools). Avoid spaces in SDK paths since this will also cause problems.</p>
     <div class="step">
     <h3>Creating New Symbian OS C++ Projects</h3>
@@ -18,7 +18,7 @@
         <li>The <b class="step">New Symbian OS C++ Project</b> wizard appears. Select a template related to an installed SDK.</li>
       <p>A project template provides the initial source files and project settings appropriate for the chosen project type. A brief description of each template appears below the list. The project type determines the type of program that you are writing.</p>
       <p class="note"><b>NOTE</b> If the selected template requires user input, additional wizard pages will collect data from the user before creating the project.</p>
-      <p>Checkmark the <b>Filter templates based on enabled SDKs</b> option to only list  SDKs enabled in the <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences</a> panel. Uncheck this option to list  SDKs that can be used with Carbide. Click <b>Next</b>.</p>
+      <p>Checkmark the <b>Filter templates based on enabled SDKs</b> option to only list  SDKs enabled in the <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences</a> panel. Uncheck this option to list  SDKs that can be used with Carbide. Click <b>Next</b>.</p>
       <p align="center"><img src="../images/step2.png" width="500" height="567" alt="" ></p>
       <li>Enter a name for your project. </li>
       <p>Checkmark the <b>Use default location</b> option to save the project in the current workspace by default or uncheck it to save to another location. Enter the path in the <b>Location</b> field or click <b>Browse</b> button to locate the directory. Click <b>Next</b>.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html	Wed Aug 11 11:52:30 2010 -0500
@@ -8,13 +8,13 @@
 		which of the installed SDKs to work with. From the chosen SDK, Symbian OS
 		plug-ins pick-up information such as header files, import libraries,
    documentation and other SDK specific information.</p>
-  <p>You can add and manage SDKs in the SDK Preferences panel. The <a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences</a> panel lists all
+  <p>You can add and manage SDKs in the SDK Preferences panel. The <a href="../reference/pref_carb_sdk_preference.html">SDK Preferences</a> panel lists all
     available SDKs and allows you to rescan the drive for newly installed and supported SDKs or remove an existing SDK.
     The changes in SDK Preferences are applicable to all projects under that
     workspace.</p>
   <h5>Related references</h5>
   <ul>
-    <li><a href="../reference/pref_carb_sdk_preferencea.html">SDK Preferences</a></li>
+    <li><a href="../reference/pref_carb_sdk_preference.html">SDK Preferences</a></li>
     <li><a href="sdks/sdk_add.htm">Adding  SDKs</a></li>
     <li><a href="sdks/sdk_search.htm">Searching SDKs</a></li>
     <li><a href="../tasks/RmvngandVwngPropsosSDK.html">Viewing SDK Properties</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_clearing.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_clearing.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Removing Breakpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Removing Breakpoints</h2>
 <p>You can remove one or more breakpoints set for a debug session using the <a href="../../reference/view_breakpoints.htm">Breakpoints</a>, <a href="../../reference/view_disassembly.htm">Disassembly</a>, or  editor views.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_conditional.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_conditional.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Setting Conditional Breakpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Setting Conditional Breakpoints or Watchpoints </h2>
 <p>You create a conditional (temporary) breakpoint or watchpoint in the<b> Properties for C/C++ breakpoint </b>dialog. Right-click a breakpoint or watchpoint in the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view, then select <b>Properties</b> from the context menu. A conditional breakpoint or watchpoint has an associated conditional expression.  The debugger evaluates the expression to determine whether to halt program execution at that breakpoint.</p>
 <p>A conditional breakpoint or watchpoint behaves in two different ways:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_disable.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_disable.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Disabling Breakpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Disabling Breakpoints</h2>
 <p>Disable a breakpoint to prevent it from affecting program execution. The disabled breakpoint remains at the source-code line at which you set it, so that you can enable it later. Disabling the breakpoint is easier than clearing it and re-creating it from scratch.</p>
 <p>Figure 1 shows some source code and the selected line shows the breakpoint icon that appears in the marker bar when a breakpoint is disabled.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_enable.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_enable.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Enabling Breakpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Enabling Breakpoints</h2>
 <p>Enable a breakpoint to have it halt program execution at the specific line in the source file. You can set a breakpoint using  the <a href="../../reference/view_breakpoints.htm">Breakpoints</a>, <a href="../../reference/view_disassembly.htm">Disassembly</a>, or  editor views. An enabled breakpoint must still be <a href="../../concepts/breakpoints.htm">resolved</a> during a debug session before it can halt program execution. Enabling a breakpoint that you previously disabled is easier than clearing it and re-creating it from scratch. </p>
 Figure 1 shows some source code and the selected line shows the breakpoint icon that appears in the marker bar when a breakpoint is enabled.
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_exporting.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_exporting.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Exporting Breakpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Exporting Breakpoints</h2>
 <p>Use the <b>Export Breakpoints</b> command to export selected breakpoints to a breakpoints file with a .bkpt extension. All breakpoints set in the source files of all  projects in your current workspace will be listed in the Export Breakpoints window.</p>
 <p>The  <b>Export Breakpoints</b> wizard shown in Figure 1 helps you to export breakpoints from your project's source files.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_importing.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_importing.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Importing Breakpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Importing Breakpoints</h2>
 <p>Use the <b>Import Breakpoints</b> command to import breakpoints previously exported and saved to a breakpoints file (.bkpt). The  <b>Import Breakpoints</b> wizard helps you to import breakpoints from a file.</p>
 <p>Figure 1 shows the Import Breakpoints window. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_setting.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_setting.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Setting Breakpoints</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Setting Breakpoints</h2>
 <p>Use the <b>Set Breakpoint</b> command (<span class="code">Ctrl+Shift+B</span>) to set a breakpoint. A regular breakpoint suspends program execution. The debugger executes the line of source code that contains the regular breakpoint.</p>
 <p class="note"><strong>TIP</strong> If you find that a breakpoint is not being hit, verify that the EXE or DLL is listed in the <a href="../../reference/view_executables.htm">Executables</a> view. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_temporary.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_temporary.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Setting a Temporary Breakpoint</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Setting a Temporary Breakpoint</h2>
 <p>Use the Temporary Breakpoint command to set temporary breakpoints. Unlike a regular breakpoint that halts execution each time you debug a project, a temporary breakpoint halts execution only once. The debugger removes the temporary breakpoint after halting program execution. </p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_view_props.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_view_props.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Viewing Breakpoint Properties</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Viewing Breakpoint Properties</h2>
 <p>After you set a breakpoint, you can view and modify its Actions, Common, and Filtering properties. Table 1 explains breakpoint properties for the <b>Common</b> panel.</p>
 <p align="center"><img src="images/wnd_breakpoint_properties.png" width="580" height="540" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/save_breakpoints_view.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/save_breakpoints_view.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Saving the Breakpoints View</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Saving the Contents of Breakpoints View </h2>
 <p>You can save the contents of the <b>Breakpoints</b> view. This feature is useful for saving sets of breakpoint data, then later re-opening those sets.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/show_breakpoints_view.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/show_breakpoints_view.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Opening the Breakpoints View</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Opening a Breakpoints View </h2>
 <p>Use the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view to show a list of breakpoints currently set in your project.</p>
 <p align="center"><img src="../../reference/images/view_breakpoints.png" width="544" height="264" /></p>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_custom_editors.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Customizing Carbide: Editors</title>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Customizing Carbide: Editors</h2>
+<p> You can customize how the Carbide C/C++ editor looks and behaves to suit your work style. </p>
+<p>The <strong>C/++ &gt; Editor</strong> preferences include:</p>
+<ul>
+    <li><img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.ui.preferences.CEditorPreferencePage)")'> Editor</a></li>
+    <li><img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.ui.preferences.CodeAssistPreferencePage)")'> Content Assist</a></li>
+    <li><img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.ui.preferences.FoldingPreferencePage)")'> Folding</a></li>
+    <li><img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.ui.preferences.CEditorHoverPreferencePage)")'> Hovers</a></li>
+    <li><img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.ui.preferences.MarkOccurrencesPreferencePag)")'> Mark Occurences</a></li>
+    <li><img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.ui.preferences.SaveActionsPreferencePage)")'> Save Actions</a></li>
+    <li><img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.ui.preferences.ScalabilityPreferencePage)")'> Scalability</a></li>
+    <li><img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.ui.preferences.CEditorColoringPreferencePag)")'> Syntax Coloring</a></li>
+    <li><img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.ui.preferences.CTemplatePreferencePage)")'> Templates</a></li>
+    <li><img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.ui.preferences.SmartTypingPreferencePage)")'> Typing</a></li>
+</ul>
+<h4>Other references</h4>
+<ul>
+    <li><a href="carb_customizing.htm">Customizing Carbide</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>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_custom_keys.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Customizing Carbide: Shortcut Keys</title>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Customizing Carbide: Shortcut Keys</h2>
+<p>The following key binding sets are available for customizing the shortcut keys used to invoke commands in Carbide. Use the <img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.ui.preferencePages.Keys)")'>Keys</a> preference panel to select a shortcut set or modify the current set for your convenience. The Default set is extended by the other key bindings for commands not covered in the Default set or where the new set uses different key bindings for a command. </p>
+<p>The options include:</p>
+<ul>
+    <li><a href="com.nokia.carbide.cpp/html/help_keys_carbide.htm">Carbide.c++</a> (default) &ndash; Carbide + Default standard set</li>
+    <li><strong>Default </strong>&ndash; Eclipse standard set of key bindings</li>
+    <li><strong>Emacs</strong> - Emacs + Default key bindings</li>
+    <li><a href="com.nokia.carbide.cpp/html/help_keys_vs.htm">Microsoft Visual Studio</a> &ndash; Visual Studio + Default standard set</li>
+    <li><a href="com.nokia.carbide.cpp/html/help_keys_cw.htm">Nokia Codewarrior</a> &ndash; CodeWarrior + Default standard set</li>
+</ul>
+<p>In addition, you can modify any of the assigned key bindings to use different keys to better suit your work style. See the <strong>Workbench User Guide &gt; Reference &gt; Preferences &gt;</strong> <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm">Keys</a> preference panel page for more information.</p>
+<h4>Other references</h4>
+<ul>
+    <li><a href="carb_customizing.htm">Customizing Carbide</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>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_custom_menus.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Customizing Carbide: Toolbars and Menus</title>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Customizing Carbide: Toolbars and Menus</h2>
+<p> You can customize which commands appear on toolbars and menus using the <img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.project.ui.views.SymbianProjectNavigatorView)")'>Customize Perspective</a> dialog. For purposes of customizing Carbide there are two perspectives of interest, the <a href="../../concepts/CarbidePerspective.html">Carbide C/C++</a> perspective where project management and editing occurs and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective used for debugging a project.</p>
+<p>Click <strong>Window &gt; Customize Perspectve...</strong> to open the <strong>Customize Perspective</strong> dialog which allows you to customize the current perspective. There are four tabs enabling you to customize the Carbide commands in multiple ways. The tabs include:</p>
+<ul>
+    <li><a href="#toolbar">Toolbar Visibility</a></li>
+    <li><a href="#menus">Menu Visibility</a></li>
+    <li><a href="#cmdGroup">Command Group Availability</a></li>
+    <li><a href="#shortcuts">Shortcuts </a></li>
+</ul>
+<p>Its best to start with the <strong>Command Group Availability</strong> tab as it controls the command groups that appear in the <strong>Toolbar</strong> and <strong>Menu Visibility</strong> tabs. An unchecked group will not be editable in the other tabs.</p>
+<p class="note"><strong>NOTE</strong> You can reset to the perspectives default  by clicking <strong>Window &gt; Reset Perspective</strong> menu option. This removes ALL changes made to the perspective.</p>
+<h3><a name="toolbar"></a>Toolbar Visibility</h3>
+<p>Use the <strong>Toolbar Visibility</strong> tab to control which commands appear on the perspective toolbar.</p>
+<p align="center"><img src="../images/wnd_customize_perspective.png" alt="Customize Perspective dialog" width="646" height="545"></p>
+<p class="figure">Customize Perspective dialog (Toolbar Visibility tab)</p>
+<h3><a name="menus" id="menus"></a>Menu Visibility</h3>
+<p>Use the <strong>Menu Visibility</strong> tab to control which menu commands appear on the perspective menus.</p>
+<p align="center"><img src="../images/wnd_customize_perspective_menus.png" alt="Customize Perspective dialog" width="646" height="585"></p>
+<p class="figure">Customize Perspective dialog (Menu Visibility tab)</p>
+<p>&nbsp;</p>
+<h3><a name="cmdGroup" id="cmdGroup"></a>Command Group Availability</h3>
+<p>Use the <strong>Command Group Availablity</strong> tab to control which command groups to use in the perspective.</p>
+<p align="center"><img src="../images/wnd_customize_perspective_cmds.png" alt="Customize Perspective dialog" width="646" height="585"></p>
+<p class="figure">Customize Perspective dialog (Command Group tab)</p>
+<p>&nbsp;</p>
+<h3><a name="shortcuts" id="shortcuts"></a>Shortcuts</h3>
+<p>Use the <strong>Shortcuts</strong> tab to control the shortcuts used in the perspective.</p>
+<p align="center"><img src="../images/wnd_customize_perspective_shortcuts.png" alt="Customize Perspective dialog" width="646" height="585"></p>
+<p class="figure">Customize Perspective dialog (Shortcuts tab)</p>
+<p>&nbsp;</p>
+<h4>Other references</h4>
+<ul>
+    <li><a href="carb_customizing.htm">Customizing Carbide</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>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_custom_styles.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Customizing Carbide: Code Styles</title>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Customizing Carbide: Code Styles</h2>
+<p> You can customize how your source files are automatically formatted by using code styles. Code styles include items like indentation, use of braces or bracketts, whitespace, tab usages, and much more. In addition to supporting a variety of predefined code styles you can also create your own. </p>
+<p>The change or customize a code style, open the <img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=
+org.eclipse.cdt.internal.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel.</p>
+<p align="center"><img src="../images/pref_code_style_differences.png" alt="Code Style differences" width="600" height="429"></p>
+<p>The predefined code styles include:</p>
+<ul>
+    <li><strong>BSD/Allman</strong> (<em>Eclipse</em>) &ndash; Based on the code style used for the ANSI C standard.</li>
+    <li><strong>GNU</strong> (<em>Eclipse</em>) &ndash; Based on the code style used in for the GNU Coding Standards used by the GNU project.</li>
+    <li><strong>K&amp;R</strong> (<em>Eclipse</em>) &ndash; Based on the code style used in <em>The C Programming Language</em> by Kernighan and Ritchie.</li>
+    <li><strong>S60</strong> &ndash; Based on the code style used in Nokia S60 source code examples.</li>
+    <li><strong>Symbian OS</strong> (<em>default</em>) &ndash; Based on the code style used in Symbian source code examples.</li>
+    <li><strong>Qt</strong> &ndash; Based on the code style used in the Qt source code examples.</li>
+    <li><strong>Whitesmiths</strong> (<em>Eclipse</em>) &ndash; Based on the code style used in documentation for the first commercial C compiler, the Whitesmith's Compiler.</li>
+</ul>
+<h4>Other references</h4>
+<ul>
+    <li><a href="carb_customizing.htm">Customizing Carbide</a></li>
+    <li><a href="http://en.wikipedia.org/wiki/Indent_style#K.26R_style">Indent style</a> (Wikipedia)</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>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_customizing.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Customizing Carbide</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Customizing Carbide</h2>
+<p> Carbide is very customizable. If the original setup doesn't work its easy to change to something more to your liking. Some of the features and UI you can change include:</p>
+<ul>
+    <li><a href="carb_custom_styles.htm">Code Styles</a> (adhere to a source format)</li>
+    <li><a href="carb_custom_editors.htm">Editor settings</a> (fonts, colors, hover behaviors)</li>
+    <li><a href="carb_custom_keys.htm">Shortcut keys</a></li>
+    <li><a href="carb_custom_menus.htm">Toolbars and menus</a></li>
+</ul>
+<p>In addition, its possible to change some default settings so that every new project you create inherits precisely the attributes you desire. These include:</p>
+<ul>
+    <li>SDKs</li>
+</ul>
+<p>Finally, some  teams like to have everyone using the same development setup for uniformity of code. That is fully supported in:</p>
+<ul>
+    <li><a href="carb_export_setup.htm">Sharing Carbide Setups</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>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_export_setup.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Customizing Carbide: Sharing Carbide Setups</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Customizing Carbide: Sharing Carbide Setups</h2>
+<p> Some teams like everyone to use identical development environments.</p>
+<h4>Other references</h4>
+<ul>
+    <li><a href="carb_customizing.htm">Customizing Carbide</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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,36 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Run Mode Debugger Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>Run mode on-device debugging enables you to download and launch a project on a phone or target device and debug it using the Carbide debugger. Before you can do that, some setup requirements are required. Once the setup is done, Carbide can then use plug-and-play (PnP) with USB to create a remote connection that connects  with the TRK agent on the target device to download, launch, and debug the program.</p>
-<ol>
-  <li><b>Setup system and development requirements</b> (below)</li>
-  <li><a href="../trk/trk_installation_instr.htm">Install</a> Application or System TRK v3.2.6 or later on the target device</li>
-  <li><a href="../trk/trk_connection_usb.htm">Connect</a> USB cable to phone or target device for PnP connectivity</li>
-  <li><a href="../CreatingProjectsToc.htm">Create</a> or <a href="../ImportingProjects.html">import</a> a project in the Carbide C/C++ workspace</li>
-  <li><a href="../projects/prj_build.htm">Build</a> the project</li>
-  <li><a href="../../debugger/debug/cmds_starting.htm">Debug</a> the project on  a <a href="../../projects/launch/launch_phone.htm">phone</a> or <a href="../../projects/launch/launch_board.htm"> target device</a></li>
-</ol>
-<div class="step">
-  <h4><a name="runInstall" id="runInstall2"> </a>Setup  system and development requirements</h4>
-  <p>All of the following requirements are required to build, communicate, and control programs on a phone or target device.</p>
-  <ul>
-    <li>Install <a href="../trk/trk_install_pcsuite.htm">PC Suite</a> or <a href="http://nds1.nokia.com/files/support/global/phones/software/Nokia_Ovi_Suite_webinstaller_ALL.exe">Ovi Suite</a> on your PC to ensure the correct drivers are installed for connecting to the phone or target device.</li>
-    <li>Install the correct version of <a href="run_mode_debug_01.htm">Perl</a> on your PC to support Symbian OS builds</li>
-    <li>Install a supported <a href="run_mode_debug_02.htm">SDK</a> and make sure its the default</li>
-    <li><a href="run_mode_debug_03.htm">Configure</a> the environmental variables</li>
-    <li>(Optional) <a href="run_mode_debug_04.htm">Setup</a> a virtual drive to use Techview and Cust Kits</li>
-  </ul>
-  <p>Once you've setup your environment, its time to verify that the TRK agent is on the phone or target device.</p>
-</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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Run Mode Debugger Settings</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Run Mode On-Device Debugging</h2>
+<p>Run mode on-device debugging enables you to download and launch a project on a phone or target device and debug it using the Carbide debugger. Before you can do that, some setup requirements are required. Once the setup is done, Carbide can then use plug-and-play (PnP) with USB to create a remote connection that connects  with the TRK agent on the target device to download, launch, and debug the program.</p>
+<ol>
+  <li><b>Setup system and development requirements</b> (below)</li>
+  <li><a href="../trk/trk_installation_instr.htm">Install</a> Application or System TRK v3.2.6 or later on the target device</li>
+  <li><a href="../trk/trk_connection_usb.htm">Connect</a> USB cable to phone or target device for PnP connectivity</li>
+  <li><a href="../CreatingProjectsToc.htm">Create</a> or <a href="../ImportingProjects.html">import</a> a project in the Carbide C/C++ workspace</li>
+  <li><a href="../projects/prj_build.htm">Build</a> the project</li>
+  <li><a href="../../debugger/debug/cmds_starting.htm">Debug</a> the project on  a <a href="../../projects/launch/launch_phone.htm">phone</a> or <a href="../../projects/launch/launch_board.htm"> target device</a></li>
+</ol>
+<div class="step">
+  <h4><a name="runInstall" id="runInstall2"> </a>Setup  system and development requirements</h4>
+  <p>All of the following requirements are required to build, communicate, and control programs on a phone or target device.</p>
+  <ul>
+    <li>Install <a href="../trk/trk_install_pcsuite.htm">PC Suite</a> or <a href="http://nds1.nokia.com/files/support/global/phones/software/Nokia_Ovi_Suite_webinstaller_ALL.exe">Ovi Suite</a> on your PC to ensure the correct drivers are installed for connecting to the phone or target device.</li>
+    <li>Install the correct version of <a href="run_mode_debug_01.htm">Perl</a> on your PC to support Symbian OS builds</li>
+    <li>Install a supported <a href="run_mode_debug_02.htm">SDK</a> and make sure its the default</li>
+    <li><a href="run_mode_debug_03.htm">Configure</a> the environmental variables</li>
+    <li>(Optional) <a href="run_mode_debug_04.htm">Setup</a> a virtual drive to use Techview and Cust Kits</li>
+  </ul>
+  <p>Once you've setup your environment, its time to verify that the TRK agent is on the phone or target device.</p>
+</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/run_mode_debug_01.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_01.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Installing Perl</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Installing Perl</h2>
 <p><a href="http://en.wikipedia.org/wiki/Perl">Perl</a> is a high-level, general-purpose, interpreted, dynamic programming language which many Symbian OS build utilities and commands require.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Installing an SDK</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Installing an SDK</h2>
 <p>To create projects an SDK must be installed. If more than one SDK is installed one must be specified as the default.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_03.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_03.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Configuring Environment Variables</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Configuring Environment Variables</h2>
 <p>To implement run mode on-device debugging the following tasks need to be completed.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_04.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_04.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Setup a Virtual Drive</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Setup a Virtual Drive (optional)</h2>
 <p>SDKs have kernel components, kernel extensions and device drivers that are typically built on a virtual drive. So if you want to debug them the debugger will need to load files from the virtual drive that the binaries were built on. If you do not know the virtual drive the kit was built on you should first pick a drive letter randomly.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_05.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_05.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,43 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Run Mode On-Device Debugging</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><b>Set the default kit in Devices.xml </b></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-</ol>
-<div class="step">
-<h4><a name="runDefKit" id="runDefKit"> </a>Set the Default Kit in Devices.xml </h4>
-<p>The Symbian environment needs to know the kit you are using. This is needed since you may have multiple kits installed. You can specify the development kit by setting a default in the file called devices.xml located in the <span class="code">C:\Program Files\Common Files\Symbian</span> folder.</p>
-  <h5>From the command line</h5>
-  <ol>
-    <li>Set the default device devkit by typing on the command line:<br />
-&gt; <span class="code">devices &ndash;setdefault @device id: name</span></li>
-  
-  <p>The device id and name can be found in the devices.xml file. For example, for a Techview 9.2 kit you might type<br />
-    <span class="code">&gt; devices &ndash;setdefault @ SymbianOS_92_2006_wk40:com.symbian.techview</span></p>
-
-    <li>Now ensure the default device is set by entering:<br />
-&gt; <span class="code">devices</span></li>
-    <li>Make sure the correct default is set.</li>
-  </ol>
-</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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Run Mode On-Device Debugging</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Run Mode On-Device Debugging</h2>
+<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
+<ol>
+  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
+  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
+  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
+  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
+  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
+  <li><b>Set the default kit in Devices.xml </b></li>
+  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
+  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
+  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
+</ol>
+<div class="step">
+<h4><a name="runDefKit" id="runDefKit"> </a>Set the Default Kit in Devices.xml </h4>
+<p>The Symbian environment needs to know the kit you are using. This is needed since you may have multiple kits installed. You can specify the development kit by setting a default in the file called devices.xml located in the <span class="code">C:\Program Files\Common Files\Symbian</span> folder.</p>
+  <h5>From the command line</h5>
+  <ol>
+    <li>Set the default device devkit by typing on the command line:<br />
+&gt; <span class="code">devices &ndash;setdefault @device id: name</span></li>
+  
+  <p>The device id and name can be found in the devices.xml file. For example, for a Techview 9.2 kit you might type<br />
+    <span class="code">&gt; devices &ndash;setdefault @ SymbianOS_92_2006_wk40:com.symbian.techview</span></p>
+
+    <li>Now ensure the default device is set by entering:<br />
+&gt; <span class="code">devices</span></li>
+    <li>Make sure the correct default is set.</li>
+  </ol>
+</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/run_mode_debug_06.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_06.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,70 +1,70 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Run Mode On-Device Debugging</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><b>Install the SISX file on the target device</b></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-</ol>
-<div class="step">
-<h4><a name="runSISX" id="runSISX"> </a>Install the SISX File on the Target Device</h4>
-<p>The on-device debug agent is delivered to the target device as a SISX file. There are two versions of TRK: Application TRK and System TRK.</p>
-  <ul>
-    <li>Application TRK&mdash; supports application debugging only and available to developers creating applications for devices. Developers do not have access to system level routines, system ROM, and other user application code. User cannot modify the LR and SR registers, and must use a SIS file to debug an application.</li>
-    <li>System TRK&mdash; supports both application and limited ROM debugging; including application executables and limited ROM based components (no device drivers). Also available to original equipment manufacturers (OEMs) for device creation and customization.</li>
-  </ul>
-  <p>The following SISX file is officially signed by Nokia: 
-  <span class="code">s60_3_0_app_trk_2_6_nokia_signed.sisx</span></p>
-  <h5>Installing using Bluetooth</h5>
-  <ol>
-    <li>Right click on the Bluetooth item on the system tray and select Quick Connect &gt; File Transfer &gt; Find Devices</li>
-    <li>Refresh the File Transfer window to allow the device to detect all the Bluetooth devices</li>
-    <li>From the list select your device and click Open</li>
-    <li>You should enable the My Bluetooth Places window popup option that creates a connection shortcut &ldquo;MyDeviceOBEX File Transfer&rdquo; in the My Bluetooth Places folder.</li>
-    <li>The Obex File Transfer window for your devices should open from within the My Bluetooth Folder</li>
-    <li>You will be prompted to enter a Bluetooth PIN code. Enter  any number.</li>
-    <li>On the device you will be prompted  to enter the same PIN code. Enter PIN code. </li>
-    <li>The device will then ask you to accept the connection request from the PC. Press OK.</li>
-    <p>The OBEX folder on the PC should now be available.</p>
-    <li>Drop the TRK SISX file into the folder</li>
-    <li>The device will prompt you to accept the connection request from the PC. Press OK.</li>
-    <li>The SISX file should then transfer from the PC to the device</li>
-    <li>Navigate to where the SISX file was placed</li>
-    <p>If you dropped it into the OBEX folder it will be in <span class="code">Applications &gt; Messages &gt; Inbox</span>. If you dropped it into the C folder it will be in <span class="code">Applications &gt; Utilities &gt;FileBrowse &gt; C</span>.</p>
-    <li>Select the TRK SISX file on the device to install the TRK debug agent.</li>
-  </ol>
-  <h5>Installing using PC Suite</h5>
-  <ol>
-    <li>Place the SISX file on your PC</li>
-    <li>Connect the USB cable to the phone</li>
-    <li>On the device it will display USB mode:<br />
-      PC Suite<br />
-      File transfer</li>
-    <li>Select PC Suite and the device will connect to the PC</li>
-    <li>Open PC suite. In the bottom left a status display should indicate &ldquo;Series 60 Device connected via USB&rdquo;.</li>
-    <li>Double click &ldquo;Install applications&rdquo;. The Nokia Application Installer wizard will appear.</li>
-    <li>On the left you should see My Computer and on the right My Phone</li>
-    <li>From My Computer select the SISX file on your PC</li>
-    <li>From My Phone select the &ldquo;Phone memory&rdquo; drop down list an select where you want to install the file.</li>
-    <li>Select the green arrow pointing from My Computer to My Device. The SISX file should then be transferred to the device and installed.</li>
-  </ol>
-</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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Run Mode On-Device Debugging</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Run Mode On-Device Debugging</h2>
+<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
+<ol>
+  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
+  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
+  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
+  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
+  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
+  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
+  <li><b>Install the SISX file on the target device</b></li>
+  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
+  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
+</ol>
+<div class="step">
+<h4><a name="runSISX" id="runSISX"> </a>Install the SISX File on the Target Device</h4>
+<p>The on-device debug agent is delivered to the target device as a SISX file. There are two versions of TRK: Application TRK and System TRK.</p>
+  <ul>
+    <li>Application TRK&mdash; supports application debugging only and available to developers creating applications for devices. Developers do not have access to system level routines, system ROM, and other user application code. User cannot modify the LR and SR registers, and must use a SIS file to debug an application.</li>
+    <li>System TRK&mdash; supports both application and limited ROM debugging; including application executables and limited ROM based components (no device drivers). Also available to original equipment manufacturers (OEMs) for device creation and customization.</li>
+  </ul>
+  <p>The following SISX file is officially signed by Nokia: 
+  <span class="code">s60_3_0_app_trk_2_6_nokia_signed.sisx</span></p>
+  <h5>Installing using Bluetooth</h5>
+  <ol>
+    <li>Right click on the Bluetooth item on the system tray and select Quick Connect &gt; File Transfer &gt; Find Devices</li>
+    <li>Refresh the File Transfer window to allow the device to detect all the Bluetooth devices</li>
+    <li>From the list select your device and click Open</li>
+    <li>You should enable the My Bluetooth Places window popup option that creates a connection shortcut &ldquo;MyDeviceOBEX File Transfer&rdquo; in the My Bluetooth Places folder.</li>
+    <li>The Obex File Transfer window for your devices should open from within the My Bluetooth Folder</li>
+    <li>You will be prompted to enter a Bluetooth PIN code. Enter  any number.</li>
+    <li>On the device you will be prompted  to enter the same PIN code. Enter PIN code. </li>
+    <li>The device will then ask you to accept the connection request from the PC. Press OK.</li>
+    <p>The OBEX folder on the PC should now be available.</p>
+    <li>Drop the TRK SISX file into the folder</li>
+    <li>The device will prompt you to accept the connection request from the PC. Press OK.</li>
+    <li>The SISX file should then transfer from the PC to the device</li>
+    <li>Navigate to where the SISX file was placed</li>
+    <p>If you dropped it into the OBEX folder it will be in <span class="code">Applications &gt; Messages &gt; Inbox</span>. If you dropped it into the C folder it will be in <span class="code">Applications &gt; Utilities &gt;FileBrowse &gt; C</span>.</p>
+    <li>Select the TRK SISX file on the device to install the TRK debug agent.</li>
+  </ol>
+  <h5>Installing using PC Suite</h5>
+  <ol>
+    <li>Place the SISX file on your PC</li>
+    <li>Connect the USB cable to the phone</li>
+    <li>On the device it will display USB mode:<br />
+      PC Suite<br />
+      File transfer</li>
+    <li>Select PC Suite and the device will connect to the PC</li>
+    <li>Open PC suite. In the bottom left a status display should indicate &ldquo;Series 60 Device connected via USB&rdquo;.</li>
+    <li>Double click &ldquo;Install applications&rdquo;. The Nokia Application Installer wizard will appear.</li>
+    <li>On the left you should see My Computer and on the right My Phone</li>
+    <li>From My Computer select the SISX file on your PC</li>
+    <li>From My Phone select the &ldquo;Phone memory&rdquo; drop down list an select where you want to install the file.</li>
+    <li>Select the green arrow pointing from My Computer to My Device. The SISX file should then be transferred to the device and installed.</li>
+  </ol>
+</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/run_mode_debug_07.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Run Mode On-Device Debugging</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Run Mode On-Device Debugging</h2>
 <p>To implement run mode on-device debugging the following tasks need to be completed.</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Run Mode On-Device Debugging</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Run Mode On-Device Debugging</h2>
 <p>To implement run mode on-device debugging the following tasks need to be completed.</p>
 <ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,13 +7,14 @@
 <title>Using Soft Attach for On-Device Debugging</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Using Soft Attach  for On-Device Debugging</h2>
-<p>You can debug hardware via Trace32 using the soft attach option. This enables you to debug an image flashed to ROM or on a memory card. Soft attach includes all the capabilities fo Stop-mode debugging but can't debug any code loaded before the OS is booted. </p>
+<p align="center" class="fix">NEEDS REWRITING</p>
+<p>You can debug hardware via TCF using the soft attach option. This enables you to debug an image flashed to ROM or on a memory card. Soft attach includes all the capabilities fo Stop-mode debugging but can't debug any code loaded before the OS is booted. </p>
 <p>There are several components that must be provided to the debugger so that it can communicate with the attached hardware device. They are:</p>
 <ul>
   <li><b>Config_carbide.t32</b> - a required configuration file used to configure Carbide for soft attach debugging</li>
-  <li><b>.cmm file</b> - you must select the correct .cmm script file for the hardware otherwise it will not initialize properly and the debugger will be unable to communicate. The .cmm script files are located in the <span class="code">&lt;Carbide&gt;\plugins\com.nokia.carbide.cpp.support_2.0.x.xxx\Symbian_Support\Trace32\cmm_scripts</span> directory.<br>
+  <li><b>.cmm file</b> - you must select the correct .cmm script file for the hardware otherwise it will not initialize properly and the debugger will be unable to communicate. The .cmm script files are located in the <span class="code">&lt;Carbide&gt;\plugins\com.nokia.carbide.cpp.support_3.0.x.xxx\Symbian_Support\TCF\cmm_scripts</span> directory.<br>
     <br>
   Also, if there is a specific .cmm file for the device, like H2 or H4, especially if it includes <span class="code">_attach</span> in the name, choose that version over the others to do soft attach on the hardware. </li>
   <li><b>.log file</b> - you must have a valid .log file for the ROM image in order to debug the image </li>
@@ -53,13 +54,13 @@
   <li>Click Run &gt; Debug to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a></li>
   <li>In the Launch Types page
     <ol type="a">
-      <li>Select the Trace32 Launch Configuration</li>
+      <li>Select the TCF Launch Configuration</li>
       <li>Click Next </li>
     </ol>
   </li>
   <li>In the Symbian ROM Image Settings page
     <ol type="a">
-      <li>Enter the path to the Trace32 Initialization Script .cmm file </li>
+      <li>Enter the path to the TCF Initialization Script .cmm file </li>
       <li>Select the Target Processor  </li>
       <li>Click Next </li>
     </ol>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -11,7 +11,7 @@
 <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/pref_carb_sdk_preferencea.html">SDK preferences</a> panel.</li>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preference.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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_launchcfg.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_launchcfg.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,13 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <style type="text/css">
 <!--
-.style1 {font-size: 1em}
+.style6 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
+.style8 {font-size: 1em; font-family: Verdana, Ariel, Helvetica, sans-serif; }
+.style11 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-size: medium; }
+.style12 {
+	font-size: 1em;
+	font-weight: bold;
+}
 -->
 </style>
 </head>
@@ -49,11 +55,11 @@
         <th width="62%" scope="col">Explanation</th>
       </tr>
       <tr>
-        <td>Project</td>
+        <td><span class="style12">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>Executable</td>
+        <td><span class="style12">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>
@@ -69,13 +75,17 @@
             <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><span class="style11">
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+            <p class="style11"><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><!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><span class="style11">
+            <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+          </span>
+            <p class="style11"><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 />
@@ -85,17 +95,21 @@
                 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">
+        <td><span class="style11">
             <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-            <b>Trace32 Initialization Script</b></font></font></p></td>
+          </span>
+            <p class="style11">
+                <!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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-          <p><b><font size="2" style="font-size: 9pt">
+        <td><span class="style11">
             <!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>
+          </span>
+            <p class="style11"><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>
@@ -110,40 +124,40 @@
         <th width="62%" scope="col">Explanation</th>
       </tr>
       <tr>
-        <td><b>Break at entry point</b></td>
+        <td><span class="style6">Break at entry point</span></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><span class="style6">Target Processor </span></td>
         <td>A drop down with a list of all supported processors.  The process selection should help in determining the memory model. This will in turn help determine the base address and the offsets for the Symbian OS kernel aware information.</td>
       </tr>
       <tr>
         <td>
-          <span class="style1">
+          <span class="style8">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
-        <p class="style1"><font face="Georgia, serif"><b>Target Initialization File</b></font></p></td>
+        <p class="style8"><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  specify the initialization file, which can be run after connecting to the target.</p></td>
       </tr>
       <tr>
         <td>
-          <span class="style1">
+          <span class="style8">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
-        <p class="style1"><b><font face="Georgia, serif">Memory Configuration File</font></b></p></td>
+        <p class="style8"><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="style1">
+          <span class="style8">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
-        <p class="style1"><b><font face="Georgia, serif">Reset target at the start of each debug session</font></b></p></td>
+        <p class="style8"><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 class="style6">Default Instructon Set </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>
@@ -164,106 +178,106 @@
         <th width="62%" scope="col">Explanation</th>
       </tr>
       <tr>
-        <td><span class="style1">
+        <td><span class="style8">
           <!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>
+          <p class="style8">
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              <b>Start Address</b></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">
+        <td><span class="style8">
           <!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>
+          <p class="style8">
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              <b>Debug from Start address</b></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">
+        <td><span class="style8">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
-          <p class="style1"><font face="Georgia, serif">
+          <p class="style8">
             <!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>
+            <b>Run from start address</b></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">
+        <td><span class="style8">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
             </span>
-          <p class="style1"><font face="Georgia, serif">
+          <p class="style8">
               <!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>
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              <b>Symbian ROM Log file</b></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">
+        <td><span class="style8">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
             </span>
-          <p class="style1"><font face="Georgia, serif">
+          <p class="style8">
               <!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>
+              <b>Symbian OS Kit EPOC32 Directory</b></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">
+        <td><span class="style8">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
             </span>
-          <p class="style1"><font face="Georgia, serif">
+          <p class="style8">
               <!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>
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              <b>Log unresolved modules</b></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">
+        <td><span class="style8">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
             </span>
-          <p class="style1"><b>
+          <p class="style8"><b>
               <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-              </b><font face="Georgia, serif">
+              </b>
               <!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>
+              <b>Debug non-XIP Executables</b></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">
+        <td><span class="style8">
           <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
           </span>
-          <p class="style1"><b>
+          <p class="style8"><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>
+            </b>
+              <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+              <b>Symbian ROM Image</b></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">
+        <td><span class="style8">
           <!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>
+          <p class="style8"><b>Download Address (hex) </b></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">
+        <td><span class="style8">
           <!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>
+          <p class="style8"><b>Ask for download at the start of each debug session</b></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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -18,7 +18,7 @@
 <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>  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/pref_carb_sdk_preferencea.html">SDK preferences</a> panel.</li>
+<li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preference.html">SDK preferences</a> panel.</li>
 <li>Build your <a href="../../reference/ROM_build_settings.html">ROM Image</a></li>
 </ul>
 </div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/view_symbian_kernel_set.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/view_symbian_kernel_set.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Stopping Program Execution</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Setting Symbian OS Data View Refresh Rate</h2>
 <p>A global preference option in the  Preferences window of Carbide.c++ allows a user to change the time interval for auto-refreshing kernel data in the Symbian OS View.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debugging a Program</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debugging a Program</h2>
 <p>Use the <b>Debug</b> command (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
 <p>If this is the first time the program is launched for debugging, a new debug launch configuration is automatically created for you based on current project settings and assigned a name. If a debug launch configuration is already available, the Debug command launches using the last debug launch configuration used with the project. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_disabling.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_disabling.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<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>Disabling an Eventpoint</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Disabling an Eventpoint</h2>
-<p>Disable an eventpoint to prevent it from performing its specified action. The disabled eventpoint remains at the source-code line at which you set it, so that you can enable it later. Disabling the eventpoint is easier than clearing it and re-creating it from scratch.</p>
-<div class="step">
-  <h4>To disable an eventpoint</h4>
-  <ol>
-    <li>Select the eventpoint to disable</li>
-    <p>Select the eventpoint by name in the Breakpoints view, or click the cursor on the source-code line that contains the eventpoint.</p>
-    <li>Click Debug &gt; Disable Eventpoint</li>
-    <p>The Disable Eventpoint menu appears.</p>
-    <li>From the menu, click the Disable Eventpoint command, where Eventpoint is the type of eventpoint that you want to disable</li>
-    <p>The enabled eventpoint icon changes to a disabled eventpoint icon (shown at left). The disabled eventpoint icon indicates that the eventpoint does not perform its specified action.<br />
-</p>
-  </ol>
-</div>
-<d<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<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>Disabling an Eventpoint</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Disabling an Eventpoint</h2>
+<p>Disable an eventpoint to prevent it from performing its specified action. The disabled eventpoint remains at the source-code line at which you set it, so that you can enable it later. Disabling the eventpoint is easier than clearing it and re-creating it from scratch.</p>
+<div class="step">
+  <h4>To disable an eventpoint</h4>
+  <ol>
+    <li>Select the eventpoint to disable</li>
+    <p>Select the eventpoint by name in the Breakpoints view, or click the cursor on the source-code line that contains the eventpoint.</p>
+    <li>Click Debug &gt; Disable Eventpoint</li>
+    <p>The Disable Eventpoint menu appears.</p>
+    <li>From the menu, click the Disable Eventpoint command, where Eventpoint is the type of eventpoint that you want to disable</li>
+    <p>The enabled eventpoint icon changes to a disabled eventpoint icon (shown at left). The disabled eventpoint icon indicates that the eventpoint does not perform its specified action.<br />
+</p>
+  </ol>
+</div>
+<d<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/eventpoints/eventpoints_enabling.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_enabling.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Enabling an Eventpoint</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Enabling an Eventpoint</h2>
 <p>Enable an eventpoint to have it perform its specified action during program execution. Enabling an eventpoint that you previously disabled is easier than clearing it and re-creating it from scratch.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_setting.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_setting.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Setting a Conditional Eventpoint</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Setting a Conditional Eventpoint</h2>
 <p>Use the Condition column of the Breakpoints view to set a conditional eventpoint. A conditional eventpoint has an associated conditional expression. The debugger evaluates the expression to determine whether the eventpoint performs its specified action.</p>
 <p>A conditional eventpoint behaves in two different ways:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_viewing.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_viewing.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Viewing Eventpoint Properties</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Viewing Eventpoint Properties</h2>
 <p>After you set an eventpoint, you can view and modify its properties.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_clear.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_clear.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Log Point</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Log Point</h2>
 <p>  A <b>Log Point</b> logs or speaks a string or expression. A Log Point can also record messages to the Log window. You can configure the message that appears in the log window.</p>
 <h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_set.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_set.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Log Point</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Log Point</h2>
 <p>  A <b>Log Point</b> logs or speaks a string or expression. A Log Point can also record messages to the Log window. You can configure the message that appears in the log window.</p>
 <h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_clear.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_clear.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Pause Point</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Pause Point</h2>
 <p>  A <b>Pause Point</b> suspends program execution long enough to refresh debugger data. For example, without setting a pause point, you must wait for the debugger to halt program execution before it can refresh data. Setting a Pause Point, however, lets you pause the debugging session to give the debugger time to refresh the data.</p>
 <h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_set.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_set.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Pause Point</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Pause Point</h2>
 <p>  A <b>Pause Point</b> suspends program execution long enough to refresh debugger data. For example, without setting a pause point, you must wait for the debugger to halt program execution before it can refresh data. Setting a Pause Point, however, lets you pause the debugging session to give the debugger time to refresh the data.</p>
 <h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_clear.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_clear.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Clearing a Trace Collection</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Clearing a Trace Collection</h2>
 <p>Clear a  <b>Trace Collection</b>  eventpoint when you are finished collecting trace data.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_off.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_off.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Trace Collection Off</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Trace Collection Off</h2>
 <p>  A <b>Trace Collection Off</b> eventpoint stops the collection of trace data. This eventpoint is useful when you want trace collection to stop when program execution reaches a line of source code that you specify.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_on.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_on.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Trace Collection On</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Trace Collection On</h2>
 <p>A <b>Trace Collection On</b> eventpoint starts the collection of trace data. This eventpoint is useful when you want trace collection to start when program execution reaches a line of source code that you specify.</p>
 <div class="step">
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/pref_code_style_differences.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/wnd_customize_perspective.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/wnd_customize_perspective_cmds.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/wnd_customize_perspective_menus.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/wnd_customize_perspective_shortcuts.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_adding.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_adding.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Adding a Memory Monitor</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Adding a Memory Monitor </h2>
 <p>You can add one or more memory monitors to the <a href="../../reference/view_memory.htm">Memory</a> view. A memory monitor  shows the contents of a different address or expression. </p>
 <p class="note"><b>NOTE</b> When using an emulator, the memory addresses are actually based on their location and  formats dependent upon the host machine. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_removing.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_removing.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -12,7 +12,7 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Removing a Memory Monitor or Rendering </h2>
 <p>Remove a memory monitor or rendering when you have finished working with it. </p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_rendering_adding.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_rendering_adding.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Adding a Memory Monitor</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Adding a  Memory Rendering </h2>
 <p>Add a memory rendering pane to display the memory monitor item in different formats. The formats available include:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/view_memory_show.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/view_memory_show.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Opening the Memory View</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Opening a Memory View </h2>
 <p>Use the <b>Memory</b> view to examine a portion of memory starting at a specific address on the host machine.</p>
 <p class="note"><b>NOTE</b> When using an emulator, the memory addresses are actually based on their location and formats dependent upon the host machine.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Attaching to a Symbian OS Process</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Attaching  to a Symbian OS Process</h2>
 <div>
   <p>Use the <b>Symbian OS Attach to Process</b> launch configuration to attach the debugger to an already running Symbian OS process or thread on a target device. This is useful for debugging servers running in RAM in a client-server relationship where the client relies on the presence of the server process to operate as one example.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/open_log_view.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/open_log_view.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Opening a Log View</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Opening a Log View</h2>
-<p>Use the <a href="../../reference/debugger_settings.htm">Debugger Settings</a> preference panel to enable the message logging option. The Log view records these types of messages for a program during a debugging session:</p>
-<ul>
-  <li>the start of new tasks</li>
-  <li>routine entry and exit</li>
-  <li>Windows: DLL loading and unloading, and debug <span class="code">printf()</span> messages</li>
-</ul>
-<p>Select the <b>Log System Messages</b> option in the <b>Debugger Settings</b> target settings preference panel.</p>
-<ul>
-  <li>Select <b>Project &gt; Debug</b></li>
-</ul>
-<ol>
-  <p>The <a href="../../reference/view_log.  <p>The <a href="../../reference/view_log.htm">Log</a> view appears. It allows you to select, copy, and save logged text to a file for later analysis. </p>
-</ol>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.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>Opening a Log View</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Opening a Log View</h2>
+<p>Use the <a href="../../reference/debugger_settings.htm">Debugger Settings</a> preference panel to enable the message logging option. The Log view records these types of messages for a program during a debugging session:</p>
+<ul>
+  <li>the start of new tasks</li>
+  <li>routine entry and exit</li>
+  <li>Windows: DLL loading and unloading, and debug <span class="code">printf()</span> messages</li>
+</ul>
+<p>Select the <b>Log System Messages</b> option in the <b>Debugger Settings</b> target settings preference panel.</p>
+<ul>
+  <li>Select <b>Project &gt; Debug</b></li>
+</ul>
+<ol>
+  <p>The <a href="../../reference/view_log.  <p>The <a href="../../reference/view_log.htm">Log</a> view appears. It allows you to select, copy, and save logged text to a file for later analysis. </p>
+</ol>
+<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/processes/opening_system_browser.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/opening_system_browser.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Opening the System Browser View</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Opening the System Browser View</h2>
 <p>Use the System Views or System menu command to view and manipulate active processes on a selected machine. If multiple machines are available, select each machine from the System Views submenu to display multiple System Browser windows. If you choose a machine that is already open, the existing window will be brought to the front.</p>
 <p class="note"><b>NOTE</b> The System Browser view appears on platforms that support it.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Adding Symbian OS Classes</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Adding Symbian OS Classes</h2>
 <p>Use the <b>New Symbian OS C++ Class</b> wizard to add Symbian  templated classes to a project. </p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Building Projects and Symbian Components </h2>
 <p>Building projects consists of a new abld-based build system that wraps build functionality around existing SDK build tools that invoke <span class="code">makmake</span> commands (e.g. <span class="code">bldmake bldfiles</span> and <span class="code">abld build</span>).</p>
 <p> The plug-ins provide extra functionality to set up suitable build configurations for Symbian OS C++ projects.  The initial selection of a build configuration is done when you create a project, as described in <a href="../CreatingNewProjects.html">Creating New Projects</a>. You can later <a href="prj_set_build_tgt.htm">change</a> the Active Build Configuration. The Build Configurations also provides a command (<b>Project &gt; <a href="../../reference/menus/build_all_targets.htm">Build All Configurations</a></b>) to build all the selected build configurations in a batch.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_cmd_line.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_cmd_line.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -15,7 +15,7 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Setting Environment for x86 Compiler</h2>
 <p>You can build  files and projects using the Carbide.c++ command-line tools. </p>
 <p>The command-line tools are located in the <span class="code">plugins\x86Build</span> folder and include:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_multi_projects.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_multi_projects.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
   <title>Building Multiple Projects</title>
   <link rel="StyleSheet" href="../../../book.css" type="text/css" />
 </head>
-<body bgcolor="#ffffff">
+<body >
 <h2>Importing Projects With Inter-Dependencies</h2>
 If you are building a project that had external project dependencies,
 such as an import library from a DLL you must make sure the projects
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Cleaning Projects</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Cleaning Projects</h2>
 <p>In the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> or <a href="../../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views you can select a project, right-click and select <b>Clean Project</b> (<span class="code">CTRL+SHIFT+-</span>) to remove the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
 <p>If you select a project and select the menu option <b>Project &gt; Clean...</b> the <b>Clean</b> dialog  appears (Figure 1). You can clean all projects or select individual projects to clean within the workspace. This method of cleaning projects  performs the same operations as the <b>Clean Project</b> context menu option. If the <b>Start a build immediately</b> option is selected, then the selected project(s) are rebuilt after the clean operation.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Working with PKG and SIS Files</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2><b>Creating a .SIS File</b></h2>
 <p>Carbide.c++ attempts to build SIS files for all phone targets when a PKG file exists in a given build project. More than one SIS/PKG file can be included and built by a project, but only one can be downloaded to the device for debugging purposes. </p>
 <p>There are three main tools involved in generating SIS files from PKG files.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
   <title>Creating a Launch Configuration</title>
   <link rel="StyleSheet" href="../../../book.css" type="text/css" />
 </head>
-<body bgcolor="#ffffff">
+<body >
 <h2>Creating a Launch Configuration</h2>
 <p>To run or debug a project you need a <a href="../../projects/launch/launch_configs_overview.htm">launch configuration</a>. A project must have at least one launch configuration, and can have as many as necessary. When run on an emulator project the wizard simply creates an emulator launch configuration and launches the emulator. When running a device project for the first time the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> seeks additional information required to create the launch configuration, then downloads the executable to the device and launches it. Once the emulator or device are loaded with the executable, the debug session  can commence. </p>
 <p>There are two methods for setting up a launch configuration, including:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -1,49 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugging Applications</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugging Applications</h2>
-<p>You can debug one or more applications just as you would any other executable with full support of the Carbide debugger. There are two methods that one can use to debug an application:</p>
-<ul>
-  <li><b>For console applications, assign the Executable and leave the Emulator blank in the Debug window</b></li>
-  <p>In the <a href="prj_debug_config.htm">Debug</a> window or <a href="prj_debug_config.htm">launch configuration</a>, simply  point the <b>Executable</b> option  to the  executable and clear the <b>Emulator</b> option  as shown in Figure 1. This launches the  application when you start a debug session from the project. </p>
-</ul>
-<blockquote>
-  <p align="center"><img src="images/page_debug_console.png" width="633" height="206" /></p>
-  <p class="figure">Figure 1 - Launch ConsoleTest executable to debug the ConsoleTest project</p>
-</blockquote>
-
-<ul>
-  <li><b>For regular applications, assign the Executable and Remote process to launch in the Debug window</b></li>
-</ul>
-<blockquote>
-  <p>In the <a href="prj_debug_config.htm">Debug</a> window or <a href="prj_debug_config.htm">launch configuration</a>, simply point both the <b>Executable</b>   and  <b>Remote process to launch</b> options to the application. This launches the  application when you start a debug session from the application project.</p>
-  <p align="center"><img src="../../reference/images/panel_trk_main.png" width="593" height="251" /></p>
-  <p align="left" class="figure">Figure 2 - Assign Executable and Remote Process</p>
-</blockquote>
-<h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/Projects.html">Projects</a></li>
-    <li><a href="../../concepts/Modify.html">Project Resources</a> </li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="prj_debug_dlls.htm">Debugging DLLs </a></li>
-    <li><a href="prj_import_exe.htm">Importing Symbian Executables </a></li>
-    <li><a href="prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  </ul>
-  <h5>Related references</h5>
-  <ul>
-    <li><a href="../../reference/ProjectDirectories.html">Project Directories</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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugging Applications</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Debugging Applications</h2>
+<p>You can debug one or more applications just as you would any other executable with full support of the Carbide debugger. There are two methods that one can use to debug an application:</p>
+<ul>
+  <li><b>For console applications, assign the Executable and leave the Emulator blank in the Debug window</b></li>
+  <p>In the <a href="prj_debug_config.htm">Debug</a> window or <a href="prj_debug_config.htm">launch configuration</a>, simply  point the <b>Executable</b> option  to the  executable and clear the <b>Emulator</b> option  as shown in Figure 1. This launches the  application when you start a debug session from the project. </p>
+</ul>
+<blockquote>
+  <p align="center"><img src="images/page_debug_console.png" width="633" height="206" /></p>
+  <p class="figure">Figure 1 - Launch ConsoleTest executable to debug the ConsoleTest project</p>
+</blockquote>
+
+<ul>
+  <li><b>For regular applications, assign the Executable and Remote process to launch in the Debug window</b></li>
+</ul>
+<blockquote>
+  <p>In the <a href="prj_debug_config.htm">Debug</a> window or <a href="prj_debug_config.htm">launch configuration</a>, simply point both the <b>Executable</b>   and  <b>Remote process to launch</b> options to the application. This launches the  application when you start a debug session from the application project.</p>
+  <p align="center"><img src="../../reference/images/panel_trk_main.png" width="593" height="251" /></p>
+  <p align="left" class="figure">Figure 2 - Assign Executable and Remote Process</p>
+</blockquote>
+<h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/Projects.html">Projects</a></li>
+    <li><a href="../../concepts/Modify.html">Project Resources</a> </li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="prj_debug_dlls.htm">Debugging DLLs </a></li>
+    <li><a href="prj_import_exe.htm">Importing Symbian Executables </a></li>
+    <li><a href="prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  </ul>
+  <h5>Related references</h5>
+  <ul>
+    <li><a href="../../reference/ProjectDirectories.html">Project Directories</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>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -4,10 +4,10 @@
 <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>Importing Executables for Debugging</title>
+<title>Debugging DLLs</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debugging DLLs</h2>
 <p>A binary that you want to debug must be built with symbolic information (a .sym file). You can debug a DLL just as you would any other executable with full support of the Carbide debugger. Basically, the following situations can occur: </p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_multiple_projects.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_multiple_projects.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debugging Multiple Projects</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debugging Multiple Projects</h2>
 <p>Use the <a href="prj_import_exe.htm">import Symbian executable</a> feature to import another project's executable into a main project to debug them both in a single debugging session. This works very well when every executable you import uses the same debug <a href="../../projects/launch/launch_configs_overview.htm">launch configuration</a>, enabling you to switch between the various executables as necessary to debug each in turn or together. For example, you could debug an application project as well as the two DLL projects that it uses, in a single debug session.</p>
 <p class="note"><b>NOTE</b> You must have the executable's project  in order to embed that executable into the main project for debugging. </p>
@@ -21,9 +21,7 @@
   </ol>
 </div>
 <h5>Related Tasks</h5>
-<ul>
-  <li><a href="prj_import_exe.htm">Importing Executables for Debugging</a></li>
-  <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
+<ul><li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_rom.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debugging in ROM</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debugging in ROM</h2>
 <p>You will see symbolic information for other components when  you are debugging  in ROM using System TRK  if those components were built with symbolic information and the ROM Log file is specified. If a function in the stack crawl is in a ROM module and the IDE is able to find a file containing symbolic information for that module, the IDE will load it automatically and display function names. The IDE will also allow source level debugging and let you set breakpoints in this module. </p>
 <p>Some issues to pay attention to  when debugging include: </p>
@@ -17,13 +17,8 @@
 <blockquote>
   <p class="note"><b>NOTE</b> You cannot debug ROM DLLs using Application TRK. </p>
 </blockquote>
-<ul>
-  <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>
+<ul><li><a href="../../projects/launch/trace32.htm">Symbian OS Trace32 Support</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_freeze_def_file.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_freeze_def_file.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Freezing DLL Projects</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Freezing DLL Projects</h2>
 <p>Use the <b>Project &gt; Freeze Exports</b> menu command to freeze a entire project, normally a DLL, to ensure backward compatibility of a new release. The result is a .def file that can be imported into other projects. You cannot freeze a single file of the project, only the entire project. Also, once a project is frozen, only new exports can be added. </p>
 <p class="note">  <b>NOTE</b> A .def file must be included in the project target to export a project. The IDE will not create one if it is missing.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm	Wed Aug 11 11:18:20 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Importing a Symbian Executable</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Importing a Symbian Executable</h2>
-<p>Use the <b>File &gt; Import &gt; Symbian OS Executable</b> feature to import an executable into the <a href="../../reference/view_executables.htm">Executables</a> view and debug it. This is useful when the binary is not part of any project in the workspace. An example of this may be a library that is called from an mmp file.  The binary must be built with the same build configuration as the current build configuration that is being used (compiler must be the same). </p>
-<p class="note"><b>NOTE</b> You also need the symbolics (.sym) file for debugging  ARM build configurations.</p>
-<p class="note"><b>NOTE</b> Binaries built by the project can be debugged by selecting executables to debug in the Executable tab of the launch configuration Debug window.</p>
-<div class="step">
-  <h4>To import a Symbian Executable </h4>
-  <ol>
-    <li>Select the File &gt; Import... menu item</li>
-   <p>The Import  window appears (Figure 1). </p>
-   <p align="center"><img src="images/wnd_import_executable_01.png" width="403" height="469" /></p>
-   <p class="figure">Figure 1 - Import window</p>
-   <li>Expand Symbian OS and select Symbian OS Executable in the list, then click Next</li>
-   <p>The Import Executable window appears (Figure 2). </p>
-    <li>Enter the executable name in the Select Executable field or click Browse to locate the executable </li>
-    <p>Use the <b>Select executable</b> field to choose a single executable or <b>Search directory</b> field to select one or more Symbian executables to import from the specified directory.</p>
-    <p align="center"><img src="images/wnd_import_executable_02.png" width="473" height="491" /></p>
-   <p class="figure">Figure 2 - Import Executable window</p>
-    <li>Click Finish</li>
-    <p>The IDE imports the Symbian executable and displays it in the Executables view  (figure 3).</p>
-    <p align="center"><img src="images/wnd_import_executable_06.png" width="677" height="164" /></p>
-    <p class="figure">Figure 3 - Executables view showing executable and source files </p>
-    <p>The new project is listed under the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> view, as shown in Figure 4.</p>
-    <p align="center"><img src="images/wnd_import_executable_05.png" width="252" height="206" /></p>
-    <p class="figure">Figure 4 - New executable listed</p>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/Projects.html">Projects</a></li>
-    <li><a href="../../concepts/Modify.html">Project Resources</a> </li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul><li><a href="../ImportingProjects.html">Importing Projects</a></li>
-    <li><a href="../ImportingProjects.html">Importing BLD.INF Files</a></li>
-    <li><a href="prj_debug_rom.htm">Debugging in ROM</a></li>
-  </ul>
-  <h5>Related references </h5>
-  <ul>
-    <li><a href="../../reference/ProjectDirectories.html">Project Directories</a></li>
-    <li><a href="../../reference/view_executables.htm">Executables view</a> </li>
-</ul>
-
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Adding/Removing Build Configurations</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Adding/Removing Build Configurations</h2>
 <p>Use the <b>Properties for &lt;<em>project_name</em>&gt;</b> window to manage the active or build configurations associated with a project. In the <b>Active Configuration</b> group you can select which build configuration is current active as well as choose which build configurations appear in the Build Configurations sub-menu as choices. </p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_preprocess.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_preprocess.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Preprocessing Files </title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Preprocessing Files </h2>
 <p>In the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> or <a href="../../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views you can preprocess source files (.c, .cpp, .cia), header files (.h), and resource files (.rss) by right-clicking the source file and then selecting the <b>Preprocess</b> command. Use the <a href="../../reference/pref_carb_preprocess.htm">Preprocess</a> preference panel to specify the preprocessor settings. </p>
 <p>When preprocessing resource files that use more than one language, the <b>Select Language</b> dialog appears asking you to select the language to preprocess. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Setting an Active Configuration</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Setting an Active Configuration</h2>
 <p>If you have more than one build configuration in a project, use the <b>Manage configurations </b> icon on the toolbar or the <b>Build  Configuration</b> menu item to select the build target used to create executables. The active build target is indicated by a check mark.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Working with PKG and SIS Files</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Creating a PKG  File</h2>
 <p>After creating a project for the application you are developing for a device,  you will need to create a .pkg file if you are using Application TRK. A .pkg file contains all the files that will need to be downloaded to the device.   Once a .pkg file is available, you can add it to a project, and the IDE will use it and additional information entered in the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> pane  to create an application's .sis installation file. By default, when creating a project, the .pkg file is located in the project's <b>sis</b> folder.</p>
 <p>A minimal .pkg file consists of the following lines:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_changing.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_changing.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Changing Register Values</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Changing Register Values</h2>
 <p>  You can change register values in the <a href="../../reference/view_registers.htm">Registers</a> view during program execution in order to examine program behavior.</p>
 <p class="note"><b>NOTE</b> Changing a register value can cause unpredictable behavior in the running program. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_data_views.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_data_views.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Changing Register Data Views</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Changing Register Data Views</h2>
 <p>  You can change the register data in the <a href="../../reference/view_registers.htm">Registers</a> view to see register contents in a different format. For example, you can change the view of a register from binary to hexadecimal format.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_open_wnd.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_open_wnd.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Opening a Registers View</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Opening a Registers View </h2>
 <p>  Open the <a href="../../reference/view_registers.htm">Registers</a> view to <a href="mem_reg_viewing.htm">inspect</a> and <a href="mem_reg_changing.htm">modify</a> various register contents.</p>
 <p class="note"><b>NOTE</b> When using an emulator, the registers shown are those of the x86 processor on the host machine, not that of the target device.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_viewing.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_viewing.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Expanding Registers</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Expanding Register Groups</h2>
 <p>You can expand register groups  in the <a href="../../reference/view_registers.htm">Registers</a> view to inspect and <a href="mem_reg_changing.htm">modify</a> their contents.</p>
 <p class="note"><b>NOTE</b> When using an emulator, the registers shown are those of the x86 processor on the host machine, not that of the target device.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,13 +7,13 @@
 <title>Adding SDKs</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Adding SDKs </h2>
 <p> Use the <b>Add New SDK</b> window to provide the information Carbide.c++ requires to identify, locate and build a project with the specified SDK.</p>
-<p align="center"><img src="../../reference/images/wnd_ad_sdk.png" width="428" height="256" /></p>
+<p align="center"><img src="../../reference/images/wnd_ad_sdk.png" width="438" height="262" /></p>
 <p class="figure">Figure 1. Add New SDK window</p>
 <h5>Table 1 Add New SDK window&mdash;items</h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+<table width="800"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="25%" scope="col">Item</th>
     <th width="75%" scope="col">Explanation</th>
@@ -47,7 +47,7 @@
 <div class="step">
   <h4>Adding  SDKs to Carbide.c++ </h4>
   <ol>
-    <li>Click  Add  New SDK in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel </a></li>
+    <li>Click  Add  New SDK in the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel </a></li>
     <p>The <b>Add New SDK</b> window (Figure 1) appears.</p>
     <li>Enter SDK name, EPOCROOT, and additional information</li>
     <p>Enter the requested information in the appropriate fields.</p>
@@ -65,7 +65,7 @@
 </ul>
 <h5>Related references </h5>
 <ul>
-  <li><a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences Panel</a></li>
+  <li><a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences Panel</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add_custkits.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add_custkits.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Adding Symbian Custom Kits</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Adding Symbian Custom Kits</h2>
 <p>The <span class="note">Carbide.c++ Developer Edition</span> and higher level products includes  functionality to work with Symbian CustKits or any arbitrary SDK source base. This enables you to work with evolving SDKs as they are released. </p>
 <p class="note"><b>NOTE</b> The features that enable build support with CustKits are only available for Carbide.c++ Developer Edition and higher level products. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2> Platform Filtering Preferences </h2>
 <p> Use the <img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.BuildPlatformFilterPage)")'>
 Platform Filtering Preferences</a> tabs in the <b>Preferences</b> window to select which platforms are visible when creating new projects or build configurations. </p>
@@ -79,7 +79,7 @@
 <h4>Related references </h4>
 <ul>
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
-  <li><a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences Panel </a> </li>
+  <li><a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences Panel </a> </li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,15 +7,15 @@
 <title>Searching for SDKs</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Searching for SDKs</h2>
-<p>  Use the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to search for installed Symbian OS SDKs.</p>
+<p>  Use the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to search for installed Symbian OS SDKs.</p>
 <p align="center"><img src="../../images/SDKPreferences.png" width="740" height="546" /></p>
 <p class="figure">Figure 1. SDK Preferences panel</p>
 <div class="step">
   <h4>Searching for SDKs </h4>
   <ul>
-    <li>Click Rescan All SDKs in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel </a></li>
+    <li>Click Rescan All SDKs in the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel </a></li>
   </ul>
   <ol>
     <p>Carbide rescans the hard drive searching for install SDKs, adding them to the <b>Available Symbian OS SDKs</b> list.</p>
@@ -28,7 +28,7 @@
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
   <li><a href="sdk_add.htm">Adding SDKs</a></li>
   <li><a href="sdk_view_properties.htm">View SDK Properties</a> </li>
-  <li><a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences Panel</a></li>
+  <li><a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences Panel</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,16 +7,16 @@
 <title>Viewing SDK Properties</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>SDK Properties</h2>
-<p> Use the <b>SDK Properties</b> window to examine the properties associated with the currently selected SDK in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a>. You can also use this window to <a href="sdk_add_custkits.htm">map</a> an unrecognized SDK to a known build configuration to use CustKits with a project.</p>
+<p> Use the <b>SDK Properties</b> window to examine the properties associated with the currently selected SDK in the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a>. You can also use this window to <a href="sdk_add_custkits.htm">map</a> an unrecognized SDK to a known build configuration to use CustKits with a project.</p>
 <p class="note"><b>NOTE</b> The SDK Properties dialog box serves as a devices.xml editor for the OEM or Professional Developer edition of Carbide.c++.</p>
 <p align="center"><img src="images/wnd_sdk_properties.png" width="418" height="375" alt="SDK Properties window" /></p>
 <p class="figure">Figure 1. SDK properties window </p>
 <div class="step">
   <h4>Viewing and Modifying SDK Properties </h4>
   <ol>
-    <li>Select an SDK in the Available Symbian OS SDKs list  in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel </a></li>
+    <li>Select an SDK in the Available Symbian OS SDKs list  in the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel </a></li>
     <li>Click SDK Properties
     <p>The <b>SDK Properties </b> window (Figure 1) appears. You can now review an SDKs properties and make modifications if your Carbide.c++ edition supports SDK modification.</p>
     <p class="note"><b>NOTE</b> Changes are directly applied to the devices.xml file.</p></li>
@@ -29,7 +29,7 @@
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
   <li><a href="sdk_add.htm">Adding SDKs</a></li>
   <li><a href="sdk_search.htm">Searching SDKs</a></li>
-  <li><a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences Panel </a> </li>
+  <li><a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences Panel </a> </li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Debugging a Symbian OS Program on the S60 Emulator</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Debugging a Symbian OS Program</h2>
 <p>Use the Carbide.c++ debugger to debug a compiled Symbian OS program in an emulator or on-device. The same process works for other emulators and target devices as well.</p>
 <p class="note"><b>NOTE</b> This example uses the Symbian Emulator included with the Symbian^3 SDK. The steps are identical for on-device debugging, although a <span class="code">.sym</span> file is not needed for emulator builds.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_deploying.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_deploying.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Deploying Programs</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Deploying Programs to Devices</h2>
 <p>Once you have completed the program and tested it with the emulator, it&#8217;s possible to create a <a href="../projects/prj_new_build_config.htm">new</a> build configuration for your device, <a href="../projects/prj_build.htm">build</a> it, then create a <span class="code">.sis</span> file and deploy it to a device.</p>
 <p>To upload a valid <span class="code">.sis</span> file to the target device you need software that communicates with the target device from your PC. Every Symbian phone ships with this connectivity software, which we will refer to generically as Symbian Connect. The actual name for the software is vendor dependent, so refer to your phone&rsquo;s documentation for the name.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Application Emulator Debug Example using Templates</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Application  Emulator Debug Example using Templates</h2>
 <p>This example shows how to create, build, and debug a program for the emulator called HelloCarbide using Carbide project templates. Once debugged, you can create a new build compiled to run on a target device. If the Carbide.c++ edition you are using supports on-device debugging, then Carbide.c++ deploys the program to the target device automatically. The steps include:</p>
 <ul>
@@ -17,7 +17,7 @@
   <li>Using a <a href="carbide_debugging.htm">debugger</a> to interactively control the program in the emulator </li>
 </ul>
 <p>Follow the steps to successfully create the HelloCarbide program and debug it on the S60 Emulator. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../reference/pref_carb_sdk_preference.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../sdks/sdk_add.htm">add</a> it to the Discovered Symbian OS SDK list.</p>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Run Mode Debug Example (Application TRK) </h2>
 <p>This example shows how to create and build an application and debug it on a device using the Application TRK on-device debug agent. The majority of steps are identical to the ones used to create a program and debug in an emulator, with some minor variations.</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_help.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_help.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide Help</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Carbide Help</h2>
 <p>The Carbide IDE provides a wealth of help resources you can tap into to make learning and using Carbide easy. They include:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Carbide Overview</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Carbide Overview</h2>
 <p>Carbide is an integrated development environment (IDE) designed to develop <a href="http://www.SymbianFoundation.org">Symbian</a> applications for mobile devices. Carbide is built using the open source <a href="http://www.eclipse.org">Eclipse</a> and C/C++ development toolkit (CDT) projects as its base with a wealth of additional tools that make it ideal for developing mobile applications. Carbide includes all the tools necessary to develop mobile applications including editors, GUI designers, project management tools, source code analysis tools, compilers, debuggers, profilers, on-device agents, revision control systems,and much more.</p>
 <p>The basic structure of creating applications is easy to understand. You create a project, add some code, compile it into an executable file, then test it on an emulator, a simulator, or the actual device. If the application is compiled for debugging you can also control the program from within Carbide to ensure that the program behaves as expected using breakpoints, watchpoints, view variables, memory, stack traces, and other intimate details of the program as it runs.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -8,12 +8,12 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Run Mode Overview </h2>
 <p>This example shows how to create and build an application and debug it on a device using the Application TRK on-device debug agent. Click this link to the <img src="../../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=com.nokia.carbide.cpp.doc.user.trk_appTRK_Using)")'>HelloCarbide</a> cheatsheet that provides links to detailed steps. The majority of steps are identical to the ones used to create a program and debug in an emulator, with some minor variations.</p>
 <p>See the <a href="carbide_example_trk.htm">Run Mode Debug Example</a> for a walkthrough of the following steps which include:</p>
 <ol>
-  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preferencea.html">SDK preferences</a> panel.</li>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_sdk_preference.html">SDK preferences</a> panel.</li>
   <li>Create a project by <a href="../ImportingProjects.html">importing</a> a Bld.inf  </li>
   <li>Verify that all the symbolics for the binaries are visible in the <a href="../../reference/view_executables.htm">Executables</a> view</li>
   <li><a href="../projects/prj_creating_sis_file.htm">Manage</a> the project's PKG file, being sure to:
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>System Requirements</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>System Requirements</h2>
 <p>You use the Carbide.c++ IDE in conjunction with a recognized SDK to develop Symbian OS software.</p>
 <p> In practice, whether you use an SDK, a developer kit (DevKit), or both depends on the edition of
@@ -49,7 +49,7 @@
   </tr>
   <tr>
     <th scope="row">Operating System </th>
-    <td><p>Microsoft&reg; Windows&reg; XP (Service Pack 2/3) recommended, Microsoft&reg; Windows&reg; Vista&reg; and Microsoft&reg; Windows&reg; 7 supported </p>
+    <td><p>Microsoft&reg; Windows&reg; XP (Service Pack 2/3) recommended,  Microsoft&reg; Windows&reg; 7 supported </p>
       <p class="note"><b>NOTE</b> While Carbide.c++ supports many different OS configurations, only the ones listed here provide for optimal Symbian development. </p>
         <p class="note"><b>NOTE</b> If you experience any VM issues, see the <a href="../../hints_tips.htm#VMissues">Tips &amp; Hints</a> page for info on modifying Carbide's default memory setup. </p></td>
   </tr>
@@ -65,7 +65,7 @@
       </ul>
       <ul>
           <li>Symbian, S60 platform, and S60 device SDKs <ul><li><a href="http://www.forum.nokia.com/info/sw.nokia.com/id/ec866fab-4b76-49f6-b5a5-af0631419e9c/S60_All_in_One_SDKs.html">Symbian ^3</a></li>
-                        <li>S60 5th Editio</li>
+                        <li>S60 5th Edition</li>
                   </ul>
             </li>
       </ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -12,7 +12,7 @@
 -->
 </style>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Updating Carbide.c++</h2>
 <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Launch Configuration Setup</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Launch Configuration Setup</h2>
 <p>To communicate between the Carbide.c++ debugger and the <a href="../../concepts/trk.htm">on-device debug agent</a>, using either Application TRK or System TRK, you must <a href="../projects/prj_debug_config.htm">define</a> a debug <a href="../../projects/launch/launch_configs_overview.htm">launch configuration</a> that matches the installed debug agent. The two configurations available include:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Bluetooth Connectivity Setup</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Bluetooth Connection Setup</h2>
 <p>The on-device debug agent software supports the use of Bluetooth to debug programs running on a target device. To enable communication with a Bluetooth device, a connection must be established between the PC and the device. The on-device debug agent requires a dedicated COM port in order to talk with the device. In some cases, other programs that use the same COM port number will interfere with the TRK debug agent, essentially &quot;fighting&quot; over control of the COM port. Follow the steps below to setup a Bluetooth connection with the Bluetooth enabled device. </p>
 <p class="note"><b>NOTE</b> Ensure that no other program has commandeered the Bluetooth connection. For example, some phone connectivity programs will not release a COM port unless specifically told to do so. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>USB Connectivity Setup</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>USB Connection Setup</h2>
 <p>On-device debugging  supports the use of USB to debug programs running on a target device. To enable communication with a USB device, a connection must be established between the PC and the device. Doing that requires one of the following USB connectivity cables to physically connect the PC to the device:</p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Installing On-device Debug Agents using Bluetooth</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <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. 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_pcsuite.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Installing On-device Debug Agents using USB</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Installing On-device Debug Agents using PC Suite</h2>
 <p>Use the PC Suite software that came with your device (<a href="http://europe.nokia.com/A4144905">Nokia PC Suite</a> is one example) to install the on-device debug agent, either Application 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Installing On-device Debug Agents using USB</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Installing On-device Debug Agents using USB</h2>
 <p> An USB connection can be used to install the on-device debug agent, either Application TRK or System TRK, (SISX file), to enable on-target debugging. The installation location of the  on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
 <p class="note"><b>NOTE</b> You can  use the connection software that came with your device to install the on-device debug agent SISX file. For example, all Nokia phones ship with the PC Suite software for installing programs. See your phone's operating manual for assistance on using it's software. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_installation_instr.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Installing an On-device Debug Agent</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Installing an On-device Debug Agent </h2>
 <p>To use any version of the on-device debug agent on a target device it must be installed. We highly recommend using the  <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Connections</a> dialog to help connect and verify that the latest version of TRK (3.2.6+) is installed on the device, especially to support plug-and-play (PnP) connections. </p>
 <p>Refer to the <a href="trk_connection_bluetooth.htm">Bluetooth Connection Setup</a> page for more information on using Bluetooth or the <a href="trk_connection_usb.htm">USB Connection Setup</a> page if using USB.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>TRK Overview</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>TRK Overview</h2>
 <p>This section describes how to setup and use the on-device debug agent software to debug programs on S60 v3.x and UIQ 3rd edition devices. Topics include: </p>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_preconditions.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>ODD Preconditions</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Preconditions to On-Device Debugging</h2>
 <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">
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Bluetooth Connectivity Setup</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Starting the On-Device TRK Debug Agent</h2>
 <div class="step">
   <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_start_sisx_usb.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>Bluetooth Connectivity Setup</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>Starting the On-Device Debug Agent Using USB </h2>
 <div class="step">
   <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones  it will be the Installed folder, on others it may be in My Own folder. Refer to the documentation that came with the phone to learn where installed programs are stored.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm	Wed Aug 11 11:52:30 2010 -0500
@@ -7,7 +7,7 @@
 <title>On-device Debugging Troubleshooting</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
-<body bgcolor="#FFFFFF">
+<body >
 <h2>On-device Debugging Troubleshooting </h2>
 <p>If you are having problems with  on-device debugging, see if the following solutions can solve the problem.</p>
 <h3><a name="deploy" id="deploy"></a>Deploying SIS Files using Carbide (Application TRK) </h3>
--- a/core/com.nokia.carbide.cpp.doc.user/index.xml	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/index.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -481,7 +481,7 @@
 		<topic href="html/reference/pref_cpp_code_style.htm" />
 		<topic href="html/reference/pref_carb_debugger.htm" />
 		<topic href="html/tasks/sdks/sdk_platform_filter.htm" />
-		<topic href="html/reference/pref_carb_sdk_preferencea.html" />
+	   <topic href="html/reference/pref_carb_symbian_sdk.htm" />
 		<topic href="html/reference/pref_carb_preprocess.htm" />
 		<topic href="html/reference/pref_carb_diagnostic_logs.htm" />
     </entry>
@@ -569,6 +569,7 @@
 <!-- S -->
 
 	<entry keyword="SDKs">
+	   <topic href="html/reference/pref_carb_symbian_sdk.htm" />
 	   <topic href="html/tasks/sdks/sdk_add.htm" />
 	   <topic href="html/tasks/sdks/sdk_add_custkits.htm" label="Adding Symbian Custom Kits"/>
 	   <topic href="html/tasks/sdks/sdk_search.htm" label="Searching"/>
@@ -576,13 +577,13 @@
        <topic href="html/qt_help/qt_pref_panel.htm"/>
 	</entry>
 
-	<entry keyword="SDK Preferences">
-	   <topic href="html/reference/pref_carb_sdk_preferencea.html"/>
-       <topic href="html/qt_help/qt_pref_panel.htm"/>
+	<entry keyword="Symbian SDKs">
+		<topic href="html/reference/pref_carb_symbian_sdk.htm" />
+		<topic href="html/qt_help/qt_pref_panel.htm"/>
 	</entry>
 
 	<entry keyword="SDK Support">
-	   <topic href="html/tasks/AddinganSDK.html" />
+	   <topic href="html/tasks/sdks/sdk_add.htm" />
 	   <topic href="html/tasks/WorkingwithSDKs.html"/>
 	   <topic href="html/tasks/RmvngandVwngPropsosSDK.html" label="Viewing and Editing SDK Properties"/>
 	</entry>
@@ -643,6 +644,15 @@
 	<entry keyword="System Browser View">
 	   <topic href="html/reference/view_system_browser.htm" label="System Browser" />
 	</entry>
+	
+	<entry keyword="Symbian Build System">
+	   <topic href="html/concepts/sbsv2.htm" label="Symbian Build System" />
+	</entry>
+
+	<entry keyword="SBSv2">
+	   <topic href="html/concepts/sbsv2.htm" label="Symbian Build System" />
+	</entry>
+
 
 <!-- T -->
 
--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -20,7 +20,17 @@
 		  
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
-       		label="Improved Carbide Debugger  (3.0b)" 
+       		label="Symbian Build System (SBSv2, 3.0)" 
+       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/concepts/sbsv2.htm" 
+       		id="carbide-whatsnew" 
+       		style-id="content-link">
+          	<text>SBSv2 is the new build engine for Symbian programs. Find out more here.</text>
+       		</link>
+       	</group>
+
+		<group style-id="content-group" id="carbide-cpp">
+       		<link 
+       		label="Improved Carbide Debugger (3.0)" 
        		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
        		id="carbide-whatsnew" 
        		style-id="content-link">
@@ -30,11 +40,11 @@
 
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
-       		label="Plug-n-Play On-device Debugging (in 2.5)" 
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/release_notes.htm" 
+       		label="TCF TRK (3.0)" 
+       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/concepts/trk.htm" 
        		id="carbide-whatsnew" 
        		style-id="content-link">
-          	<text>Debugging programs on a target device has never been easier with PnP on-device debugging.</text>
+          	<text>The TRK remote agent now uses TCF for faster, more flexible communication.</text>
        		</link>
        	</group>
 
--- a/core/com.nokia.carbide.cpp.doc.user/plugin.xml	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/plugin.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -35,14 +35,50 @@
    <extension
          point="org.eclipse.ui.cheatsheets.cheatSheetContent">
       <category
-            id="com.nokia.carbide.ide.cheatsheets"
-            name="Carbide.c++ Getting Started" />
+            id="com.nokia.carbide.how_to.cheatsheets"
+            name="Carbide How do I..." />
+            
             
-      <cheatsheet
-            category="com.nokia.carbide.ide.cheatsheets"
-            contentFile="html/cheatsheets/getStarted_cs.xml"
-            id="com.nokia.carbide.cpp.doc.user.getStarted"
-            name="HelloCarbide Project Example"/>
+         <!-- HOW TO PROJECTS CARBIDE 								-->
+         
+         <!-- HOW TO DEBUG CARBIDE 									-->
+         
+         <!-- HOW TO CUSTOMIZE CARBIDE 								-->
+		 <cheatsheet
+           composite="false"
+		   category="com.nokia.carbide.how_to.cheatsheets"
+           contentFile="html/cheatsheets/how_to_customize_cmd_groups.xml"
+           id="com.nokia.carbide.cpp.doc.user.customize_cmd_groups"
+           name="Customize Toolbars and Menus"/>
+
+		 <cheatsheet
+           composite="false"
+		   category="com.nokia.carbide.how_to.cheatsheets"
+           contentFile="html/cheatsheets/how_to_customize_code_styles.xml"
+           id="com.nokia.carbide.cpp.doc.user.customize_code_styles"
+           name="Customize Code Styles"/>
+
+		 <cheatsheet
+           composite="false"
+		   category="com.nokia.carbide.how_to.cheatsheets"
+           contentFile="html/cheatsheets/how_to_customize_editors.xml"
+           id="com.nokia.carbide.cpp.doc.user.customize_editors"
+           name="Customize Editors"/>
+
+		 <cheatsheet
+           composite="false"
+		   category="com.nokia.carbide.how_to.cheatsheets"
+           contentFile="html/cheatsheets/how_to_customize_key_cmds.xml"
+           id="com.nokia.carbide.cpp.doc.user.customize_key_cmds"
+           name="Customize Key Commands"/>
+
+		 <cheatsheet
+           composite="false"
+		   category="com.nokia.carbide.how_to.cheatsheets"
+           contentFile="html/cheatsheets/how_to_customize_share_settings.xml"
+           id="com.nokia.carbide.cpp.doc.user.customize_share_settings"
+           name="Share my Settings..."/>
+
    </extension>
 
    <extension
@@ -75,6 +111,13 @@
 			contentFile="html/cheatsheets/stop_mode_cs.xml"
             id="com.nokia.carbide.cpp.doc.user.stop_mode"
             name="Stop Mode On-Device Debugging" />
+          <cheatsheet
+                category="com.nokia.carbide.ide.cheatsheets"
+                composite="false"
+                contentFile="$nl$/html/cheatsheets/getStarted_cs.xml"
+                id="com.nokia.carbide.cpp.doc.user.cheatsheet1176819414"
+                name="Creating and debugging an application project">
+          </cheatsheet>
 
    </extension>
 
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
+
 <toc label="Introduction" href="html/concepts/Introduction.html"  >
   <topic label="Carbide.c++ Overview" 			href="html/tasks/start/carbide_overview.htm" >
     <topic href="html/tasks/start/carbide_requirements.htm" label="System Requirements">
@@ -17,8 +18,8 @@
     <topic label="Supported Target Types"		href="html/concepts/build_targets.htm" />
     <topic label="Supported SDKs" 		    	href="html/sos_references.htm" />
     <topic label="Updating Carbide" 			href="html/tasks/start/carbide_updating.htm" />
-    <topic label="Concepts" 					href="html/concepts/concepts.htm" />
   </topic>
+   <topic label="Concepts" 					href="html/concepts/concepts.htm" />
    <topic label="Carbide tutorials">
 		<topic label="Emulator Application Projects"				href="html/projects/tutorials/new_proj_from_template_00.htm" >
 		  <topic label="Creating new projects from templates" 		href="html/projects/tutorials/new_proj_from_template_01.htm" />
@@ -101,23 +102,25 @@
       <topic label="Workspace Information"	        href="html/concepts/workspaces.htm" />
   </topic>
   <topic label="Project management" >
-    <topic label="Carbide C/C++ perspective" 		href="html/concepts/CarbidePerspective.html" />
-    <topic label="Carbide.c++ preferences" 			href="html/reference/pref_carb_cpp.htm" >
-      <topic label="Build"							href="html/reference/pref_carb_build.htm" />
-      <topic label="Carbide.c++ News"				href="html/reference/pref_carb_carbide_news.htm" />
-      <topic label="Debugger"						href="html/reference/pref_carb_debugger.htm" />
-      <topic label="Diagnostic Logs"          		href="html/reference/pref_carb_diagnostic_logs.htm" />
-      <topic label="Platform Filtering Preferences"	href="html/tasks/sdks/sdk_platform_filter.htm" />
-      <topic label="Preprocess"						href="html/reference/pref_carb_preprocess.htm" />
-      <topic label="SDK Preferences"                  href="html/reference/pref_carb_sdk_preferencea.html" />
+    <topic label="Carbide C/C++ perspective" 			href="html/concepts/CarbidePerspective.html" />
+    <topic label="Symbian Build System (SBSv2)" 			href="html/concepts/sbsv2.htm" />
+    <topic label="Carbide.c++ preferences" 				href="html/reference/pref_carb_cpp.htm" >
+      <topic label="Build"								href="html/reference/pref_carb_build.htm" />
+      <topic label="Debugger"							href="html/reference/pref_carb_debugger.htm" />
+      <topic label="Diagnostic Logs"          			href="html/reference/pref_carb_diagnostic_logs.htm" />
+      <topic label="Preprocess"							href="html/reference/pref_carb_preprocess.htm" />
+      <topic label="SDK Preferences (deprecated)"                  	href="html/reference/pref_carb_sdk_preference.html" />
+      <topic label="Symbian Filtering Preferences"		href="html/tasks/sdks/sdk_platform_filter.htm" />
+      <topic label="Symbian SDKs"						href="html/reference/pref_carb_symbian_sdk.htm" />
       <topic label="Code Styles"						href="html/reference/pref_cpp_code_style.htm" >
         <topic label="Setting the Workspace Code Style"	href="html/tasks/code_style_workspace.htm" />
         <topic label="Reformatting a Source File"		href="html/tasks/code_style_reformatting_sources.htm" />
       </topic>
     </topic>
     <topic label="Working with SDKs"					href="html/tasks/WorkingwithSDKs.html" >
-      <topic label="SDK Preferences"					href="html/reference/SDKPreferences.html" />
-      <topic label="Adding an SDK"					href="html/tasks/AddinganSDK.html" >
+      <topic label="SDK Preferences (deprecated)"					href="html/reference/SDKPreferences.html" />
+      <topic label="Symbian SDKs"						href="html/reference/pref_carb_symbian_sdk.htm" />
+      <topic label="Adding an SDK"					href="html/tasks/sdks/sdk_add.htm" >
         <topic label="Adding SDKs"					href="html/tasks/sdks/sdk_add.htm" />
       </topic>
       <topic label="Searching for SDKs"				href="html/tasks/sdks/sdk_search.htm" />
@@ -201,7 +204,6 @@
         <topic label="Attach to Process"			href="html/projects/launch/attach_process.htm" />
         <topic label="Emulation"					href="html/projects/launch/emulation.htm" />
         <topic label="System TRK"					href="html/projects/launch/stop_mode.htm" />
-        <topic label="Trace32"						href="html/projects/launch/trace32.htm" />
         <anchor id="launch_config_ANCHOR"/>
       </topic>
       <topic label="Configuration panes"				href="html/projects/launch/pages_overview.htm" >
@@ -291,17 +293,8 @@
        <topic href="html/projects/launch/launch_board.htm" label="Debugging a reference board">
        </topic>
       <topic label="Stop Mode Debug Example" 				href="html/tasks/debugger/stop_mode_debug.htm" >
-        <topic label="1. On-Device Debugging Preconditions" href="html/tasks/debugger/stop_mode_debug_precond.htm" />
-        <topic label="2. Trace32 Support" 					href="html/projects/launch/trace32.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 label="On-Device Debugging Preconditions" href="html/tasks/debugger/stop_mode_debug_precond.htm" />
+        <topic label="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" />
       <topic label="ARM Registers" 						href="html/concepts/arm_registers.htm" />
@@ -341,7 +334,6 @@
       <topic label="Emulation Debugging"			        href="html/concepts/emulators.htm" />
       <topic label="Debugging DLLs"						href="html/tasks/projects/prj_debug_dlls.htm" />
       <topic label="Debugging in ROM"		                href="html/tasks/projects/prj_debug_rom.htm" />
-      <topic label="Importing Symbian Executables"		href="html/tasks/projects/prj_import_exe.htm" />
     </topic>
 
       <topic label="Troubleshooting" 						href="html/tasks/trk/trk_troubleshooting.htm"/>
@@ -352,6 +344,18 @@
     <topic label="System Search view"      		href="html/reference/search/view_system_search.htm" />
     <topic label="System Search preferences"    href="html/reference/search/pref_system_search.htm" />
   </topic>
+  <topic href="html/tasks/carbide_tools.htm" label="Creating Carbide Tools" />
+  <topic href="html/tasks/custom/carb_customizing.htm" label="Customizing Carbide">
+     <topic href="html/tasks/custom/carb_custom_styles.htm" label="Code Styles">
+     </topic>
+     <topic href="html/tasks/custom/carb_custom_editors.htm" label="Editors">
+     </topic>
+     <topic href="html/tasks/custom/carb_custom_menus.htm" label="Toolbars and Menus">
+     </topic>
+     <topic href="html/tasks/custom/carb_custom_keys.htm" label="Shortcut Keys">
+     </topic>
+     <topic href="html/tasks/custom/carb_export_setup.htm" label="Sharing Carbide Setups">
+     </topic>
+  </topic>
   <topic href="html/hints_tips.htm" label="Tips &amp; Hints" />
-  <topic href="html/tasks/carbide_tools.htm" label="Creating Carbide Tools" />
 </toc>
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/getting_started.html	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/getting_started.html	Wed Aug 11 11:52:30 2010 -0500
@@ -47,7 +47,7 @@
 								<br /><br />
 										<div id="footer"><hr>
 											<p id="copyright">
-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>.</p>        
+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>        
 							  </div>   
 									</div> 
 								</div>
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/index.html	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/index.html	Wed Aug 11 11:52:30 2010 -0500
@@ -1,58 +1,58 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Hover Help Guide</title>
-	    <link rel="stylesheet" type="text/css" href="_stock/css/sfdl.css" media="screen" />
-		<link rel="stylesheet" type="text/css" href="_stock/css/ui.css" media="screen" />
-		<link rel="stylesheet" type="text/css" href="_stock/css/sysdoc.css" media="screen" />
-	    <link href="_stock/css/ajaxToc-sfdl.css" type="text/css" rel="stylesheet">
-	</head>
-	<body>		
-		<div id="main_content">
-			<table width="100%" cellpadding="0" cellspacing="0" border="0">
-				<tr>
-					<td valign="top" width="100%">
-						<div id="main_content_txt">
-							<div class="main_content_padding">		
-																<div id="main">
-									<div id="navigator">
-										<div id="navigator_padding">
-										
-										</div>
-									</div>
-									<div id="authoredContent">
-										<a name=""></a>
-<h1>Hover Help Guide</h1><a name="hover%2eindex"></a>
-<p>
-	 Hover Help lets developers who work with
-	 Symbian OS C++ in the Carbide IDE access  Symbian OS
-	 API documentation in a pop-up window when hovering over an API item, such as a class name. The Hover Help plug-in is included with Carbide.c++ as part of the development tools package.</p>
-<p>
-	 This guide describes how to set up and configure Hover Help. 
-  </p><ul class="indexlinks">
-<li>
-<a href="getting_started.html#hover%2egs%2e" title="Overview of Hover Help">Overview</a><div class="indexsummary">This section contains an overview of Hover Help.</div></li>
-<li>
-<a href="setup.html#hover%2ecomponents%2e" title="Initial set up of Hover Help and how to add a Developer Library plug-in">Set Up</a><div class="indexsummary">This section describes the initial set up of Hover Help and how to add a Developer Library plug-in.</div></li>
-<li>
-<a href="preferences.html#hover%2eprefs%2e" title="Hover Help preferences panel to configure and choose a Developer Library">Preferences</a><div class="indexsummary">This section describes the Hover Help preferences panel that can configure and change the Developer Library version used by Hover Help.</div></li>
-</ul>
-
-   </div>
-									<div id="fnFeedbackChannelCommentsPlaceholder"></div>
-								<br /><br />
-										<div id="footer">        
-											<p id="copyright">
-												Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
-												2
-											  License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.											</p>        
-										</div>   
-									</div> 
-								</div>
-							</div>
-					
-				
-			</table>
-			<div style="clear: both"></div>
-</div></body>
-</html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>Hover Help Guide</title>
+	    <link rel="stylesheet" type="text/css" href="_stock/css/sfdl.css" media="screen" />
+		<link rel="stylesheet" type="text/css" href="_stock/css/ui.css" media="screen" />
+		<link rel="stylesheet" type="text/css" href="_stock/css/sysdoc.css" media="screen" />
+	    <link href="_stock/css/ajaxToc-sfdl.css" type="text/css" rel="stylesheet">
+	</head>
+	<body>		
+		<div id="main_content">
+			<table width="100%" cellpadding="0" cellspacing="0" border="0">
+				<tr>
+					<td valign="top" width="100%">
+						<div id="main_content_txt">
+							<div class="main_content_padding">		
+																<div id="main">
+									<div id="navigator">
+										<div id="navigator_padding">
+										
+										</div>
+									</div>
+									<div id="authoredContent">
+										<a name=""></a>
+<h1>Hover Help Guide</h1><a name="hover%2eindex"></a>
+<p>
+	 Hover Help lets developers who work with
+	 Symbian OS C++ in the Carbide IDE access  Symbian OS
+	 API documentation in a pop-up window when hovering over an API item, such as a class name. The Hover Help plug-in is included with Carbide.c++ as part of the development tools package.</p>
+<p>
+	 This guide describes how to set up and configure Hover Help. 
+  </p><ul class="indexlinks">
+<li>
+<a href="getting_started.html#hover%2egs%2e" title="Overview of Hover Help">Overview</a><div class="indexsummary">This section contains an overview of Hover Help.</div></li>
+<li>
+<a href="setup.html#hover%2ecomponents%2e" title="Initial set up of Hover Help and how to add a Developer Library plug-in">Set Up</a><div class="indexsummary">This section describes the initial set up of Hover Help and how to add a Developer Library plug-in.</div></li>
+<li>
+<a href="preferences.html#hover%2eprefs%2e" title="Hover Help preferences panel to configure and choose a Developer Library">Preferences</a><div class="indexsummary">This section describes the Hover Help preferences panel that can configure and change the Developer Library version used by Hover Help.</div></li>
+</ul>
+
+   </div>
+									<div id="fnFeedbackChannelCommentsPlaceholder"></div>
+								<br /><br />
+										<div id="footer">        
+											<p id="copyright">
+												Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+												2
+											  License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.											</p>        
+										</div>   
+									</div> 
+								</div>
+							</div>
+					
+				
+			</table>
+			<div style="clear: both"></div>
+</div></body>
+</html>
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/preferences.html	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/preferences.html	Wed Aug 11 11:52:30 2010 -0500
@@ -1,130 +1,130 @@
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>Preferences in Hover Help Guide</title>
-	    <link rel="stylesheet" type="text/css" href="_stock/css/sfdl.css" media="screen" />
-		<link rel="stylesheet" type="text/css" href="_stock/css/ui.css" media="screen" />
-		<link rel="stylesheet" type="text/css" href="_stock/css/sysdoc.css" media="screen" />
-	    <link href="_stock/css/ajaxToc-sfdl.css" type="text/css" rel="stylesheet">
-</head>
-	<body>		
-		<div id="main_content">
-			<table width="100%" cellpadding="0" cellspacing="0" border="0">
-				<tr>
-					<td valign="top" width="100%">
-						<div id="main_content_txt">
-							<div class="main_content_padding">		
-																<div id="main">
-									<div id="navigator">
-										<div id="navigator_padding">
-										
-											&nbsp;<span class="separator">&#187;</span>
-											<a href="index.html">Hover&nbsp;Help&nbsp;Plug-in&nbsp;Guide</a>
-										
-										</div>
-									</div>
-									<div id="authoredContent">
-										<div class="section">
-<h1>Hover Help Preferences</h1><a name="hover%2eprefs%2e"></a>
-<p>
-		This section describes the preferences panel that you can use to configure
-		and change the Developer Library plug-ins used by Hover Help.
-	 Select <b>Window > Preferences > Carbide.c++ > Hover Help</b> to open the Hover Help preference panel.</p>
-<p>
-		With the preferences panel, you can: 
-	 </p><ul> 
-		<li>
-			 Let Hover Help automatically choose the right Developer Library. 
-		</li>
-		<li>
-			 Select a Developer Library using the drop-down box. 
-		</li>
- 		<li>
- 			 Deactivate Hover Help. 
-		</li>
-		<li>
-			 Restore the default Hover Help configuration.
-		</li>
-		<li>
-			 Apply, confirm or cancel the changes. 
-		</li>
- 
-	 </ul><div class="section">
-<h2><em>Automatically select latest Developer Library</em> Checkbox</h2><a name="hover%2eprefs%2eautomatic"></a>
-<p>
-		  When you check the &quot;Automatically select latest Developer
-		  Library&quot; checkbox, the Developer Library is automatically selected for you.
-		  The name of the selected library is displayed in the grayed field.
-		  If you want to select a particular Developer Library, follow these 
-		  <a href="preferences.html#hover%2eprefs%2eselect_DL" title="The selected Developer Library is shown in the drop-down box.">steps</a>.
-		</p><p>
-		  The right Developer Library is chosen using these heuristics: 
-		</p><ol> 
-		  <li>
-				Choose by audience and license of the Developer Library.
-				<em>Platform</em> development has precedence over <em>public</em> development. 
-			  
-			 
-				For example: &quot;Developer Library <em>rel1</em> (Platform) (<em>date1</em>)&quot; will be chosen rather
-				than &quot;Developer Library <em>rel2</em> (Public) (<em>date2</em>)&quot;.
-			  
-		  </li>
- 
-		  <li>
- 
-			 
-				Then choose by latest publication date of the Developer Library.
-				For example: &quot;Developer Library <em>rel1</em> (Platform) (<em>21/03/2009</em>)&quot; will be chosen
-				rather than &quot;Developer Library <em>rel1</em> (Platform) (<em>20/02/2009</em>)&quot;.
-			  
-		  </li>
- 		  
-		</ol></div>
-<div class="section">
-<h2>Developer Libraries Drop-Down Box</h2><a name="hover%2eprefs%2eselect_DL"></a><p>
-		  The selected Developer Library is shown in the drop-down box. 
-		</p><p>
-		  To change the Developer Library, first uncheck the <a href="preferences.html#hover%2eprefs%2eautomatic" title="When you check the checkbox &quot;Automatically select the latest Developer Library&quot; the Developer Library is automatically selected for you. The name of the selected library is displayed in the greyed field.">&quot;Automatically select latest Developer Library&quot;</a> checkbox.
-		  Then select a Developer Library from the drop-down box list. 
-		  To add a new Developer Library, follow these <a href="setup.html#hover%2eadd_DL%2e" title="New versions of the Developer Library plug-in are published regularly. You can configure Hover Help to use a new version.">steps</a>.
-		</p></div>
-<div class="section">
-<h2><em>Deactivate Hovering</em> Checkbox</h2><a name="hover%2eprefs%2edeactivate"></a><p>
-		  Checking the <code class="ProgramOutput">Deactivate Hovering</code> checkbox disables Hover Help,
-		  and unchecking the checkbox reactivates Hover Help.
-		</p><p>
-		  When you reactivate Hover Help, the
-		  <a href="preferences.html#hover%2eprefs%2eautomatic" title="When you check the checkbox &quot;Automatically select the latest Developer Library&quot; the Developer Library is automatically selected for you. The name of the selected library is displayed in the greyed field.">&quot;Automatically select latest Developer Library&quot;</a>
-		  checkbox is checked. 
-		</p></div>
-<div class="section">
-<h2><em>Restore Defaults</em> Button</h2><a name="hover%2eprefs%2edefault"></a><p>
-		  If the &#8220;Restore Defaults&#8221; button is clicked,
-		  the <a href="preferences.html#hover%2eprefs%2eautomatic" title="When you check the checkbox, the Developer Library is automatically selected for you. The name of the selected library is displayed in the greyed field.">&quot;Automatically select latest Developer Library&quot;</a>
-		  checkbox is checked, and the <a href="preferences.html#hover%2eprefs%2edeactivate" title="When you check the checkbox, Hover Help is disabled.">&quot;Deactivate Hovering&quot;</a>
-		  checkbox is unchecked.
-		</p></div>
-<div class="section">
-<h2><em>Apply</em>, <em>OK</em>, <em>Cancel</em> Buttons</h2><a name="hover%2eprefs%2eApplyConfirmCancel"></a><p>
-		  These buttons have the common Carbide behaviours. 
-		</p></div>
-</div>
-
-   </div>
-									<div id="fnFeedbackChannelCommentsPlaceholder"></div>
-								<br /><br />
-										<div id="footer">        
-											<p id="copyright">
-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>.</p>        
-										</div>   
-									</div> 
-								</div>
-							</div>
-						</div>
-					
-				
-			</table>
-			<div style="clear: both"></div>
-		</div>
-</body>
-</html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>Preferences in Hover Help Guide</title>
+	    <link rel="stylesheet" type="text/css" href="_stock/css/sfdl.css" media="screen" />
+		<link rel="stylesheet" type="text/css" href="_stock/css/ui.css" media="screen" />
+		<link rel="stylesheet" type="text/css" href="_stock/css/sysdoc.css" media="screen" />
+	    <link href="_stock/css/ajaxToc-sfdl.css" type="text/css" rel="stylesheet">
+</head>
+	<body>		
+		<div id="main_content">
+			<table width="100%" cellpadding="0" cellspacing="0" border="0">
+				<tr>
+					<td valign="top" width="100%">
+						<div id="main_content_txt">
+							<div class="main_content_padding">		
+																<div id="main">
+									<div id="navigator">
+										<div id="navigator_padding">
+										
+											&nbsp;<span class="separator">&#187;</span>
+											<a href="index.html">Hover&nbsp;Help&nbsp;Plug-in&nbsp;Guide</a>
+										
+										</div>
+									</div>
+									<div id="authoredContent">
+										<div class="section">
+<h1>Hover Help Preferences</h1><a name="hover%2eprefs%2e"></a>
+<p>
+		This section describes the preferences panel that you can use to configure
+		and change the Developer Library plug-ins used by Hover Help.
+	 Select <b>Window > Preferences > Carbide.c++ > Hover Help</b> to open the Hover Help preference panel.</p>
+<p>
+		With the preferences panel, you can: 
+	 </p><ul> 
+		<li>
+			 Let Hover Help automatically choose the right Developer Library. 
+		</li>
+		<li>
+			 Select a Developer Library using the drop-down box. 
+		</li>
+ 		<li>
+ 			 Deactivate Hover Help. 
+		</li>
+		<li>
+			 Restore the default Hover Help configuration.
+		</li>
+		<li>
+			 Apply, confirm or cancel the changes. 
+		</li>
+ 
+	 </ul><div class="section">
+<h2><em>Automatically select latest Developer Library</em> Checkbox</h2><a name="hover%2eprefs%2eautomatic"></a>
+<p>
+		  When you check the &quot;Automatically select latest Developer
+		  Library&quot; checkbox, the Developer Library is automatically selected for you.
+		  The name of the selected library is displayed in the grayed field.
+		  If you want to select a particular Developer Library, follow these 
+		  <a href="preferences.html#hover%2eprefs%2eselect_DL" title="The selected Developer Library is shown in the drop-down box.">steps</a>.
+		</p><p>
+		  The right Developer Library is chosen using these heuristics: 
+		</p><ol> 
+		  <li>
+				Choose by audience and license of the Developer Library.
+				<em>Platform</em> development has precedence over <em>public</em> development. 
+			  
+			 
+				For example: &quot;Developer Library <em>rel1</em> (Platform) (<em>date1</em>)&quot; will be chosen rather
+				than &quot;Developer Library <em>rel2</em> (Public) (<em>date2</em>)&quot;.
+			  
+		  </li>
+ 
+		  <li>
+ 
+			 
+				Then choose by latest publication date of the Developer Library.
+				For example: &quot;Developer Library <em>rel1</em> (Platform) (<em>21/03/2009</em>)&quot; will be chosen
+				rather than &quot;Developer Library <em>rel1</em> (Platform) (<em>20/02/2009</em>)&quot;.
+			  
+		  </li>
+ 		  
+		</ol></div>
+<div class="section">
+<h2>Developer Libraries Drop-Down Box</h2><a name="hover%2eprefs%2eselect_DL"></a><p>
+		  The selected Developer Library is shown in the drop-down box. 
+		</p><p>
+		  To change the Developer Library, first uncheck the <a href="preferences.html#hover%2eprefs%2eautomatic" title="When you check the checkbox &quot;Automatically select the latest Developer Library&quot; the Developer Library is automatically selected for you. The name of the selected library is displayed in the greyed field.">&quot;Automatically select latest Developer Library&quot;</a> checkbox.
+		  Then select a Developer Library from the drop-down box list. 
+		  To add a new Developer Library, follow these <a href="setup.html#hover%2eadd_DL%2e" title="New versions of the Developer Library plug-in are published regularly. You can configure Hover Help to use a new version.">steps</a>.
+		</p></div>
+<div class="section">
+<h2><em>Deactivate Hovering</em> Checkbox</h2><a name="hover%2eprefs%2edeactivate"></a><p>
+		  Checking the <code class="ProgramOutput">Deactivate Hovering</code> checkbox disables Hover Help,
+		  and unchecking the checkbox reactivates Hover Help.
+		</p><p>
+		  When you reactivate Hover Help, the
+		  <a href="preferences.html#hover%2eprefs%2eautomatic" title="When you check the checkbox &quot;Automatically select the latest Developer Library&quot; the Developer Library is automatically selected for you. The name of the selected library is displayed in the greyed field.">&quot;Automatically select latest Developer Library&quot;</a>
+		  checkbox is checked. 
+		</p></div>
+<div class="section">
+<h2><em>Restore Defaults</em> Button</h2><a name="hover%2eprefs%2edefault"></a><p>
+		  If the &#8220;Restore Defaults&#8221; button is clicked,
+		  the <a href="preferences.html#hover%2eprefs%2eautomatic" title="When you check the checkbox, the Developer Library is automatically selected for you. The name of the selected library is displayed in the greyed field.">&quot;Automatically select latest Developer Library&quot;</a>
+		  checkbox is checked, and the <a href="preferences.html#hover%2eprefs%2edeactivate" title="When you check the checkbox, Hover Help is disabled.">&quot;Deactivate Hovering&quot;</a>
+		  checkbox is unchecked.
+		</p></div>
+<div class="section">
+<h2><em>Apply</em>, <em>OK</em>, <em>Cancel</em> Buttons</h2><a name="hover%2eprefs%2eApplyConfirmCancel"></a><p>
+		  These buttons have the common Carbide behaviours. 
+		</p></div>
+</div>
+
+   </div>
+									<div id="fnFeedbackChannelCommentsPlaceholder"></div>
+								<br /><br />
+										<div id="footer">        
+											<p id="copyright">
+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>        
+										</div>   
+									</div> 
+								</div>
+							</div>
+						</div>
+					
+				
+			</table>
+			<div style="clear: both"></div>
+		</div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/setup.html	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/setup.html	Wed Aug 11 11:52:30 2010 -0500
@@ -85,7 +85,7 @@
 								<br /><br />
 										<div id="footer">        
 											<p id="copyright">
-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>.</p>        
+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>        
 									  </div>   
 									</div> 
 								</div>
--- a/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Wed Aug 11 11:52:30 2010 -0500
@@ -14,7 +14,8 @@
  org.eclipse.core.filesystem,
  org.eclipse.ui.ide,
  org.eclipse.cdt.core,
- org.eclipse.equinox.p2.ui;bundle-version="2.0.0"
+ org.eclipse.equinox.p2.ui;bundle-version="2.0.0",
+ com.nokia.carbide.cpp.featureTracker
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp,
  com.nokia.carbide.cpp.logging
--- a/core/com.nokia.carbide.cpp/plugin_customization.ini	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp/plugin_customization.ini	Wed Aug 11 11:52:30 2010 -0500
@@ -248,7 +248,7 @@
 # universal intro definitions
 org.eclipse.ui.intro.universal/INTRO_ROOT_PAGES = overview, whatsnew, tutorials, webresources, migrate
 org.eclipse.ui.intro.universal/INTRO_DATA = product:introDATA.xml
-# org.eclipse.ui.intro/INTRO_THEME = com.nokia.carbide.cpp.carbide
+org.eclipse.ui.intro/INTRO_THEME = org.eclipse.ui.intro.universal.slate
 
 # can be used for preprocess so we need to make it big!
 org.eclipse.cdt.ui/buildConsoleLines=500000
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Wed Aug 11 11:52:30 2010 -0500
@@ -20,6 +20,9 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
+import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerConsts;
+import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin;
+
 /**
  * The main plugin class to be used in the desktop.
  */
@@ -40,6 +43,8 @@
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
+
+		FeatureUseTrackerPlugin.getFeatureUseProxy().startUsingFeature(FeatureUseTrackerConsts.CARBIDE_IDE);
 	}
 
 	/**
--- a/core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/META-INF/MANIFEST.MF	Wed Aug 11 11:52:30 2010 -0500
@@ -21,7 +21,8 @@
  org.eclipse.ui.editors,
  org.eclipse.ui.forms;bundle-version="3.5.0",
  com.nokia.cpp.utils.ui;bundle-version="1.0.0",
- com.nokia.cpp.utils.core;bundle-version="1.0.0"
+ com.nokia.cpp.utils.core;bundle-version="1.0.0",
+ org.eclipse.equinox.p2.touchpoint.natives;bundle-version="1.0.200"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Nokia
--- a/core/com.nokia.carbide.discovery.ui/plugin.xml	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/plugin.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -118,5 +118,25 @@
           title="Install SDKs">
     </portalPageLayer>
  </extension>
+   <extension
+         point="org.eclipse.equinox.p2.engine.actions">
+      <action
+            class="org.eclipse.sequoyah.pulsar.internal.core.action.ExecuteAction"
+            name="org.eclipse.equinox.p2.touchpoint.natives.execute"
+            touchpointType="org.eclipse.equinox.p2.native"
+            touchpointVersion="1.0.0"
+            version="1.0.0">
+      </action>
+   </extension>
+   <extension
+         point="org.eclipse.equinox.p2.engine.actions">
+      <action
+            class="org.eclipse.sequoyah.pulsar.internal.core.action.UnzipAndExecuteAction"
+            name="org.eclipse.equinox.p2.touchpoint.natives.unzipandexecute"
+            touchpointType="org.eclipse.equinox.p2.native"
+            touchpointVersion="1.0.0"
+            version="1.0.0">
+      </action>
+   </extension>
 
 </plugin>
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Activator.java	Wed Aug 11 11:52:30 2010 -0500
@@ -72,11 +72,11 @@
 	public void start(BundleContext context) throws Exception {
 		plugin = this;
 		super.start(context);
-		Job j = new Job("Getting proxy info") {
+		Job j = new Job(Messages.Activator_GetProxyInfoJobTitle) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
-					IProxyData proxyData = ProxyUtils.getProxyData(new URI("http://www.yahoo.com"));
+					IProxyData proxyData = ProxyUtils.getProxyData(new URI("http://www.yahoo.com")); //$NON-NLS-1$
 					if (proxyData != null) {
 						System.setProperty(PROPERTY_PROXYHOST, proxyData.getHost());
 						System.setProperty(PROPERTY_PROXYPORT, String.valueOf(proxyData.getPort()));
@@ -101,7 +101,7 @@
 	}
 
 	public static void runInUIThreadWhenProxyDataSet(final Control control, final Runnable r) {
-		Job j = new Job("") {
+		Job j = new Job("") { //$NON-NLS-1$
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				setBusyCursor(control, true);
@@ -123,6 +123,8 @@
 	}
 	
 	public static void setBusyCursor(final Control control, final boolean isBusy) {
+		if (control == null)
+			return;
 		final Display display = control.getDisplay();
 		display.syncExec(new Runnable() {
 			@Override
@@ -194,4 +196,8 @@
 		return (String) properties.get(key);
 	}
 
+    public static IStatus makeErrorStatus(String message, Throwable t) {
+        return new Status(IStatus.ERROR, PLUGIN_ID, message, t);
+    }
+
 }
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/Messages.java	Wed Aug 11 11:52:30 2010 -0500
@@ -25,6 +25,7 @@
 	public static String AbstractBrowserPortalPage_RefreshLabel;
 	public static String AbstractBrowserPortalPage_StopLabel;
 	public static String AbstractBrowserPortalPageLayer_BadURLError;
+	public static String AbstractBrowserPortalPageLayer_BrowserCreateError;
 	public static String AbstractBrowserPortalPageLayer_ForwardLabel;
 	public static String AbstractBrowserPortalPageLayer_InvalidURLError;
 	public static String AbstractBrowserPortalPageLayer_OpenLocationLabel;
@@ -43,6 +44,7 @@
 	public static String AbstractDiscoveryPortalPageLayer_UncheckAllActionLabel;
 	public static String AbstractRSSPortalPageLayer_ReturnToFeedLabel;
 	public static String AbstractRSSPortalPageLayer_RSSReadError;
+	public static String Activator_GetProxyInfoJobTitle;
 	public static String Activator_MissingConfigURLError;
 	public static String PortalEditor_BadCommandBarFactoryError;
 	public static String PortalEditor_Name;
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/discovery/ui/messages.properties	Wed Aug 11 11:52:30 2010 -0500
@@ -3,6 +3,7 @@
 AbstractBrowserPortalPage_RefreshLabel=Refresh page
 AbstractBrowserPortalPage_StopLabel=Stop loading
 AbstractBrowserPortalPageLayer_BadURLError=Could not load page due to bad URL
+AbstractBrowserPortalPageLayer_BrowserCreateError=Could not create browser: {0}
 AbstractBrowserPortalPageLayer_ForwardLabel=Forward
 AbstractBrowserPortalPageLayer_InvalidURLError=Invalid URL
 AbstractBrowserPortalPageLayer_OpenLocationLabel=Open location
@@ -21,6 +22,7 @@
 AbstractDiscoveryPortalPageLayer_UncheckAllActionLabel=Check none
 AbstractRSSPortalPageLayer_ReturnToFeedLabel=Return to RSS
 AbstractRSSPortalPageLayer_RSSReadError=Could not read RSS from: {0}
+Activator_GetProxyInfoJobTitle=Getting proxy info
 Activator_MissingConfigURLError=Could not find URL in configuration/server.properties file for key={0}
 PortalEditor_BadCommandBarFactoryError=Command bar factory class could not be created for id: {0
 PortalEditor_Name=Carbide Portal
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java	Wed Aug 11 11:52:30 2010 -0500
@@ -238,7 +238,7 @@
 				Rectangle rect = composite.getClientArea();
 				Image newImage = new Image(composite.getDisplay(), rect.width, rect.height);
 				GC gc = new GC(newImage);
-				gc.setForeground(composite.getDisplay().getSystemColor(SWT.COLOR_BLACK));
+				gc.setForeground(composite.getDisplay().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));
 				gc.setBackground(composite.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
 				gc.fillGradientRectangle(0, 0, rect.width, rect.height, true);
 				gc.dispose();
@@ -341,9 +341,4 @@
 		return this;
 	}
 
-	@Override
-	public void refreshCommandBars() {
-		// TODO ask portal page to recreate command bars
-	}
-
 }
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/SimpleRSSReader.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/SimpleRSSReader.java	Wed Aug 11 11:52:30 2010 -0500
@@ -21,8 +21,8 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.text.DateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
@@ -37,6 +37,8 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
+import com.nokia.carbide.discovery.ui.Activator;
+
 /**
  * A simple RSS reader
  * @see http://www.rssboard.org/rss-specification
@@ -94,23 +96,26 @@
 					link = new URL(value);
 				} catch (MalformedURLException e) {
 					// don't store malformed URLs
-					e.printStackTrace();
+					Activator.logError("Bad URL", e);
 				}
 			}
 			else if (RSSHandler.DESCRIPTION.equals(element) || RSSHandler.SUMMARY.equals(element))
 				description = value;
 			else if (RSSHandler.PUBDATE.equals(element)) {
-				try {
-					// FIXME parser needs writing!!
-					pubDate = DateFormat.getInstance().parse(value);
-				} catch (ParseException e) {
-					// don't store malformed dates
-//					e.printStackTrace();
-				}
+				pubDate = parseRFC822Date(value);
 			}
 			else if (RSSHandler.CATEGORY.equals(element))
 				categories.add(value);
 		}
+
+		private Date parseRFC822Date(String value) {
+	        SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z"); //$NON-NLS-1$
+	        try {
+				return format.parse(value);
+			} catch (ParseException e) {
+			}
+			return null;
+		}
 	}
 	
 	public static class Channel extends Container {
@@ -213,7 +218,6 @@
 		}
 		
 	}
-
 	
 	public static Rss readRSS(URL url) throws SAXException, IOException, ParserConfigurationException {
 		Rss rss = new Rss();
@@ -224,4 +228,6 @@
 		parser.parse(inputStream, new RSSHandler(rss));
 		return rss;
 	}
+
+
 }
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractBrowserPortalPageLayer.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractBrowserPortalPageLayer.java	Wed Aug 11 11:52:30 2010 -0500
@@ -18,6 +18,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.text.MessageFormat;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -27,7 +28,6 @@
 import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.browser.LocationAdapter;
 import org.eclipse.swt.browser.LocationEvent;
@@ -136,8 +136,14 @@
 		composite.setLayout(new FillLayout());
 		try {
 			browser = new Browser(composite, SWT.MOZILLA);
-		} catch (SWTError e) {
-			e.printStackTrace();
+		} catch (Throwable e1) {
+			try {
+				// try creating regular browser
+				browser = new Browser(composite, SWT.NONE);
+			} catch (Throwable e2) {
+				// don't log with Throwable directly because it may display a dialog
+				Activator.logError(MessageFormat.format(Messages.AbstractBrowserPortalPageLayer_BrowserCreateError, e2.getMessage()), null);
+			}
 		}
 		
 		return composite;
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractDiscoveryPortalPageLayer.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractDiscoveryPortalPageLayer.java	Wed Aug 11 11:52:30 2010 -0500
@@ -113,6 +113,7 @@
 	protected static final String REFRESH_ACTION_ID = 
 		AbstractDiscoveryPortalPageLayer.class.getName() + ".refresh"; //$NON-NLS-1$
 
+	private IEditorPart part;
 	private CatalogViewer viewer;
 	private List<ISelectionChangedListener> selectionListeners;
 	private IActionUIUpdater updater;
@@ -181,6 +182,7 @@
 	}
 
 	protected IAction[] makeActions(final IEditorPart part) {
+		this.part = part;
 		selectionListeners = new ArrayList<ISelectionChangedListener>();
 		List<IAction> actions = new ArrayList<IAction>();
 		IAction action;
@@ -188,9 +190,7 @@
 		// install
 		action = new BaseSelectionListenerAction(Messages.AbstractDiscoveryPortalPageLayer_InstallActionLabel) {
 			public void run() {
-				DiscoveryUi.install(viewer.getCheckedItems(), 
-						new RunnableContextDialog(part.getEditorSite().getShell(), 
-								Messages.AbstractDiscoveryPortalPageLayer_GatheringInstallInfoDesc));
+				installCatalogItems(viewer.getCheckedItems());
 			};
 			
 			protected boolean updateSelection(IStructuredSelection selection) {
@@ -280,6 +280,12 @@
 		return (IAction[]) actions.toArray(new IAction[actions.size()]);
 	}
 
+	protected void installCatalogItems(List<CatalogItem> items) {
+		DiscoveryUi.install(items, 
+				new RunnableContextDialog(part.getEditorSite().getShell(), 
+						Messages.AbstractDiscoveryPortalPageLayer_GatheringInstallInfoDesc));
+	}
+
 	@Override
 	public void dispose() {
 		for (ISelectionChangedListener listener : selectionListeners) {
@@ -293,16 +299,16 @@
 		IProvisioningAgent agent = session.getProvisioningAgent();
 		IMetadataRepositoryManager metadataManager = (IMetadataRepositoryManager) agent.getService(IMetadataRepositoryManager.SERVICE_NAME);
 		IArtifactRepositoryManager artifactManager = (IArtifactRepositoryManager) agent.getService(IArtifactRepositoryManager.SERVICE_NAME);
-		for (URI uri : getCatalogURIs()) {
+		for (URI uri : getSiteURIs(viewer.getCatalog().getItems())) {
 			metadataManager.addRepository(uri);
 			artifactManager.addRepository(uri);
 		}
 		defaultUI.openInstallWizard(null, null, null);
 	}
 
-	protected Collection<URI> getCatalogURIs() {
+	protected static Collection<URI> getSiteURIs(List<CatalogItem> catalogItems) {
 		Set<URI> uris = new HashSet<URI>();
-		for (CatalogItem catalogItem : viewer.getCatalog().getItems()) {
+		for (CatalogItem catalogItem : catalogItems) {
 			try {
 				uris.add(new URI(catalogItem.getSiteUrl()));
 			} catch (URISyntaxException e) {
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractRSSPortalPageLayer.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractRSSPortalPageLayer.java	Wed Aug 11 11:52:30 2010 -0500
@@ -17,8 +17,12 @@
 package com.nokia.carbide.internal.discovery.ui.extension;
 
 import java.net.URL;
+import java.text.DateFormat;
 import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -34,6 +38,8 @@
 
 public abstract class AbstractRSSPortalPageLayer extends AbstractBrowserPortalPageLayer {
 
+	private static final List<Pattern> EXCLUDE_TAG_PATTERNS = new ArrayList<Pattern>();
+
 	private static final String[] EXCLUDE_TAGS = { 	
 		"object", //$NON-NLS-1$
 		"param", //$NON-NLS-1$
@@ -42,10 +48,18 @@
 		"img" //$NON-NLS-1$
 	};
 	
-	private static final Pattern[] EXCLUDE_TAG_PATTERNS = new Pattern[EXCLUDE_TAGS.length * 2];
+	private static final String[] EXCLUDE_FORMAT_TAGS = {
+		"b", //$NON-NLS-1$
+		"i", //$NON-NLS-1$
+		"em", //$NON-NLS-1$
+		"strong", //$NON-NLS-1$
+		"tt", //$NON-NLS-1$
+		"s", //$NON-NLS-1$
+		"strike", //$NON-NLS-1$
+		"p" //$NON-NLS-1$
+	};
 	
 	static {
-		int i = 0;
 		for (String tagString : EXCLUDE_TAGS) {
 			StringBuilder sb = new StringBuilder();
 			sb.append('<');
@@ -53,18 +67,25 @@
 			sb.append(" .*</"); //$NON-NLS-1$
 			sb.append(tagString);
 			sb.append('>');
-			EXCLUDE_TAG_PATTERNS[i++] = 
-				Pattern.compile(sb.toString(), 
-						Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+			EXCLUDE_TAG_PATTERNS.add(Pattern.compile(sb.toString(),
+					Pattern.CASE_INSENSITIVE | Pattern.MULTILINE));
 		}
 		for (String tagString : EXCLUDE_TAGS) {
 			StringBuilder sb = new StringBuilder();
 			sb.append('<');
 			sb.append(tagString);
 			sb.append(" .*/>"); //$NON-NLS-1$
-			EXCLUDE_TAG_PATTERNS[i++] = 
-				Pattern.compile(sb.toString(), 
-						Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+			EXCLUDE_TAG_PATTERNS.add(Pattern.compile(sb.toString(),
+					Pattern.CASE_INSENSITIVE | Pattern.MULTILINE));
+		}
+		for (String formatTag : EXCLUDE_FORMAT_TAGS) {
+			StringBuilder sb = new StringBuilder();
+			sb.append("</?"); //$NON-NLS-1$
+			sb.append(formatTag);
+			sb.append('>');
+			EXCLUDE_TAG_PATTERNS.add(Pattern.compile(sb.toString(),
+					Pattern.CASE_INSENSITIVE | Pattern.MULTILINE));
+			
 		}
 	}
 	
@@ -114,21 +135,28 @@
 				buf.append(clean(item.getTitle()));
 				buf.append("</a>"); //$NON-NLS-1$
 				buf.append("<div class=\"itemBody\">"); //$NON-NLS-1$
+				Date date = item.getPubDate();
+				if (date != null) {
+					String dateString = DateFormat.getDateTimeInstance().format(date);
+					buf.append(dateString);
+					buf.append("<br>");
+				}
 				buf.append(clean(item.getDescription()));
 				buf.append("</div></li>"); //$NON-NLS-1$
 			}
 			buf.append("</ul>"); //$NON-NLS-1$
 		}
 		buf.append(HTML_BODY_FOOTER);
-		System.out.println(buf.toString());
 		browser.setText(buf.toString());
 	}
 
 	private String clean(String s) {
+		String output = s;
 		for (Pattern pattern : EXCLUDE_TAG_PATTERNS) {
-			s = pattern.matcher(s).replaceAll(""); //$NON-NLS-1$
+			output = pattern.matcher(output).replaceAll(""); //$NON-NLS-1$
 		}
-		return s.length() > MAX_ELEM_LEN ? s.substring(0, MAX_ELEM_LEN) : s;
+		output = output.length() > MAX_ELEM_LEN ? output.substring(0, MAX_ELEM_LEN) : output;
+		return output;
 	}
 
 	@Override
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/IPortalEditor.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/IPortalEditor.java	Wed Aug 11 11:52:30 2010 -0500
@@ -23,6 +23,4 @@
 	
 	IEditorPart getEditorPart();
 
-	void refreshCommandBars();
-	
 }
--- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/PulsarPageLayer.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/view/PulsarPageLayer.java	Wed Aug 11 11:52:30 2010 -0500
@@ -20,10 +20,4 @@
 
 
 public class PulsarPageLayer extends AbstractDiscoveryPortalPageLayer {
-
-	@Override
-	protected String getDirectoryURL() {
-		return "http://tools.ext.nokia.com/pulsar/directory.xml"; //$NON-NLS-1$
-	}
-	
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/org/eclipse/sequoyah/pulsar/internal/core/action/ExecuteAction.java	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Contributors:
+ * 	David Dubrow
+ *  Gustavo de Paula (Motorola) - Add change permission in a linux OS
+ */
+
+package org.eclipse.sequoyah.pulsar.internal.core.action;
+
+import java.text.MessageFormat;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
+import org.eclipse.sequoyah.pulsar.internal.core.action.execution.ExecutionFactory;
+import org.eclipse.sequoyah.pulsar.internal.core.action.execution.ExecutionHandler;
+
+import com.nokia.carbide.discovery.ui.Activator;
+
+public class ExecuteAction extends ProvisioningAction {
+
+    public static final String ACTION_EXECUTE = "execute"; //$NON-NLS-1$
+    private static final String PARM_EXECUTABLE = "executable"; //$NON-NLS-1$
+
+    /* (non-Javadoc)
+     * @see org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction#execute(java.util.Map)
+     */
+    @Override
+    public IStatus execute(Map<String, Object> parameters) {
+        String executable = (String) parameters.get(PARM_EXECUTABLE);
+        if (executable == null)
+            return Activator.makeErrorStatus(MessageFormat.format(
+                    "The \"{0}\" parameter was not set in the \"{1}\" action", PARM_EXECUTABLE,
+                    ACTION_EXECUTE), null);
+
+//        IInstallableUnit iu = (IInstallableUnit) parameters
+//                .get(ActionConstants.PARM_IU);
+//        if (executable.equals(ActionConstants.PARM_ARTIFACT)) {
+//            IArtifactKey artifactKey = iu.getArtifacts();
+//
+//            IFileArtifactRepository downloadCache;
+//            try {
+//                downloadCache = Util.getDownloadCacheRepo();
+//            } catch (ProvisionException e) {
+//                return e.getStatus();
+//            }
+//            File fileLocation = downloadCache.getArtifactFile(artifactKey);
+//            if ((fileLocation == null) || !fileLocation.exists())
+//                return Activator.makeErrorStatus(MessageFormat.format(
+//                        Messages.ExecuteAction_MissingArtifactError,
+//                        artifactKey), null);
+//            executable = fileLocation.getAbsolutePath();
+//        }
+        try {
+            ExecutionHandler handler = ExecutionFactory.getExecutionHandler(
+                    System.getProperty("os.name"), executable);
+
+            IStatus status = handler.handleExecution();
+
+            if (!status.isOK()) {
+                return status;
+            }
+        } catch (Exception e) {
+            return Activator.makeErrorStatus(MessageFormat.format(
+                    "could not execute \"{0}\"", executable), e);
+        }
+
+        return Status.OK_STATUS;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.equinox.internal.provisional.p2.engine.ProvisioningAction#undo(java.util.Map)
+     */
+    @Override
+    public IStatus undo(Map<String, Object> parameters) {
+        return Activator.makeErrorStatus(
+                "undo not supported for exectutables", null);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/org/eclipse/sequoyah/pulsar/internal/core/action/UnzipAndExecuteAction.java	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Contributors:
+ * 	David Dubrow
+ *  Euclides Neto (Motorola) - Externalize strings.
+ *  Gustavo de Paula (Motorola) - Add change permission in a linux OS  
+ */
+
+package org.eclipse.sequoyah.pulsar.internal.core.action;
+
+import java.text.MessageFormat;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.equinox.internal.p2.touchpoint.natives.Util;
+import org.eclipse.equinox.internal.p2.touchpoint.natives.actions.ActionConstants;
+import org.eclipse.equinox.internal.p2.touchpoint.natives.actions.UnzipAction;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.sequoyah.pulsar.internal.core.action.execution.ExecutionFactory;
+import org.eclipse.sequoyah.pulsar.internal.core.action.execution.ExecutionHandler;
+
+import com.nokia.carbide.discovery.ui.Activator;
+
+@SuppressWarnings("restriction")
+public class UnzipAndExecuteAction extends UnzipAction {
+
+    public static final String ACTION_UNZIPANDEXECUTE = "unzipAndExecute"; //$NON-NLS-1$
+    private static final String PARM_EXECUTABLE = "executable"; //$NON-NLS-1$
+
+    /* (non-Javadoc)
+     * @see org.eclipse.equinox.internal.p2.touchpoint.natives.actions.UnzipAction#execute(java.util.Map)
+     */
+    @Override
+    public IStatus execute(Map<String, Object> parameters) {
+        IStatus status = super.execute(parameters);
+        if (!status.isOK()) {
+            return status;
+        }
+
+        String executable = (String) parameters.get(PARM_EXECUTABLE);
+        if (executable == null) {
+            return Activator.makeErrorStatus(MessageFormat.format(
+            		"The \"{0}\" parameter was not set in the \"{1}\" action", PARM_EXECUTABLE,
+                    ACTION_UNZIPANDEXECUTE), null);
+        }
+
+        IProfile profile = (IProfile) parameters
+                .get(ActionConstants.PARM_PROFILE);
+        String installFolder = Util.getInstallFolder(profile);
+        if (installFolder == null) {
+            return Activator.makeErrorStatus(
+                    "The profile did not have an install folder", null);
+        } else {
+            IPath path = new Path(installFolder);
+            path = path.append(executable);
+            executable = path.toOSString();
+            try {
+                ExecutionHandler handler = ExecutionFactory.getExecutionHandler(
+                        System.getProperty("os.name"), executable);
+
+                IStatus status2 = handler.handleExecution();
+
+                if (!status2.isOK()) {
+                    return status;
+                }
+            } catch (Exception e) {
+                return Activator.makeErrorStatus(MessageFormat.format(
+                		"could not execute \"{0}\"", executable), e);
+            }
+        }
+
+        return Status.OK_STATUS;
+    }
+
+    /* (non-Javadoc)
+     * @see org.eclipse.equinox.internal.p2.touchpoint.natives.actions.UnzipAction#undo(java.util.Map)
+     */
+    @Override
+    public IStatus undo(Map<String, Object> parameters) {
+        return Activator.makeErrorStatus(
+        		"undo not supported for exectutables", null);
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/org/eclipse/sequoyah/pulsar/internal/core/action/execution/ExecutionFactory.java	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2009 Motorola
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Diego Madruga (Motorola) - Initial implementation
+ */
+package org.eclipse.sequoyah.pulsar.internal.core.action.execution;
+
+/**
+ * 
+ */
+public class ExecutionFactory {
+
+    /**
+     * @param osName
+     * @param executable
+     * @return
+     */
+    public static ExecutionHandler getExecutionHandler(final String osName,
+            final String executable) {
+
+        String lcOsName = osName.toLowerCase();
+        if (lcOsName.startsWith("mac")) {
+            if (executable.endsWith(".dmg")) {
+                return new MacDmgExecutionHandler(executable);
+            }
+        } else if (lcOsName.startsWith("linux")) {
+            return new LinuxBinaryExecutionHandler(executable);
+        }
+        return new ExecutionHandler(executable);
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/org/eclipse/sequoyah/pulsar/internal/core/action/execution/ExecutionHandler.java	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2009 Motorola
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Diego Madruga (Motorola) - Initial implementation
+ */
+package org.eclipse.sequoyah.pulsar.internal.core.action.execution;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Status;
+
+import com.nokia.carbide.discovery.ui.Activator;
+
+/**
+ * 
+ */
+public class ExecutionHandler {
+
+    protected String executable;
+
+    /**
+     * @noreference This constructor is not intended to be referenced by
+     *              clients.
+     */
+    public ExecutionHandler(String executable) {
+        this.executable = executable;
+    }
+
+    /**
+     * @return
+     */
+    public IStatus handleExecution() {
+
+        MultiStatus multiStatus;
+
+        IStatus preExecuteStatus;
+        IStatus executeStatus;
+        IStatus posExecuteStatus;
+
+        preExecuteStatus = preExecute();
+        executeStatus = execute();
+        posExecuteStatus = posExecute();
+
+        if (preExecuteStatus.isOK() && executeStatus.isOK()
+                && posExecuteStatus.isOK()) {
+            multiStatus = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK,
+                    new IStatus[] { preExecuteStatus, executeStatus,
+                            posExecuteStatus },
+                    "The process was executed correctly.", null);
+        } else {
+            multiStatus = new MultiStatus(Activator.PLUGIN_ID, IStatus.ERROR,
+                    new IStatus[] { preExecuteStatus, executeStatus,
+                            posExecuteStatus },
+                    "Some errors were found durig the execution.", null);
+        }
+
+        return multiStatus;
+
+    }
+
+    /**
+     * @return
+     */
+    protected IStatus execute() {
+        IStatus status = new Status(IStatus.OK, Activator.PLUGIN_ID, "");
+
+        ProcessBuilder processBuilder = new ProcessBuilder(executable);
+        Process process;
+        try {
+            process = processBuilder.start();
+            process.waitFor();
+        } catch (IOException e) {
+            status = new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+                    "An I/O error has occurred", e);
+        } catch (InterruptedException e) {
+            status = new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+                    "The execution process was interrupted", e);
+        }
+
+        return status;
+    }
+
+    /**
+     * @return
+     */
+    protected IStatus posExecute() {
+        return new Status(IStatus.OK, Activator.PLUGIN_ID, "");
+    }
+
+    /**
+     * @return
+     */
+    protected IStatus preExecute() {
+        return new Status(IStatus.OK, Activator.PLUGIN_ID, "");
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/org/eclipse/sequoyah/pulsar/internal/core/action/execution/LinuxBinaryExecutionHandler.java	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2009 Motorola
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Diego Madruga (Motorola) - Initial implementation
+ */
+package org.eclipse.sequoyah.pulsar.internal.core.action.execution;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.equinox.internal.p2.touchpoint.natives.actions.ActionConstants;
+import org.eclipse.equinox.internal.p2.touchpoint.natives.actions.ChmodAction;
+
+/**
+ * 
+ */
+@SuppressWarnings("restriction")
+public class LinuxBinaryExecutionHandler extends ExecutionHandler {
+
+    /* (non-Javadoc)
+     * @see org.eclipse.sequoyah.pulsar.internal.core.action.execution.ExecutionHandler#preExecute()
+     */
+    @Override
+    public IStatus preExecute() {
+        Map<String, Object> parameters = new HashMap<String, Object>();
+        parameters.put(ActionConstants.PARM_TARGET_DIR, executable.substring(0,
+                executable.lastIndexOf('/')));
+        parameters.put(ActionConstants.PARM_TARGET_FILE, executable.substring(
+                executable.lastIndexOf('/') + 1, executable.length()));
+        parameters.put(ActionConstants.PARM_PERMISSIONS, "777");
+
+        ChmodAction ca = new ChmodAction();
+
+        return ca.execute(parameters);
+    }
+
+    /**
+     * @param executable
+     */
+    public LinuxBinaryExecutionHandler(String executable) {
+        super(executable);
+    }
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.discovery.ui/src/org/eclipse/sequoyah/pulsar/internal/core/action/execution/MacDmgExecutionHandler.java	Wed Aug 11 11:52:30 2010 -0500
@@ -0,0 +1,56 @@
+/**
+ * Copyright (c) 2009 Motorola
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Diego Madruga (Motorola) - Initial implementation
+ */
+package org.eclipse.sequoyah.pulsar.internal.core.action.execution;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+
+import com.nokia.carbide.discovery.ui.Activator;
+
+/**
+ * 
+ */
+public class MacDmgExecutionHandler extends ExecutionHandler {
+
+    /**
+     * @param executable
+     */
+    public MacDmgExecutionHandler(String executable) {
+        super(executable);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.eclipse.sequoyah.pulsar.internal.core.action.execution.ExecutionHandler#execute()
+     */
+    @Override
+    protected IStatus execute() {
+        IStatus status = new Status(IStatus.OK, Activator.PLUGIN_ID, "");
+
+        ProcessBuilder processBuilder = new ProcessBuilder("open", executable);
+        Process process;
+        try {
+            process = processBuilder.start();
+            process.waitFor();
+        } catch (IOException e) {
+            status = new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+                    "An I/O error has occurred", e);
+        } catch (InterruptedException e) {
+            status = new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+                    "The execution process was interrupted", e);
+        }
+
+        return status;
+    }
+
+}
--- a/core/com.nokia.carbide.search.system-feature/feature.xml	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.search.system-feature/feature.xml	Wed Aug 11 11:52:30 2010 -0500
@@ -4,6 +4,7 @@
       label="%featureName"
       version="3.0.0.qualifier"
       provider-name="Nokia"
+      plugin="com.nokia.carbide.search.system"
       image="Carbide_Image.png">
 
    <description>
--- a/core/com.nokia.carbide.search.system/about.ini	Wed Aug 11 11:18:20 2010 -0500
+++ b/core/com.nokia.carbide.search.system/about.ini	Wed Aug 11 11:52:30 2010 -0500
@@ -12,10 +12,8 @@
 # This text is shown in Feature Details -dialog when feature is selected.
 aboutText=%productBlurb
 
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
 # Property "featureImage" contains path to feature image (32x32)
+featureImage=icons/Carbide_c_icon_32x32.png
 
 # Property "aboutImage" contains path to product image (500x330 or 115x164)
 # needed for primary features only
Binary file core/com.nokia.carbide.search.system/icons/Carbide_c_icon_32x32.png has changed
--- a/debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF	Wed Aug 11 11:18:20 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/META-INF/MANIFEST.MF	Wed Aug 11 11:52:30 2010 -0500
@@ -19,5 +19,5 @@
  lib/commons-codec-1.3.jar,
  lib/commons-logging-1.1.jar
 Export-Package: com.nokia.carbide.trk.support.connection;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.carbide.cpp.edc",
- com.nokia.carbide.trk.support.service;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.cdt.debug.launch.platSim,com.nokia.carbide.cpp.edc"
+ com.nokia.carbide.trk.support.service;x-friends:="com.nokia.carbide.symsee.trk.support,com.nokia.carbide.cpp.edc"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingConnectedService.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/service/TracingConnectedService.java	Wed Aug 11 11:52:30 2010 -0500
@@ -242,8 +242,4 @@
 		
 		return new TestResult(estatus, getShortDescription(estatus), message);
 	}
-
-	public void setDeviceOS(String familyName, String version) {
-		// unimplemented
-	}
 }
\ No newline at end of file
--- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF	Wed Aug 11 11:18:20 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/META-INF/MANIFEST.MF	Wed Aug 11 11:52:30 2010 -0500
@@ -33,9 +33,7 @@
   x-friends:="com.nokia.carbide.automation.smoke.test,
    com.nokia.carbide.automation.utils,
    com.nokia.cdt.debug.cw.symbian.tests,
-   com.nokia.cdt.debug.launch,
-   com.nokia.cdt.debug.launch.platSim,
-   com.nokia.cdt.debug.launch.platSim.stopMode",
+   com.nokia.cdt.debug.launch",
  com.nokia.cdt.debug.cw.symbian.binaryparser;
   x-friends:="com.nokia.carbide.automation.smoke.test,
    com.nokia.carbide.automation.utils,
--- a/debuggercdi/com.nokia.cdt.debug.launch/META-INF/MANIFEST.MF	Wed Aug 11 11:18:20 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/META-INF/MANIFEST.MF	Wed Aug 11 11:52:30 2010 -0500
@@ -33,6 +33,5 @@
  com.nokia.cdt.internal.debug.launch.newwizard,
  com.nokia.cdt.internal.debug.launch.ui,
  com.nokia.cdt.internal.debug.launch.wizard
-Bundle-ClassPath: lib/JSiMa.jar,
- .
+Bundle-ClassPath: .
 
--- a/debuggercdi/com.nokia.cdt.debug.launch/build.properties	Wed Aug 11 11:18:20 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/build.properties	Wed Aug 11 11:52:30 2010 -0500
@@ -4,8 +4,5 @@
                .,\
                plugin.xml,\
                icons/,\
-               lib/,\
-               os/,\
-               lib/JSiMa.jar,\
                schema/
 
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/LaunchPlugin.java	Wed Aug 11 11:52:30 2010 -0500
@@ -102,7 +102,6 @@
 	
 	public static final String REMOTE_CONNECTIONS_TRK_SERVICE = "com.nokia.carbide.trk.support.service.TRKService"; //$NON-NLS-1$
 	public static final String REMOTE_CONNECTIONS_TRACING_SERVICE = "com.nokia.carbide.trk.support.service.TracingService"; //$NON-NLS-1$
-	public static final String REMOTE_CONNECTIONS_PLATSIM_SERVICE = "com.nokia.cdt.internal.debug.launch.platSim.service.PlatSimService"; //$NON-NLS-1$
 
 	// Preference constants
 	public static final String Use_New_Project_Assist = "com.nokia.cdt.debug.launch.Use_New_Project_Assist"; //$NON-NLS-1$
@@ -603,11 +602,6 @@
 					findServiceByID(REMOTE_CONNECTIONS_TRK_SERVICE);
 	}
 	
-	public static IService getPlatSimService() {
-		return RemoteConnectionsActivator.getConnectionTypeProvider().
-					findServiceByID(REMOTE_CONNECTIONS_PLATSIM_SERVICE);
-	}
-	
 	/**
 	 * Returns the currently active workbench window or <code>null</code>
 	 * if none.
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/CommandRunLaunchWizard2.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/CommandRunLaunchWizard2.java	Wed Aug 11 11:52:30 2010 -0500
@@ -10,10 +10,8 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.ILaunchManager;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java	Wed Aug 11 11:18:20 2010 -0500
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/newwizard/LaunchWizardData.java	Wed Aug 11 11:52:30 2010 -0500
@@ -93,8 +93,6 @@
 	public final static LaunchType APP_TRK = new LaunchType(null);
 	public final static LaunchType SYS_TRK = new LaunchType(null);
 	public final static LaunchType ATTACH_TO_PROCESS_LAUNCH = new LaunchType(null);
-	public final static LaunchType PLATSIM_RUN_MODE = new LaunchType(null);
-	public final static LaunchType PLATSIM_STOP_MODE = new LaunchType(null);
 	
 	// settings made in Debug/Run Process section
 	enum EExeSelection {
--- a/project/com.nokia.carbide.cpp.project.core/META-INF/MANIFEST.MF	Wed Aug 11 11:18:20 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.core/META-INF/MANIFEST.MF	Wed Aug 11 11:52:30 2010 -0500
@@ -16,7 +16,6 @@
  com.nokia.carbide.cpp.epoc.engine,
  com.nokia.carbide.cpp.sdk.core,
  com.nokia.carbide.templatewizard,
- org.eclipse.cdt.managedbuilder.core,
  org.eclipse.jface,
  org.eclipse.core.filesystem,
  com.nokia.carbide.cpp.qt.core