Merge commit
authorEd Swartz <ed.swartz@nokia.com>
Thu, 02 Sep 2010 13:19:32 -0500
changeset 1958 aac450e0c99e
parent 1957 c7e4f77e6b70 (current diff)
parent 1940 8193259c7a95 (diff)
child 1959 37285903ed51
Merge commit
core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_find_n_add_extentions.xml
core/com.nokia.carbide.cpp.doc.user/html/images/icons/menu_build_target.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_app_selection.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_finish.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_launch_types.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_rom_image.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trace32.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trk_conn.png
core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trk_sis.png
core/com.nokia.carbide.cpp.doc.user/html/images/step1.png
core/com.nokia.carbide.cpp.doc.user/html/images/step2.png
core/com.nokia.carbide.cpp.doc.user/html/images/step4.png
core/com.nokia.carbide.cpp.doc.user/html/images/step5.png
core/com.nokia.carbide.cpp.doc.user/html/images/step6.png
core/com.nokia.carbide.cpp.doc.user/html/images/step7.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_ad_sdk.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/RmvngandVwngPropsosSDK.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add_custkits.htm
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java	Thu Sep 02 13:19:32 2010 -0500
@@ -21,6 +21,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.TrayDialog;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
@@ -46,6 +49,7 @@
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer;
 import org.eclipse.ui.dialogs.PreferencesUtil;
@@ -226,7 +230,11 @@
 			filteringContentProviderWrapper.setConfigFilter(new QtConfigFilter());
 		}
 		
-		drawSDKConfigTree();
+		try {
+			drawSDKConfigTree();
+		} catch (CoreException e1) {
+			e1.printStackTrace();
+		}
 		
 		BrokenConfigurationInProjectTreeNode[] brokenTreeInput = BrokenConfigurationInProjectTreeNode.getTreeViewerInput(cpi);
 		if (brokenTreeInput.length > 0) {
@@ -247,7 +255,11 @@
 			public void widgetSelected(SelectionEvent e) {
 				// I don't see a way to open it to a specific tab, only the page
 				if (Window.OK == PreferencesUtil.createPreferenceDialogOn(getShell(), "com.nokia.carbide.cpp.sdk.ui.preferences.BuildPlatformFilterPage", null, null, 0).open()){ //$NON-NLS-1$
-					drawSDKConfigTree();
+					try {
+						drawSDKConfigTree();
+					} catch (CoreException e1) {
+						e1.printStackTrace();
+					}
 				}
 			}
 		});
@@ -260,7 +272,11 @@
 			public void widgetSelected(SelectionEvent e) {
 				// I don't see a way to open it to a specific tab, only the page
 				if (Window.OK == PreferencesUtil.createPreferenceDialogOn(getShell(), "com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage", null, null, 0).open()){ //$NON-NLS-1$
-					drawSDKConfigTree();
+					try {
+						drawSDKConfigTree();
+					} catch (CoreException e1) {
+						e1.printStackTrace();
+					}
 				}
 			}
 		});
@@ -270,11 +286,18 @@
 		return container;
 	}
 
-	private void drawSDKConfigTree() {
+	private void drawSDKConfigTree() throws CoreException {
 		boolean sbsv2Project = CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(cpi.getProject());
 	
 		properSdkViewer.setContentProvider(filteringContentProviderWrapper);
-		BuildTargetTreeNode[] sdkConfigTreeNodes = BuildTargetTreeNode.getTreeViewerInput(sbsv2Project);
+		IWorkbenchWindow wbw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		BuildTargetTreeNode[] sdkConfigTreeNodes = null;
+		if (wbw != null){
+			sdkConfigTreeNodes = BuildTargetTreeNode.getTreeViewerInput(sbsv2Project, wbw);
+		} else {
+			IStatus s = new Status(IStatus.ERROR, CarbideBuilderPlugin.PLUGIN_ID, 0, "Error retrieving workbench window. Cannot display configuration tree.", null);
+			throw new CoreException(s);
+		}
 		if (sbsv2Project){
 			replaceFilteredConfigsFromProject(sdkConfigTreeNodes);
 		}
--- a/core/com.nokia.carbide.cpp.doc.user/book.css	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/book.css	Thu Sep 02 13:19:32 2010 -0500
@@ -12,7 +12,7 @@
 /* 20091007 added verdana and ariel to list to match SFO website fonts choices */
 body, p, table, li {
 	font-family: Verdana, Ariel, Helvetica, sans-serif;
-	font-size: 1.0em;
+	font-size: 0.9em;
 	font-weight: normal;
 }
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_find_n_add_extentions.xml	Tue Aug 31 07:53:48 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<cheatsheet
-      title="Find and Add Extensions">
-`	<intro>
-    	<description>
-			You can add functionality to Carbide by installing additional extensions.
-    	</description>
-	</intro>
-  <item
-        skip="true"
-        title="Open the Carbide.c++ Portal view">
-     <description>
-        Use the <b>Carbide.c++ Portal > Customize</b> tab to find, download, and install extensions.
-     </description>
-      <command
-            required="false"
-            serialization="org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.makeFast=com.nokia.carbide.discovery.ui.portalEditor)"/>
-  </item>
-</cheatsheet>
--- a/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/trk_appTrk_debugapps_cs.xml	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/trk_appTrk_debugapps_cs.xml	Thu Sep 02 13:19:32 2010 -0500
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<cheatsheet title="Debugging DLLs, Applications, and Executables">
-	<intro>
-		<description>
-		Read the following information to Debug DLLs, Applications, and Executables.
-		</description> 
-	</intro> 
-	
-	<item title="Debugging DLLs" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm" >
-		<description>
-		Click question mark on right side for instructions to debug DLLs.
-		</description>
-	</item>
-
-	<item title="Debugging Applications" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm" >
-		<description>
-		Click question mark on right side for instructions to debug applications.
-		</description>
-	</item>
-
-	<item title="Importing and Debugging a Symbian Executable" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm" >
-		<description>
-		Click question mark on right side for instructions to import and debug a Symbian executable.
-		</description>
-	</item>
-
-	<item title="Attaching to a Symbian OS Process" href="/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm" >
-		<description>
-		Click question mark on right side for instructions to attach to a Symbian OS Process.
-		</description>
-	</item>
-
-	<item title="Debugging a Symbian OS Program" href="/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm" >
-		<description>
-		Click question mark on right side for instructions to debug a compiled Symbian OS program.
-		</description>
-	</item>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cheatsheet title="Debugging DLLs, Applications, and Executables">
+	<intro>
+		<description>
+		Read the following information to Debug DLLs, Applications, and Executables.
+		</description> 
+	</intro> 
+	
+	<item title="Debugging DLLs" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm" >
+		<description>
+		Click question mark on right side for instructions to debug DLLs.
+		</description>
+	</item>
+
+	<item title="Debugging Applications" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm" >
+		<description>
+		Click question mark on right side for instructions to debug applications.
+		</description>
+	</item>
+
+	<item title="Importing and Debugging a Symbian Executable" href="/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm" >
+		<description>
+		Click question mark on right side for instructions to import and debug a Symbian executable.
+		</description>
+	</item>
+
+	<item title="Attaching to a Symbian OS Process" href="/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_to_process.htm" >
+		<description>
+		Click question mark on right side for instructions to attach to a Symbian OS Process.
+		</description>
+	</item>
+
+	<item title="Debugging a Symbian OS Program" href="/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_debugging.htm" >
+		<description>
+		Click question mark on right side for instructions to debug a compiled Symbian OS program.
+		</description>
+	</item>
+
 </cheatsheet>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -9,14 +9,17 @@
 </head>
 <body >
 <h2>Auto-Targeting of Executables</h2>
-<p>In run-mode  the Carbide debugger now supports the auto-targeting of processes that are already running or are created during the execution of the debug session. Previously, the debugger forced users to explicitly attach to a running process. Now, the debugger attempts to target all the EXEs specified in the <a href="../projects/launch/page_executables.htm">Executables</a> tab of the launch configuration. </p>
+<p>In run-mode  the Carbide debugger now supports the auto-targeting of processes that are already running or are created during the execution of the debug session. Previously, the debugger forced users to explicitly attach to a running process. Now, the debugger attempts to target all the EXEs and binaries like DLLs specified in the <a href="../projects/launch/page_executables.htm">Executables</a> tab of the launch configuration. </p>
 <ul>
   <li>If the executables are already started, it gets the load address of the executable and targets it for debugging, resolving any breakpoints it finds.</li>
   <li>The debugger will target any executable not already started whenever a &quot;process load&quot; event occurs, resolving its breakpoints as well.</li>
 </ul>
+<h4>Debugging DLLs</h4>
+<p>One common debugging DLL use case is when the developer doesn't know which process calls the DLL. This makes it difficult to debug the DLL because you doesn't know which process to attach to nor start. Carbide enables DLL debugging  by simply attaching the DLL to any running process as long as the DLL is included in the <a href="../reference/view_executables.htm">Executables</a> view. See <a href="../tasks/processes/attach_to_process.htm">Attaching  to a Process</a> for more details.</p>
 <h5>Other References</h5>
 <ul>
   <li><a href="../projects/launch/page_executables.htm">Executables</a></li>
+  <li><a href="../tasks/processes/attach_to_process.htm">Attaching  to a Process</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -16,7 +16,7 @@
 </ul>
 <p>Build configurations are defined when the project is created. A project can have any number of build configurations and more  can be <a href="../tasks/projects/prj_new_build_config.htm">added</a> as necessary. Each build configuration can have its own combination of tool settings to precisely control how it is defined and built. Build configurations are maintained in the project Properties window in the Carbide Build Configurations panel. To open the panel, select a project in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> or <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view and select <b>Project &gt; Properties</b> or right-click and select Properties.</p>
 <p align="center"><img src="images/build_configs.png" width="801" height="350"></p>
-<p>You can select a build configuration in the <b>Active Configuration</b> group or use the <b>Project &gt; Active  Configuration</b> menu option  to <a href="../tasks/projects/prj_set_build_tgt.htm">set</a> which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the <b>Run</b> (<img src="../images/icons/btn_run.png" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.</p>
+<p>You can select a build configuration in the <b>Active Configuration</b> group or use the <b>Project &gt; Active  Configuration</b> menu option  to <a href="../tasks/projects/prj_set_build_tgt.htm">set</a> which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the <b>Run</b> (<img src="../images/icons/btn_run.png" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../projects/images/icon_debug.png" width="17" height="16" align="absmiddle" />) control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.</p>
 <p>If no <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> is present in the project, one is created on initial launch. Subsequent launches of the project will use either the last launch configuration or if more than one launch configuration exists, it uses the most correct one.</p>
 <p class="note"><b>NOTE</b> The Carbide <b>Run</b> and <b>Debug</b> buttons are shaded in blue to indicate their behavior differs from the standard Eclipse behavior.</p>
 <h5>Table 1 Build Configuration items </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -15,13 +15,13 @@
 <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_preference.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_symbian_sdk.htm">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>
     <th width="17%" rowspan="2" valign="middle" scope="col">Target Types </th>
     <th colspan="2" scope="col">Platform Security<br />
-(S60 5.0, Symbian ^3) </th>
+(S60 5.0, Symbian ^3, Symbian ^4) </th>
   </tr>
   <tr>
     <th width="15%" valign="middle" scope="col"><div align="center">RAPTOR, GCCE, ARMV5, ARMV5_ABIV2</div></th>
@@ -61,7 +61,6 @@
 </table>
 <h5>Related tasks</h5>
 <ul>
-  <li><a href="../tasks/sdks/sdk_add_custkits.htm">Adding Symbian Custom Kits</a></li>
   <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting Build Configurations</a></li>
   <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
 </ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -43,8 +43,7 @@
     <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>
+  <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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html	Thu Sep 02 13:19:32 2010 -0500
@@ -52,32 +52,19 @@
 		</li> 
 		<li> 
 		  <p>
-			 Add scalable graphics (MIF) and Symbian OS bitmaps (MBM) to projects, and edit these resources. You can add these using the		    New command, which is available on the File menu, and on the pop-up menus of the Project Explorer and Symbian Project Navigator views. MBM and MIF editors are provided to modify
+			 Add scalable graphics (MIF) and Symbian OS bitmaps (MBM) to projects, and edit these resources. You can add these using the New command, which is available on the File menu, and on the pop-up menus of the Project Explorer and Symbian Project Navigator views. MBM and MIF editors are provided to modify
 		  the resources.</p> 
 		  <p>
 			 For more information, see <a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a>.		  </p> 
 		</li> 
-		<li> 
-		  <p>
-			 Build programs for multiple SDKs and targets. The standard CDT build
-			 commands such as Build Project and Build All Configurations,
-		  which are available in the Project menu, are used.</p> 
-		  <p>
+		<li>
+        	<p>
+            Build programs for multiple SDKs and targets. The standard CDT build commands such as Build Project and Build All Configurations,
+		  which are available in the Project menu, are used.</p>
+		    <p>
 		  For more information, see <a href="../tasks/projects/prj_build.htm">Building Projects</a>.</p>
 		</li> 
-  </ul>
-
-   
- 
-
-  <ul>
-       <li> 
-	     <p>
-		    Configure the SDKs that are available for use with Carbide.c++ in the	       SDK Preferences settings. Select <strong>Window
-         &gt; Preferences</strong>, expand the Carbide.c++ group and select SDK Preferences.</p> 
-	     <p>
-		    For more information, see <a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</a>.</p> 
-       </li>
+       <li>To view the SDKs that are available for use with Carbide.c++ use the <a href="../reference/pref_carb_symbian_sdk.htm">Symbian SDK</a> preferences panel. </li>
   </ul>
 </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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -21,8 +21,8 @@
       <li><a href="../debugger/debug/cmds_resuming.htm">Restarting</a> the debugger</li>
     </ul>
   </li>
-  <li>Variable information in the <a href="../reference/view_variables.htm">Variables</a> view&mdash;see the variables in the executing code, their <a href="../tasks/variables/show_variables_view.htm">values</a>, and their <a href="../tasks/variables/set_variable_formats.htm">types</a></li>
-  <li>Breakpoint information in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view&mdash;see the <a href="../tasks/breakpoints/pgm_bp_enable.htm">breakpoints</a>, <a href="../tasks/breakpoints/pgm_bp_conditional.htm">conditional</a> breakpoints, and <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm">breakpoint actions</a></li>
+  <li>Variable information in the <a href="../reference/view_variables.htm">Variables</a> view&mdash;see the variables in the executing code, their <a href="../reference/perspective_debug.htm">values</a>, and their <a href="working_with_variables.htm">types</a></li>
+  <li>Breakpoint information in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view&mdash;see the <a href="../tasks/breakpoints/pgm_bp_enable.htm">breakpoints</a>, <a href="../tasks/breakpoints/pgm_bp_conditional.htm">conditional</a> breakpoints, and <a href="working_with_debugger.htm">breakpoint actions</a></li>
   <li>Source code&mdash;see the source code under debugger control</li>
 </ul>
 <h5>Related concepts</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -12,7 +12,7 @@
 <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>
   <li><a href="breakpoints.htm">Breakpoints</a>&mdash;halt program execution on a line of source code that you specify. You can set a breakpoint that always halts program execution, or you can set a breakpoint that halts program execution if a condition that you specify is true.</li>
-  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm">Breakpoint actions</a>&mdash;perform a task during program execution on a line of source
+  <li><a href="working_with_debugger.htm">Breakpoint actions</a>&mdash;perform a task during program execution on a line of source
     code that you specify. Breakpoint actions can play sounds, run scripts, log data, and perform other operations.</li>
   <li><a href="watchpoints.htm">Watchpoints</a>&mdash;halt program execution after a location in memory changes
   value</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_variables.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_variables.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -24,8 +24,8 @@
 <ul>
   <li><a href="../reference/view_expressions.htm">Expressions view</a></li>
   <li><a href="../reference/view_variables.htm">Variables View</a> </li>
-  <li><a href="../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="working_with_variables.htm">Setting Variable Formats</a></li>
+  <li><a href="../reference/perspective_debug.htm">Opening a Variables View</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/context_help/carbide_debug_dialogs_help.xml	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml	Thu Sep 02 13:19:32 2010 -0500
@@ -41,7 +41,7 @@
 		<description>Use the Symbian OS Data view to view processes, threads, chunks, and library information</description>
 		<topic label="Symbian OS Data"						href="html/reference/view_symbian_kernel.htm" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 
 	<!-- Symbian OS Data View Overview pane -->
@@ -49,7 +49,7 @@
 		<description>The Overview pane displays kernel objects by their heirarchical owner relationship</description>
 		<topic label="Symbian OS Data Overview"				href="html/reference/view_symbian_kernel.htm#overview" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 
 		<!-- Symbian OS Data View Processes pane -->
@@ -57,7 +57,7 @@
 		<description>The Processes pane lists processes in the target's Symbian OS</description>
 		<topic label="Symbian OS Processes"					href="html/reference/view_symbian_kernel.htm#processes" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 
 		<!-- Symbian OS Data View Thread pane -->
@@ -65,7 +65,7 @@
 		<description>The Threads pane lists threads in the target's Symbian OS</description>
 		<topic label="Symbian OS Threads"						href="html/reference/view_symbian_kernel.htm#threads" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 		
 	<!-- Symbian OS Data View Chunk pane -->
@@ -73,7 +73,7 @@
 		<description>The Chunks pane lists chunks in the target's Symbian OS</description>
 		<topic label="Symbian OS Chunks"						href="html/reference/view_symbian_kernel.htm#chunks" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 
 	<!-- Symbian OS Data View Library pane -->
@@ -81,7 +81,7 @@
 		<description>The Libraries pane lists libraries in the target's Symbian OS</description>
 		<topic label="Symbian OS Library List"					href="html/reference/view_symbian_kernel.htm#Library" />
 		<topic label="Setting Symbian OS View Refresh Rate"  href="html/tasks/debugger/view_symbian_kernel_set.htm" />
-		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Symbian OS Process"         href="html/tasks/processes/attach_to_process.htm" />
 	</context>
 
 		
@@ -166,14 +166,14 @@
 	<!-- LAUNCH.ATTACH -->
 	<context id="attach_main" >
 		<description>Create an Attach to Process launch configuration.</description>
-		<topic label="Attach to Process"  					href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Process"  					href="html/tasks/processes/attach_to_process.htm" />
 		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
 	</context>
 	
 	<!-- ATTACH TO PROCESS WINDOW -->
 	<context id="attach_choose_process" >
 		<description>Attaching to a process on the target device.</description>
-		<topic label="Attach to Process"  					href="html/tasks/processes/attach_debugger_to_process.htm" />
+		<topic label="Attach to Process"  					href="html/tasks/processes/attach_to_process.htm" />
 		<topic label="Symbian OS Data view"  				href="html/reference/view_symbian_kernel.htm" />
 		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
 	</context>
@@ -290,7 +290,7 @@
 		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
 		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
 		<topic label="Launch Configuration Filter"			href="html/reference/launch_configuration_filter.htm" />
-		<topic label="Carbide Project Settings"		    	href="html/reference/build_properties/pane_project_settings.htm" />
+		<topic label="Carbide Project Settings"		    	href="html/reference/build_properties/prop_carb_project_settings.htm" />
 	</context>
 
 	<context id="wizard_summary_page" >
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml	Thu Sep 02 13:19:32 2010 -0500
@@ -26,16 +26,16 @@
 	<!-- Carbide Project Settings page -->
 	<context id="project_properties_page" >
 		<description>Use the Carbide Project Settings window to specify project build options.</description>
-		<topic label="Carbide Project Settings"		              href="html/reference/build_properties/pane_project_settings.htm" />
-		<topic label="Carbide Build Configurations"				  href="html/reference/build_properties/pane_build_config.htm" />
-		<topic label="Macro Settings"				  			  href="html/reference/build_properties/pane_macro_settings.htm" />
+		<topic label="Carbide Project Settings"		              href="html/reference/build_properties/prop_carb_project_settings.htm" />
+		<topic label="Carbide Build Configurations"				  href="html/reference/build_properties/prop_carb_build_config.htm" />
+		<topic label="Macro Settings"				  			  href="html/reference/build_properties/prop_carb_macro_settings.htm" />
 		<topic label="Building Projects"			              href="html/tasks/projects/prj_build.htm" />
 	</context>
 
 	<!-- Carbide Build Configurations Page -->
 	<context id="project_configurations_page" >
 		<description>The Carbide Build Configurations page allows you to specify SIS file options and environment variable settings for the selected build configuration</description>
-		<topic label="Carbide Build Configurations"					href="html/reference/build_properties/pane_build_config.htm" />
+		<topic label="Carbide Build Configurations"					href="html/reference/build_properties/prop_carb_build_config.htm" />
 		<topic label="SIS Builder"									href="html/reference/build_properties/pane_build_config_sis.htm" />
 		<topic label="SBSv2"										href="html/reference/build_properties/pane_build_config_sbsv2.htm" />
 		<topic label="Environment"									href="html/reference/build_properties/pane_build_config_env.htm" />
@@ -48,9 +48,9 @@
 	<!-- Carbide Build Manage Configurations Page -->
 	<context id="manage_configurations_dialog" >
 		<description>Add or Remove build configurations to current project</description>
-		<topic label="Carbide Build Configurations"				   	href="html/reference/build_properties/pane_build_config.htm" />
+		<topic label="Carbide Build Configurations"				   	href="html/reference/build_properties/prop_carb_build_config.htm" />
 		<topic label="Adding/Removing Build Configurations"	   		href="html/tasks/projects/prj_new_build_config.htm" />
-		<topic label="Carbide Macro Settings"	   					href="html/reference/build_properties/pane_macro_settings.htm" />
+		<topic label="Carbide Macro Settings"	   					href="html/reference/build_properties/prop_carb_macro_settings.htm" />
 	</context>
 
 	<!-- Carbide Build Preference Page (added v1.3) -->
@@ -75,8 +75,8 @@
 	<!-- Carbide Macro Settings panel (added v1.3) -->
 	<context id="macro_settings_page" >
 		<description>Set project macros options</description>
-		<topic label="Carbide Macro Settings"	   		href="html/reference/build_properties/pane_macro_settings.htm" />
-		<topic label="Carbide Build Configurations"		href="html/reference/build_properties/pane_build_config.htm" />
+		<topic label="Carbide Macro Settings"	   		href="html/reference/build_properties/prop_carb_macro_settings.htm" />
+		<topic label="Carbide Build Configurations"		href="html/reference/build_properties/prop_carb_build_config.htm" />
 	</context>
 
 	<!-- Dependency Tracking (added v2.1) -->
@@ -382,7 +382,6 @@
 		<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" />
-		<topic label="Adding Symbian Custom Kits" 			href="html/tasks/sdks/sdk_add_custkits.htm" />
 	</context>
 
 	<!-- SDK Preferences panel: SDK Add dialog -->
@@ -398,7 +397,6 @@
 		<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="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>
 
 	<!-- Carbide.c++ > Platform Filtering Preferences panel -->
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Thu Sep 02 13:19:32 2010 -0500
@@ -113,7 +113,7 @@
 		<topic label="Creating a Launch Configuration"	href="html/tasks/projects/prj_debug_config.htm" />
 		<topic label="Launch Configurations"			href="html/concepts/launch_configuration.htm" />
 		<topic label="Launch Configuration Filter"		href="html/reference/launch_configuration_filter.htm" />
-		<topic label="Carbide Project Settings"		    href="html/reference/build_properties/pane_project_settings.htm" />
+		<topic label="Carbide Project Settings"		    href="html/reference/build_properties/prop_carb_project_settings.htm" />
 	</context>
 
 	<context id="wizard_summary_page" >
@@ -322,9 +322,9 @@
 	<!-- PROJECT PROPERTY DIALOG                                        -->
 	<context id="property_dialog_context" >
 		<description>Carbide specific project settings.</description>
-		<topic label="Carbide Build Configurations"		href="html/reference/build_properties/pane_build_config.htm" />
-		<topic label="Macro Settings"					href="html/reference/build_properties/pane_macro_settings.htm" />
-		<topic label="Project Settings"					href="html/reference/build_properties/pane_project_settings.htm" />
+		<topic label="Carbide Build Configurations"		href="html/reference/build_properties/prop_carb_build_config.htm" />
+		<topic label="Macro Settings"					href="html/reference/build_properties/prop_carb_macro_settings.htm" />
+		<topic label="Project Settings"					href="html/reference/build_properties/prop_carb_project_settings.htm" />
 	</context>
 	
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -16,11 +16,11 @@
   <li><a href="#RESTART_DB">Restarting a session</a></li>
 </ul>
 <h4><a name="START_DB" id="START_DB"></a>Starting a session</h4>
-<p>Use the <b>Debug</b> command (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
+<p>Use the <b>Debug</b> command (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
 <p>If the project does not already have a launch configuration, the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a> will automatically create one for <a href="../../projects/launch/launch_emulator.htm">emulator</a> targets or ask for additional information to create <a href="../../projects/launch/launch_phone.htm">phone</a> or <a href="../../projects/launch/launch_board.htm">hardware device</a> configurations. It will generate a default name for the launch configuration and add it to the list of available launch configurations for the project. Once complete and saved the debug session is launched. If a  launch configuration is already available, the Debug command launches  the last  launch configuration used by the project. </p>
 <p>To create new launch configurations where none previously existed or launch the last one created:</p>
 <ul>
-  <li>Click the <b>Debug</b> button (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) in the <b>Carbide C/C++</b> perspective</li>
+  <li>Click the <b>Debug</b> button (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle" />) in the <b>Carbide C/C++</b> perspective</li>
   <li>Select <b>Run &gt; Debug</b> from the  menu bar </li>
 </ul>
 <p>To launch a specific launch configuration:</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -105,7 +105,6 @@
   <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>
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/menu_build_target.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_app_selection.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_finish.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_launch_types.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_rom_image.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trace32.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trk_conn.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/wiz_launch_config_trk_sis.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step1.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step2.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step4.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step5.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step6.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step7.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -1,19 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Applications Launch Configuration</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2>Applications  Launch Configuration</h2>
-<p>Use the <b>Symbian OS Applications</b> launch configuration to launch projects using the best launch configuration match. When chosen, Carbide examines the project and determines which specific launch configuration  works best for the project, then launches it with the selected launch configuration. It is essentially identical to clicking the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) in the toolbar.</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Applications Launch Configuration</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Applications  Launch Configuration</h2>
+<p>Use the <b>Symbian OS Applications</b> launch configuration to launch projects using the best launch configuration match. When chosen, Carbide examines the project and determines which specific launch configuration  works best for the project, then launches it with the selected launch configuration. It is essentially identical to clicking the <b>Debug</b> icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) in the toolbar.</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/menu_build_target.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_app_selection.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_build_options.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_debug_as.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_launch_types.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_rom_image.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_trk_conn.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_config_trk_sis.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/wiz_launch_new_launch_config.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -10,7 +10,7 @@
 <h2>Launch Configuration Overview</h2>
 <p>A <b>launch configuration</b> defines the operational settings used by the Carbide.c++ tools  to launch and debug programs. A project must have at least one launch configuration, and can have as many as necessary. This enables you to develop and debug your project using various compilers (GCCE and RVCT) and different targets (emulator, on-device, and reference boards) as each launch configuration can be tailored to fit the intended target. </p>
 <h4>Creating a Launch Configuration </h4>
-<p>To create a default launch configuration for a project use the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. Using this method ensures that you have a working launch configuration for the project. You can invoke the New Launch Configuration Wizard for projects lacking a launch configuration by selecting the <b>Run &gt; Debug</b> (<span class="code">F11</span>) or<b> </b><b>Run &gt; Run</b> (<span class="code">CTRL+F11</span>) menu options, or clicking the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" alt="Debug icon"/>) icons in the toolbar. If a project already has a defined launch configuration, selecting the  <b>Run</b> or <b>Debug</b> command calls  the   previously defined and last used launch configuration, bypassing the wizard entirely.</p>
+<p>To create a default launch configuration for a project use the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. Using this method ensures that you have a working launch configuration for the project. You can invoke the New Launch Configuration Wizard for projects lacking a launch configuration by selecting the <b>Run &gt; Debug</b> (<span class="code">F11</span>) or<b> </b><b>Run &gt; Run</b> (<span class="code">CTRL+F11</span>) menu options, or clicking the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle" alt="Debug icon"/>) icons in the toolbar. If a project already has a defined launch configuration, selecting the  <b>Run</b> or <b>Debug</b> command calls  the   previously defined and last used launch configuration, bypassing the wizard entirely.</p>
 <p>For emulator projects  the wizard simply gathers the data it needs from the project and creates an emulator launch configuration and launches the emulator. For on-device targets, more information is required, so the wizard asks for the missing information it needs, creates the  launch configuration, then downloads the executable to the device and launches it. Once the emulator or device is loaded with the executable, the debug session   commences. </p>
 <p>You can  customize any project launch configuration  afterward using the <b>Debug</b> dialog as necessary. </p>
 <h4>Available Launch Configurations</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -10,80 +10,90 @@
 </head>
 <body >
 <h2>New Launch Configuration Wizard </h2>
-<p>The <b>New Launch Configuration Wizard</b> launches when no launch configuration exists for a project. Wherever possible the <b>New Launch Configuration </b> wizard gathers the information from the project and asks additional questions based on the type of launch configuration chosen. For example, a launch configuration using Application TRK requires different information than  one targeted for System TRK. </p>
+<p>The <b>New Launch Configuration Wizard</b> launches when no launch configuration exists for a build configuration in a project. Wherever possible the <b>New Launch Configuration </b> wizard gathers the information from the project and asks additional questions based on the type of launch configuration chosen. For example, a launch configuration using Application TRK requires different information than  one targeted for System TRK. </p>
+<p>Every project consists of one or more build configurations as listed under the <b>Build project</b> icon (<img src="../images/icon_build_project.png" alt="Build project icon" width="17" height="17" align="absmiddle">) of the toolbar or in the <a href="../../tasks/projects/prj_new_build_config.htm">Add/Remove Carbide Build Configuration</a> dialog. Every build configuration needs a launch configuration to enable debugging. Launch configurations can be shared between  build configurations. The <b>New Launch Configuration Wizard</b> detects when a build configuration doesn't have an associated launch configuration and guides you through the setup process.</p>
+<p align="center"><img src="images/menu_build_target.png" width="428" height="224"></p>
+<p class="figure">Figure 1. Build configurations for the chosen project appear under the Build icon</p>
+<p>To access the <b>New Launch Configuration Wizard</b> click the <b>Debug</b> icon (<img src="../../projects/images/icon_debug.png" alt="" width="17" height="16" align="absmiddle">) on the toolbar. If no launch configuration exists for the  selected build target the wizard is launched. If a launch configuration already exists, then that launch configuration is launched and not the wizard.</p>
+<h2>Launch Configuration Wizard Pages</h2>
+<p>The following are the possible pages you will see depending upon your choice of build configuration and type of debugging required. Different launch configurations need different information to work properly. The following table lists all the pages seen when choosing common types of debugging.</p>
 <table width="700"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="41%" scope="col">Launch Configuration</th>
-    <th width="59%" scope="col">Wizard Pages</th>
-  </tr>
-  <tr>
-    <td><b>Common pages</b></td>
-    <td><ul>
-      <li><a href="#CATEGORY">Category Type</a></li>
-      <li><a href="#LAUNCH">Launch Type</a></li>
-      <li><a href="#BLD_OPT">Build Option Selection</a></li>
-      <li><a href="#EXE_SEL">Executable Selection</a></li>
-      <li><a href="#FINISH">New Launch Configuration</a></li>
-    </ul>      </td>
-  </tr>
-  <tr>
-    <td><b>Emulation</b></td>
-    <td><ul>
-      <li><a href="#EXE_SEL">Executable Selection</a></li>
-      <li><a href="#BLD_OPT">Build Option Selection</a></li>
-      <li><a href="#FINISH">New Launch Configuration</a></li>
-      </ul>    </td>
-  </tr>
-  <tr>
-    <td><b>Application TRK and System TRK</b></td>
-    <td><ul>
-      <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
-      <li><a href="#TRK_SIS">TRK SIS Selection</a> (<i>Application TRK only</i>) </li>
-    </ul>    </td>
-  </tr>
-  <tr>
-    <td><b>Attach to Process</b></td>
-    <td><ul>
-      <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
-      </ul>    </td>
-  </tr>
+    <tr>
+        <th width="41%" scope="col">Launch Configuration</th>
+        <th width="59%" scope="col">Wizard Pages</th>
+    </tr>
+    <tr>
+        <td><b>Common pages</b></td>
+        <td><ul>
+            <li><a href="#DEBUGAS">Debug As</a></li>
+            <li>Launch Types</li>
+            <li><a href="#BLD_OPT">Build Option Selection</a></li>
+            <li><a href="#EXE_SEL">Executable Selection</a></li>
+            <li><a href="#FINISH">New Launch Configuration</a></li>
+        </ul></td>
+    </tr>
+    <tr>
+        <td><b>Simulator</b></td>
+        <td><ul>
+            <li><a href="#EXE_SEL">Executable Selection</a></li>
+            <li><a href="#BLD_OPT">Build Option Selection</a></li>
+            <li><a href="#FINISH">New Launch Configuration</a></li>
+        </ul></td>
+    </tr>
+    <tr>
+        <td><b>Application TRK and System TRK</b></td>
+        <td><ul>
+            <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
+            <li><a href="#TRK_SIS">TRK SIS Selection</a> (<i>Application TRK only</i>) </li>
+        </ul></td>
+    </tr>
+    <tr>
+        <td><b>Attach to Process</b></td>
+        <td><ul>
+            <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
+        </ul></td>
+    </tr>
 </table>
-<p>To access the <b>New Launch Configurtion Wizard</b> click the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">). If no launch configuration exists for the  build target the wizard is launched. If a launch configuration already exists, then that launch configuration is launched and not the wizard.</p>
-<p align="center"><img src="../../images/icons/menu_build_target.png" width="270" height="120"></p>
-<p class="figure">Figure 1 - Build Target selection list </p>
-<h3><a name="CATEGORY" id="LAUNCH2"></a>Category Types</h3>
-<p>Use the<b> Category Types</b> page to select the the  launch category.  The choices include Phone, Board, and possibly others. The choice made here filters the <b>Launch Types</b> page to  only show valid launch configurations. Once a category is selected, click <b>Next</b>. </p>
-<p align="center"><img src="images/wiz_launch_config_categories.png" width="438" height="533"></p>
-<p class="figure">Figure 2 - Category Types page </p>
+<h3><a name="DEBUGAS" id="LAUNCH2"></a>Debug As</h3>
+<p>Use the<b> Debug As </b>dialog  to select the method of debugging for the chosen build configuration.  The choices include: </p>
+<ul>
+    <li><b>Symbian OS Phone of Simulator Launch</b> &ndash; choose to work with attached phones or devices</li>
+</ul>
+<ul>
+    <li><b>Symbian OS Platform Simulator Launch</b> &ndash; choose to work with platform boards</li>
+</ul>
+<p>The choice made here filters the <b>Launch Types</b> page to  only show valid launch configurations. Once a debug as choice is made, click <b>OK</b>. </p>
+<p align="center"><img src="images/wiz_launch_config_debug_as.png" alt="Debug As dialog" width="346" height="435"></p>
+<p class="figure">Figure 1 - Debug As dialog </p>
 <h3><a name="LAUNCH" id="LAUNCH"></a>Launch Types</h3>
 <p>Use the<b> Launch Types</b> page to select the type of launch configuration for the build target. This page does not appear when using an Emulator target. Available types are listed from the most frequently chosen (Application TRK) to the least likely type (Attach to Process). Select a type and click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_launch_types.png" width="438" height="533"></p>
-<p class="figure">Figure 3 - Launch Type page </p>
+<p align="center"><img src="images/wiz_launch_config_launch_types.png" width="438" height="533"></p>
+<p class="figure">Figure 2 - Launch Type page </p>
 <h3><a name="BLD_OPT" id="EXE_SEL2"></a>Build Options Selection </h3>
 <p>Use the <b>Build Options Selection </b> page to define if the launch configuration uses automatic build or not. Choices include using the global automatic built setting (default), enable or disable automatic build for the launch configuration. You can also set the global option using the Configure Workspace Settings... to open the Launching preference panel.</p>
-<p align="center"><img src="images/wiz_launch_config_build_options.png" width="484" height="533"></p>
-<p class="figure">Figure 4 - Build Options Selection page </p>
+<p align="center"><img src="images/wiz_launch_config_build_options.png" width="631" height="433"></p>
+<p class="figure">Figure 3 - Build Options Selection page </p>
 <h3><a name="EXE_SEL" id="EXE_SEL"></a>Executable Selection </h3>
 <p>Use the <b>Application Selection </b> page to choose a binary created by the project to launch and debug and verify its location. If only a single binary is available the <b>Process to launch</b> option is disabled. </p>
 <p><b>EMULATOR ONLY</b> Use the <b>Location</b> field for emulator targets to verify that the correct executable on the host is selected. This field is not used with on-device launch configurations. </p>
 <p>Use the <b>Specify device path of remote process to launch</b> option to specify alternate paths for launching the executable from RAM (c:\sys\bin\), ROM (z:\sys\bin\) or  memory cards (e:\sys\bin\) . </p>
 <p>Select the Executable to launch, verify it is the correct binary, then click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_app_selection.png" width="438" height="533"> </p>
-<p class="figure">Figure 5 - Executable Selection page (when project has multiple EXEs)</p>
+<p align="center"><img src="images/wiz_launch_config_app_selection.png" width="438" height="533"> </p>
+<p class="figure">Figure 4 - Executable Selection page (when project has multiple EXEs)</p>
 <h3><a name="TRK_CONN" id="TRK_CONN"></a>TRK Connection Settings </h3>
 <p>Use the <b>TRK Connection Settings</b> page to specify the connection used to communicate with the target device. If the device is already connected, the drop down list will include both the COM port and the name of the device using that port. Use the <a href="../../reference/trk/wnd_on_device_setup.htm">On-Device Conection</a> dialog to verify and update all Carbide software services on the device. Choose the serial port used to communicate with the target device and click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_trk_conn.png" width="487" height="533"> </p>
-<p class="figure">Figure 6 - TRK Connection Settings  page </p>
+<p align="center"><img src="images/wiz_launch_config_trk_conn.png" width="487" height="533"> </p>
+<p class="figure">Figure 5 - TRK Connection Settings  page </p>
 <p>&nbsp;</p>
 <h3><a name="TRK_SIS" id="TRK_SIS"></a>TRK SIS Selection</h3>
 <p>Use the <b>TRK SIS Selection</b> page to select the SIS file to install on the target device. Click the <b>Modify SIS builder settings for build configuration</b> link to open the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> properties pane to add, edit, or review  the SIS files to build. Once the correct SIS File to Install is selected, click <b>Next</b>. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_trk_sis.png" width="463" height="533"></p>
-<p class="figure">Figure 7 - TRK SIS Selection page </p>
+<p align="center"><img src="images/wiz_launch_config_trk_sis.png" width="463" height="533"></p>
+<p class="figure">Figure 6 - TRK SIS Selection page </p>
 <h3><a name="FINISH" id="FINISH"></a>New Launch Configuration</h3>
 <p>Use the <b>New Launch Configuration</b> page to note the name of the configuration, confirm the launch configuration settings,  and then launch the debug session. If something doesn't look right, click <b>Back</b> to return to a page and change its setting. If all the settings are correct, click <b>Finish</b> to start the debug session using this launch configuration. </p>
 <p>If you checkmark <b> Advanced settings</b>, the <a href="../../reference/wnd_debug_configuration.htm">Debug</a> dialog appears instead of launching the project. This enables you to make additional changes to the new launch configuration before starting the debug session. By design and intent, this should seldom be required for the initial launch. </p>
-<p align="center"><img src="../../images/icons/wiz_launch_config_finish.png" width="438" height="533"></p>
-<p class="figure">Figure 8 - New Launch Configuration page </p>
+<p align="center"><img src="images/wiz_launch_new_launch_config.png" alt="New Launch Configuration dialog" width="631" height="433"></p>
+<p class="figure">Figure 7 - New Launch Configuration page </p>
 <h5>Other references</h5>
 <ul>
   <li><a href="../../projects/launch/launch_configs_overview.htm">Launch Configuration</a>  </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_00.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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/pref_carb_symbian_sdk.htm">Symbian SDKs 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>
+<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_symbian_sdk.htm">Symbian SDKs</a> preference panel 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="../../tasks/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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_01.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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/pref_carb_symbian_sdk.htm">Symbian SDKs 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>
+<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_symbian_sdk.htm">Symbian SDKs</a>preference panel 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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_02.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -33,7 +33,7 @@
                     </li>
     </ol>
     <blockquote>
-        <p>Once compiling is complete use the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a>, <a href="PLUGINS_ROOT//org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a>, <a href="../../reference/view_console.htm">Console</a>, and <a href="../../reference/view_executables.htm">Executables</a> views to locate and resolve any problems generated during the build. See Step 2 <a href="new_proj_from_template_02.htm">here</a> for more details.</p>
+        <p>Once compiling is complete use the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a>, <a href="../../reference/pref_carb_symbian_sdk.htm">Problems</a>, <a href="../../reference/view_console.htm">Console</a>, and <a href="../../reference/view_executables.htm">Executables</a> views to locate and resolve any problems generated during the build. See Step 2 <a href="new_proj_from_template_02.htm">here</a> for more details.</p>
         <p><img src="../images/dll_build_project.png" alt="Project Explorer showing DLL project" width="257" height="281"></p>
     </blockquote>
 </div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_03.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_dll_example_03.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -25,7 +25,7 @@
             <ul>
                 <li>Right-click the project in the Project Explorer view and choose <strong>Debug As &gt; Debug Symbian OS Application on Phone or Simulator</strong> menu option.</li>
                 <li>Click the Run &gt; Debug (F11) menu option.</li>
-                <li>Click the Debug (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar to build the project. </li>
+                <li>Click the Debug (<img src="../../reference/pref_carb_symbian_sdk.htm" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar to build the project. </li>
             </ul>
             <p>The first time you perform any of the following actions, the <strong>New Launch Configuration Wizard</strong> appears asking for the additional info to connect to a device.</p>
             <p><img src="../images/dll_new_launch_config.png" alt="New Launch Configuration Wizard" width="550" height="460"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_00.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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/pref_carb_symbian_sdk.htm">Symbian SDKs 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>
+<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_symbian_sdk.htm">Symbian SDKs</a>preference panel 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_02.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_02.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <title>Building Projects and Components</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="../../tasks/sdks/sdk_add.htm"></script>
 </head>
 <body >
 <h2>Building Projects and Components</h2>
@@ -69,7 +69,7 @@
        	        </li>
             
                 <li>Check the Problems view for error or warning messages<br />
-                    <p>Examine the <a href="PLUGINS_ROOT//org.eclipse.cdt.doc.user/reference/cdt_u_problems_view.htm">Problems</a> view to see what errors and warning messages were generated during the build. The Description column contains additional information about the problem that can help you resolve it.</p>
+                    <p>Examine the <a href="../../reference/pref_carb_symbian_sdk.htm">Problems</a> view to see what errors and warning messages were generated during the build. The Description column contains additional information about the problem that can help you resolve it.</p>
                	    <p><img src="../images/new_build_project_problems_view.png" alt="Executables view" width="797" height="210"></p>
                 </li>
                 <li>Examine the Console view for more specific details on  an error or warning message<br />
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/new_proj_from_template_04.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -16,7 +16,7 @@
     <li><strong>Launching and debugging an executable using the Carbide debugger</strong></li>
 </ol>
 <hr>
-<p class="note"><b>NOTE</b> You can only debug compiled programs. Use the <a href="../projects/prj_build.htm">Build Project</a> command to compile project sources into a binary file if you do not already have an executable in the project. A symbolics (<span class="code">.sym</span>) file is also required for debugging on a target device. Ensure that a <span class="code">.sym</span> file has been created. If you are importing an existing application, you may have to rebuild the application and create a related <span class="code">.sym</span> file. Make sure a <span class="code">.sym</span> file has been created in the output directory.</p>
+<p class="note"><b>NOTE</b> You can only debug compiled programs. Use the <a href="../../reference/pref_carb_symbian_sdk.htm">Build Project</a> command to compile project sources into a binary file if you do not already have an executable in the project. A symbolics (<span class="code">.sym</span>) file is also required for debugging on a target device. Ensure that a <span class="code">.sym</span> file has been created. If you are importing an existing application, you may have to rebuild the application and create a related <span class="code">.sym</span> file. Make sure a <span class="code">.sym</span> file has been created in the output directory.</p>
 <div class="step">
     <h4><strong></strong>Launching and debugging an executable</h4>
     <ol>
@@ -32,7 +32,7 @@
             <ul>
                 <li>Right-click the project and choose Debug As &gt; Debug Symbian OS Application on Emulator.</li>
                 <li>Click the Run &gt; Debug (<span class="code">F11</span>) menu item.</li>
-                <li>Click the Debug (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar.</li>
+                <li>Click the Debug (<img src="../../reference/pref_carb_symbian_sdk.htm" alt="Debug icon" width="17" height="17" align="absmiddle">) icon in the toolbar.</li>
             </ul>
             <p>The emulator is launched and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears to manage the debug session.</p>
         </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_00.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -14,7 +14,7 @@
     <li><a href="run_mode_debug_example_01.htm">Connect</a>  target device for PC</li>
     <li><a href="../trk/trk_installation_instr.htm">Install </a>TRK remote agent (v3.2.7) or later on the target device</li>
     <li><a href="run_mode_debug_example_04.htm">Configure</a> project for downloading</li>
-    <li><a href="run_mode_debug_example_05.htm">Debug</a> project on target device</li>
+    <li><a href="../../tasks/projects/prj_build.htm">Debug</a> project on target device</li>
 </ol>
 <h4>Other references</h4>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_01.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_01.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -14,7 +14,7 @@
     <li><strong>Connect target device to PC</strong></li>
     <li><a href="../trk/trk_installation_instr.htm">Install </a>TRK remote agent (v3.2.7) or later on the target device</li>
     <li><a href="run_mode_debug_example_04.htm">Configure</a> project for downloading</li>
-    <li><a href="run_mode_debug_example_05.htm">Debug</a> project on target device</li>
+    <li><a href="../../tasks/projects/prj_build.htm">Debug</a> project on target device</li>
     </ol>
 <hr>
 <p>The most reliable connection between a remote device and your PC is a cable. In this case, the USB cable that physically connects your phone to the a PC USB connection. Once connected, Carbide uses plug-and-play (PnP) to create a remote connection  to the phone or remote device.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_03.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -14,7 +14,7 @@
     <li><a href="run_mode_debug_example_01.htm">Connect</a> target device to PC</li>
     <li><a href="../trk/trk_installation_instr.htm">Install </a>TRK remote agent (v3.2.7) or later on the target device</li>
     <li><strong>Configure project for downloading</strong></li>
-    <li><a href="run_mode_debug_example_05.htm">Debug</a> project on target device</li>
+    <li><a href="../../tasks/projects/prj_build.htm">Debug</a> project on target device</li>
     </ol>
 <hr>
 <p>&nbsp;</p>
@@ -25,7 +25,7 @@
     		<p>We choose <strong>Phone Debug (armv5_udeb)</strong> for this example using the <strong>Manage Configurations</strong> icon on the toolbar, but yours name may differ based upon the SDK  selected for your project.</p>
             <p><img src="../images/debugging_project_07.png" alt="Select device target"></p>
         </li>
-        <li>Click the Debug icon (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) on the toolbar.
+        <li>Click the Debug icon (<img src="../../reference/pref_carb_symbian_sdk.htm" alt="Debug icon" width="17" height="17" align="absmiddle">) on the toolbar.
     		<p>This opens the <strong>New Launch Configuration Wizard</strong> dialog asking for additional information. For the first launch you must define the name of the package to install on the target device.</p>
             <p><img src="../images/debugging_project_08.png" alt="New Launch Configuration Wizard" width="538" height="434"></p>
             <ol type="a">
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/tutorials/run_mode_debug_example_04.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -24,7 +24,7 @@
         <li>Set breakpoints in the program.
         	<p><a href="../../debugger/breakpoints/toggling_breakpoints.htm">Set breakpoints</a> at the critical points in the program where you want to stop execution.</p>
         </li>
-        <li>Click the Debug icon (<img src="../images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) to launch the program for debugging on the target device.
+        <li>Click the Debug icon (<img src="../../reference/pref_carb_symbian_sdk.htm" alt="Debug icon" width="17" height="17" align="absmiddle">) to launch the program for debugging on the target device.
         	<p>Follow the steps in <a href="run_mode_debug_example_03.htm">Configure project for downloading</a> to build and launch the program for debugging.</p>
         </li>
         <li>Use the Carbide debugger to examine program internals and control its execution.
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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_preference.html">Symbian SDKs 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_symbian_sdk.htm">Symbian SDKs 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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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_preference.html">Symbian SDKs 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_symbian_sdk.htm">Symbian SDKs 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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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_preference.html">Symbian SDKs 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_symbian_sdk.htm">Symbian SDKs 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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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_preference.html">Symbian SDKs 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_symbian_sdk.htm">Symbian SDKs 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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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_preference.html">Symbian SDKs 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_symbian_sdk.htm">Symbian SDKs 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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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_preference.html">Symbian SDKs 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_symbian_sdk.htm">Symbian SDKs 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_04.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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_preference.html">Symbian SDKs 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_symbian_sdk.htm">Symbian SDKs 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/reference/BasicSettings.html	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/BasicSettings.html	Thu Sep 02 13:19:32 2010 -0500
@@ -8,7 +8,7 @@
 		You can set some basic properties for the project in this page, like	   Application UID, Author and Copyright
 	 notice for the project. </p>
 	 <p class="note"><b>NOTE</b> Fields appearing in window vary depending upon the type of project being created. </p>
-    <p align="center" class="Image"><img src="../images/step5.png" width="500" height="500" /></p>
+    <p align="center" class="Image"><img src="../tasks/images/new_proj_step5.png" width="500" height="500" /></p>
    <table width="787"
 border="0" cellpadding="2" cellspacing="0">
      <tr valign="top"><th width="206" class="Cell">Name</th>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Thu Sep 02 13:19:32 2010 -0500
@@ -45,7 +45,7 @@
     </ul>
   
    
-<div id="footer"> <img src="../images/c3_32x32.png" alt="C3 logo" width="32" height="32" border="2" align="left">    Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.<br>
+<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/reference/ProjectDirectories.html	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html	Thu Sep 02 13:19:32 2010 -0500
@@ -13,7 +13,7 @@
 	 </p> 
 	 <div class="Figure">
 
-		<p align="center" class="Image"><img src="../images/step6.png" width="500" height="500" /></p>
+		<p align="center" class="Image"><img src="../tasks/images/new_proj_step6.png" width="500" height="500" /></p>
 	   <p class="Image">Figure 1 - Project Directories page </p>
 	 </div><table width="720"
 border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Thu Sep 02 13:19:32 2010 -0500
@@ -9,9 +9,9 @@
 <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_preference.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_symbian_sdk.htm">SDK Preferences</a> page. </p>
 <div class="Figure">
-<p align="center" class="Image"><img src="../images/step4.png" width="500" height="500"><br>
+<p align="center" class="Image"><img src="../tasks/images/new_proj_step4.png" width="525" height="503"><br>
 </p>
 </div>
 
@@ -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_preference.html">SDK Preferences</a></li>
+<li><a href="pref_carb_symbian_sdk.htm">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_sis.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -58,7 +58,7 @@
 </ul>
 <h5>Other references</h5>
 <ul>
-  <li><a href="pane_build_config.htm">Carbide Build Configurations </a><a href="../../tasks/projects/working_with_sis_pkg_files.htm"></a></li>
+  <li><a href="prop_carb_build_config.htm">Carbide Build Configurations </a><a href="../../tasks/projects/working_with_sis_pkg_files.htm"></a></li>
   <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
   <li><a href="pane_build_config_env.htm">Environment</a></li>
   <li><a href="pane_build_config_paths.htm">Paths and Symbols</a></li>
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/panel_global_debugger.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_build_workspace.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_diagnostic_logs.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_preprocess.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_ad_sdk.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_add_sdk.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_sis_properties.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_build.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_build.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -17,7 +17,7 @@
 <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>
-<p align="center"><img src="images/prefs_build_workspace.png" width="620" height="458" alt="" /></p>
+<p align="center"><img src="images/prefs_build_workspace.png" width="696" height="554" alt="" /></p>
 <p class="figure">Figure 1 - Build workspace preferences page </p>
 <p>The following options are available in both the global Build preference panel and the project <b>Properties &gt; Carbide.c++ &gt; </b><b><a href="build_properties/prop_carb_project_settings.htm">Project Settings</a></b> panel. </p>
 <h5>Table 1 Build Preferences &mdash;items</h5>
@@ -41,7 +41,7 @@
   <tr>
     <td><b>Run builds concurrently (improves compile time) </b></td>
     <td><p>Enable to tell Carbide to generate concurrent builds up to the amount specified in the Build jobs field. This option can significantly reduce build times as it takes advantage of multi-core processors and hyperthreading to run multiple threads at once. </p>
-    <p>If not enabled, only a single build is run. Note that this may be required if your project contains circular dependencies or other issues that prevent concurrent builds from executing correctly. </p></td>
+    <p>If not enabled, only a single build is run. Note  this may be required if your project contains circular dependencies or other issues that prevent concurrent builds from executing correctly. </p></td>
   </tr>
   <tr>
     <td><b>Use default incremental builder </b></td>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_cpp.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_cpp.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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_preference.html">SDK Preferences</a></li>
+  <li><a href="pref_carb_symbian_sdk.htm">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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_debugger.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -12,7 +12,7 @@
 <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>
-<p align="center"><img src="images/panel_global_debugger.png" width="688" height="586" alt="" /></p>
+<p align="center"><img src="images/panel_global_debugger.png" width="719" height="646" alt="" /></p>
 <p class="figure">Figure 1 - Carbide.c++ Debugger preference panel</p>
 <h5>Table 1. Carbide.c++ Debugger panel&mdash;items </h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_diagnostic_logs.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_diagnostic_logs.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -10,9 +10,9 @@
 </head>
 <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>The <b>Diagnostic Logs</b> preference panel 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>
-<p align="center"><img src="images/prefs_diagnostic_logs.png" width="627" height="544"></p>
+<p align="center"><img src="images/prefs_diagnostic_logs.png" width="719" height="646"></p>
 <p class="figure">Figure 1 - Diagnostic Logs preferences panel </p>
 <h5>Table 1 <span class="figure">Diagnostic Logs</span> preferences &mdash;items</h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_preprocess.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_preprocess.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -10,10 +10,10 @@
 </head>
 <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>
-<p class="figure">Figure 1 - Preprocess preferences page </p>
-<h5>Table 1 <span class="figure">Preprocess</span> p references &mdash;items</h5>
+<p>The <b>Carbide.c++ &gt;</b> <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> preference panel in the <b>Preferences</b> window provides global settings for the Carbide preprocessor. </p>
+<p align="center"><img src="images/prefs_preprocess.png" width="719" height="646" /></p>
+<p class="figure">Figure 1 - Preprocess preferences panel </p>
+<h5>Table 1 <span class="figure">Preprocess</span> preferences &mdash;items</h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="20%" scope="col">Item</th>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_symbian_sdk.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_symbian_sdk.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -16,7 +16,7 @@
    <body>
 <h2>Symbian SDKs</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.sdk_prefs_page)")'>
-   Symbian SDKs</a> page in the <b>Preferences</b> window to view which installed SDKs are available to projects during an import. If the SDK is properly configured for SBSv2 you may never need to view this preference panel.</p>
+   Symbian SDKs</a> preference panel in the <b>Preferences</b> window to view the installed SDKs that are available for creating projects during an import. If the SDK is properly configured for SBSv2 you may never need to view this preference panel.</p>
 <p>One thing to note is that Carbde.c++ no longer requires the <span class="code">devices.xml</span> file to recognize and use SDKs. Insteads it now caches this information for later use. If the SDK contains an entry for the <span class="code">devices.xml</span> Carbide will use it.</p>
 <p>To
     access <strong>Symbian SDKs</strong> preferences preference panel, select <b>Window &gt; Preferences &gt; Carbide.c++ &gt; Symbian SDKs</b>. </p>
@@ -27,22 +27,23 @@
    <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>
+           <td class="Cell"><p>Lists all the installed and recognized SDKs that are supported by the IDE. SDKs no longer supported will not be shown. You can double-click on any <b>SDK ID</b> or <b>Location</b> entry to directly edit the fields information.</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>
+             <p>SDKs shown in <span class="style2">RED</span>  indicate  a problem, usually no <span class="code">EPOCROOT</span> or unsupported Symbian OS version. </p>
+           <p>Click on a SDK name to see its <span class="code">EPOCROOT</span> 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>
+             <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_add.htm">add</a> an SDK to the <b>Symbian 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>
+           <td class="Cell">Click to remove the selected SDK from the <b>Symbian SDKs</b> 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>
+           <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>Symbian SDKs</b> list.</p>           </td>
      </tr>
          <tr valign="top">
            <td class="Cell"><p><b>Rescan All SDKs</b></p>           </td>
@@ -55,7 +56,6 @@
        
        <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>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_x86_exceptions.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_x86_exceptions.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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_preference.html">SDK Preferences</a></li>
+  <li><a href="pref_carb_symbian_sdk.htm">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/view_executables.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -13,7 +13,7 @@
 <ul>
   <li>target all binaries for debugging because the symbolics are automatically loaded when a bld.inf is imported or a project is created from a template</li>
   <li>debug a binary that is not part of a project in the workspace by importing it into the Executables view to load the symbolics</li>
-  <li> debug a process running on a device by <a href="../tasks/processes/attach_debugger_to_process.htm">attaching</a> to the process and importing the binaries associated with the process into the Executables view to load the symbolics. For example, you to debug a library loaded by the process, you would need to import the libary and the process executable. </li>
+  <li> debug a process running on a device by <a href="../tasks/processes/attach_to_process.htm">attaching</a> to the process and importing the binaries associated with the process into the Executables view to load the symbolics. For example, you to debug a library loaded by the process, you would need to import the libary and the process executable. </li>
   <li>remove binaries when a project is closed or deleted from the workspace</li>
   <li>remove  binaries  imported from outside the workspace by clicking the <b>Remove the selected executables</b> icon (<img src="images/icon_delete_launch_config.png" width="17" height="16" align="absmiddle">) or deleting the binary from the Executables project in the <a href="view_proj_explorer.htm">Project Explorer</a> view </li>
   <li>locate and manage which source and resource files are associated with each executable. Paths shown in black text have been resolved, those in gray text cannot be found. </li>
@@ -25,7 +25,7 @@
 <p class="note"><b>NOTE</b> To debug ROM DLLs with System TRK or in stop mode, always specify the <a href="../projects/launch/page_rom_log.htm">ROM Log file</a> in the project's launch configuration. </p>
 <p align="center"><img src="images/view_executables.png" width="813" height="309" /></p>
 <p class="figure">Figure 1 - Executables view</p>
-<p align="left">The Executables view consists of the Executable Name and Source File Name panes describled in the table below. Use the Columns button in the toolbar to show or hide specific columns in each pane. Columns can be sorted and rearranged in the order desired. </p>
+<p align="left">The <strong>Executables</strong> view consists of the <strong>Executable Name</strong> and <strong>Source File Name</strong> panes describled in the table below. Use the <strong>Columns</strong> button in the toolbar to show or hide specific columns in each pane. Columns can be sorted and rearranged in the order desired. </p>
 <h5>Table 1. Executables view  information </h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -61,7 +61,7 @@
   </tr>
 </table>
 <h4>Executables view toolbar icons</h4>
-<p>The table below lists the unique icons displayed in the Executables view toolbar. </p>
+<p>The table below lists the unique icons displayed in the <strong>Executables</strong> view toolbar. </p>
 <h5>Table 2. Executables view toolbar options </h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -77,7 +77,7 @@
     <tr>
       <td><div align="center"><img src="../images/icons/btn_import_executables.png" width="18" height="15" /></div></td>
       <td>Import an executable file </td>
-      <td>Click to import an executable not in the workspace into the executables list. </td>
+      <td>Click to select and import an executable not in the workspace into the executables list. </td>
     </tr>
     <tr>
       <td><center>
@@ -96,6 +96,8 @@
 <h5>Other references</h5>
 <ul>
   <li><a href="perspective_debug.htm">Debug perspective </a></li>
+  <li><a href="../concepts/autotargeting.htm">Auto-Targeting of Executables</a></li>
+  <li><a href="../tasks/processes/attach_to_process.htm">Attaching to a Process</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -72,7 +72,7 @@
 </ul>
 <h5>Related tasks</h5>
 <ul>
-  <li><a href="../tasks/variables/show_variables_view.htm">Showing the Variables View</a> </li>
+  <li><a href="perspective_debug.htm">Showing the Variables View</a> </li>
   <li><a href="perspective_debug.htm">Showing Global Variables</a> </li>
 </ul>
 <h5>Related References </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Thu Sep 02 13:19:32 2010 -0500
@@ -8,25 +8,25 @@
 <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_preference.html">Symbian SDKs 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_symbian_sdk.htm">Symbian SDKs 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>
     <ol>
       <li class="step">Select <b>File &gt; New &gt; Symbian OS C++ Project</b> to invoke the <b>New Project</b> wizard.</span></li>
-        <p><img src="../images/step1.png" width="506" height="318" alt="" ></p>
+        <p><img src="images/new_proj_step1.png" width="548" height="120" alt="" ></p>
         <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_preference.html">Symbian SDKs panel</a>. 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>
+      <p>Checkmark the <b>Filter templates based on enabled SDKs</b> option to only list  SDKs enabled in the <a href="../reference/pref_carb_symbian_sdk.htm">Symbian SDKs panel</a>. Uncheck this option to list  SDKs that can be used with Carbide. Click <b>Next</b>.</p>
+      <p align="center"><img src="images/new_proj_step2.png" width="525" height="503" 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>
-      <p align="center"><span class="Image"><img src="images/new_proj_name_location.png" alt="new project" width="500" height="400"></span><span class="Image"><br>
+      <p align="center"><span class="Image"><img src="images/new_proj_name_location.png" alt="new project" width="525" height="503"></span><span class="Image"><br>
       </span></p>
       <li>Select the <b>SDKs and Build Configurations</b>. </li>
       <p>Checkmark the <b>Filter SDKs based on selected template</b> option to only show  build configurations based on the selected SDK template, or uncheck to show all enabled SDKs and their related build configurations.</p>
-      <p align="center"><img src="../images/step4.png" width="500" height="500" alt="" ></p>
+      <p align="center"><img src="images/new_proj_step4.png" width="525" height="503" alt="" ></p>
       <p class="Image">The Symbian OS SDKs wizard page shows a tree of the SDKs and the type of builds available within that SDK. Select a single SDK
         if the program you are developing is for just one version of a platform,
       or select multiple SDKs to build the program for multiple build platforms or SDK versions.</p>
@@ -34,7 +34,7 @@
         do the build, and whether debug and/or release builds are required. For this example we recommend using the Emulator Debug version as the <a href="../concepts/build_configurations.htm">build configuration</a>. Later, you can <a href="projects/prj_set_build_tgt.htm">switch</a> to another build configuration to create the project for a specific device.</p>
       <p> Click <b>Next</b>.</p>
       <li>Set the project properties in the <b>Basic Settings</b> page. </li>
-      <div align="center"><img src="../images/step5.png" width="500" height="500" alt="" >        </div>
+      <div align="center"><img src="images/new_proj_step5.png" width="525" height="503" alt="" >        </div>
       <blockquote>
         <p align="left" class="note"><b>NOTE</b> The basic properties for a project may change based on the template selected for a particular project type. </p>
         <p align="left" style="font-weight: normal;">Fill in the applicable fields, which
@@ -61,7 +61,7 @@
       <li span style="font-weight: normal;">
         Click <b>Next</b> to move to the <b>Project Directories</b> page.</li>
         <div class="Figure">
-          <p align="center" class="Image"><img src="../images/step6.png" width="500" height="500" alt="" ><br>
+          <p align="center" class="Image"><img src="images/new_proj_step6.png" width="525" height="503" alt="" ><br>
           </p>
           <p class="note" style="font-weight: normal;"> <b>NOTE</b> The project directories depends on the selected template. That is, the directories required to store project data may
       change based on the template used. </p>
@@ -71,7 +71,7 @@
       <p>This generates the necessary files for the project based on the template selected and show them in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> view.</p>
     </ol>
     <blockquote>
-      <p align="center"><img src="../images/step7.png" width="273" height="301" alt="" > </p>
+      <p align="center"><img src="images/new_proj_step7.png" width="224" height="267" alt="" > </p>
     </blockquote>
   </div>
   <blockquote>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html	Thu Sep 02 13:19:32 2010 -0500
@@ -34,7 +34,7 @@
 	 </ul>
 
      <h3>Projects for Symbian OS 9.3+ </h3>
-     <p>The latest versions of Symbian OS 9.3+ devkits include extensive use of <span class="code">PRJ_EXTENSIONS</span> and <span class="code">PRJ_TESTEXTENSIONS</span>. These top-level entries are extension makefile templates whose names are later filled in with target names, sources, and options. The intent is to make source editing easier and dependency checking possible during a build. </p>
+     <p>Versions of Symbian OS 9.3+ devkits include extensive use of <span class="code">PRJ_EXTENSIONS</span> and <span class="code">PRJ_TESTEXTENSIONS</span>. These top-level entries are extension makefile templates whose names are later filled in with target names, sources, and options. The intent is to make source editing easier and dependency checking possible during a build. </p>
      <p>Currently if you  import a bld.inf file but are not importing all of the components and one of these extensions are found:</p>
      <ul>
        <li>a warning appears at the top of the wizard page</li>
@@ -62,19 +62,18 @@
 			 Type the location of the bld.inf file to import, or browse to the file using the Browse button. </li>
 		  <p class="Image"><img src="../reference/images/import_bld_inf_02.png" alt="Select bld.inf file to import" width="573" height="550"></p>
 		  <p class="note"><strong>NOTE</strong> Depending upon which SDKs are installed, you may see both SBSv1 and SBSv2 builders available. It is recommended that SBSv2 be the primary choice as SBSv1 has been deprecated for future Symbian OS development.</p>
-		  <p class="Image">SBSv2   works with recent versions of Symbian^3 and Symbian ^4 SDKs. Both  SBSv1 and SBSv2 are GNU make based build systems.&nbsp; SBSv1 uses Perl to generate make files,  while SBSv2 uses Python. Select the appropriate builder for your project.</p>
-		  When building for  SBSv2, the builder will set <span class="code">EPOCROOT</span> to the absolute path (including drive  letter) to the kit for the active build configuration.&nbsp; It will also add the path to the sbs bin  directory to the start of the <span class="code">PATH</span> variable.&nbsp;  This is derived from the SBS_HOME environment variable.
-		  <p class="Image">For SBSv2, all  build configurations (platform/target), including the built-in platforms  (WINSCW, ARMV5), are declared in xml files in the <span class="code">\sbs\lib\config</span> directory.  The Build  Configurations selection page  displays only kits  known to support SBSv2.</p>
+		  <p class="Image">SBSv2   works with recent versions of Symbian^3 and Symbian ^4 SDKs. Both  SBSv1 and SBSv2 are GNU make based build systems. SBSv1 uses Perl to generate make files,  while SBSv2 uses Python. Select the appropriate builder for your project.</p>
+		  <p class="note"><strong>NOTE</strong> Choose SBSv2 whenever possible as SBSv1 is being phased out.</p>
+	     When building for  SBSv2, the builder will set <span class="code">EPOCROOT</span> to the absolute path (including drive  letter) to the kit for the active build configuration.&nbsp; It will also add the path to the sbs bin  directory to the start of the <span class="code">PATH</span> variable.&nbsp;  This is derived from the <span class="code">SBS_HOME</span> environment variable.
+	     <p class="Image">For SBSv2, all  build configurations (platform/target), including the built-in platforms  (WINSCW, ARMV5), are declared in xml files in the <span class="code">\sbs\lib\config</span> directory.  The Build  Configurations selection page  displays only kits  known to support SBSv2.</p>
 		  <li> Click Next to select the recognized SDKs and Build Configurations to be created for this project
-		      <blockquote>
-		          <p>The SDKs and Build Configurations shows a tree of
+		      <p>The SDKs and Build Configurations shows a tree of
 		              the SDKs that are available to be used, and for each SDK, the type of build configurations
 		              that are available. You can select a single SDK if you are developing the program
 		              for just one version of a platform, or multiple SDKs if your
 		              program is to be built against multiple platforms or operating system
 		              versions.</p>
-	          </blockquote>
-         </li>
+	     </li>
      </ol>
      <blockquote>
          <p class="note"><b>NOTE</b> The platforms listed are dependent upon the filter settings in the <a href="sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a>.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/RmvngandVwngPropsosSDK.html	Tue Aug 31 07:53:48 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Viewing SDK Properties and Removing SDKs in Working with SDKs</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {font-family: "Courier New", Courier, mono}
-.style2 {color: #FF0000}
--->
-</style>
-</head>
-   <body>
-   <h2>Editing SDK Properties</h2>
-   <div class="Bodytext">
-	  
-	 <p>
-		This section explains how to view and edit properties of an
-		existing SDK using SDK preferences. For an overview of how the plug-ins handle
-		SDKs, see <a href="WorkingwithSDKs.html">Working with SDKs</a>.</p>
-    <h4>
-		To edit properties of an existing SDK</h4> 
- 
-	 <ol> 
-		<li> 
-		  <p>
-			 Click <b>Window &gt; Preferences</b> to open the Preferences page, then expand Carbide.c++ and select <b>SDK Preferences</b> from the list of preferences
-			 to show the page that allows SDK Preferences to be set.</p> 
-	   </li>
-		<div class="Figure">
-
-		   <p class="Image"><img src="../images/SDKPreferences.png" width="740" height="546" /></p>
-	   </div>
-		<p class="note"><b>NOTE</b> SDKs shown in <span class="style2">red</span> indicate a problem, for example no <span class="style1">EPOCROOT</span>. </p>
-
-		<li>Select a  SDK entry, then click SDK Properties to <a href="sdks/sdk_view_properties.htm">edit</a> the selected SDK's information</li>
-		<li>Click OK to accept changes</li>
-     </ol>
-   </div>
-	 <h5>Related tasks</h5>
-
-   <ul>
-<li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
-<li><a href="sdks/sdk_view_properties.htm">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/tasks/WorkingwithSDKs.html	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html	Thu Sep 02 13:19:32 2010 -0500
@@ -8,18 +8,12 @@
 		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 Symbian SDKs panel. The <a href="../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a> 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>
+  <p>You can add and manage SDKs in the Symbian SDKs panel. The <a href="../reference/pref_carb_symbian_sdk.htm">Symbian SDKs</a> preference panel lists all available SDKs and allows you to rescan system drives for newly installed and supported SDKs.</p>
   <h5>Related references</h5>
   <ul>
-    <li><a href="../reference/pref_carb_sdk_preference.html">SDK Preferences</a></li>
+    <li><a href="../reference/pref_carb_symbian_sdk.htm">Symbian SDKs</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>
-    <li><a href="../tasks/RmvngandVwngPropsosSDK.html">Editing SDK Properties</a></li>
-    <li><a href="sdks/sdk_add_custkits.htm">Adding Symbian Custom Kits</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_02.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -6,48 +6,30 @@
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Installing an SDK</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
+<style type="text/css">
+<!--
+.style1 {font-size: 1em}
+-->
+</style></head>
 <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>
+<p>To create projects to create and develop Symbian OS programs at least one Software Development Kit (SDK) must be installed and recognized by Carbide.</p>
 <div class="step">
 <h4><a name="runSDK" id="runSDK"> </a>Installing an SDK</h4>
-<p>The following SDKs can be downloaded from Nokia at: <a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/</a>.</p>
+<p>Download the following SDKs from Nokia at: <a href="http://www.forum.nokia.com/Tools_Docs_and_Code/">http://www.forum.nokia.com/</a>.</p>
 <ol>
-  <li>Install at least one of the following SDKs using the install directions that accompany the SDK:
+        <li>Install   one of the following SDKs using the install directions that accompany it:    </li>
     <ul>
-      <li>Nokia Symbian^3</li>
-      <li>Nokia Qt for SDK 1.0</li>
-      <li>S60 5th Edition v1.0</li>
-      </ul>
-  </li>
-  <li>Set the default SDK to use for projects
-    <ol type="A">
-      <li>In Carbide.c++
-        <ol type="i">
-          <li>Click Window &gt; Preferences &gt; Carbide.c++ &gt; SDK Preferences to open the Symbian SDKs panel</li>
-          <li>Select the SDK and click SDK Properties to open the SDK Properties dialog</li>
-          <li>Set the Default SDK value to Yes</li>
-          <li>Close all the dialogs</li>
-        </ol>
-      </li>
-      <li>In a command-line prompt:
-        <ol type="i">
-          <li>Set the default device devkit by typing on the command line:<br>
-            <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>
-              <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>
-            <br />
-  &gt; <span class="code">devices</span></li>
-          </ol>
-      </li>
-      <li>Make sure the correct SDK default is set.</li>
-      </ol>
-  </li>
-  </ol>
+          <li>Nokia Symbian^4</li>
+            <li>Nokia Symbian^3</li>
+            <li>Nokia Qt for SDK 1.0</li>
+            <li>S60 5th Edition v1.0</li>
+        </ul>
+    <li><span class="style1">Launch Carbide.c++</span></li>
+    </ol>
+<blockquote>
+    <p><span class="style1">The next time you create a project the new SDK is available as an option. This happens because every time Carbide launches it searches for newly installed SDKs and adds them to a cache file for later use. You can review which SDKs are installed by opening the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs</a> preference panel.</span></p>
+    </blockquote>
 </div>
 
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug.htm	Thu Sep 02 13:19:32 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_preference.html">Symbian SDKs panel</a>.</li>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs panel</a>.</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_precond.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/stop_mode_debug_precond.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -18,7 +18,7 @@
 <li>Install Board Support Package (BSP) for your target board</li>
 <li>Install JTAG software and drivers</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_preference.html">Symbian SDKs panel</a>.</li>
+<li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs panel</a>.</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/work_debug_act_debug.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -9,12 +9,12 @@
 </head>
 <body >
 <h2>Debugging a Program</h2>
-<p>Use the <b>Debug</b> command (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
+<p>Use the <b>Debug</b> command (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle" />) to execute a program under debugger control using the current <a href="../../reference/wnd_debug_configuration.htm">launch configuration</a> settings.</p>
 <p>If this is the first time the program is launched for debugging, a new debug launch configuration is automatically created for you based on current project settings and assigned a name. If a debug launch configuration is already available, the Debug command launches using the last debug launch configuration used with the project. </p>
 <div class="step">
   <h4>Launching a Program for Debugging </h4>
   <ul>
-    <li>Click the Debug button (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" />) in the C/C++ perspective</li>
+    <li>Click the Debug button (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle" />) in the C/C++ perspective</li>
     <p>or</p>
 	<li>Select Run &gt; Debug from the  menu bar </li>
     <p>Both of these methods create a new debug launch configuration if none previously existed in the project or uses the last one launched for debugging. </p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_name_location.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step1.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step2.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step4.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step5.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step6.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step7.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm	Tue Aug 31 07:53:48 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Attaching to a Symbian OS Process</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body >
-<h2>Attaching  to a Symbian OS Process</h2>
-<div>
-  <p>Use the <b>Symbian OS Attach to Process</b> launch configuration to attach the debugger to an already running Symbian OS process or thread on a target device. This is useful for debugging servers running in RAM in a client-server relationship where the client relies on the presence of the server process to operate as one example.</p>
-  <p><span class="note">You can also attach to a process in the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view when debugging.</span></p>
-  <p class="note"><b>NOTE</b> You cannot attach to a process running on the emulator. It must be a target device running the Symbian OS and the TRK debug agent.</p>
-  <p>When attempting to find a process the debugger  uses the UID3  to locate the process. </p>
-  <div class="step">
-    <h4>Attaching to a Symbian OS Process</h4>
-    <ol>
-      <li><a href="../projects/prj_import_exe.htm">Import an executable</a> to import it into the <a href="../../reference/view_executables.htm">Executables</a> view </li>
-      <li>Select any project  in the workspace or the binary to attach to in the Executables view</li>
-      <p>In this example, we select the Executables project created when the binary was imported from the Project Explorer view (Figure 1). </p>
-      <p align="center"><img src="images/sos_processes_executables.png" width="258" height="189"></p>
-      <p class="figure">Figure 1 - Executables project created when importing an executable </p>
-      <li>Click Debug (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Configuration Launch Wizard</a> </li>
-      <li>Select the Attach to Process Launch Configuration option and fill in the requested information</li>
-      <li>Click Debug</li>
-      <p>The <b>Attach to Process </b>window appears. Click a column title to sort the processes in ascending or descending order to help you locate a specific process or use the filter text box to show specific processes. </p>
-      <p align="center"><img src="images/sos_processes_choose_thread.png" width="300" height="375" /></p>
-      <p class="figure">Figure 2 -<b> Attach to Process</b> window </p>
-      <li>Select a process, click OK</li>
-      <p>The <b>Attach to Process </b>window closes. Open a <a href="../../reference/view_symbian_kernel.htm">Symbian OS</a> view to show the process and thread information.</p>
-      <p class="note"><b>NOTE</b> Terminating an Attach to Process session actually kills the process on the device. This means you must restart the process on the device in order to attach to it again. </p>
-    </ol>
-  </div>
-</div>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../../debugger/debug/viewing_debug.htm">Debug View</a></li>
-  <li><a href="../../reference/wnd_debug_configuration.htm">Debug Window </a></li>
-  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_to_process.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Attaching to a Process</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Attaching  to a Process</h2>
+<div>
+  <p>Use a <b>Symbian OS Attach to Process</b> launch configuration to attach the debugger to an already running Symbian OS process or thread on a target device. This is useful for debugging DLLs where the main process is unknown or for servers running in RAM in a client-server relationship where the client relies on the presence of the server process to operate.</p>
+  <p>One common debugging DLL use case is when the developer doesn't know which process calls the DLL. This makes it difficult to debug the DLL because you doesn't know which process to attach to nor start. Carbide enables DLL debugging  by simply attaching the DLL to any running process as long as the DLL is included in the <a href="../../reference/view_executables.htm">Executables</a> view.</p>
+  <p>You can also attach to a process in the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view when debugging.</p>
+  <p class="note"><b>NOTE</b> You cannot attach to a process running on the emulator. It must be a target device running the Symbian OS and the TRK debug agent.</p>
+  <p>When attempting to find a process the debugger  uses the UID3  to locate the process. </p>
+  <div class="step">
+    <h4>Attaching to any Running Process</h4>
+    <ol>
+      <li>In the <a href="../../reference/view_executables.htm">Executables</a> view, click the Import an executable file icon (<img src="../../images/icons/btn_import_executables.png" alt="Import an executable icon" width="18" height="15" align="absmiddle">) to add an executable to the Executables view for debugging.
+          <p>The executable added appears in the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> view under an <b>Executables</b> project. This group includes all executables listed in the <b>Executables</b> view that are not linked to any project in the workspace.</p>
+          <p align="center"><img src="../projects/images/attach_to_process_proj_explorer.png" alt="Project Explorer Executables project" width="267" height="267"></p>
+          <p class="figure">Figure 1 -<b> Executables list in Project Explorer view</b></p>
+          <p class="note"><b>NOTE</b> The executable must include symbolics in order for debugging to work.</p>
+      </li>
+      <li>Click Debug (<img src="../../projects/images/icon_debug.png" alt="Debug icon" width="17" height="17" align="absmiddle">) to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Configuration Launch Wizard</a>.</li>
+      <p>Select the Symbian OS Attach to Process launch configuration option and fill in the requested information.</p>
+      <p align="center"><img src="../projects/images/attach_to_process_launch_config.png" alt="Attach to Process launch config" width="641" height="312"></p>
+      <p class="figure">Figure 2 -<b> Attach to Process</b> launch configuration</p>
+      <li>Click Debug.</li>
+      <p>The <b>Attach to Process </b>dialog appears. Click a column title to sort the processes in ascending or descending order to help you locate a specific process or use the filter text box to show specific processes. </p>
+      <p align="center"><img src="images/sos_processes_choose_thread.png" width="300" height="375" /></p>
+      <p class="figure">Figure 3 -<b> Attach to Process</b> window </p>
+      <li>Select a process, click OK.</li>
+      <p>In this example we've linked the <span class="code">prefs.dll</span> program to the process <span class="code">BlackFlag.exe</span> on the device. The <b>Attach to Process </b>dialog closes. Open the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view to show the process and thread information.</p>
+      <p class="note"><b>NOTE</b> Terminating an Attach to Process session actually kills the process on the device. This means you must restart the process on the device in order to attach to it again. </p>
+    </ol>
+</div>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../../debugger/debug/viewing_debug.htm">Debug View</a></li>
+  <li><a href="../../reference/wnd_debug_configuration.htm">Debug Window </a></li>
+  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View</a> </li>
+  <li><a href="../projects/prj_debug_dlls_any_process.htm">Debugging DLLs with any Process</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/attach_to_process_launch_config.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/attach_to_process_proj_explorer.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/build_console.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/menu_build_project.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/sis_builder_tab.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -10,56 +10,54 @@
 </head>
 <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>
+<p>Building projects consists of a new sbs-based build system (Raptor) that wraps build functionality around existing SDK build tools which invoke <span class="code">makmake</span> commands (e.g. <span class="code">bldmake bldfiles</span> and <span class="code">sbs 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. A command is available (<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>
 <p> Building Symbian OS C++ projects can involve the use of Symbian OS specific tools, such as the Symbian OS resource compiler. For detailed information on such tools, see the documentation for the SDK that you are using.</p>
 <p>You build  projects to process the source files that comprise a program and
-  generate object code. The compiler flags syntax errors in the source files. Use the  <a href="../../reference/ProjectPreferences.html">Properties for &lt;project_name&gt; </a> window to control how the project is built. The following methods build a project:</p>
-<ul><li><b>Build All Configurations</b>&#8212;builds all build configurations for a project</li>
+  generate object code. The compiler flags syntax errors in the source files. Use the  <a href="../../reference/ProjectPreferences.html">Properties for &lt;project_name&gt;</a> dialog to control how the project is built. The following methods build a project:</p>
+<ul>
+    <li><b>Build All Configurations</b> (<span class="code">CTRL+ALT+A</span>) &#8212;builds all build configurations for a project</li>
+  <li><b>Build Project</b> (<span class="code">CTRL+B</span>) &#8212;  builds the entire project if it has never been built before or on subsequent builds only those files that have changed since the last build operation</li>
   <li><b>Build Working Set</b>&#8212;specify which projects to build in a working set </li>
-  <li><b>Build Project</b>&#8212;(CTRL+B) builds the entire project if it has never been built before or on subsequent builds only those files that have changed since the last build operation</li>
 </ul>
-<p align="center"><img src="images/menu_build_project.png" width="359" height="341" /></p>
-<p class="figure">Figure 1 - Right-click project name to build a project </p>
+<p align="center"><img src="images/menu_build_project.png" width="280" height="262" /></p>
+<p class="figure">Figure 1 - Project menu includes all build options</p>
 <div class="step">
   <h4>Building a project</h4>
   <ul>
-    <li>Right-click the project name in the Project Explorer view and select Build Project (Figure 1) </li>
-  </ul>
-  <ol>
-    <p></p>
-    or
-  </ol>
-  <ul>
-    <li>Select the Project &gt; Build Project menu item </li>
-  </ul>
-  <ul>
-    <p></p>
-    or
-  </ul>
-  <ul>
-    <li>Click the Build icon in the tool bar (Figure 2) to build the current build configuration </li>
-    <p align="center"><img src="images/wnd_build_config_select_tgt.png" width="321" height="69" /></p>
-    <p class="figure">Figure 2 - Build icon </p>
-    <p>or
-    </p>
-  </ul>
-  <ul>
-    <li>Select a build configuration using the Build icon&#8217;s dropdown list in the tool bar (Figure 2)</li>
-  </ul>
-  <ol>
-    <p>Carbide.c++ builds the project. A build dialog  and a task bar appear during a build process. All build output  is shown in the Console view while build errors and warnings appear in the Problems view.</p>
-    <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
+    <li>Choose one of the following to build a project:</li>
+        <table width="800" border="0" cellpadding="2" cellspacing="0">
+            <tr valign="top">
+                <th width="30%" class="Cell"><div align="left">From the ...</div></th>
+                    <th width="70%" class="Cell"><div align="left">Do the following...</div></th>
+                </tr>
+            <tr valign="top">
+                <td class="Cell"><b>Menu bar</b></td>
+                    <td class="Cell"> Click the <strong>Project &gt; Build Project</strong> menu option.</td>
+            </tr>
+            <tr valign="top">
+                <td class="Cell"><b>Toolbar</b></td>
+                    <td class="Cell">Click the <b>Build</b> icon (<img src="../../projects/images/icon_build_project.png" alt="Build project icon" width="17" height="17" align="absmiddle">) on the toolbar</td>
+            </tr>
+            <tr valign="top">
+                <td class="Cell"><b>Project</b></td>
+                    <td class="Cell"><ol>
+                            <li>Right-click the project              
+                            <li>Select Build Project</li>
+                    </ol></td>
+            </tr>
+        </table>
+        </ul>
+  <p>Carbide.c++ builds the project. A build dialog  and a task bar appear during a build process. All build output  is shown in the Console view while build errors and warnings appear in the Problems view.</p>
+  <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
       built. Carbide  always checks that makefiles are up-to-date and
-    dependencies present.</p>
-    <p>Project is also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window &gt; Preferences &gt; General &gt;</b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
-    <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window &gt; Preferences &gt; Run/Debug &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
-  </ol>
-  <p>When performing a build, output is displayed in the Console window. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b>Build Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window &gt; Preferences &gt; C/C++ &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Build Console</a></b> preference panel (figure 2).</p>
+      dependencies present.</p>
+  <p>Projects are also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window &gt; Preferences &gt; General &gt;</b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
+  <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window &gt; Preferences &gt; Run/Debug &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
+  <p>When performing a build, output is displayed in the <a href="../../reference/view_console.htm">Console</a> view. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b>Build Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window &gt; Preferences &gt; C/C++ &gt; Build &gt; <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Build Console</a></b> preference panel (figure 4).</p>
+  <p align="center"><img src="images/build_console.png" alt="Build Console" width="630" height="214" /></p>
+  <p align="left" class="figure">Figure 4 - Build Console preference panel</p>
   <p>Not clearing the console is useful when you are performing multiple builds, such as a regular project build, building a project package (.pkg) file, and building a ROM image. For example, if you do not clear the console before each build, then a subsequent build will not overwrite information from a previous build.</p>
-<p align="center"><img src="images/build_console.png" width="532" height="451" /></p>
-<p align="left" class="figure">Figure 4 - Build Console Preference Panel</p>
-<p>&nbsp;</p>
 </div>
   <h5>Concepts</h5>
   <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -21,7 +21,7 @@
 <ul>
   <li>For non-Platform Security SDKs (pre-OS 9.x), <span class="code">makesis</span> is called</li>
 </ul>
-<p>Depending upon which tool is used, you will  need to complete some entries in the<a href="../../reference/build_properties/pane_build_config_sis.htm"> SIS Builder</a> pane of the Carbide Build Configurations panel of the project Properties dialog box. You can access this pane by selecting a project in the Project Explorer view and select <b>Project &gt; Properties</b> &gt;  <b>Carbide Build Configurations</b>. Fill in the necessary information to add PKG files to the project for downloading. </p>
+<p>Depending upon which tool is used, you will  need to complete some entries in the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> pane of the Carbide Build Configurations panel of the project Properties dialog box. You can access this pane by selecting a project in the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> view and select <b>Project &gt; Properties</b> <strong>&gt; Carbide.c++ &gt; </strong><b>Carbide Build Configurations</b>. Fill in the necessary information to add PKG files to the project for downloading. </p>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="19%" scope="col">Tool</th>
@@ -31,14 +31,14 @@
     <td><b>SIS Builder </b></td>
     <td><p>Use the <b>Add</b> control to add one or more SIS or PKG files to the project up to the maximum number Carbide supports. Note that the <b>SIS Builder</b> pane operates on a build configuration level. You will need to add files in this pane for every build configuration in the project. </p>
       <p>In addition, any PKG file added here is picked up by the <a href="../../projects/launch/page_installation.htm">Installation</a> tab in Application TRK configurations. However, as only one SIS file can be debugged at a time you must specify which SIS/PKG file to install for debugging purposes. This is handy if you have both a developer SIS file and a certified SIS file that you want to remain in sync during development. Both are always built but you only need to debug one. </p>
-      <p><img src="images/sis_builder_tab.png" width="550" height="221" /></p>
+      <p><img src="images/sis_builder_tab.png" width="573" height="203" /></p>
     <p class="figure">Figure 1 - SIS Builder tab </p></td>
   </tr>
   <tr>
     <td><b>SIS Properties </b></td>
     <td><div align="center">
       <p align="left">Complete the PKG File, and Signing Options settings in the <a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a> dialog. By default, SIS files are output in the directory of the original SIS file.</p>
-      <p><img src="../../reference/images/wnd_sis_properties.png" width="455" height="452"></p>
+      <p><img src="../../reference/images/wnd_sis_properties.png" width="533" height="463"></p>
       <p class="figure">Figure 2 - SIS Properties dialog </p>
       </div></td>
   </tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_config.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -20,7 +20,7 @@
 <h4>Creating a Default Launch Configuration</h4>
 <p class="note"><b>NOTE</b> Carbide only creates a new default launch configuration when it cannot find one in the project. If the project already contains a launch configuration, Carbide launches that instead. </p>
 <ul>
-  <li>Click the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="middle" />) or <b>Debug</b> (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="middle" alt="Debug icon"/>) icon in the tool bar
+  <li>Click the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="middle" />) or <b>Debug</b> (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="middle" alt="Debug icon"/>) icon in the tool bar
     <p>or</p>
   </li>
   <li>Choose Select <b>Run &gt; Run</b> menu option to launch the project or <b>Run &gt; Debug</b> menu option to debug the project</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -14,7 +14,7 @@
   <li>If the DLL appears in the <a href="../../reference/view_executables.htm">Executables</a> view it can be debugged. Just <a href="../breakpoints/pgm_bp_setting.htm">set</a> breakpoints inside the DLL sources before you start the debug session. The next time  the  project is debugged, the DLL is loaded and made  available for debugging.</li>
 </ul>
 <blockquote>
-  <p class="note"><b class="note">NOTE</b> Breakpoints inside a DLL will not be <a href="../../concepts/breakpoints.htm">resolved</a> until the DLL is loaded into memory by the calling binary. </p>
+  <p class="note"><b class="note">NOTE</b> Breakpoints inside a DLL are not  <a href="../../concepts/breakpoints.htm">resolved</a> until the DLL is loaded into memory by the calling binary. </p>
 </blockquote>
 <ul>
   <li>If the DLL is not built by the project you can import the DLL by  clicking the<b> Import an executable file</b> icon (<img src="../../images/icons/btn_import_executables.png" width="18" height="15" align="absmiddle">) in the <a href="../../reference/view_executables.htm">Executables</a> view. Then, set your  breakpoints and start the  debug session.</li>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/images/wnd_sdk_properties.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -6,13 +6,18 @@
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Adding SDKs</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {font-size: 1em}
+-->
+</style>
 </head>
 <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="438" height="262" /></p>
-<p class="figure">Figure 1. Add New SDK window</p>
-<h5>Table 1 Add New SDK window&mdash;items</h5>
+<p> Use the <b>Add New SDK</b> dialog to provide the information Carbide.c++ requires to identify and locate  the specified SDK.</p>
+<p align="center"><img src="../../reference/images/wnd_add_sdk.png" width="435" height="150" /></p>
+<p class="figure">Figure 1. Add New SDK dialog</p>
+<h5>Table 1 Add New SDK dialog&mdash;items</h5>
 <table width="800"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="25%" scope="col">Item</th>
@@ -24,48 +29,29 @@
   </tr>
   <tr>
     <td><b>EPOCROOT</b></td>
-    <td>The path to  EPOCROOT within the SDK. Click <b>Browse</b> to locate and select EPOCROOT.</td>
-  </tr>
-  <tr>
-    <td><b>Vendor</b></td>
-    <td><p>Select the vendor from the drop down list, for example, com.nokia.s60 or com.symbian.TechView</p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Is Default</b></td>
-    <td>Specify whether or not the selected SDK is the default to use.</td>
-  </tr>
-  <tr>
-    <td><b>OS Version</b></td>
-    <td>Specify the operating system version or select Auto detect.</td>
-  </tr>
-  <tr>
-    <td><b>SDK Version </b></td>
-    <td>Select the SDK version or Auto detect.</td>
+    <td>The path to  <span class="code">EPOCROOT</span> within the SDK. Click <b>Browse</b> to locate and select <span class="code">EPOCROOT</span>.</td>
   </tr>
 </table>
 <div class="step">
   <h4>Adding  SDKs to Carbide.c++ </h4>
   <ol>
-    <li>Click  Add  New SDK in the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel </a></li>
+    <li>Click Add New SDK in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs</a><span class="style1"> preference panel </span></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>
-    <li>Click OK  </li>
-    <p>The <b>Add New SDK</b> window closes and the SDK is added to the <b>Available Symbian OS SDKs</b> list in the <b>Symbian SDKs panel</b>. </p>
+    <li>Enter the identifying SDK ID</li>
+    <li>Enter the EPOCROOT path or click Browse to locate it</li>
+    <li>Click OK </li>
+    <p>The <b>Add New SDK</b> dialog closes and the SDK is added to the <b>Symbian SDKs</b> list. </p>
   </ol>
 </div>
-
 <h5>Related tasks </h5>
 <ul>
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
-  <li><a href="sdk_add_custkits.htm">Adding Symbian Custom Kits</a></li>
   <li><a href="sdk_search.htm">Searching SDKs</a></li>
   <li><a href="sdk_view_properties.htm">View SDK Properties</a> </li>
 </ul>
 <h5>Related references </h5>
 <ul>
-  <li><a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a></li>
+  <li><a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs 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	Tue Aug 31 07:53:48 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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>Adding Symbian Custom Kits</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<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>
-<ul>
-  <li><b>Adding a CustKit without a devices.xml entry</b></li>
-Use the <b>Add SDK</b> dialog to <a href="sdk_add.htm">add</a> an SDK entry for the CustKit that you want to use with the project. You may want to add a Symbian source base that Carbide.c++ can recognize if you do not plan to build from the command line. Once you've added the CustKit, you can now import projects against the newly added SDK.
-<li><b>Mapping a CustKit</b><b> SDK to a known SDK release <br />
-    <br />
-  </b>Use the <a href="sdk_view_properties.htm">SDK Properties</a> window to map  an unrecognized SDK (S60_3rd_Ed_FP2) to a known version of  a similar SDK (S60_3rd_Ed) . This should enable you to import projects against the CustKit SDK. </li>
-</ul>
-<p align="center"><img src="images/sdk_info_errors_shown.png" width="373" height="192"></p>
-<p align="center" class="figure">Figure 1 - SDK Information group showing SDK errors </p>
-<blockquote>
-  <p>Some issues to look for in the SDK Properties dialog include:
-  </p>
-</blockquote>
-<ul>
-  <ul>
-    <li><b>SDK Name</b> &#8212; templates and UI designs  may not display if the name used is not a known default  (e.g. com.nokia.s60) as defined under the SDK properties</li>
-    <li><b>OS version</b> &#8212; ensure the correct OS version is assigned to the CustKit tells Carbide what platforms the SDK supports </li>
-    <li><b>SDK version</b> &#8212;    used to filter which template projects and/or UI Designer projects are available and the UI components displayed </li>
-  </ul>
-</ul>
-<h5>Related references </h5>
-<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>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -83,7 +83,7 @@
 <h4>Related references </h4>
 <ul>
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
-  <li><a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel </a> </li>
+  <li><a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs 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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -9,16 +9,16 @@
 </head>
 <body >
 <h2>Searching for SDKs</h2>
-<p>  Use the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a> to search for installed Symbian OS SDKs.</p>
-<p align="center"><img src="../../images/SDKPreferences.png" width="696" height="583" /></p>
+<p>  Use the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs</a> preference panel to search for installed Symbian SDKs. Note that Carbide rescans system drives searching for installed SDKs at startup, adding them to the <b>Symbian SDKs</b> list.</p>
+<p align="center"><img src="../../reference/images/prefs_symbian_sdks.png" alt="Symbian SDks" width="719" height="525"></p>
 <p class="figure">Figure 1. Symbian SDKs panel</p>
 <div class="step">
   <h4>Searching for SDKs </h4>
   <ul>
-    <li>Click Rescan All SDKs in the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel </a></li>
+    <li>Click Rescan All SDKs in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs</a> preference panel </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>
+    <p>Carbide rescans the hard drive searching for installed SDKs, adding them to the <b>Symbian  SDKs</b> list. This is useful should you install a new SDK and don't restart Carbide.</p>
   </ol>
 </div>
 
@@ -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_preference.html">Symbian SDKs panel</a></li>
+  <li><a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs 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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -9,17 +9,16 @@
 </head>
 <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_preference.html">Symbian SDKs 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> Use the <b>SDK Properties</b> dialog to examine the properties associated with the currently selected SDK in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs</a> preference panel. </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>
+<p class="figure">Figure 1. SDK properties dialog </p>
 <div class="step">
-  <h4>Viewing and Modifying SDK Properties </h4>
+  <h4>Viewing  SDK Properties </h4>
   <ol>
-    <li>Select an SDK in the Available Symbian OS SDKs list  in the <a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs 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>
+    <li>Select an SDK in the Symbian OS SDKs list  in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs</a> preference panel </li>
+    <li>Click Properties
+        <p>The <b>SDK Properties </b> dialog (Figure 1) appears. You can now review the SDKs properties.</p>
+    </li>
   </ol>
 </div>
 
@@ -29,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_search.htm">Searching SDKs</a></li>
-  <li><a href="../../reference/pref_carb_sdk_preference.html">Symbian SDKs panel </a> </li>
+  <li><a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs 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_example.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -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_preference.html">Symbian SDKs 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>
+<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_symbian_sdk.htm">Symbian SDKs 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	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -22,7 +22,7 @@
     <p class="note"><b>NOTE</b> The symbolics are automatically loaded for the binaries that appear in the Executables view.</p>
     <li>Set  <a href="../breakpoints/pgm_bp_setting.htm">breakpoints</a> in the project source files </li>
     <p>In this example we will set one breakpoint in two different EXEs. The first is set in the file called <span class="code">MCEngine.cpp</span> (MCServer.exe) and the second is set in  <span class="code">MPlayerAppUI.cpp</span> (MusicPlayer.exe). </p>
-    <li>Click the Debug icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration</a> wizard
+    <li>Click the Debug icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration</a> wizard
       <ol type="a">
         <li>Select the Application TRK Launch Configuration from the Launch Types page, then click Next</li>
         <p align="center"><img src="../trk/images/trk_launch_types.png" width="438" height="533"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -13,7 +13,7 @@
 <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_preference.html">Symbian SDKs panel</a>.</li>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/pref_carb_symbian_sdk.htm">Symbian SDKs panel</a>.</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:
@@ -32,7 +32,7 @@
 <p>At this point you can open sources files from the <b>Executables</b> view or project view in order to set breakpoints.</p>
 <h5>Related tasks</h5>
 <ul>
-  <li><a href="../processes/attach_debugger_to_process.htm">Attaching to a Symbian OS Process </a></li>
+  <li><a href="../processes/attach_to_process.htm">Attaching to a Symbian OS Process </a></li>
 </ul>
 <h5>Related references</h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -25,7 +25,7 @@
     <td valign="middle"><p>An SDK or OS developer kit (DevKit) including:</p>
       <ul><li>9.x or higher for Platform Security </li>
     </ul></td>
-    <td height="65"><p>Targets: Symbian ^3, S60 5th Ed., Qt</p>
+    <td height="65"><p>Targets: Symbian ^3, Symbian ^4, Nokia Qt SDK, S60 5th Ed.</p>
       <p>Debugger: Emulators, on-device debugging</p>      </td>
   </tr>
 </table>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Thu Sep 02 13:19:32 2010 -0500
@@ -14,7 +14,7 @@
   <li><b>Symbian OS Appication TRK</b>&#8212; used to run or debug applications on a target device using the Application TRK on-device debug agent. Application TRK is an application that runs on released phones and allows you to debug your executables. The debugger will download a Symbian OS installation file to the phone and install it prior to launching.</li>
   <li><b>Symbian OS System TRK</b> (<i>not available in the Developer Edition</i>) &#8212;used to run or debug applications or ROM code on a target device using the System TRK on-device debug agent. System TRK is an application that runs on reference boards and prototype phones and allows you to debug your executables. The debugger will download files to the phone prior to launching.</li>
 </ul>
-<p>By default, you can click the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) in the toolbar to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. This   creates a launch configuration for the project based on project information and any additional input required, like COM port selection. It is the recommended method for creating new launch configurations. Or, use the <a href="../../projects/launch/page_main.htm">Debug</a> window to create a customized  launch configuration. </p>
+<p>By default, you can click the <b>Debug</b> icon (<img src="../../projects/images/icon_debug.png" width="17" height="16" align="absmiddle">) in the toolbar to launch the <a href="../../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. This   creates a launch configuration for the project based on project information and any additional input required, like COM port selection. It is the recommended method for creating new launch configurations. Or, use the <a href="../../projects/launch/page_main.htm">Debug</a> window to create a customized  launch configuration. </p>
 <p align="center"><img src="../../reference/images/wnd_trk_debug_config.png" width="819" height="593" /></p>
 <p class="figure">Figure 1. Debug launch configuration for on-device debugging   (<i>Application TRK shown</i>)</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/index.xml	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/index.xml	Thu Sep 02 13:19:32 2010 -0500
@@ -13,7 +13,7 @@
 	</entry>
 
     <entry keyword="Attaching to a Symbian OS Process ">
-	   <topic href="html/tasks/processes/attach_debugger_to_process.htm" label="Attaching debugger to Symbian OS Process"/>
+	   <topic href="html/tasks/processes/attach_to_process.htm" label="Attaching debugger to Symbian OS Process"/>
 	</entry>
 
 <!-- B -->
@@ -104,8 +104,8 @@
 <!-- C -->
 
 	<entry keyword="Carbide">
-       <topic label="build configurations"		href="html/reference/build_properties/pane_build_config.htm"/>
-       <topic label="project settings"			href="html/reference/build_properties/pane_project_settings.htm"/>
+       <topic label="build configurations"		href="html/reference/build_properties/prop_carb_build_config.htm"/>
+       <topic label="project settings"			href="html/reference/build_properties/prop_carb_project_settings.htm"/>
 	</entry>
 
 
@@ -491,7 +491,7 @@
 	</entry>
 
 	<entry keyword="Processes">
-	   <topic href="html/tasks/processes/attach_debugger_to_process.htm" label="Attaching debugger to Symbian OS Process"/>
+	   <topic href="html/tasks/processes/attach_to_process.htm" label="Attaching debugger to Symbian OS Process"/>
 	</entry>
 
     <entry keyword="Projects">
@@ -571,7 +571,6 @@
 	<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"/>
 	   <topic href="html/tasks/sdks/sdk_view_properties.htm" label="Viewing Properties"/>
        <topic href="html/qt_help/qt_pref_panel.htm"/>
@@ -585,7 +584,6 @@
 	<entry keyword="SDK Support">
 	   <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>
 
 	<entry keyword="SIS File">
--- a/core/com.nokia.carbide.cpp.doc.user/intro/carbide.css	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/carbide.css	Thu Sep 02 13:19:32 2010 -0500
@@ -1,21 +1,21 @@
-
-a#carbide img { background-image : url(images/carbide.png); }
-a#carbide:hover img { background-image : url(images/carbide_hov.png); }
-
-a#carbide-whatsnew img { background-image : url(images/carbide_new.png); }
-a#carbide-whatsnew :hover img { background-image : url(images/carbide_new_hov.png); }
-
-a#carbide-sample img { background-image : url(images/carbide_sample.png); }
-a#carbide-sample:hover img { background-image : url(../images/carbide_sample_hov.png); }
-
-a#carbide-tutorial img { background-image : url(images/carbide_tutorial.png); }
-a#carbide-tutorial:hover img { background-image : url(images/carbide_tutorial_hov.png); }
-
-a#carbide-keys img { background-image : url(images/carbide_keys.png); }
-a#carbide-keys:hover img { background-image : url(images/carbide_keys_hov.png); }
-
-a#carbide-web img { background-image : url(images/carbide_web.png); }
-a#carbide-web:hover img { background-image : url(images/carbide_web_hov.png); }
-
-a#carbide-people img { background-image : url(images/carbide_people.png); }
-a#carbide-people:hover img { background-image : url(images/carbide_people_hov.png); }
+
+a#carbide img { background-image : url(images/carbide.png); }
+a#carbide:hover img { background-image : url(images/carbide_hov.png); }
+
+a#carbide-whatsnew img { background-image : url(images/carbide_new.png); }
+a#carbide-whatsnew :hover img { background-image : url(images/carbide_new_hov.png); }
+
+a#carbide-sample img { background-image : url(images/carbide_sample.png); }
+a#carbide-sample:hover img { background-image : url(images/carbide_sample_hov.png); }
+
+a#carbide-tutorial img { background-image : url(images/carbide_tutorial.png); }
+a#carbide-tutorial:hover img { background-image : url(images/carbide_tutorial_hov.png); }
+
+a#carbide-keys img { background-image : url(images/carbide_keys.png); }
+a#carbide-keys:hover img { background-image : url(images/carbide_keys_hov.png); }
+
+a#carbide-web img { background-image : url(images/carbide_web.png); }
+a#carbide-web:hover img { background-image : url(images/carbide_web_hov.png); }
+
+a#carbide-people img { background-image : url(images/carbide_people.png); }
+a#carbide-people:hover img { background-image : url(images/carbide_people_hov.png); }
--- a/core/com.nokia.carbide.cpp.doc.user/plugin.xml	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/plugin.xml	Thu Sep 02 13:19:32 2010 -0500
@@ -121,20 +121,22 @@
 			
    </extension>
 
+	<!-- CREATED FOR SDK DOCS, NOT NEEDED IN CARBIDE
    <extension
          point="org.eclipse.ui.cheatsheets.cheatSheetContent">
          
-         <!-- CREATE A PLATSIM CATEGORY -->
+         <!-- CREATE A PLATSIM CATEGORY
 		<category
 			id="com.nokia.platsim.cheatsheets"
 			name="PlatSim" />
             
-         <!-- ADD PLATSIM TOPICS TO CATEGORY -->
+         <!-- ADD PLATSIM TOPICS TO CATEGORY
+		 
 		<cheatsheet
 			category="com.nokia.platsim.cheatsheets"
 			contentFile="html/cheatsheets/platsim_create_images.xml"
 			id="com.nokia.platsim.platsim_create_images"
-			name="Creating images in PlatSim" />
+			name="Creating images for PlatSim" />
 			
 		<cheatsheet
 			category="com.nokia.platsim.cheatsheets"
@@ -143,6 +145,7 @@
 			name="PlatSim debugging in Carbide.c++" />
 			
    </extension>
+    -->
    
 	<!--
    <extension
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Thu Sep 02 13:19:32 2010 -0500
@@ -31,6 +31,7 @@
 		  <topic label="Creating DLL Projects" 						href="html/projects/tutorials/new_proj_dll_example_01.htm" />
 		  <topic label="Building the DLL Project" 					href="html/projects/tutorials/new_proj_dll_example_02.htm" />
 		  <topic label="Debugging a DLL Project"					href="html/projects/tutorials/new_proj_dll_example_03.htm" />
+      	  <topic label="Debugging DLLs with Any Process"			href="html/tasks/projects/prj_debug_dlls_any_process.htm" />
 		</topic>
 		<topic label="Remote Target Debugging (Run-mode)"			href="html/projects/tutorials/run_mode_debug_example_00.htm" >
 		  <topic label="Connect remote device to PC" 				href="html/projects/tutorials/run_mode_debug_example_01.htm" />
@@ -106,7 +107,6 @@
       <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" >
@@ -116,13 +116,10 @@
     </topic>
     <topic label="Working with SDKs"					href="html/tasks/WorkingwithSDKs.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="Build Configuration Filtering"		href="html/tasks/sdks/sdk_platform_filter.htm" />
+      <topic label="Adding an SDK"					href="html/tasks/sdks/sdk_add.htm" />
       <topic label="Searching for SDKs"				href="html/tasks/sdks/sdk_search.htm" />
       <topic label="Viewing SDK Properties"			href="html/tasks/sdks/sdk_view_properties.htm" />
-      <topic label="Editing SDK Properties"			href="html/tasks/RmvngandVwngPropsosSDK.html" />
-      <topic label="Adding Symbian Custom Kits"		href="html/tasks/sdks/sdk_add_custkits.htm" />
     </topic>
     <topic label="Creating projects" 								href="html/tasks/CreatingProjectsToc.htm" >
       <topic label="Project Templates" 					    	href="html/concepts/templates.htm" />
@@ -132,7 +129,7 @@
       <topic label="N-Gage Projects" 								href="html/concepts/ngage_projects.htm" />
     </topic>
     <topic label="C/C++ Project and File Properties"	href="html/reference/ProjectPreferences.html" >
-      <topic label="Build Configurations"					href="html/reference/build_properties/pane_build_config.htm" >
+      <topic label="Build Configurations"					href="html/reference/build_properties/prop_carb_build_config.htm" >
         <topic label="SIS Builder" 							href="html/reference/build_properties/pane_build_config_sis.htm" >
           <topic label="SIS Properties"						href="html/reference/build_properties/wnd_sis_properties.htm" />
         </topic>
@@ -142,8 +139,8 @@
         <topic label="Paths and Symbols"						href="html/reference/build_properties/pane_build_config_paths.htm" />
         <topic label="ROM Builder"								href="html/reference/ROM_build_settings.html" />
       </topic>
-      <topic label="Macro Settings"						href="html/reference/build_properties/pane_macro_settings.htm" />
-      <topic label="Project Settings"						href="html/reference/build_properties/pane_project_settings.htm" />
+      <topic label="Macro Settings"							href="html/reference/build_properties/prop_carb_macro_settings.htm" />
+      <topic label="Project Settings"						href="html/reference/build_properties/prop_carb_project_settings.htm" />
     </topic>
     <topic label="Building projects"  						href="html/concepts/build_system.htm" >
       <topic label="Active Build Configuration"				href="html/concepts/build_configurations.htm" />
@@ -278,7 +275,7 @@
     -->
         
       <topic href="html/tasks/projects/prj_debug_dlls.htm" label="Debugging DLLs"></topic>
-      <topic href="html/tasks/processes/attach_debugger_to_process.htm" label="Attaching to a Symbian OS Process"></topic>
+      <topic href="html/tasks/processes/attach_to_process.htm" label="Attaching to a Process"></topic>
       <topic href="html/tasks/start/carbide_debugging.htm" label="Debugging a Symbian OS Program"></topic>
       <topic href="html/reference/view_sym_os_data_overview.htm" label="Symbian OS Data View"></topic>
         
@@ -323,9 +320,11 @@
       </topic>
     </topic>
     <topic label="Debugging variations"                     href="html/concepts/debugger_about.htm" >
+      <topic label="Attaching to a Process"					href="html/tasks/processes/attach_to_process.htm" />
+      <topic label="Auto-Targeting of Executables"			href="html/concepts/autotargeting.htm" />
+      <topic label="Debugging DLLs"							href="html/tasks/projects/prj_debug_dlls.htm" />
+      <topic label="Debugging in ROM"		                href="html/tasks/projects/prj_debug_rom.htm" />
       <topic label="Emulation Debugging"			        href="html/concepts/emulators.htm" />
-      <topic label="Debugging DLLs"						href="html/tasks/projects/prj_debug_dlls.htm" />
-      <topic label="Debugging in ROM"		                href="html/tasks/projects/prj_debug_rom.htm" />
     </topic>
 
       <topic label="Troubleshooting" 						href="html/tasks/trk/trk_troubleshooting.htm"/>
--- a/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/TestDevicesXMLListener.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core.test/src/com/nokia/carbide/cpp/sdk/core/test/TestDevicesXMLListener.java	Thu Sep 02 13:19:32 2010 -0500
@@ -74,54 +74,54 @@
 	// Here we just rescan the sdks and the listener will perform the test
 	public void testCarbideConfigurationChangedListener() throws Exception{
 		 
-		if (!SBSv2Utils.enableSBSv1Support())
-			return;
-		
-		ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
-		
-		// get devics.xml and make a backup copy
-		File devicesFile = SDKCorePlugin.getSDKManager().getDevicesXMLFile(); 
-		assertNotNull("Devices.xml file is NULL!", devicesFile);
-		assertTrue(devicesFile.toString() + "file doesn't exist", devicesFile.exists());
-		File backupFile = new File(devicesFile.toString() + ".backup");
-		
-		if (backupFile.exists()) {
-			backupFile.delete();
-		}
-		backupFile.createNewFile();
-		// backup devices.xml
-		copyFile(devicesFile, backupFile);
-		
-
-		
-		// Here we just changed the time stamp and not the contents so it should be OK.
-		assertTrue("Devices.xml has changed only timestamp, bad return value", ((SDKManager)sdkMgr).checkDevicesXMLSynchronized());
-		
-		ISymbianSDK sdk = sdkMgr.getSDKList().get(0);
-		((SymbianSDK)sdk).setEPOCROOT("K:\\");
-		sdkMgr.updateSDK(sdk);
-		assertTrue("Devices.xml should still be true with sdk update via APIs", ((SDKManager)sdkMgr).checkDevicesXMLSynchronized());
-		
-		// copy a different devices.xml file over.
-		copyFile (pluginRelativeFile(devicesTestFile), devicesFile);
-		
-		assertFalse("Devices.xml has changed changed content, should reutrn false. ", ((SDKManager)sdkMgr).checkDevicesXMLSynchronized());
-		
-		ISDKManagerInternal sdkMgrInternal = (ISDKManagerInternal)sdkMgr;
-		sdkMgrInternal.fireDevicesXMLChanged();
-		
-		if (backupFile != null) {
-			// restore devices.xml
-			try {
-				copyFile(backupFile, devicesFile);
-			} catch (Exception e) {
-				fail(e.getMessage());
-			}
-			backupFile.delete();
-		}
-		
-		assertTrue("devices.xml change was not detected properly", outOfSyncListenerWasTested);
-		
+//		if (!SBSv2Utils.enableSBSv1Support())
+//			return;
+//		
+//		ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
+//		
+//		// get devics.xml and make a backup copy
+//		File devicesFile = SDKCorePlugin.getSDKManager().getDevicesXMLFile(); 
+//		assertNotNull("Devices.xml file is NULL!", devicesFile);
+//		assertTrue(devicesFile.toString() + "file doesn't exist", devicesFile.exists());
+//		File backupFile = new File(devicesFile.toString() + ".backup");
+//		
+//		if (backupFile.exists()) {
+//			backupFile.delete();
+//		}
+//		backupFile.createNewFile();
+//		// backup devices.xml
+//		copyFile(devicesFile, backupFile);
+//		
+//
+//		
+//		// Here we just changed the time stamp and not the contents so it should be OK.
+//		assertTrue("Devices.xml has changed only timestamp, bad return value", ((SDKManager)sdkMgr).checkDevicesXMLSynchronized());
+//		
+//		ISymbianSDK sdk = sdkMgr.getSDKList().get(0);
+//		((SymbianSDK)sdk).setEPOCROOT("K:\\");
+//		sdkMgr.updateSDK(sdk);
+//		assertTrue("Devices.xml should still be true with sdk update via APIs", ((SDKManager)sdkMgr).checkDevicesXMLSynchronized());
+//		
+//		// copy a different devices.xml file over.
+//		copyFile (pluginRelativeFile(devicesTestFile), devicesFile);
+//		
+//		assertFalse("Devices.xml has changed changed content, should reutrn false. ", ((SDKManager)sdkMgr).checkDevicesXMLSynchronized());
+//		
+//		ISDKManagerInternal sdkMgrInternal = (ISDKManagerInternal)sdkMgr;
+//		sdkMgrInternal.fireDevicesXMLChanged();
+//		
+//		if (backupFile != null) {
+//			// restore devices.xml
+//			try {
+//				copyFile(backupFile, devicesFile);
+//			} catch (Exception e) {
+//				fail(e.getMessage());
+//			}
+//			backupFile.delete();
+//		}
+//		
+//		assertTrue("devices.xml change was not detected properly", outOfSyncListenerWasTested);
+//		
 	}
 	
 	public void copyFile(File in, File out) throws Exception {
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Thu Sep 02 13:19:32 2010 -0500
@@ -181,6 +181,7 @@
 			((SymbianSDK)sdk).setEPOCROOT(value.toString());
 			SDKCorePlugin.getSDKManager().updateSDK(sdk);
 			getViewer().refresh();
+			updateSDKStatus(sdk);
 		}
 	}
 
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetTreeNode.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetTreeNode.java	Thu Sep 02 13:19:32 2010 -0500
@@ -19,9 +19,13 @@
 package com.nokia.carbide.cpp.sdk.ui.shared;
 
 import java.io.File;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.operation.IRunnableContext;
+import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.viewers.TreeNode;
 
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildContext;
@@ -112,60 +116,81 @@
 	 * from the SDK preferences page.  Only enabled SDK's are used.  Each SDK node will
 	 * have build configurations for children appropriate for the SDK.  These configurations
 	 * are filtered based on the platform filtering preference panel.
-	 * @return
-	 */
-	public static BuildTargetTreeNode[] getTreeViewerInput() {
-		return getTreeViewerInput(false);
-	}
-
-	/**
-	 * Gets the list of SDK tree nodes for use in a tree viewer.  The SDK's are gathered
-	 * from the SDK preferences page.  Only enabled SDK's are used.  Each SDK node will
-	 * have build configurations for children appropriate for the SDK.  These configurations
-	 * are filtered based on the platform filtering preference panel.
 	 * @param sbsv2Project true if this is an SBSv2 project which affects how the build
 	 * configuration list is calculated
+	 * @param IRunnableContext - a runnable context for which to update a progress monitor. Cannot be null.
 	 * @return array of BuildTargetTreeNode, or null
 	 * @since 1.4
 	 */
-	public static BuildTargetTreeNode[] getTreeViewerInput(boolean sbsv2Project) {
-		ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
-		List<ISymbianSDK> sdkList = sdkMgr.getSDKList();
-		if (sdkList == null)
-			return null;
+	public static BuildTargetTreeNode[] getTreeViewerInput(final boolean sbsv2Project, IRunnableContext runnableContext) {
+		
+		final List<BuildTargetTreeNode> assembledInput = new ArrayList<BuildTargetTreeNode>();
 		
-		List<ISymbianSDK> sdkListCopy = new ArrayList<ISymbianSDK>();
-		// Only add SDKs that are enabled
-		for (ISymbianSDK currSDK : sdkList){
-			if (currSDK.isEnabled()){
-				sdkListCopy.add(currSDK);
-			}
-		}
-		
-		if (sbsv2Project) {
-			// filter non-SBSv2 supported SDK's
-			sdkListCopy = SBSv2Utils.getSupportedSDKs(sdkListCopy);
+		try {
+			runnableContext.run(true, false, new IRunnableWithProgress(){
+
+				public void run(IProgressMonitor monitor)
+						throws InvocationTargetException, InterruptedException {
+					
+					String msgPrefix = "Building SDK/Configuration Model: "; //$NON-NLS-N$
+					
+					ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
+					List<ISymbianSDK> sdkList = sdkMgr.getSDKList();
+					monitor.beginTask(msgPrefix, sdkList.size() + 2);
+					if (sdkList == null)
+						return;
+					
+					monitor.worked(1);
+					List<ISymbianSDK> sdkListCopy = new ArrayList<ISymbianSDK>();
+					// Only add SDKs that are enabled
+					for (ISymbianSDK currSDK : sdkList) {
+						if (currSDK.isEnabled()) {
+							sdkListCopy.add(currSDK);
+						}
+					}
+
+					if (sbsv2Project) {
+						// filter non-SBSv2 supported SDK's
+						sdkListCopy = SBSv2Utils.getSupportedSDKs(sdkListCopy);
+					}
+
+					BuildTargetTreeNode[] input = new BuildTargetTreeNode[sdkListCopy
+							.size()];
+					int index = 0;
+					monitor.worked(1);
+					for (ISymbianSDK sdk : sdkListCopy) {
+						monitor.worked(1);
+						monitor.setTaskName(msgPrefix + sdk.getUniqueId());
+						BuildTargetTreeNode treeNode = new BuildTargetTreeNode(
+								sdk, sbsv2Project);
+						if (treeNode.getChildren() != null || sbsv2Project) {
+							input[index++] = treeNode;
+						}
+					}
+
+					// Filter out any SDKs that don't have configs
+					monitor.worked(1);
+					for (BuildTargetTreeNode currNode : input) {
+						if (currNode != null) {
+							assembledInput.add(currNode);
+						}
+					}
+					monitor.done();
+				}
+			
+			
+			});
+		} catch (InvocationTargetException e) {
+			e.printStackTrace();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
 		}
 		
-		BuildTargetTreeNode[] input = new BuildTargetTreeNode[sdkListCopy.size()];
-		int index = 0;
-		for (ISymbianSDK sdk : sdkListCopy) {
-			
-			BuildTargetTreeNode treeNode = new BuildTargetTreeNode(sdk, sbsv2Project);
-			if (treeNode.getChildren() != null || sbsv2Project){
-				input[index++] = treeNode;
-			}
+		if (assembledInput.size() == 0){
+			return null;
 		}
-		
-		// Filter out any SDKs that don't have configs
-		BuildTargetTreeNode[] realInput = new BuildTargetTreeNode[index];
-		index = 0;
-		for (BuildTargetTreeNode currNode : input) {
-			if (currNode != null){
-				realInput[index++] = currNode;
-			}
-		}
-		return realInput;
+
+		return assembledInput.toArray(new BuildTargetTreeNode[assembledInput.size()]);
 	}
 	
 	private static String stripSDKIDFromConfigName(String configName, String sdkID){
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/sdk/ui/shared/BuildTargetsPage.java	Thu Sep 02 13:19:32 2010 -0500
@@ -439,7 +439,7 @@
 			}
 
 			if (setInput) {
-		        viewer.setInput(BuildTargetTreeNode.getTreeViewerInput(useSBSv2Builder));
+		        viewer.setInput(BuildTargetTreeNode.getTreeViewerInput(useSBSv2Builder, getContainer()));
 			}
 
 			if (!inited) {
--- a/core/com.nokia.carbide.cpp.ui/META-INF/MANIFEST.MF	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.ui/META-INF/MANIFEST.MF	Thu Sep 02 13:19:32 2010 -0500
@@ -12,7 +12,8 @@
  com.nokia.cpp.utils.ui,
  com.nokia.sdt.utils,
  org.eclipse.core.resources,
- org.eclipse.ui.forms
+ org.eclipse.ui.forms,
+ com.nokia.carbide.cpp.featureTracker;bundle-version="3.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp.internal.ui.images;
   x-friends:="com.nokia.sdt.symbian,
--- a/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/ui/CarbideUIPlugin.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/ui/CarbideUIPlugin.java	Thu Sep 02 13:19:32 2010 -0500
@@ -21,6 +21,7 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
+import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin;
 import com.nokia.carbide.cpp.internal.ui.SharedImages;
 import com.nokia.cpp.internal.api.utils.core.Logging;
 
@@ -32,6 +33,8 @@
 	// The plug-in ID
 	public static final String PLUGIN_ID = "com.nokia.carbide.cpp.ui";
 
+	private static final String CARBIDE_IDE_FEATURE = "CARBIDE_IDE"; //$NON-NLS-1$
+
 	// The shared instance
 	private static CarbideUIPlugin plugin;
 	
@@ -50,6 +53,8 @@
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
+
+		FeatureUseTrackerPlugin.getFeatureUseProxy().useFeature(CARBIDE_IDE_FEATURE);
 	}
 
 	/*
--- a/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Thu Sep 02 13:19:32 2010 -0500
@@ -15,8 +15,7 @@
  org.eclipse.ui.ide,
  org.eclipse.cdt.core,
  com.nokia.carbide.discovery.ui;bundle-version="1.0.0",
- org.eclipse.equinox.p2.ui;bundle-version="2.0.0",
- com.nokia.carbide.cpp.featureTracker
+ org.eclipse.equinox.p2.ui;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp,
  com.nokia.carbide.cpp.logging
Binary file core/com.nokia.carbide.cpp/icons/Carbide_c_flat.ico has changed
Binary file core/com.nokia.carbide.cpp/splash.bmp has changed
--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Thu Sep 02 13:19:32 2010 -0500
@@ -22,7 +22,6 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
-import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin;
 import com.nokia.carbide.internal.discovery.ui.wizard.P2Utils;
 
 /**
@@ -30,8 +29,6 @@
  */
 public class ProductPlugin extends AbstractUIPlugin {
 
-	private static final String CARBIDE_IDE_FEATURE = "CARBIDE_IDE"; //$NON-NLS-1$
-	
 	//The shared instance.
 	private static ProductPlugin plugin;
 	
@@ -47,12 +44,11 @@
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
+
 		File file = P2Utils.getInitialFeaturesFile();
 		if (!file.exists()) {
 			P2Utils.writeFeaturesToFile(file);
 		}
-
-		FeatureUseTrackerPlugin.getFeatureUseProxy().useFeature(CARBIDE_IDE_FEATURE);
 	}
 
 	/**
--- a/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/templatewizard/ui/TemplatePagesNode.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/internal/api/templatewizard/ui/TemplatePagesNode.java	Thu Sep 02 13:19:32 2010 -0500
@@ -58,6 +58,7 @@
 			Image defaultPageImage = parentWizard.getDefaultPageImage();
 			ImageDescriptor imageDescriptor = ImageDescriptor.createFromImage(defaultPageImage);
 			setDefaultPageImageDescriptor(imageDescriptor);
+			setNeedsProgressMonitor(true);
 			
 			ILoadedTemplateUI selectedLoadedTemplateUI = parentWizard.getSelectedTemplateUI();
 			selectedLoadedTemplateUI.initExtraPagesProvider(parentWizard, 
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties	Tue Aug 31 07:53:48 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties	Thu Sep 02 13:19:32 2010 -0500
@@ -5,7 +5,7 @@
 ConnectionStatusReconciler_NotReadyLabel=Not Ready
 ConnectionStatusReconciler_ReadyLabel=Ready
 ConnectionStatusReconciler_TracingServicePrefix=, Tracing service 
-ConnectionStatusReconciler_TRKServicePrefix=debugging services 
+ConnectionStatusReconciler_TRKServicePrefix=Debugging services 
 ConnectionStatusReconciler_unavailableLabel=unavailable
 TRKConnectedService.AppTRKName=Application TRK 
 TRKConnectedService.DownLabel=Not Accessible
--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/mmp/EMMPStatement.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/mmp/EMMPStatement.java	Thu Sep 02 13:19:32 2010 -0500
@@ -82,6 +82,11 @@
 	STDCPP("STDCPP", IMMPParserConfiguration.FLAG_STATEMENT), //$NON-NLS-1$
 	NOSTDCPP("NOSTDCPP", IMMPParserConfiguration.FLAG_STATEMENT), //$NON-NLS-1$
 	
+	/**
+	 * @since 3.0
+	 */
+	TRACES("TRACES", IMMPParserConfiguration.FLAG_STATEMENT), //$NON-NLS-1$
+	
 	HEADER("HEADER", IMMPParserConfiguration.FLAG_STATEMENT, "RESOURCE|BITMAP"), //$NON-NLS-1$ //$NON-NLS-2$
 	HEADERONLY("HEADERONLY", IMMPParserConfiguration.FLAG_STATEMENT, "RESOURCE|BITMAP"), //$NON-NLS-1$ //$NON-NLS-2$
 	
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/wizards/NewSymbianOSCppProjectWizard.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/wizards/NewSymbianOSCppProjectWizard.java	Thu Sep 02 13:19:32 2010 -0500
@@ -22,6 +22,8 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IWorkbench;
 
 import com.nokia.carbide.cpp.internal.api.sdk.ISDKManagerInternal;
 import com.nokia.carbide.cpp.internal.api.sdk.ui.TemplateSDKsFilter;
@@ -80,6 +82,7 @@
 			String description = Messages.getString("NewSymbianOSCppProjectWizard.NewProjectPageDesc"); //$NON-NLS-1$
 			newProjectPage = new NewProjectPage(title, description);
 			pagesAfterTemplateChoice.add(newProjectPage);
+			setNeedsProgressMonitor(true);
 			buildTargetsPage = new ProjectWizardBuildTargetsPage(this);
 			pagesAfterTemplateChoice.add(buildTargetsPage);
 			notifyTemplateChanged();
@@ -88,6 +91,11 @@
 	}
 
 	@Override
+	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
+		super.init(workbench, currentSelection);
+	}
+
+	@Override
 	public String getChooseTemplatePageTitle() {
 		return Messages.getString("NewSymbianOSCppProjectWizard.ChooseTemplatePageTitle"); //$NON-NLS-1$
 	}
--- a/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtCorePlugin.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.core/src/com/nokia/carbide/cpp/internal/qt/core/QtCorePlugin.java	Thu Sep 02 13:19:32 2010 -0500
@@ -58,7 +58,6 @@
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
-		SDKCorePlugin.getSDKManager().addInstalledSdkChangeListener(this);
 	}
 
 	/*
@@ -129,7 +128,7 @@
 	 * ISDKManagerLoadedHook extension implementation
 	 */
 	public void symbianSDKManagerLoaded() {
-		scanForQtSDKs();
+		SDKCorePlugin.getSDKManager().addInstalledSdkChangeListener(this);
 	}
 
 	/**
--- a/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/NewQtCppProjectWizard.java	Tue Aug 31 07:53:48 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.ui/src/com/nokia/carbide/cpp/internal/qt/ui/wizard/NewQtCppProjectWizard.java	Thu Sep 02 13:19:32 2010 -0500
@@ -38,6 +38,7 @@
     @Override
 	public List<IWizardDataPage> getPagesAfterTemplateChoice() {
 		if (pagesAfterTemplateChoice == null) {
+			setNeedsProgressMonitor(true);
 			pagesAfterTemplateChoice = new ArrayList<IWizardDataPage>();
 
 			newProjectPage = new NewProjectPage(Messages.NewQtCppProjectWizard_title, Messages.NewQtCppProjectWizard_desc);