merge commit
authorstechong
Mon, 06 Jul 2009 14:59:19 -0500
changeset 354 539b1b65d45f
parent 353 55ef76a19104 (current diff)
parent 352 d0fdcfed28a6 (diff)
child 355 26cc9825bb33
merge commit
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/BuilderPreferenceConstants.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/BuilderPreferenceConstants.java	Mon Jul 06 14:59:19 2009 -0500
@@ -104,4 +104,10 @@
 	 * @since 2.0
 	 */
 	public final static String PREF_MAKE_ENGINE = "makeEngine"; //$NON-NLS-1$
+	
+	/**
+	 * String setting for whether or not to alert user if Carbide can override abld-generated makefile dependencies.
+	 * @since 2.1
+	 */
+	public final static String PREF_DONT_PROMPT_FOR_DEPENDENCY_MISMATCH = "promtToTrackDependencies"; //$NON-NLS-1$
 }
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Mon Jul 06 14:59:19 2009 -0500
@@ -980,6 +980,26 @@
 	 * @param componentPath the absolute file system path of the component
 	 * @param isTest true for test components, false otherwise
 	 * @return false if any makefile generation was necessary but failed, true otherwise
+	 * 
+	 * @deprecated use {@link #generateAbldMakefileIfNecessary(ICarbideBuildConfiguration, CarbideCommandLauncher, IPath, boolean, IProgressMonitor)} instead
+	 */
+	protected static boolean generateAbldMakefileIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IPath componentPath, boolean isTest) {
+		return generateAbldMakefileIfNecessary(config, launcher, componentPath, isTest, new NullProgressMonitor());
+	}
+	
+	/**
+	 * Generates the abld makefile if necessary.
+	 * Generates the makefile for the given mmp file if:
+	 * 	 1) the makefile for the mmp does not exist
+	 *   2) if the mmp or any of its includes is newer than the makefile
+	 *   3) the makefile does not have the necessary Carbide changes
+	 *   
+	 *   The command used will be 'abld [test] makefile platform mmpname'
+	 * @param config the build configuration context
+	 * @param launcher the Carbide launcher
+	 * @param componentPath the absolute file system path of the component
+	 * @param isTest true for test components, false otherwise
+	 * @return false if any makefile generation was necessary but failed, true otherwise
 	 */
 	protected static boolean generateAbldMakefileIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IPath componentPath, boolean isTest, IProgressMonitor progress) {
 		return getBuilder(config.getCarbideProject().getProject()).generateAbldMakefileIfNecessary(config, launcher, componentPath, isTest, progress);
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCommandLauncher.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCommandLauncher.java	Mon Jul 06 14:59:19 2009 -0500
@@ -16,29 +16,20 @@
 */
 package com.nokia.carbide.cdt.builder.builder;
 
-import java.io.IOException;
-import java.util.Properties;
+import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
 
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.CommandLauncher;
-import org.eclipse.cdt.core.ConsoleOutputStream;
-import org.eclipse.cdt.core.ErrorParserManager;
-import org.eclipse.cdt.core.IMarkerGenerator;
-import org.eclipse.cdt.core.ProblemMarkerInfo;
+import org.eclipse.cdt.core.*;
 import org.eclipse.cdt.core.model.ICModelMarker;
 import org.eclipse.cdt.core.resources.IConsole;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.utils.spawner.EnvironmentReader;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.internal.resources.MarkerInfo;
+import org.eclipse.core.internal.resources.Workspace;
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.*;
 
-import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
+import java.io.IOException;
+import java.util.*;
 
 /**
  * A utility class to handle windows process execution. This utility class handles all the execution, 
@@ -46,6 +37,53 @@
  */
 public class CarbideCommandLauncher extends CommandLauncher implements IMarkerGenerator {
 
+	public class MarkerCacheElement {
+		private int line;
+		private int severity;
+		private String message;
+		
+		public MarkerCacheElement(IMarker marker) throws CoreException {
+			line = marker.getAttribute(IMarker.LINE_NUMBER, -1);
+			severity = ((Integer) marker.getAttribute(IMarker.SEVERITY)).intValue();
+			message = (String) marker.getAttribute(IMarker.MESSAGE);
+		}
+
+		public MarkerCacheElement(ProblemMarkerInfo problemMarkerInfo) {
+			line = problemMarkerInfo.lineNumber;
+			severity = mapMarkerSeverity(problemMarkerInfo.severity);
+			message = problemMarkerInfo.description;
+		}
+
+		@Override
+		public int hashCode() {
+			final int prime = 31; 
+			int result = 1;
+			result = prime * result + line;
+			result = prime * result + severity;
+			result = prime * result
+					+ ((message == null) ? 0 : message.hashCode());
+			return result;
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (!(obj instanceof MarkerCacheElement))
+				return false;
+			MarkerCacheElement other = (MarkerCacheElement) obj;
+			if (line != other.line)
+				return false;
+			if (severity != other.severity)
+				return false;
+			if (message == null) {
+				if (other.message != null)
+					return false;
+			} 
+			else if (!message.equals(other.message))
+				return false;
+			return true;
+		}
+	}
+
 	protected IProgressMonitor monitor;
 	protected IConsole console;
 	protected ErrorParserManager stdoutStream;
@@ -56,6 +94,8 @@
 	protected IProject project;
 	protected String[] errorParserIds;
 	protected IMarkerGenerator markerGen;
+	private Map<IResource, Set<MarkerCacheElement>> markerCache;
+	private long markerCreationTime;
 	
 	/**
 	 * Location of tool execution
@@ -212,6 +252,8 @@
 	 * @return 0 (zero) on success. returns the actual tool return status
 	 */
 	public int executeCommand(IPath command, String[] args, String[] env, IPath workingDir){
+		markerCache = null;
+		markerCreationTime = System.currentTimeMillis();
 		int exitValue = -1;
 		String errMsg;
 		try {
@@ -299,35 +341,27 @@
     }
 
 	public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
-
+		if (markerCache == null)
+			markerCache = new HashMap<IResource, Set<MarkerCacheElement>>();
+		
 		try {
 			IResource markerResource = problemMarkerInfo.file ;
 			if (markerResource == null)  {
 				markerResource = stdoutStream.getProject();
 			}
-			IMarker[] cur = markerResource.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, false, IResource.DEPTH_ONE);
-
-			/*
-			 * Try to find matching markers and don't put in duplicates
-			 */
-			if ((cur != null) && (cur.length > 0)) {
-				for (int i = 0; i < cur.length; i++) {
-					int line = cur[i].getAttribute(IMarker.LINE_NUMBER, -1);
-					int sev = ((Integer) cur[i].getAttribute(IMarker.SEVERITY)).intValue();
-					String mesg = (String) cur[i].getAttribute(IMarker.MESSAGE);
-					if (line == problemMarkerInfo.lineNumber && sev == mapMarkerSeverity(problemMarkerInfo.severity) && mesg.equals(problemMarkerInfo.description)) {
-						return;
-					}
+			
+			Set<MarkerCacheElement> cacheElements = markerCache.get(markerResource);
+			if (cacheElements == null) {
+				cacheElements = new HashSet<MarkerCacheElement>();
+				markerCache.put(markerResource, cacheElements);
+				IMarker[] cur = markerResource.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, false, IResource.DEPTH_ONE);
+				for (IMarker marker : cur) {
+					cacheElements.add(new MarkerCacheElement(marker));
 				}
 			}
-
-			// need to pause briefly between marker creations so the creation timestamps
-			// are unique and sorting the problems view by creation time works properly.
-			try {
-				Thread.sleep(20);
-			} catch (InterruptedException e1) {
-				e1.printStackTrace();
-			}
+			
+			if (!cacheElements.add(new MarkerCacheElement(problemMarkerInfo)))
+				return;
 
 			IMarker marker = markerResource.createMarker(ICModelMarker.C_MODEL_PROBLEM_MARKER);
 			marker.setAttribute(IMarker.MESSAGE, problemMarkerInfo.description);
@@ -356,6 +390,7 @@
 				}
 				marker.setAttribute(ICModelMarker.C_MODEL_MARKER_EXTERNAL_LOCATION, absolutePath.toOSString());
 			}
+			setUniqueCreationTime(marker);
 		}
 		catch (CoreException e) {
 			CCorePlugin.log(e.getStatus());
@@ -363,6 +398,16 @@
 
 	}
 	
+	private void setUniqueCreationTime(IMarker marker) {
+		// This is using internal platform APIs to avoid putting a delay into every marker creation
+		// to ensure each marker gets a unique creation time (for sorting in the problems view).
+		// The total delay could be significant when there are many problem markers
+		IResource resource = marker.getResource();
+		Workspace workspace = (Workspace) resource.getWorkspace();
+		MarkerInfo markerInfo = workspace.getMarkerManager().findMarkerInfo(resource, marker.getId());
+		markerInfo.setCreationTime(markerCreationTime++);
+	}
+
 	int mapMarkerSeverity(int severity) {
 
 		switch (severity) {
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java	Mon Jul 06 14:59:19 2009 -0500
@@ -16,70 +16,38 @@
 */
 package com.nokia.carbide.cdt.internal.builder;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.io.*;
+import java.util.*;
 
-import org.eclipse.cdt.make.core.makefile.ICommand;
-import org.eclipse.cdt.make.core.makefile.IMacroDefinition;
-import org.eclipse.cdt.make.core.makefile.IRule;
-import org.eclipse.cdt.make.core.makefile.ITargetRule;
+import org.eclipse.cdt.make.core.makefile.*;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.core.runtime.*;
+import org.eclipse.jface.dialogs.*;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.*;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
 
-import com.nokia.carbide.cdt.builder.BuilderPreferenceConstants;
-import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
-import com.nokia.carbide.cdt.builder.DefaultGNUMakefileViewConfiguration;
-import com.nokia.carbide.cdt.builder.DefaultMMPViewConfiguration;
-import com.nokia.carbide.cdt.builder.DefaultViewConfiguration;
-import com.nokia.carbide.cdt.builder.EpocEngineHelper;
-import com.nokia.carbide.cdt.builder.EpocEnginePathHelper;
+import com.nokia.carbide.cdt.builder.*;
 import com.nokia.carbide.cdt.builder.builder.CarbideCPPBuilder;
 import com.nokia.carbide.cdt.builder.builder.CarbideCommandLauncher;
-import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
-import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
+import com.nokia.carbide.cdt.builder.project.*;
 import com.nokia.carbide.cdt.internal.builder.ui.MMPChangedActionDialog;
+import com.nokia.carbide.cdt.internal.builder.ui.TrackDependenciesQueryDialog;
 import com.nokia.carbide.cdt.internal.builder.ui.MMPChangedActionDialog.MMPChangedAction;
-import com.nokia.carbide.cpp.epoc.engine.BldInfViewRunnableAdapter;
-import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
-import com.nokia.carbide.cpp.epoc.engine.MMPDataRunnableAdapter;
+import com.nokia.carbide.cpp.epoc.engine.*;
 import com.nokia.carbide.cpp.epoc.engine.model.IModel;
 import com.nokia.carbide.cpp.epoc.engine.model.IModelProvider;
 import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IBldInfView;
 import com.nokia.carbide.cpp.epoc.engine.model.makefile.IMakefileView;
-import com.nokia.carbide.cpp.epoc.engine.model.mmp.EMMPLanguage;
-import com.nokia.carbide.cpp.epoc.engine.model.mmp.EMMPStatement;
-import com.nokia.carbide.cpp.epoc.engine.model.mmp.IMMPData;
-import com.nokia.carbide.cpp.epoc.engine.model.mmp.IMMPResource;
+import com.nokia.carbide.cpp.epoc.engine.model.mmp.*;
 import com.nokia.carbide.cpp.epoc.engine.preprocessor.AcceptedNodesViewFilter;
 import com.nokia.carbide.cpp.internal.qt.core.QtCorePlugin;
 import com.nokia.carbide.cpp.sdk.core.*;
 import com.nokia.cpp.internal.api.utils.core.FileUtils;
+import com.nokia.cpp.internal.api.utils.ui.QueryWithTristatePrefDialog;
 import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
 
 
@@ -2433,7 +2401,7 @@
 		return true;
 	}
 
-	protected boolean needsAbldMakefileGeneration(ICarbideBuildConfiguration config, IPath componentPath) {
+	protected boolean needsAbldMakefileGeneration(final ICarbideBuildConfiguration config, IPath componentPath) {
 		// if this is an extension makefile then we always do the makefile step.
 		if (isExtensionMakefile(componentPath)) {
 			return true;
@@ -2479,17 +2447,37 @@
 		}
 		
 		// now check to see if our makefile changes are there
-		if (areWeManagingTheMakeFiles && !makeFileHasOurChanges(makefile)) {
+		final IPreferenceStore prefsStore = CarbideBuilderPlugin.getDefault().getPreferenceStore();
+		
+		if (prefsStore.getBoolean(BuilderPreferenceConstants.PREF_DONT_PROMPT_FOR_DEPENDENCY_MISMATCH) == false &&
+				areWeManagingTheMakeFiles && !makeFileHasOurChanges(makefile)) {
+			
 			// if they are not then the user must have been building from the command line.  this means that
 			// any dependency files that exist could be stale so we need to delete them.  we also need to
 			// remove any object code since the corresponding dependency info will not be available.
+			final int manageDeps[] = { IDialogConstants.OK_ID };
+			Display.getDefault().syncExec(new Runnable() {
+
+				public void run() {
+					// ask the user if they want to update now
+					TrackDependenciesQueryDialog dlg = new TrackDependenciesQueryDialog(WorkbenchUtils.getSafeShell(), config.getCarbideProject());
+					manageDeps[0] = dlg.open();
+				}
+			});
+			
 			try {
-				cleanupObjectCodeDirectory(new Path(makefile.getAbsolutePath()).removeLastSegments(1));
+				if (manageDeps[0] == IDialogConstants.OK_ID){
+					cleanupObjectCodeDirectory(new Path(makefile.getAbsolutePath()).removeLastSegments(1));
+				}
 			} catch (Exception e) {
 				CarbideBuilderPlugin.log(e);
 	    		e.printStackTrace();
 			}
-			return true;
+			if (manageDeps[0] == IDialogConstants.OK_ID){
+				return true;
+			} else {
+				return false;
+			}
 		}
 		
 		return false;
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java	Mon Jul 06 14:59:19 2009 -0500
@@ -53,6 +53,7 @@
 	private Composite defaultMMPActionComposite;
 	private Label defaultMMPChangedActionLabel;
 	private Combo defaultMMPChangedActionCombo;
+	private Button dontCheckForExternalDependencies; // global setting only
 	
 	// SBS v2 Tab
 	private Label cleanCmdv2Label;
@@ -200,7 +201,15 @@
 		defaultMMPChangedActionCombo.add(Messages.getString("SharedPrefs.ActionCompileAndLink")); //$NON-NLS-1$
 		defaultMMPChangedActionCombo.setToolTipText(Messages.getString("SharedPrefs.defaultMMPChangedActionComboToolTip")); //$NON-NLS-1$
 		defaultMMPChangedActionCombo.setLayoutData(new GridData());
-
+		
+		if (!projectSetting){
+			// Only a global setting
+			dontCheckForExternalDependencies = new Button(content, SWT.CHECK);
+			dontCheckForExternalDependencies.setText(Messages.getString("BuildSettingsUI.SharedPrefs.DontTrackDeps"));  //$NON-NLS-1$
+			dontCheckForExternalDependencies.setToolTipText(Messages.getString("BuildSettingsUI.SharedPrefs.DontTrackDepsToolTip")); //$NON-NLS-1$
+			dontCheckForExternalDependencies.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
+		}
+		
 	}
 
 	private void createSBSv2TabComposite() {
@@ -428,5 +437,17 @@
 		makeEngineText.setText(makeEngine);
 	}
 
+	public boolean getDontPromtTrackDeps(){
+		if (!projectSetting){
+			return dontCheckForExternalDependencies.getSelection();
+		} else {
+			return true;
+		}
+	}
+	
+	public void setDontPromtTrackDeps(boolean dontAsk){
+		dontCheckForExternalDependencies.setSelection(dontAsk);
+	}
+	
 	
 }
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuilderPreferenceInitializer.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuilderPreferenceInitializer.java	Mon Jul 06 14:59:19 2009 -0500
@@ -44,6 +44,7 @@
 		store.setDefault(BuilderPreferenceConstants.PREF_MMP_CHANGED_ACTION_PROMPT, true);
 		store.setDefault(BuilderPreferenceConstants.PREF_DEFAULT_MMP_CHANGED_ACTION, 0);
 		store.setDefault(BuilderPreferenceConstants.PREF_MAKE_ENGINE, "make"); //$NON-NLS-1$
+		store.setDefault(BuilderPreferenceConstants.PREF_DONT_PROMPT_FOR_DEPENDENCY_MISMATCH, false);
 	}
 
 }
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuilderPreferencePage.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuilderPreferencePage.java	Mon Jul 06 14:59:19 2009 -0500
@@ -48,6 +48,7 @@
 		buildSettingsUI.setPromptForMMPChangedAction(promptForMMPChangedAction());
 		buildSettingsUI.setDefaultMMPChangedAction(defaultMMPChangedAction());
 		buildSettingsUI.setUseBuiltInEnvVars(useBuiltInX86Vars());
+		buildSettingsUI.setDontPromtTrackDeps(promtDontTrackDependencies());
 		
 		if (SBSv2Utils.enableSBSv2Support()) {
 			buildSettingsUI.setDefaultCleanLevelv2(getCleanLevelv2());
@@ -83,6 +84,7 @@
 		store.setValue(BuilderPreferenceConstants.PREF_MMP_CHANGED_ACTION_PROMPT, buildSettingsUI.getPromptForMMPChangedAction());
 		store.setValue(BuilderPreferenceConstants.PREF_DEFAULT_MMP_CHANGED_ACTION, buildSettingsUI.getDefaultMMPChangedAction());
 		store.setValue(BuilderPreferenceConstants.PREF_USE_BUILIN_X86_VARS, buildSettingsUI.getUseBuiltInEnvVars());
+		store.setValue(BuilderPreferenceConstants.PREF_DONT_PROMPT_FOR_DEPENDENCY_MISMATCH, buildSettingsUI.getDontPromtTrackDeps()); // global setting only
 		
 		if (SBSv2Utils.enableSBSv2Support()) {
 			store.setValue(BuilderPreferenceConstants.PREF_CLEAN_LEVEL_V2, buildSettingsUI.getDefaultCleanLevelv2());
@@ -103,6 +105,7 @@
 		buildSettingsUI.setPromptForMMPChangedAction(true);
 		buildSettingsUI.setDefaultMMPChangedAction(0);
 		buildSettingsUI.setUseBuiltInEnvVars(true);
+		buildSettingsUI.setDontPromtTrackDeps(false);
 
 		if (SBSv2Utils.enableSBSv2Support()) {
 			buildSettingsUI.setDefaultCleanLevelv2(0);
@@ -152,7 +155,16 @@
 		IPreferenceStore store = CarbideBuilderPlugin.getDefault().getPreferenceStore();
 		return store.getBoolean(BuilderPreferenceConstants.PREF_MMP_CHANGED_ACTION_PROMPT);
 	}
-
+	
+	/**
+	 * For SBSv1 global preferences only
+	 * @return
+	 */
+	public static boolean promtDontTrackDependencies(){
+		IPreferenceStore store = CarbideBuilderPlugin.getDefault().getPreferenceStore();
+		return store.getBoolean(BuilderPreferenceConstants.PREF_DONT_PROMPT_FOR_DEPENDENCY_MISMATCH);
+	}
+	
 	public static int defaultMMPChangedAction() {
 		IPreferenceStore store = CarbideBuilderPlugin.getDefault().getPreferenceStore();
 		return store.getInt(BuilderPreferenceConstants.PREF_DEFAULT_MMP_CHANGED_ACTION);
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideCPPBuilderUIHelpIds.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideCPPBuilderUIHelpIds.java	Mon Jul 06 14:59:19 2009 -0500
@@ -32,4 +32,5 @@
 	public static final String CARBIDE_BUILDER_SIS_DIALOG = CarbideBuilderPlugin.PLUGIN_ID + ".builder_sis_dialog"; //$NON-NLS-1$
 	public static final String CARBIDE_BUILDER_MMP_CHANGED_ACTION_DIALOG = CarbideBuilderPlugin.PLUGIN_ID + ".builder_mmp_changed_action_dialog"; //$NON-NLS-1$
 	public static final String CARBIDE_BUILDER_MMP_SELECTION_DIALOG = CarbideBuilderPlugin.PLUGIN_ID + ".builder_mmp_selection_dialog"; //$NON-NLS-1$
+	public static final String CARBIDE_BUILDER_TRACK_DEPENDENCIES_QUERY_DIALOG = CarbideBuilderPlugin.PLUGIN_ID + ".dependency_tracking_dialog"; //$NON-NLS-1$
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/TrackDependenciesQueryDialog.java	Mon Jul 06 14:59:19 2009 -0500
@@ -0,0 +1,181 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+package com.nokia.carbide.cdt.internal.builder.ui;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TrayDialog;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.window.IShellProvider;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.ui.PlatformUI;
+
+import com.nokia.carbide.cdt.builder.BuilderPreferenceConstants;
+import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
+import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
+import com.nokia.carbide.cdt.builder.project.ICarbideProjectModifier;
+import com.nokia.carbide.cdt.internal.builder.CarbideProjectInfo;
+
+
+public class TrackDependenciesQueryDialog extends TrayDialog {
+
+	private Button okButton;
+	private Button trackDependenciesRadio;
+	private Button dontTrackDependenciesRadio;
+	private Button dontAskAgainCheck;
+	
+	private boolean userWantsToTrackDeps = false;
+	
+	private ICarbideProjectInfo cpi;
+	
+	/**
+	 * Dialog presented to user when users is building with SBSv1 and built the project first from the command-line.
+	 * The user will be asked whether or not Carbide should manage the dependencies. This dialog will also handle writing
+	 * the persistent data for the global and project settings.
+	 * 
+	 * Unpon calling open(), the dialog will return IDialogConstants for OK and CANCEL, where OK means Carbide should track dependencies.
+	 * 
+	 * @param shell
+	 * @param cpi, the current project to save data to
+	 */
+	public TrackDependenciesQueryDialog(Shell shell, ICarbideProjectInfo cpi) {
+		super(shell);
+		this.cpi = cpi;
+		setShellStyle(getShellStyle() | SWT.RESIZE);
+	}
+
+	/**
+	 * @param parentShell
+	 */
+	public TrackDependenciesQueryDialog(IShellProvider parentShell) {
+		super(parentShell);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+	 */
+	protected Control createDialogArea(Composite parent) {
+		
+		Composite composite = (Composite) super.createDialogArea(parent);
+		composite.setLayout(new GridLayout());
+		composite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
+
+		Label epocrootLabel = new Label(composite, SWT.WRAP);
+		epocrootLabel.setLayoutData(new GridData(450, SWT.DEFAULT));
+		epocrootLabel.setText(Messages.getString("TrackDependenciesQueryDialog.0"));  //$NON-NLS-1$
+		
+		// filler
+		new Label(composite, SWT.WRAP);
+		
+		trackDependenciesRadio = new Button(composite, SWT.RADIO);
+		trackDependenciesRadio.setText(Messages.getString("TrackDependenciesQueryDialog.1"));  //$NON-NLS-1$
+		trackDependenciesRadio.setToolTipText(Messages.getString("TrackDependenciesQueryDialog.2"));  //$NON-NLS-1$
+		trackDependenciesRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
+		trackDependenciesRadio.setSelection(false);
+		addButtonListener(trackDependenciesRadio);
+		
+		dontTrackDependenciesRadio = new Button(composite, SWT.RADIO);
+		dontTrackDependenciesRadio.setText(Messages.getString("TrackDependenciesQueryDialog.3")); //$NON-NLS-1$
+		dontTrackDependenciesRadio.setToolTipText(Messages.getString("TrackDependenciesQueryDialog.4"));  //$NON-NLS-1$
+		dontTrackDependenciesRadio.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
+		dontTrackDependenciesRadio.setSelection(true);
+		addButtonListener(dontTrackDependenciesRadio);
+		
+		dontAskAgainCheck = new Button(composite, SWT.CHECK);
+		dontAskAgainCheck.setText(Messages.getString("TrackDependenciesQueryDialog.5")); //$NON-NLS-1$
+		dontAskAgainCheck.setToolTipText(Messages.getString("TrackDependenciesQueryDialog.6"));  //$NON-NLS-1$
+		GridData gd = new GridData();
+		gd.horizontalIndent = 25;
+		dontAskAgainCheck.setLayoutData(gd);
+		dontAskAgainCheck.setEnabled(true);
+		dontAskAgainCheck.setSelection(false);
+		
+		return composite;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
+	 */
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, CarbideCPPBuilderUIHelpIds.CARBIDE_BUILDER_TRACK_DEPENDENCIES_QUERY_DIALOG);
+		shell.setText("Project rebuild notification"); //$NON-NLS-1$
+	}
+
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		okButton = createButton(parent, IDialogConstants.OK_ID,
+		IDialogConstants.OK_LABEL, true);
+	}
+	
+	@Override
+	protected void okPressed() {
+		
+		if (dontTrackDependenciesRadio.getSelection() == true){
+			
+			ICarbideProjectModifier cpm = CarbideBuilderPlugin.getBuildManager().getProjectModifier(cpi.getProject());
+			cpm.writeProjectSetting(CarbideProjectInfo.MANAGE_DEPENDENCIES, "false");
+			cpm.writeProjectSetting(CarbideProjectInfo.OVERRIDE_WORKSPACE_SETTINGS_KEY, "true");
+			cpm.saveChanges();
+			
+			if (dontAskAgainCheck.getSelection() == true){
+				// set the global pref
+				IPreferenceStore prefsStore = CarbideBuilderPlugin.getDefault().getPreferenceStore();
+				prefsStore.setValue(BuilderPreferenceConstants.PREF_DONT_PROMPT_FOR_DEPENDENCY_MISMATCH, true);
+			}
+		} else {
+			// nothing pref option to save
+		}
+		
+		// cache so we can get value after widgets disposed
+		userWantsToTrackDeps = trackDependenciesRadio.getSelection();
+		
+		super.okPressed();
+	}
+	
+	/**
+	 * Sets the listener event to a button.
+	 * 
+	 * @param aButton
+	 */
+	private void addButtonListener( final Button aButton ) {
+		SelectionListener listener = new SelectionAdapter() {
+			public void widgetSelected( SelectionEvent e )  {
+				if (e.getSource().equals(trackDependenciesRadio)) {
+					dontAskAgainCheck.setEnabled(false);
+				} else if (e.getSource().equals(dontTrackDependenciesRadio)) {
+					dontAskAgainCheck.setEnabled(true);
+				} 
+			}
+		};
+		aButton.addSelectionListener(listener);
+	}
+
+	@Override
+	public int open() {
+		super.open();
+		if (userWantsToTrackDeps == true){
+			return IDialogConstants.OK_ID;
+		} else {
+			return IDialogConstants.CANCEL_ID;
+		}
+	}
+	
+}
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/messages.properties	Mon Jul 06 14:53:12 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/messages.properties	Mon Jul 06 14:59:19 2009 -0500
@@ -105,6 +105,8 @@
 BuildSettingsUI.SBSv1TabToolTip=Symbian OS Build System version 1 builder settings
 BuildSettingsUI.SBSv2TabLabel=SBSv2
 BuildSettingsUI.SBSv2TabToolTip=Symbian OS Build System version 2 builder settings
+BuildSettingsUI.SharedPrefs.DontTrackDeps=Do not offer to track dependencies for projects built on command-line
+BuildSettingsUI.SharedPrefs.DontTrackDepsToolTip=When enabled, Carbide will not check abld makefiles and promt you to let Carbide manage them.
 
 SharedPrefs.CleanCommandLabelText=Clean level:
 SharedPrefs.CleanCommandLabelToolTip=The type of clean that should be done when cleaning a project.
@@ -195,3 +197,10 @@
 CarbideRomBuilderTab.Working_Dir_Tool_Tip=Specify the working directory for building the ROM image
 CarbideRomBuilderTab.Browse=Browse...
 CarbideRomBuilderTab.Rom_Dir_Dialog_Title=ROM Build Working Directory
+TrackDependenciesQueryDialog.0=This project was previously built from the command-line.  Carbide can manage the makefile dependencies in this project for faster incremental builds, but a full rebuild wil be required.
+TrackDependenciesQueryDialog.1=Improve Carbide build times (forces a rebuild)
+TrackDependenciesQueryDialog.2=Carbide will make dependency file for each source file and update makefiles accordingly.
+TrackDependenciesQueryDialog.3=Do not update dependencies (slower builds from Carbide, no rebuild)
+TrackDependenciesQueryDialog.4=Source dependencies will be managed as they currently exist in abld-generated makefiles.
+TrackDependenciesQueryDialog.5=Don't ask me again for any project
+TrackDependenciesQueryDialog.6=Carbide will not try to override dependency tracking for projects that are built with abld first.
--- a/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/reference/api_Change_Notes.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/reference/api_Change_Notes.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -130,7 +130,9 @@
 <ul>
   <li><i>com.nokia.carbide.cdt.builder.EpocEngineHelper#getVariantTargetName(IMMPData mmpData, IPath target)</i></li>
 </ul>
-
+<ul>
+  <li><i>com.nokia.carbide.cdt.builder.builder.CarbideCPPBuilder#generateAbldMakefileIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IPath componentPath, boolean isTest)</i></li>
+</ul>
 <h3>Removed APIs</h3>
 <p>The following Carbide APIs have been removed and are no longer available to plug-ins.</p>
 <p>Since Carbide 1.2.0</p>
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionTypePage.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionTypePage.java	Mon Jul 06 14:59:19 2009 -0500
@@ -174,8 +174,7 @@
 	}
 	
 	private Collection<IConnectionType> getConnectionTypes() {
-		Collection<IConnectionType> connectionTypes = 
-			RemoteConnectionsActivator.getConnectionTypeProvider().getConnectionTypes();
+		Collection<IConnectionType> connectionTypes = getValidConnectionTypes();
 		IService serviceToRestrict = settingsWizard.getServiceToRestrict();
 		if (serviceToRestrict != null) {
 			List<IConnectionType> restrictedConnectionTypes = new ArrayList<IConnectionType>();
@@ -193,6 +192,21 @@
 		return connectionTypes;
 	}
 
+	private Collection<IConnectionType> getValidConnectionTypes() {
+		// valid connection types have at least one compatible service, or are the actual connection type of the connection being edited
+		IConnection connectionToEdit = settingsWizard.getConnectionToEdit();
+		IConnectionType connectionTypeToEdit = connectionToEdit != null ? connectionToEdit.getConnectionType() : null;
+		Collection<IConnectionType> allConnectionTypes = 
+		RemoteConnectionsActivator.getConnectionTypeProvider().getConnectionTypes();
+		Collection<IConnectionType> connectionTypes = new ArrayList<IConnectionType>();
+		for (IConnectionType connectionType : allConnectionTypes) {
+			if (!RemoteConnectionsActivator.getConnectionTypeProvider().getCompatibleServices(connectionType).isEmpty() ||
+					connectionType.equals(connectionTypeToEdit))
+				connectionTypes.add(connectionType);
+		}
+		return connectionTypes;
+	}
+
 	private boolean validatePage() {
 		setErrorMessage(null);
 		String name = getName();
--- a/core/com.nokia.carbide.cpp-feature/feature.xml	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp-feature/feature.xml	Mon Jul 06 14:59:19 2009 -0500
@@ -314,8 +314,8 @@
 
    <url>
       <!-- all Carbide.c++ features should use the exact same text for update label and discovery label -->
-      <update label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide203"/>
-      <discovery label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide203"/>
+      <update label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide21"/>
+      <discovery label="Carbide.c++ Update Site" url="http://tools.ext.nokia.com/updates/carbide21"/>
    </url>
 
    <requires>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/dependency_tracking.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -0,0 +1,32 @@
+<!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>Dependency Tracking</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {font-family: "Courier New", Courier, mono}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Dependency Tracking</h2>
+<p> This section only applies to the SBSv1 (abld) build system. If you are using the Raptor (SBSv2) build system Carbide does not perform any build system modifications to optimize dependency tracking.</p>
+<p>Carbide has made some performance improvements over command-line builds when performing incremental builds. Once a project has been built, many users  invoke 'abld build' on their project, not knowing that their makefiles are regenerated each time, taking a large performance hit. Although a command-line user can invoke 'abld target' to improve incremental build performance, Carbide invokes each build stage independently for a full incremental build (including the 'abld makefile' stage). In order to get around this performance hit from the IDE, Carbide manages the source and resource dependencies in separate <span class="style1">.d</span> (dependency) files generated under the build system. Then Carbide  makes a small modification to each component's (MMP) makefile under the <span class="style1">\epoc32\build</span>\ directory by including the generated .d files as dependency includes. This performance modification  makes incremental builds faster from Carbide.</p>
+<p>Normally,  you do not need to know the details of dependency management unless you first build from the command-line and then try to build their project from the IDE. When this happens, Carbide will prompt you with the <b>Project rebuild notification</b> dialog when you initiate a build from the IDE.</p>
+<p align="center"><img src="images/deps_track_query.png" width="483" height="203"></p>
+<p align="left" class="figure">Figure 1 -Dependency Tracking dialog</p>
+<p>It is recommended you choose the <strong>Improve Carbide build times</strong> option if you plan to continue building in Carbide. However, be cautious of this as Carbide will remove all the object code and build everything from scratch. </p>
+<p>If you choose the option <strong>Do not update dependencies</strong>,  Carbide disables the option to manage dependencies under the <b><a href="../reference/build_properties/pane_project_settings.htm">Carbide Project Settings</a></b>, <strong>SBSv1</strong> tab. </p>
+<h5>Related references <b></b></h5>
+<ul>
+  <li><a href="../reference/build_properties/pane_project_settings.htm">Carbide Project Settings</a></li>
+  <li><a href="../reference/wnd_build_prefs.htm">Carbide Global Build Settings</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
Binary file core/com.nokia.carbide.cpp.doc.user/html/concepts/images/deps_track_query.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_debug_dialogs_help.xml	Mon Jul 06 14:59:19 2009 -0500
@@ -1,379 +1,379 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- =============================================================================== -->
-<!-- CONTEXT HELP FOR CARBIDE DEBUGGER DIALOGS AND PLUGINS                           -->
-<!-- Location for all Carbide debugger context help.                                 -->
-<!-- Includes context help references for:                                           -->
-<!--    plugin="com.freescale.cdt.debug.cw.core.ui"                                  -->
-<!--    plugin="com.nokia.cdt.debug.cw.symbian"                                      -->
-<!--    plugin="com.nokia.carbide.cpp.debug.kernelaware"                                     -->
-<!--    plugin="com.nokia.cdt.debug.launch"                                          -->
-<!-- =============================================================================== -->
-
-<contexts>
-
-<!-- =============================================================================== -->
-<!-- PLUGIN: com.freescale.cdt.debug.cw.core.ui                                      -->
-<!-- =============================================================================== -->
-	
-
-	<!-- Carbide.c++ debugging preference panel -->
-	<context id="debugger_global_settings_page_help" >
-		<description>Carbide.c++ global debugger settings</description>
-		<topic label="Carbide.c++ Debugger preferences"	  href="html/reference/wnd_debugger_prefs.htm" />
-	</context>
-
-	
-<!-- =============================================================================== -->
-<!-- PLUGIN: com.nokia.cdt.debug.cw.symbian                                          -->
-<!-- FILE: GlobalSettings.java                                                       -->	
-<!-- =============================================================================== -->
-
-		
-<!-- =============================================================================== -->
-<!-- Define help for Carbide.c++ Symbian OS Data View                                -->
-<!-- PLUGIN: com.nokia.carbide.cpp.debug.kernelaware                                         -->
-<!-- FILE: SymbianOSView.java                                                        -->	
-<!-- =============================================================================== -->
-
-	<!-- Symbian OS Data View main window -->
-	<context id="symbian_os_data_view" >
-		<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" />
-	</context>
-
-	<!-- Symbian OS Data View Overview pane -->
-	<context id="symbian_os_data_view_overview_tab" >
-		<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" />
-	</context>
-
-		<!-- Symbian OS Data View Processes pane -->
-	<context id="symbian_os_data_view_process_tab" >
-		<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" />
-	</context>
-
-		<!-- Symbian OS Data View Thread pane -->
-	<context id="symbian_os_data_view_thread_tab" >
-		<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" />
-	</context>
-		
-	<!-- Symbian OS Data View Chunk pane -->
-	<context id="symbian_os_data_view_chunk_tab" >
-		<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" />
-	</context>
-
-	<!-- Symbian OS Data View Library pane -->
-	<context id="symbian_os_data_view_library_tab" >
-		<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" />
-	</context>
-
-		
-<!-- =============================================================================== -->
-<!-- PLUGIN: com.nokia.cdt.debug.launch                                              -->
-<!-- FILE: LaunchTabHelpIds.java                                                     -->	
-<!-- =============================================================================== -->
-
-	<!-- EXECUTABLES -->
-	<context id="all_executables">
-		<description>Control which executables are included in the debug process.</description>
-		<topic label="Executables tab" 						href="html/reference/trk/panel_trk_exes.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-	
-	<!-- ============================================================== -->
-	<!-- EMULATOR SECTION                                               -->
-	<!-- ============================================================== -->
-	
-	<context id="context_main" >
-		<description>Define the project's launch configuration.</description>
-		<topic label="Main tab"         					href="html/reference/emulator/panel_emulator_main.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-	</context>
-
-	<!-- LAUNCH.MAIN -->
-	<context id="emulation_main" >
-		<description>Define the project's launch configuration.</description>
-		<topic label="Main tab"        						href="html/reference/emulator/panel_emulator_main.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-	</context>
-
-	<!-- LAUNCH.DEBUGGER -->
-	<context id="emulation_debugger" >
-		<description>Control symbolics loading and other debugger options.</description>
-		<topic label="Debugger tab" 						href="html/reference/emulator/panel_debugger.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-	</context>
-
-	<!-- LAUNCH.EXCEPTIONS -->
-	<context id="emulation_exceptions" >
-		<description>Control the exceptions the debugger should catch.</description>
-		<topic label="x86 Exceptions tab" 					href="html/reference/emulator/panel_debug_exceptions.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-	</context>
-	
-
-	<!-- ============================================================== -->
-	<!-- TRK ATTACH TO PROCESS SECTION                                  -->
-	<!-- ============================================================== -->
-	
-	<!-- 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="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="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>
-	
-	
-	<!-- ============================================================== -->
-	<!-- TRK RUN-MODE SECTION                                           -->
-	<!-- ============================================================== -->
-	
-	<!-- RUNMODE.MAIN -->
-	<context id="runmode_main" >
-		<description>Control symbolics loading and other debugger options.</description>
-		<topic label="Main tab" 							href="html/reference/trk/panel_trk_main.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>S
-
-	<!-- RUNMODE.DEBUGGER -->
-	<context id="runmode_debugger" >
-		<description>Control entry points, message handling, and instruction set default settings.</description>
-		<topic label="Debugger tab"      					href="html/reference/trk/panel_trk_debugger.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-
-	<!-- RUNMODE.CONNECTION -->
-	<context id="runmode_connection" >
-		<description>Specify the method used to transfer files to the target device.</description>
-		<topic label="Connection tab"    					href="html/reference/trk/panel_trk_connection.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-
-	<!-- RUNMODE.INSTALLATION -->
-	<context id="runmode_installation" >
-		<description>Specify the .sis file to install on the target device.</description>
-		<topic label="Installation tab"  					href="html/reference/trk/panel_trk_installation.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-
-	<!-- RUNMODE.FILETRANSFER -->
-	<context id="runmode_filetransfer" >
-		<description>Manage the files transfered to the target device at the start of each launch.</description>
-		<topic label="File Transfer tab" 					href="html/reference/trk/panel_trk_file_transfer.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-
-	<!-- RUNMODE.FILETRANSFERDIALOG -->
-	<context id="runmode_filetransferDialog" >
-		<description>Select additional files for addition to the file transfer list.</description>
-		<topic label="File Transfer tab" 					href="html/reference/trk/panel_trk_file_transfer.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-
-	
-	<!-- ============================================================== -->
-	<!-- TRK STOP-MODE SECTION                                          -->
-	<!-- ============================================================== -->
-	
-	<!-- STOPMODE.MAIN -->
-	<context id="stopmode_main" >
-		<description>Control symbolics loading and other debugger options.</description>
-		<topic label="Main tab" 							href="html/reference/trk/panel_trk_main.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-	</context>
-
-	<!-- STOPMODE.DEBUGGER -->
-	<context id="stopmode_debugger" >
-		<description>Control entry points, message handling, and instruction set default settings.</description>
-		<topic label="Debugger tab"      					href="html/reference/trk/panel_trk_debugger.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-	</context>
-
-	<!-- STOPMODE.T32CONNECTION -->
-	<context id="stopmode_t32connection" >
-		<description>Specify the settings for Trace32 debugging.</description>
-		<topic label="Trace32 Support"    					href="html/reference/wnd_Trace32_config.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-	</context>
-
-	<!--  STOPMODE.SOPHIACONNECTION -->
-	<context id="stopmode_sophiaconnection" >
-		<description>Specify the settings for Sophia debugging.</description>
-		<topic label="Sophia Target Interface Support"    	href="html/reference/wnd_sophia_config.htm" />
-		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-
-	<!--  STOPMODE.ROMIMAGE -->
-	<context id="stopmode_romimage" >
-		<description>Specify the ROM image details.</description>
-		<topic label="Stop Mode ROM Image"					href="html/tasks/debugger/stop_mode_debug_launchcfg.htm" />
-		<topic label="ROM Log"								href="html/tasks/debugger/stop_mode_debug_rom_log_file.htm" />
-	</context>
-
-	<!--  STOPMODE.ROMLOGFILE -->
-	<context id="stopmode_romlogfile" >
-		<description>Specify the ROM Log file details.</description>
-		<topic label="ROM Log"								href="html/reference/launch_configs/sys_trk_rom_log.htm" />
-	</context>
-
-	
-	<!-- ============================================================== -->
-	<!-- LAUNCH WIZARDS SECTION                                         -->
-	<!-- FILE: LaunchWizardHelpIds.java                                 -->	
-	<!-- ============================================================== -->
-
-	<!-- WIZARD BINARY SELECTION PAGE (LAUNCH CONFIG WIZARD) -->
-
-	<context id="category_selection_page">
-		<description>Select the target device category.</description>
-		<topic label="New Launch Configuration Wizard"  	href="html/tasks/projects/wiz_new_launc_config.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-
-	<context id="wizard_binary_selection_page">
-		<description>Control which executables are included in the debug process.</description>
-		<topic label="New Launch Configuration Wizard"  	href="html/tasks/projects/wiz_new_launc_config.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-	
-	<context id="wizard_selection_page" >
-		<description>Select a launch type to create a launch configuration.</description>
-		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Launch 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" />
-	</context>
-
-	<context id="wizard_summary_page" >
-		<description>Review launch configuration information.</description>
-		<topic label="Creating a Launch Configuration"	href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
-	</context>
-
-	<context id="wizard_sophia_page" >
-		<description>Specify Sophia configuration information.</description>
-		<topic label="Creating a Launch Configuration"				href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Symbian OS Sophia Target Interface Support"	href="html/reference/wnd_sophia_config.htm" />
-	</context>
-
-	<context id="wizard_trace32_page" >
-		<description>Specify Trace32 configuration information.</description>
-		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
-		<topic label="Symbian OS Trace32 Support"			href="html/reference/wnd_Trace32_config.htm" />
-	</context>
-
-	<context id="wizard_trk_connection_page" >
-		<description>Specify TRK connection information.</description>
-  <topic href="html/reference/launch_configs/page_connection.htm" label="Connection options"/>
-		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
-	</context>
-
-	<context id="wizard_trk_sis_connection_page" >
-		<description>Specify TRK SIS connection information.</description>
-  <topic href="html/reference/launch_configs/page_connection.htm" label="Connection options"/>
-		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
-	</context>
-
-	<context id="wizard_rom_image_page" >
-		<description>Specify ROM image information.</description>
-  		<topic href="html/reference/wnd_Trace32_config.htm" label="Symbian OS Trace32 Support"/>
-		<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" />
-	</context>
-
-	<context id="wizard_stop_mode_rom_img_page" >
-		<description>Define startup options and ROM image download information.</description>
-  		<topic href="html/reference/wnd_Trace32_config.htm" label="Symbian OS Trace32 Support"/>
-		<topic label="Stop-mode Debugger"					href="html/reference/launch_configs/page_trk_debugger.htm" />
-		<topic label="ROM Image options"					href="html/reference/launch_configs/stop_mode_rom_image.htm" />
-	</context>
-
-	<context id="wizard_trk_sis_selection_page" >
-		<description>Specify the SIS file to install.</description>
-		<topic label="SIS Builder"							href="html/reference/build_properties/pane_build_config_sis.htm" />
-		<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" />
-	</context>
-
-	<context id="get_sis_info_dialog" >
-		<description>Specify SIS information.</description>
-		<topic label="Set PKG File for Build Configuration"		href="html/reference/build_properties/pane_pkg_config.htm" />
-		<topic label="Creating a Launch Configuration"			href="html/tasks/projects/prj_debug_config.htm" />
-	</context>
-	
-	<context id="trk_connection_bluetooth" >
-    <description>Learn how to connect to a device using Bluetooth.</description>
-		<topic label="Bluetooth Connection Setup" 				href="html/tasks/trk/trk_connection_bluetooth.htm"/>
-		<topic label="On-Device Setup" 							href="html/reference/trk/wnd_on_device_setup.htm"/>
-	</context>
-
-	<context id="trk_connection_usb" >
-    <description>Learn how to connect to a device using USB.</description>
-		<topic label="USB Connection Setup" 					href="html/tasks/trk/trk_connection_usb.htm"/>
-		<topic label="On-Device Setup" 							href="html/reference/trk/wnd_on_device_setup.htm"/>
-	</context>
-	
-	<context id="check_existing_trk_page" >
-    <description>Connect and verify the version of TRK on the device.</description>
-		<topic label="Check TRK version" 						href="html/reference/trk/wnd_on_device_check_tab.htm"/>
-		<topic label="On-Device Setup" 							href="html/reference/trk/wnd_on_device_setup.htm"/>
-	</context>
-	
-	<context id="install_trk_page" >
-    <description>Download and install the latest TRK to the device.</description>
-		<topic label="Install latest TRK" 						href="html/reference/trk/wnd_on_device_install_tab.htm"/>
-		<topic label="On-Device Setup" 							href="html/reference/trk/wnd_on_device_setup.htm"/>
-	</context>
-	
-	
-	<!-- Build Options Selection page (2.1) -->
-	<context id="build_options_selection_page" >
-    <description>Select how auto build applies to this launch configuration.</description>
-	   <topic label="New Launch Configuration Wizard" 		href="html/projects/launch/wiz_new_launch_config.htm"/>
-	   <topic label="Launch Configuration Main page" 		href="html/projects/launch/page_main.htm"/>
-	</context>
-
-</contexts>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- =============================================================================== -->
+<!-- CONTEXT HELP FOR CARBIDE DEBUGGER DIALOGS AND PLUGINS                           -->
+<!-- Location for all Carbide debugger context help.                                 -->
+<!-- Includes context help references for:                                           -->
+<!--    plugin="com.freescale.cdt.debug.cw.core.ui"                                  -->
+<!--    plugin="com.nokia.cdt.debug.cw.symbian"                                      -->
+<!--    plugin="com.nokia.carbide.cpp.debug.kernelaware"                                     -->
+<!--    plugin="com.nokia.cdt.debug.launch"                                          -->
+<!-- =============================================================================== -->
+
+<contexts>
+
+<!-- =============================================================================== -->
+<!-- PLUGIN: com.freescale.cdt.debug.cw.core.ui                                      -->
+<!-- =============================================================================== -->
+	
+
+	<!-- Carbide.c++ debugging preference panel -->
+	<context id="debugger_global_settings_page_help" >
+		<description>Carbide.c++ global debugger settings</description>
+		<topic label="Carbide.c++ Debugger preferences"	  href="html/reference/wnd_debugger_prefs.htm" />
+	</context>
+
+	
+<!-- =============================================================================== -->
+<!-- PLUGIN: com.nokia.cdt.debug.cw.symbian                                          -->
+<!-- FILE: GlobalSettings.java                                                       -->	
+<!-- =============================================================================== -->
+
+		
+<!-- =============================================================================== -->
+<!-- Define help for Carbide.c++ Symbian OS Data View                                -->
+<!-- PLUGIN: com.nokia.carbide.cpp.debug.kernelaware                                         -->
+<!-- FILE: SymbianOSView.java                                                        -->	
+<!-- =============================================================================== -->
+
+	<!-- Symbian OS Data View main window -->
+	<context id="symbian_os_data_view" >
+		<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" />
+	</context>
+
+	<!-- Symbian OS Data View Overview pane -->
+	<context id="symbian_os_data_view_overview_tab" >
+		<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" />
+	</context>
+
+		<!-- Symbian OS Data View Processes pane -->
+	<context id="symbian_os_data_view_process_tab" >
+		<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" />
+	</context>
+
+		<!-- Symbian OS Data View Thread pane -->
+	<context id="symbian_os_data_view_thread_tab" >
+		<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" />
+	</context>
+		
+	<!-- Symbian OS Data View Chunk pane -->
+	<context id="symbian_os_data_view_chunk_tab" >
+		<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" />
+	</context>
+
+	<!-- Symbian OS Data View Library pane -->
+	<context id="symbian_os_data_view_library_tab" >
+		<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" />
+	</context>
+
+		
+<!-- =============================================================================== -->
+<!-- PLUGIN: com.nokia.cdt.debug.launch                                              -->
+<!-- FILE: LaunchTabHelpIds.java                                                     -->	
+<!-- =============================================================================== -->
+
+	<!-- EXECUTABLES -->
+	<context id="all_executables">
+		<description>Control which executables are included in the debug process.</description>
+		<topic label="Executables tab" 						href="html/reference/trk/panel_trk_exes.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>
+	
+	<!-- ============================================================== -->
+	<!-- EMULATOR SECTION                                               -->
+	<!-- ============================================================== -->
+	
+	<context id="context_main" >
+		<description>Define the project's launch configuration.</description>
+		<topic label="Main tab"         					href="html/reference/emulator/panel_emulator_main.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+	</context>
+
+	<!-- LAUNCH.MAIN -->
+	<context id="emulation_main" >
+		<description>Define the project's launch configuration.</description>
+		<topic label="Main tab"        						href="html/reference/emulator/panel_emulator_main.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+	</context>
+
+	<!-- LAUNCH.DEBUGGER -->
+	<context id="emulation_debugger" >
+		<description>Control symbolics loading and other debugger options.</description>
+		<topic label="Debugger tab" 						href="html/reference/emulator/panel_debugger.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+	</context>
+
+	<!-- LAUNCH.EXCEPTIONS -->
+	<context id="emulation_exceptions" >
+		<description>Control the exceptions the debugger should catch.</description>
+		<topic label="x86 Exceptions tab" 					href="html/reference/emulator/panel_debug_exceptions.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+	</context>
+	
+
+	<!-- ============================================================== -->
+	<!-- TRK ATTACH TO PROCESS SECTION                                  -->
+	<!-- ============================================================== -->
+	
+	<!-- 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="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="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>
+	
+	
+	<!-- ============================================================== -->
+	<!-- TRK RUN-MODE SECTION                                           -->
+	<!-- ============================================================== -->
+	
+	<!-- RUNMODE.MAIN -->
+	<context id="runmode_main" >
+		<description>Control symbolics loading and other debugger options.</description>
+		<topic label="Main tab" 							href="html/reference/trk/panel_trk_main.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>S
+
+	<!-- RUNMODE.DEBUGGER -->
+	<context id="runmode_debugger" >
+		<description>Control entry points, message handling, and instruction set default settings.</description>
+		<topic label="Debugger tab"      					href="html/reference/trk/panel_trk_debugger.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>
+
+	<!-- RUNMODE.CONNECTION -->
+	<context id="runmode_connection" >
+		<description>Specify the method used to transfer files to the target device.</description>
+		<topic label="Connection tab"    					href="html/reference/trk/panel_trk_connection.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>
+
+	<!-- RUNMODE.INSTALLATION -->
+	<context id="runmode_installation" >
+		<description>Specify the .sis file to install on the target device.</description>
+		<topic label="Installation tab"  					href="html/reference/trk/panel_trk_installation.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>
+
+	<!-- RUNMODE.FILETRANSFER -->
+	<context id="runmode_filetransfer" >
+		<description>Manage the files transfered to the target device at the start of each launch.</description>
+		<topic label="File Transfer tab" 					href="html/reference/trk/panel_trk_file_transfer.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>
+
+	<!-- RUNMODE.FILETRANSFERDIALOG -->
+	<context id="runmode_filetransferDialog" >
+		<description>Select additional files for addition to the file transfer list.</description>
+		<topic label="File Transfer tab" 					href="html/reference/trk/panel_trk_file_transfer.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>
+
+	
+	<!-- ============================================================== -->
+	<!-- TRK STOP-MODE SECTION                                          -->
+	<!-- ============================================================== -->
+	
+	<!-- STOPMODE.MAIN -->
+	<context id="stopmode_main" >
+		<description>Control symbolics loading and other debugger options.</description>
+		<topic label="Main tab" 							href="html/reference/trk/panel_trk_main.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
+	</context>
+
+	<!-- STOPMODE.DEBUGGER -->
+	<context id="stopmode_debugger" >
+		<description>Control entry points, message handling, and instruction set default settings.</description>
+		<topic label="Debugger tab"      					href="html/reference/trk/panel_trk_debugger.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
+	</context>
+
+	<!-- STOPMODE.T32CONNECTION -->
+	<context id="stopmode_t32connection" >
+		<description>Specify the settings for Trace32 debugging.</description>
+		<topic label="Trace32 Support"    					href="html/reference/wnd_Trace32_config.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
+	</context>
+
+	<!--  STOPMODE.SOPHIACONNECTION -->
+	<context id="stopmode_sophiaconnection" >
+		<description>Specify the settings for Sophia debugging.</description>
+		<topic label="Sophia Target Interface Support"    	href="html/reference/wnd_sophia_config.htm" />
+		<topic label="Creating Launch Configurations"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Setting a Build Configuration"		href="html/tasks/projects/prj_set_build_tgt.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>
+
+	<!--  STOPMODE.ROMIMAGE -->
+	<context id="stopmode_romimage" >
+		<description>Specify the ROM image details.</description>
+		<topic label="Stop Mode ROM Image"					href="html/tasks/debugger/stop_mode_debug_launchcfg.htm" />
+		<topic label="ROM Log"								href="html/tasks/debugger/stop_mode_debug_rom_log_file.htm" />
+	</context>
+
+	<!--  STOPMODE.ROMLOGFILE -->
+	<context id="stopmode_romlogfile" >
+		<description>Specify the ROM Log file details.</description>
+		<topic label="ROM Log"								href="html/reference/launch_configs/sys_trk_rom_log.htm" />
+	</context>
+
+	
+	<!-- ============================================================== -->
+	<!-- LAUNCH WIZARDS SECTION                                         -->
+	<!-- FILE: LaunchWizardHelpIds.java                                 -->	
+	<!-- ============================================================== -->
+
+	<!-- WIZARD BINARY SELECTION PAGE (LAUNCH CONFIG WIZARD) -->
+
+	<context id="wizard_binary_selection_page">
+		<description>Control which executables are included in the debug process.</description>
+		<topic label="New Launch Configuration Wizard"  	href="html/tasks/projects/wiz_new_launch_config.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>
+	
+	<context id="wizard_selection_page" >
+		<description>Select a launch type to create a launch configuration.</description>
+		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Launch 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" />
+	</context>
+
+	<context id="wizard_summary_page" >
+		<description>Review launch configuration information.</description>
+		<topic label="Creating a Launch Configuration"	href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>
+
+	<context id="wizard_sophia_page" >
+		<description>Specify Sophia configuration information.</description>
+		<topic label="Creating a Launch Configuration"				href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Symbian OS Sophia Target Interface Support"	href="html/reference/wnd_sophia_config.htm" />
+	</context>
+
+	<context id="wizard_trace32_page" >
+		<description>Specify Trace32 configuration information.</description>
+		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
+		<topic label="Symbian OS Trace32 Support"			href="html/reference/wnd_Trace32_config.htm" />
+	</context>
+
+	<context id="wizard_trk_connection_page" >
+		<description>Specify TRK connection information.</description>
+  <topic href="html/reference/launch_configs/page_connection.htm" label="Connection options"/>
+		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
+	</context>
+
+	<context id="wizard_trk_sis_connection_page" >
+		<description>Specify TRK SIS connection information.</description>
+  <topic href="html/reference/launch_configs/page_connection.htm" label="Connection options"/>
+		<topic label="Creating a Launch Configuration"		href="html/tasks/projects/prj_debug_config.htm" />
+	</context>
+
+	<context id="wizard_rom_image_page" >
+		<description>Specify ROM image information.</description>
+  		<topic href="html/reference/wnd_Trace32_config.htm" label="Symbian OS Trace32 Support"/>
+		<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" />
+	</context>
+
+	<context id="wizard_stop_mode_rom_img_page" >
+		<description>Define startup options and ROM image download information.</description>
+  		<topic href="html/reference/wnd_Trace32_config.htm" label="Symbian OS Trace32 Support"/>
+		<topic label="Stop-mode Debugger"					href="html/reference/launch_configs/page_trk_debugger.htm" />
+		<topic label="ROM Image options"					href="html/reference/launch_configs/stop_mode_rom_image.htm" />
+	</context>
+
+	<context id="wizard_trk_sis_selection_page" >
+		<description>Specify the SIS file to install.</description>
+		<topic label="SIS Builder"							href="html/reference/build_properties/pane_build_config_sis.htm" />
+		<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" />
+	</context>
+
+	<context id="get_sis_info_dialog" >
+		<description>Specify SIS information.</description>
+		<topic label="Set PKG File for Build Configuration"		href="html/reference/build_properties/pane_pkg_config.htm" />
+		<topic label="Creating a Launch Configuration"			href="html/tasks/projects/prj_debug_config.htm" />
+	</context>
+	
+	<context id="trk_connection_bluetooth" >
+    <description>Learn how to connect to a device using Bluetooth.</description>
+		<topic label="Bluetooth Connection Setup" 				href="html/tasks/trk/trk_connection_bluetooth.htm"/>
+		<topic label="On-Device Setup" 							href="html/reference/trk/wnd_on_device_setup.htm"/>
+	</context>
+
+	<context id="trk_connection_usb" >
+    <description>Learn how to connect to a device using USB.</description>
+		<topic label="USB Connection Setup" 					href="html/tasks/trk/trk_connection_usb.htm"/>
+		<topic label="On-Device Setup" 							href="html/reference/trk/wnd_on_device_setup.htm"/>
+	</context>
+	
+	<context id="check_existing_trk_page" >
+    <description>Connect and verify the version of TRK on the device.</description>
+		<topic label="Check TRK version" 						href="html/reference/trk/wnd_on_device_check_tab.htm"/>
+		<topic label="On-Device Setup" 							href="html/reference/trk/wnd_on_device_setup.htm"/>
+	</context>
+	
+	<context id="install_trk_page" >
+    <description>Download and install the latest TRK to the device.</description>
+		<topic label="Install latest TRK" 						href="html/reference/trk/wnd_on_device_install_tab.htm"/>
+		<topic label="On-Device Setup" 							href="html/reference/trk/wnd_on_device_setup.htm"/>
+	</context>
+	
+	<!-- Added Category Selection page (2.1) -->
+	<context id="category_selection_page">
+		<description>Select the target device category.</description>
+		<topic label="New Launch Configuration Wizard"  	href="html/tasks/projects/wiz_new_launch_config.htm" />
+		<topic label="Launch Configuration Overview"  		href="html/projects/launch/launch_configs_overview.htm" />
+	</context>
+	
+	<!-- Added Build Options Selection page (2.1) -->
+	<context id="build_options_selection_page" >
+    <description>Select how auto build applies to this launch configuration.</description>
+	   <topic label="New Launch Configuration Wizard" 		href="html/projects/launch/wiz_new_launch_config.htm"/>
+	   <topic label="Launch Configuration Main page" 		href="html/projects/launch/page_main.htm"/>
+	</context>
+
+</contexts>
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml	Mon Jul 06 14:59:19 2009 -0500
@@ -73,7 +73,11 @@
 		<topic label="Carbide Build Configurations"		href="html/reference/build_properties/pane_build_config.htm" />
 	</context>
 
-	
+	<!-- Dependency Tracking (added v2.1) -->
+	<context id="dependency_tracking_dialog" >
+		<description>Managing makefile dependencies</description>
+		<topic label="Dependency Tracking"		href="html/concepts/dependency_tracking.htm" />
+	</context>
 	
 <!-- =============================================================================== -->
 <!-- PLUGIN: com.nokia.carbide.cdt.rombuilder                                        -->
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wiz_new_launch_config.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -27,6 +27,15 @@
     </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>
@@ -51,12 +60,10 @@
     <td><b>Attach to Process</b></td>
     <td><ul>
       <li><a href="#TRK_CONN">TRK Connection Settings</a></li>
-      </ul>      
-    </td>
+      </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>
-For emulator targets, the New Launch Configuration Wizard automatically gathers all the information it needs from the project, so clicking <b>Debug</b> just launches the debug session.
 <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>
@@ -68,7 +75,7 @@
 <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>
 <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 auto build or not. Choices include using the global auto built setting (default), enable or disable auto 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>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>
 <h3><a name="EXE_SEL" id="EXE_SEL"></a>Executable Selection </h3>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectOtherSettings.html	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectOtherSettings.html	Mon Jul 06 14:59:19 2009 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Other Settings</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <div class="Head1">
-<h2>Other Settings </h2>
-</div>
-   <p>
-		Specify the name of the author and copyright notice information. 
-   </p> 
-
-		<p align="center" class="Image"><img src="../tasks/projects/images/wiz_add_sos_class_06.png" width="438" height="463" /></p>
-		<p align="center" class="figure">Figure 1 - Other settings page </p>
-	    <h5>Table 1 - <span class="figure">Other settings</span> page options</h5>
-	 <table width="720"
-border="0" cellpadding="2" cellspacing="0">
-	   <tr valign="top"><th width="201" class="Cell">Name</th><th width="509" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Author</b></p></td><td class="Cell">
-			 <p>Enter author information. 
-				</p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Copyright notice </b></p></td><td class="Cell">
-			 <p>Enter copyright notice information.</p></td></tr>
-</table>
-     <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-   </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Other Settings</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <div class="Head1">
+<h2>Other Settings </h2>
+</div>
+   <p>
+		Specify the name of the author and copyright notice information. 
+   </p> 
+
+		<p align="center" class="Image"><img src="../tasks/projects/images/wiz_add_sos_class_06.png" width="419" height="420" /></p>
+   <p align="center" class="figure">Figure 1 - Other settings page </p>
+	    <h5>Table 1 - <span class="figure">Other settings</span> page options</h5>
+	 <table width="720"
+border="0" cellpadding="2" cellspacing="0">
+	   <tr valign="top"><th width="201" class="Cell">Name</th><th width="509" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Author</b></p></td><td class="Cell">
+			 <p>Enter author information. 
+				</p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Copyright notice </b></p></td><td class="Cell">
+			 <p>Enter copyright notice information.</p></td></tr>
+</table>
+     <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_pkg_file.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/build_symbian_comp.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_abld.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/app_trk_installation.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/app_trk_installation.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,71 +1,71 @@
-<!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>Installation Pane</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Installation Pane</h2>
-<p>The Debug or launch configuration window's <b>Installation</b> pane specifies the .sis file to install on the target device when using Application TRK. This is required when using the TRK debug agent with 9.x based SDK&rsquo;s.</p>
-<p align="center"><img src="../images/panel_trk_installation.png" width="598" height="224" /></p>
-<p class="figure">Figure 1 - Debug window's Installation pane</p>
-<h5>Table 1. Installation pane &mdash;items </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><p><b>Installation file </b></p>
-    <p>&nbsp;</p></td>
-    <td><p>Enter the complete path to the .sis or .pkg file to install on the target device or  click Browse to use the standard file selection dialog.</p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Download directory </b></td>
-    <td>The directory on the target device to download the file into before installing it. The default directory value is <span class="code">C:\data\</span>. </td>
-  </tr>
-  <tr>
-    <td><b>Install each launch even if installer file has not changed </b></td>
-    <td>Enable this option to force an update of the installed file even if no changes have been detected. This ensures a clean program install for each debug session. </td>
-  </tr>
-  <tr>
-    <td><b>Do not show installer UI on the phone </b></td>
-    <td>Use this option to specify if the installer UI on the target device is shown when installing the file. Disabling this option may require interaction with the installer UI on the target device, slowing down the install process. The default setting is <span class="code">on</span>. </td>
-  </tr>
-  <tr>
-    <td><b>Install to drive </b></td>
-    <td>A list of common drives where files may be installed to. The default drive setting is <span class="code">C</span>. </td>
-  </tr>
-</table>
-
-<div class="step">  
-    <h4>To access the Installation Pane</h4>
-    <ol>
-      <li>Select the  Run &gt; Debug...  menu item</li>
-      <p>The <b>Debug</b> window appears. </p>
-      <li>Select a Symbian OS Application TRK configuration in the Configurations list</li>
-      <li>Click Installer tab</li>
-      <p>The Installation pane appears (Figure 1). </p>
-    </ol>
-</div>
-<h5>Common concepts</h5>
-  <ul>
-    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
-    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK)</a></li>
-</ul>
-<h5 align="left">Common references </h5>
-<ul>
-  <li><a href="page_trk_main.htm">Main Pane</a></li>
-  <li><a href="page_trk_debugger.htm">Debugger Pane</a></li>
-  <li><a href="page_connection.htm">Connection Pane</a></li>
-  <li><a href="page_file_transfer.htm">File Transfer Pane</a></li>
-  <li><a href="page_executables.htm">Executables Pane</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Installation Pane</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Installation Pane</h2>
+<p>The Debug or launch configuration windows <b>Installation</b> pane specifies the .sis file to install on the target device when using Application TRK. This is required when using the TRK debug agent with 9.x based SDK&rsquo;s.</p>
+<p align="center"><img src="../images/panel_trk_installation.png" width="598" height="224" /></p>
+<p class="figure">Figure 1 - Debug windows Installation pane</p>
+<h5>Table 1. Installation pane &mdash;items </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><p><b>Installation file </b></p>
+    <p>&nbsp;</p></td>
+    <td><p>Enter the complete path to the .sis or .pkg file to install on the target device or  click Browse to use the standard file selection dialog.</p>
+    </td>
+  </tr>
+  <tr>
+    <td><b>Download directory </b></td>
+    <td>The directory on the target device to download the file into before installing it. The default directory value is <span class="code">C:\data\</span>. </td>
+  </tr>
+  <tr>
+    <td><b>Install each launch even if installer file has not changed </b></td>
+    <td>Enable this option to force an update of the installed file even if no changes have been detected. This ensures a clean program install for each debug session. </td>
+  </tr>
+  <tr>
+    <td><b>Do not show installer UI on the phone </b></td>
+    <td>Use this option to specify if the installer UI on the target device is shown when installing the file. Disabling this option may require interaction with the installer UI on the target device, slowing down the install process. The default setting is <span class="code">on</span>. </td>
+  </tr>
+  <tr>
+    <td><b>Install to drive </b></td>
+    <td>A list of common drives where files may be installed to. The default drive setting is <span class="code">C</span>. </td>
+  </tr>
+</table>
+
+<div class="step">  
+    <h4>To access the Installation Pane</h4>
+    <ol>
+      <li>Select the  Run &gt; Debug...  menu item</li>
+      <p>The <b>Debug</b> window appears. </p>
+      <li>Select a Symbian OS Application TRK configuration in the Configurations list</li>
+      <li>Click Installer tab</li>
+      <p>The Installation pane appears (Figure 1). </p>
+    </ol>
+</div>
+<h5>Common concepts</h5>
+  <ul>
+    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
+    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK)</a></li>
+</ul>
+<h5 align="left">Common references </h5>
+<ul>
+  <li><a href="page_trk_main.htm">Main Pane</a></li>
+  <li><a href="page_trk_debugger.htm">Debugger Pane</a></li>
+  <li><a href="page_connection.htm">Connection Pane</a></li>
+  <li><a href="page_file_transfer.htm">File Transfer Pane</a></li>
+  <li><a href="page_executables.htm">Executables Pane</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/emulator_debugger.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/emulator_debugger.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,73 +1,73 @@
-<!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>Debugger Pane</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugger Pane</h2>
-<p>The <b>Debug/Run</b> window's <b>Debugger</b> pane provides control entry point breaks and which  consoles are active to show  logs. </p>
-<p align="center"><img src="../images/panel_debug_debugger.png" width="639" height="278" /></p>
-<p class="figure">Figure 1 - Debug window's Debugger tab</p>
-<h5>Table 1. Debugger pane &mdash;items </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Break at entry point </b></td>
-    <td>Select to halt program execution at a specified
-      function or address. Enter the desired function
-      name or address in the corresponding field. If you
-      enter an address, ensure that it is correct and within
-    your program.</td>
-  </tr>
-  <tr>
-    <td><b>View program output </b></td>
-    <td><p>Enable to direct standard output messages to the   Emulation Program Output Console in the <a href="../view_log.htm">Console</a> view. </p>
-    <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToFile</span> must also be set to <span class="code">1</span>.</p></td>
-  </tr>
-  <tr>
-    <td><b>View emulator output </b></td>
-    <td><p>Enable to  output emulator messages to the   Emulator  Output Console in the Console view. </p>
-    <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToDebugger</span> must also be set to&nbsp;<span class="code">1</span>.</p></td>
-  </tr>
-  <tr>
-    <td><b>View Windows system messages </b></td>
-    <td>Enable to  output Windows system messages to the   Windows System Messages Console in the Console view. </td>
-  </tr>
-</table>
-
-<div class="step">  
-    <h4>To access the Debug window </h4>
-    <ol>
-      <li>Select the  Run &gt; Debug...  menu item</li>
-      <p>The Debug window appears. </p>
-      <li>Select a  Configuration setting</li>
-      <li>Click Debugger tab </li>
-      <p>The Debugger pane appears (Figure 1). </p>
-    </ol>
-</div>
-<h5>Common concepts</h5>
-  <ul>
-    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
-  </ul>
-<h5 align="left">Common tasks</h5>
-<ul>
-  <li><a href="../../tasks/start/carbide_debugging.htm">Debugging a Program</a> (Example)</li>
-  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-</ul>
-<h5 align="left">Common references </h5>
-<ul>
-  <li><a href="../perspective_debug.htm">Debug Perspective</a></li>
-  <li><a href="../wnd_debug_configuration.htm">Debug Window </a> </li>
-  <li><a href="../view_debug.htm">Debug View</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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>Debugger Pane</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debugger Pane</h2>
+<p>The <b>Debug/Run</b> windows <b>Debugger</b> pane provides control entry point breaks and which  consoles are active to show  logs. </p>
+<p align="center"><img src="../images/panel_debug_debugger.png" width="639" height="278" /></p>
+<p class="figure">Figure 1 - Debug windows Debugger tab</p>
+<h5>Table 1. Debugger pane &mdash;items </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Break at entry point </b></td>
+    <td>Select to halt program execution at a specified
+      function or address. Enter the desired function
+      name or address in the corresponding field. If you
+      enter an address, ensure that it is correct and within
+    your program.</td>
+  </tr>
+  <tr>
+    <td><b>View program output </b></td>
+    <td><p>Enable to direct standard output messages to the   Emulation Program Output Console in the <a href="../view_log.htm">Console</a> view. </p>
+    <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToFile</span> must also be set to <span class="code">1</span>.</p></td>
+  </tr>
+  <tr>
+    <td><b>View emulator output </b></td>
+    <td><p>Enable to  output emulator messages to the   Emulator  Output Console in the Console view. </p>
+    <p class="note"><b>NOTE</b> In the <span class="code">epoc.ini</span> file the option <span class="code">LogToDebugger</span> must also be set to&nbsp;<span class="code">1</span>.</p></td>
+  </tr>
+  <tr>
+    <td><b>View Windows system messages </b></td>
+    <td>Enable to  output Windows system messages to the   Windows System Messages Console in the Console view. </td>
+  </tr>
+</table>
+
+<div class="step">  
+    <h4>To access the Debug window </h4>
+    <ol>
+      <li>Select the  Run &gt; Debug...  menu item</li>
+      <p>The Debug window appears. </p>
+      <li>Select a  Configuration setting</li>
+      <li>Click Debugger tab </li>
+      <p>The Debugger pane appears (Figure 1). </p>
+    </ol>
+</div>
+<h5>Common concepts</h5>
+  <ul>
+    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
+  </ul>
+<h5 align="left">Common tasks</h5>
+<ul>
+  <li><a href="../../tasks/start/carbide_debugging.htm">Debugging a Program</a> (Example)</li>
+  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+</ul>
+<h5 align="left">Common references </h5>
+<ul>
+  <li><a href="../perspective_debug.htm">Debug Perspective</a></li>
+  <li><a href="../wnd_debug_configuration.htm">Debug Window </a> </li>
+  <li><a href="../view_debug.htm">Debug View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/emulator_exceptions.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/emulator_exceptions.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,59 +1,59 @@
-<!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>x86 Exceptions Pane</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>x86 Exceptions Pane </h2>
-<p>  The <b>Debug/Run</b> window's <b>x86 Exceptions</b> pane lists all the exceptions that the debugger is able to catch. If you want the debugger to catch all the exceptions, enable all of the options in this view. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you prefer to handle.</p>
-<p align="center"><img src="../images/panel_debug_x86_exceptions.png" width="627" height="270" /></p>
-<p align="center" class="figure">Figure 1 - x86 Exceptions pane</p>
-<h5>Table 1. x86 Exceptions pane &mdash;items </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Check All </b></td>
-    <td>Enables catching all exceptions.</td>
-  </tr>
-  <tr>
-    <td><b>Clear All </b></td>
-    <td>Disables catching all exceptions.</td>
-  </tr>
-</table>
-<div class="step">
-  <h4>To access the x86 Exceptions pane</h4>
-  <ol>
-    <li>Select the Run &gt; Run... or Run &gt; Debug... menu item</li>
-    <p>The Debug window (Figure 1) appears. </p>
-    <li>Select a Configuration setting</li>
-    <li>Click x86 Exceptions tab </li>
-    <p>The x86 Exceptions pane appears. </p>
-  </ol>
-</div>  
-<h5>Common concepts</h5>
-  <ul>
-    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
-  </ul>
-  <h5 align="left">Common tasks</h5>
-  <ul>
-    <li><a href="../../tasks/start/carbide_debugging.htm">Debugging a Program</a> (Example)</li>
-    <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  </ul>
-  <h5 align="left">Common references </h5>
-  <ul>
-    <li><a href="../perspective_debug.htm">Debug Perspective</a></li>
-    <li><a href="../wnd_debug_configuration.htm">Debug Window </a> </li>
-    <li><a href="../view_debug.htm">Debug View</a></li>
-  </ul>
-
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!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>x86 Exceptions Pane</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>x86 Exceptions Pane </h2>
+<p>  The <b>Debug/Run</b> windows <b>x86 Exceptions</b> pane lists all the exceptions that the debugger is able to catch. If you want the debugger to catch all the exceptions, enable all of the options in this view. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you prefer to handle.</p>
+<p align="center"><img src="../images/panel_debug_x86_exceptions.png" width="627" height="270" /></p>
+<p align="center" class="figure">Figure 1 - x86 Exceptions pane</p>
+<h5>Table 1. x86 Exceptions pane &mdash;items </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Check All </b></td>
+    <td>Enables catching all exceptions.</td>
+  </tr>
+  <tr>
+    <td><b>Clear All </b></td>
+    <td>Disables catching all exceptions.</td>
+  </tr>
+</table>
+<div class="step">
+  <h4>To access the x86 Exceptions pane</h4>
+  <ol>
+    <li>Select the Run &gt; Run... or Run &gt; Debug... menu item</li>
+    <p>The Debug window (Figure 1) appears. </p>
+    <li>Select a Configuration setting</li>
+    <li>Click x86 Exceptions tab </li>
+    <p>The x86 Exceptions pane appears. </p>
+  </ol>
+</div>  
+<h5>Common concepts</h5>
+  <ul>
+    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
+  </ul>
+  <h5 align="left">Common tasks</h5>
+  <ul>
+    <li><a href="../../tasks/start/carbide_debugging.htm">Debugging a Program</a> (Example)</li>
+    <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  </ul>
+  <h5 align="left">Common references </h5>
+  <ul>
+    <li><a href="../perspective_debug.htm">Debug Perspective</a></li>
+    <li><a href="../wnd_debug_configuration.htm">Debug Window </a> </li>
+    <li><a href="../view_debug.htm">Debug View</a></li>
+  </ul>
+
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/emulator_main.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/emulator_main.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,52 +1,52 @@
-<!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>Main Pane (Emulator)</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Main Pane (Emulator) </h2>
-<p>The emulator <b>Main</b> pane  defines the process to be launched by the emulator. </p>
-<p>The behavior that occurs when launching a debug session varies based upon the <a href="../SDKPreferences.html">SDK</a>. Normally, <a href="../../tasks/debugger/work_debug_act_start.htm">starting</a> a debug session launches the emulator (<span class="code">epoc.exe</span>) and you must then navigate to your application and open it. However, starting a debug session for an .exe file will, in most cases, launch the .exe directly. This starts the emulator and then opens your application automatically. Note that some SDKs do not support this behavior. In those cases you must still open your application in the emulator manually.</p>
-<p align="center"><img src="../images/panel_debug_main.png" width="639" height="278" /></p>
-<p class="figure">Figure 1 - Debug window's emulator's Main tab </p>
-<h5>Table 1. Emulator Main pane &mdash;items </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Project</b></td>
-    <td><p>The project to associate with this debug launch configuration. Click <b>Browse</b> to select a different project. </p>    </td>
-  </tr>
-  <tr>
-    <td><b>Process to launch </b></td>
-    <td>The path to the emulator or executable to  launch. For Symbian OS 9.1 the emulator path is required. For Symbian OS 9.2 and later the path to the executable should be used.  Click <b>Browse</b> to select a different emulator. </td>
-  </tr>
-</table>
-
-<div class="step">  
-    <h4>To access the Main Pane</h4>
-    <ol>
-      <li>Select the  Run &gt; Debug...  menu item</li>
-      <p>The Debug window appears. </p>
-      <li>Select a Symbian OS System emulator configuration in the Configurations list </li>
-      <li>Click Main tab </li>
-      <p>The Main pane appears (Figure 1). </p>
-    </ol>
-</div>
-<h5>Other references</h5>
-  <ul>
-    <li><a href="../wnd_debug_configuration.htm">Debug window</a></li>
-    <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-    <li><a href="run_mode_overview.htm">Run-mode overview</a></li>
-    <li><a href="stop_mode_overview.htm">Stop-mode overview</a> </li>
-  </ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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>Main Pane (Emulator)</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Main Pane (Emulator) </h2>
+<p>The emulator <b>Main</b> pane  defines the process to be launched by the emulator. </p>
+<p>The behavior that occurs when launching a debug session varies based upon the <a href="../SDKPreferences.html">SDK</a>. Normally, <a href="../../tasks/debugger/work_debug_act_start.htm">starting</a> a debug session launches the emulator (<span class="code">epoc.exe</span>) and you must then navigate to your application and open it. However, starting a debug session for an .exe file will, in most cases, launch the .exe directly. This starts the emulator and then opens your application automatically. Note that some SDKs do not support this behavior. In those cases you must still open your application in the emulator manually.</p>
+<p align="center"><img src="../images/panel_debug_main.png" width="639" height="278" /></p>
+<p class="figure">Figure 1 - Debug windows emulator's Main tab </p>
+<h5>Table 1. Emulator Main pane &mdash;items </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Project</b></td>
+    <td><p>The project to associate with this debug launch configuration. Click <b>Browse</b> to select a different project. </p>    </td>
+  </tr>
+  <tr>
+    <td><b>Process to launch </b></td>
+    <td>The path to the emulator or executable to  launch. For Symbian OS 9.1 the emulator path is required. For Symbian OS 9.2 and later the path to the executable should be used.  Click <b>Browse</b> to select a different emulator. </td>
+  </tr>
+</table>
+
+<div class="step">  
+    <h4>To access the Main Pane</h4>
+    <ol>
+      <li>Select the  Run &gt; Debug...  menu item</li>
+      <p>The Debug window appears. </p>
+      <li>Select a Symbian OS System emulator configuration in the Configurations list </li>
+      <li>Click Main tab </li>
+      <p>The Main pane appears (Figure 1). </p>
+    </ol>
+</div>
+<h5>Other references</h5>
+  <ul>
+    <li><a href="../wnd_debug_configuration.htm">Debug window</a></li>
+    <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+    <li><a href="run_mode_overview.htm">Run-mode overview</a></li>
+    <li><a href="stop_mode_overview.htm">Stop-mode overview</a> </li>
+  </ul>
+  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/page_connection.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/page_connection.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,81 +1,81 @@
-<!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>Connection Pane</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Connection Pane</h2>
-<p>The <b>Connection</b> pane  specifies the method used to transfer files to the target device. Once a Serial Port type is chosen, the remaining options contain default values for the specific connection type. Users can change these remaining options to match the target device's communication specifications. </p>
-<p align="center"><img src="../images/panel_trk_connection.png" width="598" height="224" /></p>
-<p class="figure">Figure 1 - Debug window's Connection pane</p>
-<h5>Table 1. <span class="figure">Connection</span> pane &mdash;items </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Serial Port </b></td>
-    <td><p>Select the serial port option to use for this launch or  launch configuration. Once set, this port will be used for all subsequent launch configurations until it is set again. Note that for USB and BT can be dynamically assigned, so its critical that the port ID assigned here matches the one the system is using to communicate with the target device. </p>
-      <p>If you are using a USB connection, the connected phone's name should appear in the menu to help identify which port is being used. </p></td>
-  </tr>
-  <tr>
-    <td><b>Baud Rate </b></td>
-    <td>Use the Baud Rate option to select the baud rate for communication. The default baud rate value is 115200 bits per second (bps). </td>
-  </tr>
-  <tr>
-    <td><b>Data Bits </b></td>
-    <td>Use the Data Bits  option to select a common data bits size (4, 5, 6, 7, and 8). The default data bits value is 8. </td>
-  </tr>
-  <tr>
-    <td><b>Parity</b></td>
-    <td>Use the Parity option to select the parity setting (None, Odd, or Even). The default parity value is  None. </td>
-  </tr>
-  <tr>
-    <td><b>Stop Bits </b></td>
-    <td>Use the Stop Bits option to select the stop bits setting (1, 1.5, 2). The default stop bits value is 1.</td>
-  </tr>
-  <tr>
-    <td><b>Flow Control </b></td>
-    <td>Use the Flow Control option to select the flow control setting (None, Hardware (RTS/CTS), and Software (XON/XOFF)). The default flow control value is None. </td>
-  </tr>
-</table>
-
-<div class="step">  
-    <h4>To access the Connection Pane</h4>
-    <ol>
-      <li>Select the  Run &gt; Debug...  menu item</li>
-      <p>The <b>Debug</b> window appears. </p>
-      <li>Select a Symbian OS Application TRK configuration in the Configurations list </li>
-      <li>Click Connection tab </li>
-      <p>The <b>Connection</b> pane appears (Figure 1). </p>
-    </ol>
-</div>
-<h5>Common concepts</h5>
-  <ul>
-    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
-    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
-  </ul>
-<h5 align="left">Common tasks</h5>
-<ul>
-  <li><a href="../../tasks/trk/trk_connection_bluetooth.htm">Bluetooth Connection Setup</a></li>
-  <li><a href="../../tasks/trk/trk_install_usb.htm">Installing On-device Debug Agents using USB</a></li>
-  <li><a href="../../tasks/trk/trk_install_bluetooth.htm">Installing On-device Debug Agents using BlueTooth</a> </li>
-  <li><a href="../../tasks/trk/trk_connection_usb.htm">USB Connection Setup</a></li>
-</ul>
-<h5 align="left">Common references</h5>
-<ul>
-  <li><a href="page_trk_main.htm">Main Pane</a></li>
-  <li><a href="page_trk_debugger.htm">Debugger Pane</a></li>
-  <li><a href="page_file_transfer.htm">File Transfer Pane </a></li>
-  <li><a href="app_trk_installation.htm">Installation Pane</a></li>
-  <li><a href="page_executables.htm">Executables Pane</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Connection Pane</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Connection Pane</h2>
+<p>The <b>Connection</b> pane  specifies the method used to transfer files to the target device. Once a Serial Port type is chosen, the remaining options contain default values for the specific connection type. Users can change these remaining options to match the target device's communication specifications. </p>
+<p align="center"><img src="../images/panel_trk_connection.png" width="598" height="224" /></p>
+<p class="figure">Figure 1 - Debug windows Connection pane</p>
+<h5>Table 1. <span class="figure">Connection</span> pane &mdash;items </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Serial Port </b></td>
+    <td><p>Select the serial port option to use for this launch or  launch configuration. Once set, this port will be used for all subsequent launch configurations until it is set again. Note that for USB and BT can be dynamically assigned, so its critical that the port ID assigned here matches the one the system is using to communicate with the target device. </p>
+      <p>If you are using a USB connection, the connected phone's name should appear in the menu to help identify which port is being used. </p></td>
+  </tr>
+  <tr>
+    <td><b>Baud Rate </b></td>
+    <td>Use the Baud Rate option to select the baud rate for communication. The default baud rate value is 115200 bits per second (bps). </td>
+  </tr>
+  <tr>
+    <td><b>Data Bits </b></td>
+    <td>Use the Data Bits  option to select a common data bits size (4, 5, 6, 7, and 8). The default data bits value is 8. </td>
+  </tr>
+  <tr>
+    <td><b>Parity</b></td>
+    <td>Use the Parity option to select the parity setting (None, Odd, or Even). The default parity value is  None. </td>
+  </tr>
+  <tr>
+    <td><b>Stop Bits </b></td>
+    <td>Use the Stop Bits option to select the stop bits setting (1, 1.5, 2). The default stop bits value is 1.</td>
+  </tr>
+  <tr>
+    <td><b>Flow Control </b></td>
+    <td>Use the Flow Control option to select the flow control setting (None, Hardware (RTS/CTS), and Software (XON/XOFF)). The default flow control value is None. </td>
+  </tr>
+</table>
+
+<div class="step">  
+    <h4>To access the Connection Pane</h4>
+    <ol>
+      <li>Select the  Run &gt; Debug...  menu item</li>
+      <p>The <b>Debug</b> window appears. </p>
+      <li>Select a Symbian OS Application TRK configuration in the Configurations list </li>
+      <li>Click Connection tab </li>
+      <p>The <b>Connection</b> pane appears (Figure 1). </p>
+    </ol>
+</div>
+<h5>Common concepts</h5>
+  <ul>
+    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
+    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
+  </ul>
+<h5 align="left">Common tasks</h5>
+<ul>
+  <li><a href="../../tasks/trk/trk_connection_bluetooth.htm">Bluetooth Connection Setup</a></li>
+  <li><a href="../../tasks/trk/trk_install_usb.htm">Installing On-device Debug Agents using USB</a></li>
+  <li><a href="../../tasks/trk/trk_install_bluetooth.htm">Installing On-device Debug Agents using BlueTooth</a> </li>
+  <li><a href="../../tasks/trk/trk_connection_usb.htm">USB Connection Setup</a></li>
+</ul>
+<h5 align="left">Common references</h5>
+<ul>
+  <li><a href="page_trk_main.htm">Main Pane</a></li>
+  <li><a href="page_trk_debugger.htm">Debugger Pane</a></li>
+  <li><a href="page_file_transfer.htm">File Transfer Pane </a></li>
+  <li><a href="app_trk_installation.htm">Installation Pane</a></li>
+  <li><a href="page_executables.htm">Executables Pane</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/page_executables.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/page_executables.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,73 +1,73 @@
-<!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>Executables Pane</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Executables Pane</h2>
-<p>The    <b>Executables</b> pane specifies which executables   to debug with your project based on the chosen rule. The Executables pane gives you project level control over the executables associated with it. The pane shows all the executables in the workspace or those imported into the Executables view from outside the workspace that can be debugged by this project. See the <a href="../view_executables.htm">Executables</a> view for information on controlling  executables from the workspace. </p>
-<p align="center"><img src="../images/panel_trk_exes.png" width="598" height="224" /></p>
-<p class="figure">Figure 1 - Debug window's  Executables pane</p>
-<h5>Table 1.  Executable pane &mdash;items </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="32%" scope="col">Item</th>
-    <th width="68%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Load symbols for these executables and target them for debugging </b></td>
-    <td><p>Select the rule which govern the executable support used by this project for debugging purposes. The options include: </p>
-      <ul>
-        <li><b>Executables in the workspace  from this SDK</b> &#8212; shows all executables in the workspace built using the specified SDK. This is the default setting. </li>
-        <li><b>Executables built by this project</b> &#8212; shows only the executables built by this project  using the specified SDK</li>
-        <li><b>Executables selected below</b> &#8212; shows only the executables chosen by the user. Initial list display uses the All Executables listing. </li>
-        <li><b>All executables (slows launch)</b>  &#8212; shows all the executables in the workspace regardless of which SDK created them. Selecting this option will slow down Carbide launches as the list is populated. </li>
-      </ul>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Executables list </b></td>
-    <td>Shows all the executables associated with this project. </td>
-  </tr>
-  <tr>
-    <td><b>Add...</b></td>
-    <td>Opens the <b>Select an executable file</b> dialog which can locate and select  executable files and add them to the project's executables list. </td>
-  </tr>
-  <tr>
-    <td><b>Select All </b></td>
-    <td>Enables  all the executables in the list for debugging. </td>
-  </tr>
-  <tr>
-    <td><b>Unselect All </b></td>
-    <td>Disables  all the executables in the list from debugging. </td>
-  </tr>
-</table>
-<div class="step">  
-    <h4>To access the Executables Pane</h4>
-    <ol>
-      <li>Select the  Run &gt; Open Debug Dialog...  menu item</li>
-      <p>The <b>Debug</b> window appears. </p>
-      <li>Select a Symbian OS Application TRK configuration in the Configurations list</li>
-      <li>Click Executables tab </li>
-      <p>The Executables pane appears (Figure 1).</p>
-    </ol>
-</div>
-<h5>Common concepts</h5>
-  <ul>
-    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
-    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
-</ul>
-<h5 align="left">Common references</h5>
-<ul><li><a href="page_trk_debugger.htm">Debugger Pane</a></li>
-  <li><a href="page_connection.htm">Connection Pane</a></li>
-  <li><a href="page_file_transfer.htm">File Transfer Pane </a></li>
-  <li><a href="app_trk_installation.htm">Installation Pane</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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>Executables Pane</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Executables Pane</h2>
+<p>The    <b>Executables</b> pane specifies which executables   to debug with your project based on the chosen rule. The Executables pane gives you project level control over the executables associated with it. The pane shows all the executables in the workspace or those imported into the Executables view from outside the workspace that can be debugged by this project. See the <a href="../view_executables.htm">Executables</a> view for information on controlling  executables from the workspace. </p>
+<p align="center"><img src="../images/panel_trk_exes.png" width="598" height="224" /></p>
+<p class="figure">Figure 1 - Debug windows  Executables pane</p>
+<h5>Table 1.  Executable pane &mdash;items </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="32%" scope="col">Item</th>
+    <th width="68%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Load symbols for these executables and target them for debugging </b></td>
+    <td><p>Select the rule which govern the executable support used by this project for debugging purposes. The options include: </p>
+      <ul>
+        <li><b>Executables in the workspace  from this SDK</b> &#8212; shows all executables in the workspace built using the specified SDK. This is the default setting. </li>
+        <li><b>Executables built by this project</b> &#8212; shows only the executables built by this project  using the specified SDK</li>
+        <li><b>Executables selected below</b> &#8212; shows only the executables chosen by the user. Initial list display uses the All Executables listing. </li>
+        <li><b>All executables (slows launch)</b>  &#8212; shows all the executables in the workspace regardless of which SDK created them. Selecting this option will slow down Carbide launches as the list is populated. </li>
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td><b>Executables list </b></td>
+    <td>Shows all the executables associated with this project. </td>
+  </tr>
+  <tr>
+    <td><b>Add...</b></td>
+    <td>Opens the <b>Select an executable file</b> dialog which can locate and select  executable files and add them to the project's executables list. </td>
+  </tr>
+  <tr>
+    <td><b>Select All </b></td>
+    <td>Enables  all the executables in the list for debugging. </td>
+  </tr>
+  <tr>
+    <td><b>Unselect All </b></td>
+    <td>Disables  all the executables in the list from debugging. </td>
+  </tr>
+</table>
+<div class="step">  
+    <h4>To access the Executables Pane</h4>
+    <ol>
+      <li>Select the  Run &gt; Open Debug Dialog...  menu item</li>
+      <p>The <b>Debug</b> window appears. </p>
+      <li>Select a Symbian OS Application TRK configuration in the Configurations list</li>
+      <li>Click Executables tab </li>
+      <p>The Executables pane appears (Figure 1).</p>
+    </ol>
+</div>
+<h5>Common concepts</h5>
+  <ul>
+    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
+    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
+</ul>
+<h5 align="left">Common references</h5>
+<ul><li><a href="page_trk_debugger.htm">Debugger Pane</a></li>
+  <li><a href="page_connection.htm">Connection Pane</a></li>
+  <li><a href="page_file_transfer.htm">File Transfer Pane </a></li>
+  <li><a href="app_trk_installation.htm">Installation Pane</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/page_file_transfer.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/page_file_transfer.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,85 +1,85 @@
-<!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>TRK File Transfer Pane</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>File Transfer Pane</h2>
-<p>The <b>File Transfer</b> pane displays an auto-populated list of files for System TRK that the IDE transfers to the target device at the start of each launch. Users can add, edit, or delete files in the list. By default, any file added is automatically checked for downloading to the device. Users can uncheck a file to remove it from the download list without removing the file itself. Any missing files are marked with a warning icon and a message appears describing the issue making it easy to see potential file problems prior to attempting a download.</p>
-<p>System TRK users can  use this panel to download any type of file, like bitmaps, HTML, sounds, and more, to the phone and applicable to Application TRK for transfering any files outside of the installation file.</p>
-<p align="center"><img src="../images/panel_trk_file_transfer.png" width="598" height="224" /></p>
-<p class="figure">Figure 1 - Debug window's File Transfer pane</p>
-<h5>Table 1. <span class="figure">File Transfer</span> pane &mdash;items </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>File transfer list </b></td>
-    <td><p>The File transfer list displays  the project files that are moved to the target device for launch and debugging purposes. It contains these columns:</p>
-      <ul>
-        <li><b>Enabled</b>&#8212;a checkmark indicates that the IDE should transfer the specified file to the target directory. If unchecked, do not transfer the file. </li>
-        <li><b>File to transfer</b>&#8212;the path and filename to a file  on the host machine to be transfered </li>
-        <li><b>Target path</b>&#8212;the path to the target directory where transfered files are placed on the device </li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>Add</b></td>
-    <td>Click to add a file to the file transfer list.</td>
-  </tr>
-  <tr>
-    <td><b>Edit...</b></td>
-    <td>Click to edit the selected file in the file transfer list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove</b></td>
-    <td>Click to remove the selected file from the file transfer list. </td>
-  </tr>
-  <tr>
-    <td><b>Select All</b></td>
-    <td>Click to select all the files in the file transfer list.</td>
-  </tr>
-  <tr>
-    <td><b>Deselect All</b></td>
-    <td>Click to unselect all the files in the file transfer list.</td>
-  </tr>
-</table>
-
-<div class="step">  
-    <h4>To access the File Tansfer Pane</h4>
-    <ol>
-      <li>Select the  Run &gt; Debug...  menu item</li>
-      <p>The <b>Debug</b> window appears. </p>
-      <li>Select a Symbian OS Application TRK configuration in the Configurations list </li>
-      <li>Click File Transfer tab </li>
-      <p>The <b>File Transfer</b> pane appears (Figure 1). </p>
-    </ol>
-</div>
-<h5>Common concepts</h5>
-  <ul>
-    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
-    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
-  </ul>
-<h5 align="left">Common tasks</h5>
-<ul>
-  <li><a href="../../tasks/trk/trk_connection_bluetooth.htm">Bluetooth Connection Setup</a></li>
-  <li><a href="../../tasks/trk/trk_install_usb.htm">Installing On-device Debug Agents using USB</a></li>
-  <li><a href="../../tasks/trk/trk_install_bluetooth.htm">Installing On-device Debug Agents using BlueTooth</a> </li>
-  <li><a href="../../tasks/trk/trk_connection_usb.htm">USB Connection Setup</a></li>
-</ul>
-<h5 align="left">Common references </h5>
-<ul>
-  <li><a href="page_trk_main.htm">Main Pane</a></li>
-  <li><a href="page_trk_debugger.htm">Debugger Pane</a></li>
-  <li><a href="page_connection.htm">Connection Pane</a></li>
-  <li><a href="app_trk_installation.htm">Installation Pane</a>  </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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>TRK File Transfer Pane</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>File Transfer Pane</h2>
+<p>The <b>File Transfer</b> pane displays an auto-populated list of files for System TRK that the IDE transfers to the target device at the start of each launch. Users can add, edit, or delete files in the list. By default, any file added is automatically checked for downloading to the device. Users can uncheck a file to remove it from the download list without removing the file itself. Any missing files are marked with a warning icon and a message appears describing the issue making it easy to see potential file problems prior to attempting a download.</p>
+<p>System TRK users can  use this panel to download any type of file, like bitmaps, HTML, sounds, and more, to the phone and applicable to Application TRK for transfering any files outside of the installation file.</p>
+<p align="center"><img src="../images/panel_trk_file_transfer.png" width="598" height="224" /></p>
+<p class="figure">Figure 1 - Debug windows File Transfer pane</p>
+<h5>Table 1. <span class="figure">File Transfer</span> pane &mdash;items </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>File transfer list </b></td>
+    <td><p>The File transfer list displays  the project files that are moved to the target device for launch and debugging purposes. It contains these columns:</p>
+      <ul>
+        <li><b>Enabled</b>&#8212;a checkmark indicates that the IDE should transfer the specified file to the target directory. If unchecked, do not transfer the file. </li>
+        <li><b>File to transfer</b>&#8212;the path and filename to a file  on the host machine to be transfered </li>
+        <li><b>Target path</b>&#8212;the path to the target directory where transfered files are placed on the device </li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>Add</b></td>
+    <td>Click to add a file to the file transfer list.</td>
+  </tr>
+  <tr>
+    <td><b>Edit...</b></td>
+    <td>Click to edit the selected file in the file transfer list. </td>
+  </tr>
+  <tr>
+    <td><b>Remove</b></td>
+    <td>Click to remove the selected file from the file transfer list. </td>
+  </tr>
+  <tr>
+    <td><b>Select All</b></td>
+    <td>Click to select all the files in the file transfer list.</td>
+  </tr>
+  <tr>
+    <td><b>Deselect All</b></td>
+    <td>Click to unselect all the files in the file transfer list.</td>
+  </tr>
+</table>
+
+<div class="step">  
+    <h4>To access the File Tansfer Pane</h4>
+    <ol>
+      <li>Select the  Run &gt; Debug...  menu item</li>
+      <p>The <b>Debug</b> window appears. </p>
+      <li>Select a Symbian OS Application TRK configuration in the Configurations list </li>
+      <li>Click File Transfer tab </li>
+      <p>The <b>File Transfer</b> pane appears (Figure 1). </p>
+    </ol>
+</div>
+<h5>Common concepts</h5>
+  <ul>
+    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
+    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
+  </ul>
+<h5 align="left">Common tasks</h5>
+<ul>
+  <li><a href="../../tasks/trk/trk_connection_bluetooth.htm">Bluetooth Connection Setup</a></li>
+  <li><a href="../../tasks/trk/trk_install_usb.htm">Installing On-device Debug Agents using USB</a></li>
+  <li><a href="../../tasks/trk/trk_install_bluetooth.htm">Installing On-device Debug Agents using BlueTooth</a> </li>
+  <li><a href="../../tasks/trk/trk_connection_usb.htm">USB Connection Setup</a></li>
+</ul>
+<h5 align="left">Common references </h5>
+<ul>
+  <li><a href="page_trk_main.htm">Main Pane</a></li>
+  <li><a href="page_trk_debugger.htm">Debugger Pane</a></li>
+  <li><a href="page_connection.htm">Connection Pane</a></li>
+  <li><a href="app_trk_installation.htm">Installation Pane</a>  </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/page_trk_debugger.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/page_trk_debugger.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,133 +1,133 @@
-<!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>Debugger panes for TRK </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugger panes for TRK </h2>
-<p>The <b>Debug/Run</b> window's <b>Debugger</b> panes for TRK provides control over entry points, message handling, and instruction set default settings.</p>
-<p>Different options are available in the Debugger pane based on the type of TRK launch configuration, including:</p>
-<ul><li><a href="#trk_runmode">Run mode debugging</a></li>
-  <li><a href="#trk_stopmode">Stop mode debugging</a>   </li>
-</ul>
-<h3><a name="trk_runmode" id="trk_runmode"></a>Run-mode Debugger pane </h3>
-<p>In run-mode you can control message handling and instruction sets. </p>
-<p align="center"><img src="../images/page_run_mode_debugger.png" width="596" height="244"></p>
-<p class="figure">Figure 1 - Debug window's Debugger pane for run mode debugging </p>
-<h5>Table 1. Debugger pane &mdash; run-mode  options </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><p><b>Break at entry point</b></p>
-    </td>
-    <td><p>When checked, break at the specified entry point entered into the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
-  </tr>
-  <tr>
-    <td><b>View program output </b></td>
-    <td>When checked, show the contents of any program output  in the <b> TRK Progam Output Console</b>  in a <a href="../view_log.htm">Console</a> view. </td>
-  </tr>
-  <tr>
-    <td><b>View messages between Carbide and debug agent </b></td>
-    <td><p>When checked, show the communications between Carbide and the target device in  the <b> TRK Communication Log Console</b> of the Console view.  </p>
-      <p class="note"><b>NOTE</b> You can pin the TRK Communication Log view so that it does not lose focus. </p></td>
-  </tr>
-  <tr>
-    <td><b>Message retry delay (ms) </b></td>
-    <td>Enter the delay time in milliseconds (ms) between 100 and 10000 the debugger should wait for a response. The default Message Retry Delay value is 2000. </td>
-  </tr>
-  <tr>
-    <td><p><b>Default Instructon Set </b></p>
-        <p>&nbsp;</p></td>
-    <td><p>Specifies the default instruction set to use if the debugger cannot determine the processor mode in order to set breakpoints and to disassemble code. The options are: </p>
-        <ul>
-          <li>Auto (examine code at  current PC location) </li>
-          <li>ARM (32-bit) </li>
-          <li>THUMB (16-bit) </li>
-        </ul>
-      <p>By default the Instruction Set option uses ARM 32-bit.</p></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<h3><a name="trk_stopmode" id="trk_stopmode"></a>Stop-mode Debugger pane</h3>
-<p>In stop-mode use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
-<p align="center"><img src="../images/panel_trk_debugger.png" width="611" height="389" /></p>
-<p class="figure">Figure 2 - Debug window's Debugger pane for stop mode debugging </p>
-<h5>Table 2. Debugger pane &mdash; stop-mode  options </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><p><b>Break at entry point</b></p></td>
-    <td><p>When checked, break at the specified entry point entered into the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
-  </tr>
-  <tr>
-    <td><b>Soft attach </b></td>
-    <td>Enable the <b>Soft attach</b> option to attach a debug session to a target and debug from the specified start address instead of the target's default start address. When enabled the downloaded image option is ignored. </td>
-  </tr>
-  <tr>
-    <td><b>Debug from start address </b></td>
-    <td>Enable the <b>Debug from start addres</b>s option to debug from the target's default start address. </td>
-  </tr>
-  <tr>
-    <td><b>Run from start address </b></td>
-    <td>Enable the <b>Run from start addres</b>s option to run from the target's default start address. </td>
-  </tr>
-  <tr>
-    <td><b>Start address (hex) </b></td>
-    <td>Enter in hexidecimal format (<span class="code">0x0</span>) the starting address to use during the debug session. </td>
-  </tr>
-  <tr>
-    <td><b>Reset target at the start of each debug session </b></td>
-    <td>Forces the Carbide IDE to reset the target at the start of each debug session. This ensures that the debugging session uses the most up-to-date program code.</td>
-  </tr>
-  <tr>
-    <td><b>Target Processor </b></td>
-    <td>A drop down with a list of all supported processors. The process selection should help in determining the memory model. This will in turn help determine the base address and the offsets for the Symbian OS kernel aware information.</td>
-  </tr>
-  <tr>
-    <td><b>Target initialization file </b></td>
-    <td><p>Check this box to have the debugger run an initialization script when the debug session starts. For example, if a target device requires initialization for the debugger to be able to read and write memory or registers, you can specify an initialization script here.</p>
-    <p> Click Browse to select a script file using a standard file selection dialog box. When using T32, most of the initialization is done in the CMM script file. With other debug protocols like Sophia, you can specify the initialization file, which can be run after connecting to the target. </p></td>
-  </tr>
-  <tr>
-    <td><b>Memory configuration file </b></td>
-    <td>Controls whether the debugger uses a memory configuration file when a debug session starts. The Carbide debugger uses this configuration file to know which memory is accessible, readable, and writable on the target.</td>
-  </tr>
-</table>
-
-<div class="step">  
-    <h4>To access the Debugger Pane</h4>
-    <ol>
-      <li>Select the  Run &gt; Debug...  menu item</li>
-      <p>The <b>Debug</b> window appears. </p>
-      <li>Select a Symbian OS Application TRK configuration in the Configurations list</li>
-      <li>Click Debugger tab </li>
-      <p>The <b>Debugger</b> pane appears (Figure 1). </p>
-    </ol>
-</div>
-<h5>Common concepts</h5>
-  <ul>
-    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
-    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
-</ul>
-<h5 align="left">Common references </h5>
-<ul>
-  <li><a href="page_trk_main.htm">Main Pane</a></li>
-  <li><a href="page_connection.htm">Connection Pane</a></li>
-  <li><a href="page_file_transfer.htm">File Transfer Pane </a></li>
-  <li><a href="app_trk_installation.htm">Installation Pane</a></li>
-  <li><a href="page_executables.htm">Executables Pane</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugger panes for TRK </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debugger panes for TRK </h2>
+<p>The <b>Debug/Run</b> windows <b>Debugger</b> panes for TRK provides control over entry points, message handling, and instruction set default settings.</p>
+<p>Different options are available in the Debugger pane based on the type of TRK launch configuration, including:</p>
+<ul><li><a href="#trk_runmode">Run mode debugging</a></li>
+  <li><a href="#trk_stopmode">Stop mode debugging</a>   </li>
+</ul>
+<h3><a name="trk_runmode" id="trk_runmode"></a>Run-mode Debugger pane </h3>
+<p>In run-mode you can control message handling and instruction sets. </p>
+<p align="center"><img src="../images/page_run_mode_debugger.png" width="596" height="244"></p>
+<p class="figure">Figure 1 - Debug windows Debugger pane for run mode debugging </p>
+<h5>Table 1. Debugger pane &mdash; run-mode  options </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><p><b>Break at entry point</b></p>
+    </td>
+    <td><p>When checked, break at the specified entry point entered into the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
+  </tr>
+  <tr>
+    <td><b>View program output </b></td>
+    <td>When checked, show the contents of any program output  in the <b> TRK Progam Output Console</b>  in a <a href="../view_log.htm">Console</a> view. </td>
+  </tr>
+  <tr>
+    <td><b>View messages between Carbide and debug agent </b></td>
+    <td><p>When checked, show the communications between Carbide and the target device in  the <b> TRK Communication Log Console</b> of the Console view.  </p>
+      <p class="note"><b>NOTE</b> You can pin the TRK Communication Log view so that it does not lose focus. </p></td>
+  </tr>
+  <tr>
+    <td><b>Message retry delay (ms) </b></td>
+    <td>Enter the delay time in milliseconds (ms) between 100 and 10000 the debugger should wait for a response. The default Message Retry Delay value is 2000. </td>
+  </tr>
+  <tr>
+    <td><p><b>Default Instructon Set </b></p>
+        <p>&nbsp;</p></td>
+    <td><p>Specifies the default instruction set to use if the debugger cannot determine the processor mode in order to set breakpoints and to disassemble code. The options are: </p>
+        <ul>
+          <li>Auto (examine code at  current PC location) </li>
+          <li>ARM (32-bit) </li>
+          <li>THUMB (16-bit) </li>
+        </ul>
+      <p>By default the Instruction Set option uses ARM 32-bit.</p></td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<h3><a name="trk_stopmode" id="trk_stopmode"></a>Stop-mode Debugger pane</h3>
+<p>In stop-mode use the <b>Startup Options</b> to  attach to a target and debug or run from the specified start address. Then use <b>Target Options</b> to specify the target's processor type,  and set which initialization and memory configuration files to use in the debug session. </p>
+<p align="center"><img src="../images/panel_trk_debugger.png" width="611" height="389" /></p>
+<p class="figure">Figure 2 - Debug windows Debugger pane for stop mode debugging </p>
+<h5>Table 2. Debugger pane &mdash; stop-mode  options </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><p><b>Break at entry point</b></p></td>
+    <td><p>When checked, break at the specified entry point entered into the text field. For .EXE targets, the default entry point is set to <span class="code">E32Main</span>. By default, the <b>Break at entry point</b> option is unchecked for all other target types.</p></td>
+  </tr>
+  <tr>
+    <td><b>Soft attach </b></td>
+    <td>Enable the <b>Soft attach</b> option to attach a debug session to a target and debug from the specified start address instead of the target's default start address. When enabled the downloaded image option is ignored. </td>
+  </tr>
+  <tr>
+    <td><b>Debug from start address </b></td>
+    <td>Enable the <b>Debug from start addres</b>s option to debug from the target's default start address. </td>
+  </tr>
+  <tr>
+    <td><b>Run from start address </b></td>
+    <td>Enable the <b>Run from start addres</b>s option to run from the target's default start address. </td>
+  </tr>
+  <tr>
+    <td><b>Start address (hex) </b></td>
+    <td>Enter in hexidecimal format (<span class="code">0x0</span>) the starting address to use during the debug session. </td>
+  </tr>
+  <tr>
+    <td><b>Reset target at the start of each debug session </b></td>
+    <td>Forces the Carbide IDE to reset the target at the start of each debug session. This ensures that the debugging session uses the most up-to-date program code.</td>
+  </tr>
+  <tr>
+    <td><b>Target Processor </b></td>
+    <td>A drop down with a list of all supported processors. The process selection should help in determining the memory model. This will in turn help determine the base address and the offsets for the Symbian OS kernel aware information.</td>
+  </tr>
+  <tr>
+    <td><b>Target initialization file </b></td>
+    <td><p>Check this box to have the debugger run an initialization script when the debug session starts. For example, if a target device requires initialization for the debugger to be able to read and write memory or registers, you can specify an initialization script here.</p>
+    <p> Click Browse to select a script file using a standard file selection dialog box. When using T32, most of the initialization is done in the CMM script file. With other debug protocols like Sophia, you can specify the initialization file, which can be run after connecting to the target. </p></td>
+  </tr>
+  <tr>
+    <td><b>Memory configuration file </b></td>
+    <td>Controls whether the debugger uses a memory configuration file when a debug session starts. The Carbide debugger uses this configuration file to know which memory is accessible, readable, and writable on the target.</td>
+  </tr>
+</table>
+
+<div class="step">  
+    <h4>To access the Debugger Pane</h4>
+    <ol>
+      <li>Select the  Run &gt; Debug...  menu item</li>
+      <p>The <b>Debug</b> window appears. </p>
+      <li>Select a Symbian OS Application TRK configuration in the Configurations list</li>
+      <li>Click Debugger tab </li>
+      <p>The <b>Debugger</b> pane appears (Figure 1). </p>
+    </ol>
+</div>
+<h5>Common concepts</h5>
+  <ul>
+    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
+    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
+</ul>
+<h5 align="left">Common references </h5>
+<ul>
+  <li><a href="page_trk_main.htm">Main Pane</a></li>
+  <li><a href="page_connection.htm">Connection Pane</a></li>
+  <li><a href="page_file_transfer.htm">File Transfer Pane </a></li>
+  <li><a href="app_trk_installation.htm">Installation Pane</a></li>
+  <li><a href="page_executables.htm">Executables Pane</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/page_trk_main.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configs/page_trk_main.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,62 +1,62 @@
-<!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>Main Pane</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
-<body bgcolor="#FFFFFF">
-<h2>Main Pane</h2>
-<p>The    <b>Main</b> pane defines the project and the process to launch on the target device.  </p>
-<p align="center"><img src="../images/panel_trk_main.png" width="593" height="251" /></p>
-<p class="figure">Figure 1 - Debug window's  Main pane</p>
-<h5>Table 1.  Main pane &mdash;items </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Project</b></td>
-    <td><p>The project to associate with this  launch configuration. Click Browse to select a different project. </p>    </td>
-  </tr>
-  <tr>
-    <td><b>Remote process to launch </b></td>
-    <td><p>The absolute path of the  remote executable to launch on the target device. The binary to debug may be stored on one of several memory locations, the most common  are:</p>
-      <ul>
-      <li><b>RAM</b> (default) &#8212; programs running in RAM are launched from <span class="code">c:\sys\bin\</span> </li>
-      <li><b>ROM</b> &#8212; programs running in ROM are launched from <span class="code">z:\sys\bin\</span></li>
-      <li><b>Memory cards</b> &#8212; programs running on a memory card  are launched from <span class="code">e:\sys\bin\</span> </li>
-    </ul>
-    <p>In the event a program is not launching, verify that the<b> </b>path is correct for the memory location where the binary resides.</p>
-    </td>
-  </tr>
-</table>
-
-<div class="step">  
-    <h4>To access the Main Pane</h4>
-    <ol>
-      <li>Select the  Run &gt; Debug...  menu item</li>
-      <p>The <b>Debug</b> window appears. </p>
-      <li>Select a Symbian OS Application TRK configuration in the Configurations list</li>
-      <li>Click Main tab </li>
-      <p>The Main pane appears (Figure 1). </p>
-    </ol>
-</div>
-<h5>Common concepts</h5>
-  <ul>
-    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
-    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
-</ul>
-<h5 align="left">Common references</h5>
-<ul><li><a href="page_trk_debugger.htm">Debugger Pane</a></li>
-  <li><a href="page_connection.htm">Connection Pane</a></li>
-  <li><a href="page_file_transfer.htm">File Transfer Pane </a></li>
-  <li><a href="app_trk_installation.htm">Installation Pane</a></li>
-  <li><a href="page_executables.htm">Executables Pane</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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>Main Pane</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
+<body bgcolor="#FFFFFF">
+<h2>Main Pane</h2>
+<p>The    <b>Main</b> pane defines the project and the process to launch on the target device.  </p>
+<p align="center"><img src="../images/panel_trk_main.png" width="593" height="251" /></p>
+<p class="figure">Figure 1 - Debug windows  Main pane</p>
+<h5>Table 1.  Main pane &mdash;items </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Project</b></td>
+    <td><p>The project to associate with this  launch configuration. Click Browse to select a different project. </p>    </td>
+  </tr>
+  <tr>
+    <td><b>Remote process to launch </b></td>
+    <td><p>The absolute path of the  remote executable to launch on the target device. The binary to debug may be stored on one of several memory locations, the most common  are:</p>
+      <ul>
+      <li><b>RAM</b> (default) &#8212; programs running in RAM are launched from <span class="code">c:\sys\bin\</span> </li>
+      <li><b>ROM</b> &#8212; programs running in ROM are launched from <span class="code">z:\sys\bin\</span></li>
+      <li><b>Memory cards</b> &#8212; programs running on a memory card  are launched from <span class="code">e:\sys\bin\</span> </li>
+    </ul>
+    <p>In the event a program is not launching, verify that the<b> </b>path is correct for the memory location where the binary resides.</p>
+    </td>
+  </tr>
+</table>
+
+<div class="step">  
+    <h4>To access the Main Pane</h4>
+    <ol>
+      <li>Select the  Run &gt; Debug...  menu item</li>
+      <p>The <b>Debug</b> window appears. </p>
+      <li>Select a Symbian OS Application TRK configuration in the Configurations list</li>
+      <li>Click Main tab </li>
+      <p>The Main pane appears (Figure 1). </p>
+    </ol>
+</div>
+<h5>Common concepts</h5>
+  <ul>
+    <li><a href="../../concepts/debugger_about.htm">About the Debugger</a></li>
+    <li><a href="../../concepts/trk.htm">Target Resident Kernel (TRK) </a></li>
+</ul>
+<h5 align="left">Common references</h5>
+<ul><li><a href="page_trk_debugger.htm">Debugger Pane</a></li>
+  <li><a href="page_connection.htm">Connection Pane</a></li>
+  <li><a href="page_file_transfer.htm">File Transfer Pane </a></li>
+  <li><a href="app_trk_installation.htm">Installation Pane</a></li>
+  <li><a href="page_executables.htm">Executables Pane</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/abld.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,33 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<meta name="keywords" content="abld, abld target, abld export, abld cleanexport, abld resource, abld final, abld tidy" >
-<title>ABLD Actions</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>ABLD Actions </h2>
-<p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under  <b>Project &gt; ABLD</b> or by right-clicking a project or file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> views and choosing <b>ABLD &gt; <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
-<p align="center"><img src="../images/menu_abld.png" width="473" height="308"></p>
-<p class="figure">Figure 1 - Available ABLD actions</p>
-<p>The available commands include:</p>
-<ul>
-  <li><span class="code">target</span> &#8212; creates the main executable and also the resources</li>
-  <li><span class="code">export</span> &#8212; copies the exported files to their destinations </li>
-  <li><span class="code">cleanexport</span> &#8212; removes files created by <span class="code">abld export</span></li>
-  <li><span class="code">resource</span> &#8212; creates resources files and bitmaps</li>
-  <li><span class="code">final</span> &#8212; allows extension makefiles to execute final commands </li>
-  <li><span class="code">tidy</span> &#8212; removes executables which need not be released</li>
-</ul>
-<p>See the <a href="http://developer.symbian.com/main/oslibrary/osdocs/">Symbian Developer Library</a> for more information on the <span class="code">abld</span> command. </p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menu</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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" />
+<meta name="keywords" content="abld, abld target, abld export, abld cleanexport, abld resource, abld final, abld tidy" >
+<title>ABLD Actions</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>ABLD Actions </h2>
+<p>Use the <b>ABLD</b> menu option to invoke an specific <span class="code">abld</span> command on the selected project or file. ABLD is available under  <b>Project &gt; ABLD</b> or by right-clicking a project or file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> views and choosing <b>ABLD &gt; <i>command</i></b>. When executed any arguments specified in the <a href="../build_properties/pane_build_config_args.htm">Carbide Build Configurations</a> pane for the command are passed to the selected tool. </p>
+<p align="center"><img src="../images/menu_abld.png" width="496" height="136"></p>
+<p class="figure">Figure 1 - Available ABLD actions</p>
+<p>The available commands include:</p>
+<ul>
+  <li><span class="code">target</span> &#8212; creates the main executable and also the resources</li>
+  <li><span class="code">export</span> &#8212; copies the exported files to their destinations </li>
+  <li><span class="code">cleanexport</span> &#8212; removes files created by <span class="code">abld export</span></li>
+  <li><span class="code">resource</span> &#8212; creates resources files and bitmaps</li>
+  <li><span class="code">final</span> &#8212; allows extension makefiles to execute final commands </li>
+  <li><span class="code">tidy</span> &#8212; removes executables which need not be released</li>
+  <li><span class="code">test</span> &#8212; similar commands that act on test components</li>
+</ul>
+<p>See the <a href="http://developer.symbian.com/main/documentation/sdl/">Symbian Developer Library</a> for more information on the <span class="code">abld</span> command. </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menu</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,25 +1,25 @@
-<!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>Build Package File</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Build Package (.pkg) File</h2>
-<p>Select a .pkg file in a project&prime;s sis folder in the Project Explorer or C/C++ Projects view and right-click to display the context menu. Select <b>Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The Console view will display the processing output.  The .sis and .sisx files will appear in the sis folder.</p>
-<p align="center"><img src="../images/build_pkg_file.png" width="367" height="430" /></p>
-<p align="center" class="figure">Figure 1. Build PKG File context menu </p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menu</a></li>
-  <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a PKG File</a></li>
-  <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting an Active Configuration</a></li>
-  <li><a href="../build_properties/pane_build_config.htm">Carbide Build Configurations</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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>Build Package File</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Build Package (.pkg) File</h2>
+<p>Select a .pkg file in a project&prime;s sis folder in the Project Explorer or C/C++ Projects view and right-click to display the context menu. Select <b>Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The Console view will display the processing output.  The .sis and .sisx files will appear in the sis folder.</p>
+<p align="center"><img src="../images/build_pkg_file.png" width="371" height="420" /></p>
+<p align="center" class="figure">Figure 1. Build PKG File context menu </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menu</a></li>
+  <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a PKG File</a></li>
+  <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting an Active Configuration</a></li>
+  <li><a href="../build_properties/pane_build_config.htm">Carbide Build Configurations</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,23 +1,23 @@
-<!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>Build Symbian Component</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
-<body bgcolor="#FFFFFF">
-<h2>Build Symbian Component </h2>
-<p>Select a .mmp or .mk  file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view, then right-click and select<b> Build Symbian Component</b> (CTRL+ALT+P) to build the selected component file or makefile. You can also right-click the file in an editor view and select <b>Build Symbian Componen</b><b>t</b> to also build the file. </p>
-<p align="center"><img src="../images/build_symbian_comp.png" width="403" height="429" /></p>
-<p align="center" class="figure">Figure 1. Build Symbian Component menu item </p>
-<p></p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a></li>
-  <li><a href="clean_symbian_comp.htm">Clean Symbian Component</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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>Build Symbian Component</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
+<body bgcolor="#FFFFFF">
+<h2>Build Symbian Component </h2>
+<p>Select a .mmp or .mk  file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view, then right-click and select<b> Build Symbian Component</b> (CTRL+ALT+P) to build the selected component file or makefile. You can also right-click the file in an editor view and select <b>Build Symbian Componen</b><b>t</b> to also build the file. </p>
+<p align="center"><img src="../images/build_symbian_comp.png" width="432" height="357" /></p>
+<p align="center" class="figure">Figure 1. Build Symbian Component menu item </p>
+<p></p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+  <li><a href="clean_symbian_comp.htm">Clean Symbian Component</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,23 +1,23 @@
-<!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>Clean Symbian Component</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Clean Symbian Component </h2>
-<p>You can s elect a .mmp or .mk  file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view and right-click to display the context menu. Select <b>Clean Symbian Component</b> (CTRL+ALT+X) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to see the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
-<p align="center"><img src="../images/clean_symbian_comp.png" width="461" height="347" /></p>
-<p align="center" class="figure">Figure 1. Clean Symbian Component context menu </p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a>  </li>
-  <li><a href="clean_symbian_comp.htm">Build Symbian Component</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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>Clean Symbian Component</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Clean Symbian Component </h2>
+<p>You can select a MMP or MK  file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view and right-click to display the context menu. Select <b>Clean Symbian Component</b> (CTRL+ALT+X) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to see the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
+<p align="center"><img src="../images/clean_symbian_comp.png" width="461" height="347" /></p>
+<p align="center" class="figure">Figure 1. Clean Symbian Component context menu </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a>  </li>
+  <li><a href="clean_symbian_comp.htm">Build Symbian Component</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -19,13 +19,13 @@
   <li><a href="compile_source.htm">Compile</a></li>
   <li><a href="freeze_exports.htm">Freeze Exports</a></li>
   <li><a href="freeze_symbian_comp.htm">Freeze Symbian Component</a></li>
-  <li><a href="../trk/wnd_on_device_setup.htm">On-Device Connections</a> </li>
+  <li><a href="../trk/wnd_on_device_setup.htm">On-Device Connections...</a> </li>
   <li><a href="open_cmd_window.htm">Open Command Window</a></li>
-  <li><a href="open_explorer_window.htm">Show in  Explorer</a></li>
   <li><a href="preprocess_source.htm">Preprocess</a></li>
   <li><a href="run_codescanner.htm">Run Codescanner</a></li>
   <li><a href="run_leavescan.htm">Run Leavescan</a></li>
   <li><a href="s60_ui_designer.htm">S60 UI Designer</a></li>
+  <li><a href="open_explorer_window.htm">Show in  Explorer</a></li>
   <li><a href="new_symbian_class.htm">Symbian OS C++ Class</a></li>
   <li><a href="new_symbian_project.htm">Symbian OS C++ Project</a></li>
   <li><a href="new_symbian_project.htm">Symbian OS MMP File </a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_cmd_window.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_cmd_window.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Open Command Window</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Open Command Window</h2>
-<p>Launches a Microsoft Window's <b>Command Prompt </b>  set to the workspace directory. </p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Open Command Window</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Open Command Window</h2>
+<p>Launches a Microsoft Windows <b>Command Prompt </b>  set to the workspace directory. </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,20 +1,20 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Show in Explorer</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Show in Explorer</h2>
-<p>Launches a Microsoft Window's <b>Explorer</b> window set to the workspace directory.</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Show in Explorer</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Show in Explorer</h2>
+<p>Launches a Microsoft Windows <b>Explorer</b> window set to the workspace directory.</p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/panel_debug_exceptions.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/panel_debug_exceptions.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,59 +1,59 @@
-<!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>x86 Exceptions Pane</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>x86 Exceptions Pane </h2>
-<p>  The Debug or launch configuration window's x86 Exceptions pane lists all the exceptions that the debugger is able to catch. If you want the debugger to catch all the exceptions, enable all of the options in this view. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you prefer to handle.</p>
-<p align="center"><img src="images/panel_debug_x86_exceptions.png" width="839" height="522" /></p>
-<p align="center" class="figure">Figure 1 - x86 Exceptions pane </p>
-<h5>Table 1. x86 Exceptions pane &mdash;items </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="38%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td>Check All </td>
-    <td>Enables catching all exceptions.</td>
-  </tr>
-  <tr>
-    <td>Clear All </td>
-    <td>Disables catching all exceptions.</td>
-  </tr>
-</table>
-<div class="step">
-  <h4>To access the x86 Exceptions pane</h4>
-  <ol>
-    <li>Select the Run &gt; Debug... menu item</li>
-    <p>The Debug window (Figure 1) appears. </p>
-    <li>Select a Configuration setting</li>
-    <li>Click x86 Exceptions tab </li>
-    <p>The x86 Exceptions pane appears. </p>
-  </ol>
-</div>  
-<h5>Common concepts</h5>
-  <ul>
-    <li><a href="../concepts/debugger_about.htm">About the Debugger</a></li>
-  </ul>
-  <h5 align="left">Common tasks</h5>
-  <ul>
-    <li><a href="../tasks/start/carbide_debugging.htm">Debugging a Program</a> (Example)</li>
-    <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Debug Configuration</a></li>
-  </ul>
-  <h5 align="left">Common references </h5>
-  <ul>
-    <li><a href="perspective_debug.htm">Debug Perspective</a></li>
-    <li><a href="wnd_debug_configuration.htm">Debug Window </a> </li>
-    <li><a href="view_debug.htm">Debug View</a></li>
-  </ul>
-
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!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>x86 Exceptions Pane</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>x86 Exceptions Pane </h2>
+<p>  The <b>Debug</b> or launch configuration windows <b>x86 Exceptions</b> pane lists all the exceptions that the debugger is able to catch. If you want the debugger to catch all the exceptions, enable all of the options in this view. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you prefer to handle.</p>
+<p align="center"><img src="images/panel_debug_x86_exceptions.png" width="627" height="270" /></p>
+<p align="center" class="figure">Figure 1 - x86 Exceptions pane </p>
+<h5>Table 1. x86 Exceptions pane &mdash;items </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="38%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td>Check All </td>
+    <td>Enables catching all exceptions.</td>
+  </tr>
+  <tr>
+    <td>Clear All </td>
+    <td>Disables catching all exceptions.</td>
+  </tr>
+</table>
+<div class="step">
+  <h4>To access the x86 Exceptions pane</h4>
+  <ol>
+    <li>Select the Run &gt; Debug... menu item</li>
+    <p>The Debug window (Figure 1) appears. </p>
+    <li>Select a Configuration setting</li>
+    <li>Click x86 Exceptions tab </li>
+    <p>The x86 Exceptions pane appears. </p>
+  </ol>
+</div>  
+<h5>Common concepts</h5>
+  <ul>
+    <li><a href="../concepts/debugger_about.htm">About the Debugger</a></li>
+  </ul>
+  <h5 align="left">Common tasks</h5>
+  <ul>
+    <li><a href="../tasks/start/carbide_debugging.htm">Debugging a Program</a> (Example)</li>
+    <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Debug Configuration</a></li>
+  </ul>
+  <h5 align="left">Common references </h5>
+  <ul>
+    <li><a href="perspective_debug.htm">Debug Perspective</a></li>
+    <li><a href="wnd_debug_configuration.htm">Debug Window </a> </li>
+    <li><a href="view_debug.htm">Debug View</a></li>
+  </ul>
+
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -90,6 +90,10 @@
       </ul>
     </td>
   </tr>
+  <tr>
+    <td><strong>Do not offer to track dependencies for projects build on command-line </strong></td>
+    <td>If you build a project from the command-line (with 'abld build') and then import the project into Carbide and attempt to build, Carbide will prompt you if you would like Carbide to manage source dependencies for you. Enabling this option insures Carbide will not ask you to manage dependencies (they will be done as normally done via 'abld build' command).</td>
+  </tr>
 </table>
 <p align="left">&nbsp;</p>
 <p align="center"><img src="images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="420" height="283"></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_07.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,76 +1,76 @@
-<!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>Debugger Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><b>Configure TRK connection on the device</b></li>
-  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
-</ol>
-<div class="step">
-<h4><a name="runConfig" id="runConfig"> </a>Configure TRK Connection on the Device</h4>
-<h5>Connecting with Bluetooth</h5>
-  <ol>
-    <li>On the device make sure the Bluetooth port is turned on</li>
-    <li>On the phone launch TRK.</li>
-    <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones it will be in the Installed folder, on others it may be in the My Own folder.</p>
-    <li>TRK will ask which host you want to pair with. When requested, select your computer from the available Bluetooth devices list.</li>
-    <li>After the host and phone are paired, TRK should be connected. Verify that TRK is running.</li>
-    <li>On the PC:
-      <ol type="a">
-        <li>Right click on the Bluetooth icon in the System tray and select Advanced Configuration</li>
-        <li>Click the Local Services tab</li>
-        <li>Write down the Bluetooth COM Port number from the Local Services tab (Figure 1).</li>
-        <p>The Port number will be used when configuring the TRK launch configuration. The Bluetooth COM Port number in the Local Services tab should match the COM port used in the Connections tab of the TRK launch configuration.</p>
-        <li>Click OK to close the Bluetooth Configuration window</li>
-        <p align="center"><img src="images/Bluetooth_localservices.png" width="460" height="437" /></p>
-        <p class="figure">Figure 1. Bluetooth Configuration window's Local Services panel</p>
-      </ol>
-    </li>
-  </ol>
-<h5>Connecting with PC Suite</h5>
-
-  <ol>
-    <li>Connect the USB cable to the PC and then to the target device</li>
-    <li>On the device select PC suite from the USB mode list</li>
-    <li>Launch the TRK agent</li>
-    <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones it will be in the Installed folder, on others it may be in My Own folder.</p>
-    <li>Halt the Bluetooth device search by pressing Cancel</li>
-    <li>Click Options &gt; Settings &gt; Connection</li>
-    <li>Change Connection type to USB and set connection options (Figure 2) </li>
-    <li>Select Back and start the TRK again and you should be connected</li>
-    <p align="center"><img src="images/TRK_USB_settings.png" width="211" height="250" /></p>
-    <p class="figure">Figure 2. USB Connection Settings</p>
-    <li>On the PC</li>
-        <ol type="a">
-          <li>Open Window's Computer Management by right-clicking My Computer and select Manage from the context menu to open the Computer Management window.</li>
-            <li>Select System Tools &gt; Device Manager &gt; Ports (COM &amp; LPT) to display all active ports</li>
-            <li>Locate the S60 Phone USB (COMxx) item in the list</li>
-
-        <p align="center"><img src="images/comp_manage_ports.png" width="507" height="546" />        </p>
-    <p class="figure">Figure 3. Device Manager - Ports</p>
-
-      <li>Write down the port ID and Communication Port Properties.</li>
-      <p>The COM Port number in the Device Manager window should match the COM port used in the Connections tab of the TRK launch configuration.</p>
-      <li>Close the Device Manager window </li>
-    </ol>
-  </ol>
-  </div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugger Settings</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Run Mode On-Device Debugging</h2>
+<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
+<ol>
+  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
+  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
+  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
+  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
+  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
+  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
+  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
+  <li><b>Configure TRK connection on the device</b></li>
+  <li><a href="run_mode_debug_08.htm">Create a launch configuration</a></li>
+</ol>
+<div class="step">
+<h4><a name="runConfig" id="runConfig"> </a>Configure TRK Connection on the Device</h4>
+<h5>Connecting with Bluetooth</h5>
+  <ol>
+    <li>On the device make sure the Bluetooth port is turned on</li>
+    <li>On the phone launch TRK.</li>
+    <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones it will be in the Installed folder, on others it may be in the My Own folder.</p>
+    <li>TRK will ask which host you want to pair with. When requested, select your computer from the available Bluetooth devices list.</li>
+    <li>After the host and phone are paired, TRK should be connected. Verify that TRK is running.</li>
+    <li>On the PC:
+      <ol type="a">
+        <li>Right click on the Bluetooth icon in the System tray and select Advanced Configuration</li>
+        <li>Click the Local Services tab</li>
+        <li>Write down the Bluetooth COM Port number from the Local Services tab (Figure 1).</li>
+        <p>The Port number will be used when configuring the TRK launch configuration. The Bluetooth COM Port number in the Local Services tab should match the COM port used in the Connections tab of the TRK launch configuration.</p>
+        <li>Click OK to close the Bluetooth Configuration window</li>
+        <p align="center"><img src="images/Bluetooth_localservices.png" width="460" height="437" /></p>
+        <p class="figure">Figure 1. Bluetooth Configuration windows Local Services panel</p>
+      </ol>
+    </li>
+  </ol>
+<h5>Connecting with PC Suite</h5>
+
+  <ol>
+    <li>Connect the USB cable to the PC and then to the target device</li>
+    <li>On the device select PC suite from the USB mode list</li>
+    <li>Launch the TRK agent</li>
+    <p>The location of the TRK on-device debug agent will vary based on the phone. On some phones it will be in the Installed folder, on others it may be in My Own folder.</p>
+    <li>Halt the Bluetooth device search by pressing Cancel</li>
+    <li>Click Options &gt; Settings &gt; Connection</li>
+    <li>Change Connection type to USB and set connection options (Figure 2) </li>
+    <li>Select Back and start the TRK again and you should be connected</li>
+    <p align="center"><img src="images/TRK_USB_settings.png" width="211" height="250" /></p>
+    <p class="figure">Figure 2. USB Connection Settings</p>
+    <li>On the PC</li>
+        <ol type="a">
+          <li>Open Windows Computer Management by right-clicking My Computer and select Manage from the context menu to open the Computer Management window.</li>
+            <li>Select System Tools &gt; Device Manager &gt; Ports (COM &amp; LPT) to display all active ports</li>
+            <li>Locate the S60 Phone USB (COMxx) item in the list</li>
+
+        <p align="center"><img src="images/comp_manage_ports.png" width="507" height="546" />        </p>
+    <p class="figure">Figure 3. Device Manager - Ports</p>
+
+      <li>Write down the port ID and Communication Port Properties.</li>
+      <p>The COM Port number in the Device Manager window should match the COM port used in the Connections tab of the TRK launch configuration.</p>
+      <li>Close the Device Manager window </li>
+    </ol>
+  </ol>
+  </div>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/run_mode_debug_08.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,187 +1,187 @@
-<!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>Debugger Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode On-Device Debugging</h2>
-<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
-<ol>
-  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
-  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
-  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
-  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
-  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
-  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
-  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
-  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
-  <li><b>Create a launch configuration</b></li>
-</ol>
-<div class="step">
-<h4><a name="runLaunch" id="runLaunch"> </a>Creating a Launch Configuration setup</h4>
-<ol>
-    <li>Import the MMP or INF file</li>
-    <li>Select the Project in the C/C++ Project pane you want to debug</li>
-    <li>From the IDE select Run &gt; Debug&hellip;</li>
-    <li>The <a href="../projects/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>  appears</li>
-    <p>To communicate between the Carbide.c++ debugger and the on-device debug agent or protocol interface you must define a debug launch configuration. The Debug window is where you define the type of debug launch configuration to use when debugging programs on the target device (Figure 4).</p>
-    <p><img src="images/Debug_Config_main.png" width="830" height="506" /></p>
-    <p class="figure">Figure 4. Debug Window</p>
-    <li>Select either a Symbian OS Application TRK or Symbian OS System TRK configuration type for on-device debugging and click New</li>
-    <p>For debug launch configurations using the TRK debug agent, the following pages require review and possible option settings:</p>
-    <ul>
-      <li><b>Main</b> - defines the project to be launched on the target device</li>
-      <li>Arguments (<i>Eclipse</i>) - defines the arguments to be passed to the application and to the virtual machine</li>
-      <li><b>Debugger</b> - provides control over entry points, message handling, and instruction set default settings</li>
-      <li><b>Connection</b> - specifies the method used to transfer files to the target device</li>
-      <li><b>File Transfer</b> - files transfered to the target device at the start of each launch</li>
-      <li><b>Installation</b> - specifies the .sis or .pkg file to install on the target device</li>
-      <li>Executables -  specifies which executables are debugged by your project</li>
-      <li>Source (<i>Eclipse</i>) -  defines the location of source files used to display source when debugging </li>
-      <li>Common (<i>Eclipse</i>) - defines general information about the launch configuration</li>
-    </ul>
-    <p>Click Debug after all the preference panels have been set. The Debug window closes and the Carbide.c++ debugger begins a debugging session using the new configuration. The next time you click the Debug icon, this debug launch configuration is used to start a debug session.</p>
-</ol>
-  <h5>Main Tab</h5>
-  <p>The Main pane defines the project to be launched on the target device. Table 1 defines the fields.</p>
-  <p align="center"><img src="images/Debug_Config_main_run.png" width="594" height="255" /></p>
-  <p class="figure">Figure 5. Debug window - Main Tab </p>
-    <p>Table 1. Main pane</p>
-    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
-      <tr>
-        <th width="38%" scope="col">Item</th>
-        <th width="62%" scope="col">Explanation</th>
-      </tr>
-      <tr>
-        <td><b>Project</b></td>
-        <td><p>The project to associate with this debug launch configuration. Click Browse to select a different project. </p></td>
-      </tr>
-      <tr>
-        <td><b>Remote process to launch</b></td>
-        <td>The absolute path of the remote process to launch on the target device.</td>
-      </tr>
-    </table>
-  </ol>
-    <h5>Debugger Tab</h5>
-    <p>The Debug or launch configuration window's Debugger pane provides control over entry points, message handling, and instruction set default settings.</p>
-    <p align="center"><img src="images/Debug_Config_debugger_run.png" width="594" height="255" /></p>
-    <p class="figure">Figure 6. Debug window's Debugger Pane </p>
-    <p>Table 2. Debugger pane</p>
-    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
-      <tr>
-        <th width="38%" scope="col">Item</th>
-        <th width="62%" scope="col">Explanation</th>
-      </tr>
-      <tr>
-        <td><b>Break at entry point</b></td>
-        <td><p>When checked, break at the specified entry point entered in the text field. For .EXE targets, the default entry point is set to E32Main. By default, the Break at entry point option is unchecked for all other target types.</p></td>
-      </tr>
-      <tr>
-        <td><b>View program output </b></td>
-        <td>When checked, show the contents of any unframed messages from the communications port in a Console view.</td>
-      </tr>
-      <tr>
-        <td><b>View messages between Carbide and debug agent</b></td>
-        <td><p>When checked, show the communications between the PC and the target device in a Console view when the TRK Communciation message log is visible.</p>
-        <p class="note"><b>NOTE</b> You can pin the TRK Communication message log view so that it does not lose focus.</p></td>
-      </tr>
-      <tr>
-        <td><b>Message retry delay (ms)</b></td>
-        <td>Enter the delay time in milliseconds (ms) between 100 and 10000 that the debugger should wait for a response. The default Message retry delay value is 2000.</td>
-      </tr>
-      <tr>
-        <td><b>Default Instructon Set</b></td>
-        <td><p>Specifies the default instruction set to use if the debugger cannot determine the processor mode in order to set breakpoints and to disassemble code. The options are:</p>
-        Auto (examine code at current PC location)<br />
-		ARM (32-bit)<br />
-        THUMB (16-bit)<br />
-        <br />
-        By default the Instruction Set option uses ARM 32-bit.</td>
-      </tr>
-    </table>
-  
-  <h5>Connection Tab</h5>
-  <p>Select the Connection tab that is available for TRK. Specify the Serial port for your configuration. The Connection pane specifies the method used to transfer files to the target device. Once the <b>Current Connection to Target</b> type is selected, the remaining options contain default values for the specific connection type. You can change these options to match the target device's communication specifications.</p>
-  <p align="center"><img src="images/Debug_Config_connection_run.png" width="594" height="280" /></p>
-  <p class="figure">Figure 7. Debug window's Connection pane using PC Suite</p>
-    <p>Table 3. Connection pane</p>
-    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
-      <tr>
-        <th width="38%" scope="col">Item</th>
-        <th width="62%" scope="col">Explanation</th>
-      </tr>
-      <tr>
-        <td><b>Current Connection to Target </b></td>
-        <td>Choose the connection type to use when communicating with a device. </td>
-      </tr>
-      <tr>
-        <td><b>Serial Port</b></td>
-        <td><p>Select the serial port option to use for the  launch configuration. Once set, this port will be used for all subsequent launch configurations until it is set again.</p>
-        <p class="note"><b>NOTE</b> USB and Bluetooth can be dynamically assigned, so its critical that the port ID assigned here matches the one the system is using to communicate with the target device.</p></td>
-      </tr>
-      <tr>
-        <td><b>Baud Rate</b></td>
-        <td>Use the Baud Rate option to select the baud rate for communication. The default baud rate value is 115200 bits per second (bps).</td>
-      </tr>
-      <tr>
-        <td><b>Data Bits</b></td>
-        <td><p>Use the Data Bits option to select a common data bits size (4, 5, 6, 7, and 8). The default data bits value is 8.</p>            </td>
-      </tr>
-      <tr>
-        <td><b>Parity</b></td>
-        <td>Use the Parity option to select the parity setting (None, Odd, or Even). The default parity value is None.</td>
-      </tr>
-      <tr>
-        <td><b>Stop Bits</b></td>
-        <td><p>Use the Stop Bits option to select the stop bits setting (1, 1.5, 2). The default stop bits value is 2.</p>        </td>
-      </tr>
-      <tr>
-        <td><b>Flow Control</b></td>
-        <td>Use the Flow Control option to select the flow control setting (None, Hardware (RTS/CTS), and Software (XON/XOFF)). The default flow control value is None.</td>
-      </tr>
-    </table>
-  <h5>Installation Tab</h5>
-  <p>For Application TRK select the Installation tab. The Installation pane specifies the .sis file to install on the target device. This is used by Application TRK because Application TRK downloads all files via a SIS file. This is required when using the TRK debug agent with 9.x based SDK&rsquo;s.</p>
-  <p align="center"><img src="images/Debug_Config_installation_run.png" width="595" height="280" /></p>
-  <p class="figure">Figure 8. Debug window's Installation pane</p>
-    <p>Table 4. Installation pane</p>
-    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
-      <tr>
-        <th width="38%" scope="col">Item</th>
-        <th width="62%" scope="col">Explanation</th>
-      </tr>
-      <tr>
-        <td><b>Installation file </b></td>
-        <td><p>Browse to and select the file to be installed.</p>            </td>
-      </tr>
-      <tr>
-        <td><b>Download directory </b></td>
-        <td>Specify directory to receive download. </td>
-      </tr>
-      <tr>
-        <td><b>Install each launch even if installer file has not changed </b></td>
-        <td><p>Check this option to always install the .sis file. </p></td>
-      </tr>
-      <tr>
-        <td><b>Do not show installer UI on the phone </b></td>
-        <td>Check this option to hide the installer interface on the phone. </td>
-      </tr>
-      <tr>
-        <td><b>Install to drive: </b></td>
-        <td><p>Select drive on phone to install the .sis file. </p></td>
-      </tr>
-    </table>
-  <h5>File Transfer Tab</h5>
-  <p>For System TRK select the File Transfer pane. The File Transfer pane displays a list of files the Carbide IDE transfers to the target device at the start of each launch. By default, any file added is automatically checked for downloading to the device.</p>
-  <p class="note"><b>NOTE</b> If debugging a DLL from an application and using System TRK, ensure that the DLL is included so that it is deployed to the device with the application. It is not added by default.</p>
-  <p align="center"><img src="images/Debug_Config_filetransfer_run.png" width="595" height="280" /></p>
-  <p class="figure">Figure 9. Debug window's File Transfer pane </p>
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugger Settings</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Run Mode On-Device Debugging</h2>
+<p>To implement run mode on-device debugging the following tasks need to be completed.</p>
+<ol>
+  <li><a href="run_mode_debug.htm">Install device connection software</a></li>
+  <li><a href="run_mode_debug_01.htm">Install Perl</a></li>
+  <li><a href="run_mode_debug_02.htm">Install an SDK</a></li>
+  <li><a href="run_mode_debug_03.htm">Setup environment variables</a></li>
+  <li><a href="run_mode_debug_04.htm">Setup a virtual drive for Techview and Cust Kits</a></li>
+  <li><a href="run_mode_debug_05.htm">Set the default kit in Devices.xml </a></li>
+  <li><a href="run_mode_debug_06.htm">Install the SISX file on the target device</a></li>
+  <li><a href="run_mode_debug_07.htm">Configure TRK connection on the device</a></li>
+  <li><b>Create a launch configuration</b></li>
+</ol>
+<div class="step">
+<h4><a name="runLaunch" id="runLaunch"> </a>Creating a Launch Configuration setup</h4>
+<ol>
+    <li>Import the MMP or INF file</li>
+    <li>Select the Project in the C/C++ Project pane you want to debug</li>
+    <li>From the IDE select Run &gt; Debug&hellip;</li>
+    <li>The <a href="../projects/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>  appears</li>
+    <p>To communicate between the Carbide.c++ debugger and the on-device debug agent or protocol interface you must define a debug launch configuration. The Debug window is where you define the type of debug launch configuration to use when debugging programs on the target device (Figure 4).</p>
+    <p><img src="images/Debug_Config_main.png" width="830" height="506" /></p>
+    <p class="figure">Figure 4. Debug Window</p>
+    <li>Select either a Symbian OS Application TRK or Symbian OS System TRK configuration type for on-device debugging and click New</li>
+    <p>For debug launch configurations using the TRK debug agent, the following pages require review and possible option settings:</p>
+    <ul>
+      <li><b>Main</b> - defines the project to be launched on the target device</li>
+      <li>Arguments (<i>Eclipse</i>) - defines the arguments to be passed to the application and to the virtual machine</li>
+      <li><b>Debugger</b> - provides control over entry points, message handling, and instruction set default settings</li>
+      <li><b>Connection</b> - specifies the method used to transfer files to the target device</li>
+      <li><b>File Transfer</b> - files transfered to the target device at the start of each launch</li>
+      <li><b>Installation</b> - specifies the .sis or .pkg file to install on the target device</li>
+      <li>Executables -  specifies which executables are debugged by your project</li>
+      <li>Source (<i>Eclipse</i>) -  defines the location of source files used to display source when debugging </li>
+      <li>Common (<i>Eclipse</i>) - defines general information about the launch configuration</li>
+    </ul>
+    <p>Click Debug after all the preference panels have been set. The Debug window closes and the Carbide.c++ debugger begins a debugging session using the new configuration. The next time you click the Debug icon, this debug launch configuration is used to start a debug session.</p>
+</ol>
+  <h5>Main Tab</h5>
+  <p>The Main pane defines the project to be launched on the target device. Table 1 defines the fields.</p>
+  <p align="center"><img src="images/Debug_Config_main_run.png" width="594" height="255" /></p>
+  <p class="figure">Figure 5. Debug window - Main Tab </p>
+    <p>Table 1. Main pane</p>
+    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
+      <tr>
+        <th width="38%" scope="col">Item</th>
+        <th width="62%" scope="col">Explanation</th>
+      </tr>
+      <tr>
+        <td><b>Project</b></td>
+        <td><p>The project to associate with this debug launch configuration. Click Browse to select a different project. </p></td>
+      </tr>
+      <tr>
+        <td><b>Remote process to launch</b></td>
+        <td>The absolute path of the remote process to launch on the target device.</td>
+      </tr>
+    </table>
+  
+    <h5>Debugger Tab</h5>
+    <p>The Debug or launch configuration windows Debugger pane provides control over entry points, message handling, and instruction set default settings.</p>
+    <p align="center"><img src="images/Debug_Config_debugger_run.png" width="594" height="255" /></p>
+    <p class="figure">Figure 6. Debug windows Debugger Pane </p>
+    <p>Table 2. Debugger pane</p>
+    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
+      <tr>
+        <th width="38%" scope="col">Item</th>
+        <th width="62%" scope="col">Explanation</th>
+      </tr>
+      <tr>
+        <td><b>Break at entry point</b></td>
+        <td><p>When checked, break at the specified entry point entered in the text field. For .EXE targets, the default entry point is set to E32Main. By default, the Break at entry point option is unchecked for all other target types.</p></td>
+      </tr>
+      <tr>
+        <td><b>View program output </b></td>
+        <td>When checked, show the contents of any unframed messages from the communications port in a Console view.</td>
+      </tr>
+      <tr>
+        <td><b>View messages between Carbide and debug agent</b></td>
+        <td><p>When checked, show the communications between the PC and the target device in a Console view when the TRK Communciation message log is visible.</p>
+        <p class="note"><b>NOTE</b> You can pin the TRK Communication message log view so that it does not lose focus.</p></td>
+      </tr>
+      <tr>
+        <td><b>Message retry delay (ms)</b></td>
+        <td>Enter the delay time in milliseconds (ms) between 100 and 10000 that the debugger should wait for a response. The default Message retry delay value is 2000.</td>
+      </tr>
+      <tr>
+        <td><b>Default Instructon Set</b></td>
+        <td><p>Specifies the default instruction set to use if the debugger cannot determine the processor mode in order to set breakpoints and to disassemble code. The options are:</p>
+        Auto (examine code at current PC location)<br />
+		ARM (32-bit)<br />
+        THUMB (16-bit)<br />
+        <br />
+        By default the Instruction Set option uses ARM 32-bit.</td>
+      </tr>
+    </table>
+  
+  <h5>Connection Tab</h5>
+  <p>Select the Connection tab that is available for TRK. Specify the Serial port for your configuration. The Connection pane specifies the method used to transfer files to the target device. Once the <b>Current Connection to Target</b> type is selected, the remaining options contain default values for the specific connection type. You can change these options to match the target device's communication specifications.</p>
+  <p align="center"><img src="images/Debug_Config_connection_run.png" width="594" height="280" /></p>
+  <p class="figure">Figure 7. Debug windows Connection pane using PC Suite</p>
+    <p>Table 3. Connection pane</p>
+    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
+      <tr>
+        <th width="38%" scope="col">Item</th>
+        <th width="62%" scope="col">Explanation</th>
+      </tr>
+      <tr>
+        <td><b>Current Connection to Target </b></td>
+        <td>Choose the connection type to use when communicating with a device. </td>
+      </tr>
+      <tr>
+        <td><b>Serial Port</b></td>
+        <td><p>Select the serial port option to use for the  launch configuration. Once set, this port will be used for all subsequent launch configurations until it is set again.</p>
+        <p class="note"><b>NOTE</b> USB and Bluetooth can be dynamically assigned, so its critical that the port ID assigned here matches the one the system is using to communicate with the target device.</p></td>
+      </tr>
+      <tr>
+        <td><b>Baud Rate</b></td>
+        <td>Use the Baud Rate option to select the baud rate for communication. The default baud rate value is 115200 bits per second (bps).</td>
+      </tr>
+      <tr>
+        <td><b>Data Bits</b></td>
+        <td><p>Use the Data Bits option to select a common data bits size (4, 5, 6, 7, and 8). The default data bits value is 8.</p>            </td>
+      </tr>
+      <tr>
+        <td><b>Parity</b></td>
+        <td>Use the Parity option to select the parity setting (None, Odd, or Even). The default parity value is None.</td>
+      </tr>
+      <tr>
+        <td><b>Stop Bits</b></td>
+        <td><p>Use the Stop Bits option to select the stop bits setting (1, 1.5, 2). The default stop bits value is 2.</p>        </td>
+      </tr>
+      <tr>
+        <td><b>Flow Control</b></td>
+        <td>Use the Flow Control option to select the flow control setting (None, Hardware (RTS/CTS), and Software (XON/XOFF)). The default flow control value is None.</td>
+      </tr>
+    </table>
+  <h5>Installation Tab</h5>
+  <p>For Application TRK select the Installation tab. The Installation pane specifies the .sis file to install on the target device. This is used by Application TRK because Application TRK downloads all files via a SIS file. This is required when using the TRK debug agent with 9.x based SDK&rsquo;s.</p>
+  <p align="center"><img src="images/Debug_Config_installation_run.png" width="595" height="280" /></p>
+  <p class="figure">Figure 8. Debug windows Installation pane</p>
+    <p>Table 4. Installation pane</p>
+    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
+      <tr>
+        <th width="38%" scope="col">Item</th>
+        <th width="62%" scope="col">Explanation</th>
+      </tr>
+      <tr>
+        <td><b>Installation file </b></td>
+        <td><p>Browse to and select the file to be installed.</p>            </td>
+      </tr>
+      <tr>
+        <td><b>Download directory </b></td>
+        <td>Specify directory to receive download. </td>
+      </tr>
+      <tr>
+        <td><b>Install each launch even if installer file has not changed </b></td>
+        <td><p>Check this option to always install the .sis file. </p></td>
+      </tr>
+      <tr>
+        <td><b>Do not show installer UI on the phone </b></td>
+        <td>Check this option to hide the installer interface on the phone. </td>
+      </tr>
+      <tr>
+        <td><b>Install to drive: </b></td>
+        <td><p>Select drive on phone to install the .sis file. </p></td>
+      </tr>
+    </table>
+  <h5>File Transfer Tab</h5>
+  <p>For System TRK select the File Transfer pane. The File Transfer pane displays a list of files the Carbide IDE transfers to the target device at the start of each launch. By default, any file added is automatically checked for downloading to the device.</p>
+  <p class="note"><b>NOTE</b> If debugging a DLL from an application and using System TRK, ensure that the DLL is included so that it is deployed to the device with the application. It is not added by default.</p>
+  <p align="center"><img src="images/Debug_Config_filetransfer_run.png" width="595" height="280" /></p>
+  <p class="figure">Figure 9. Debug windows File Transfer pane </p>
+</div>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_bluetooth.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,53 +1,53 @@
-<!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>Bluetooth Connectivity Setup</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Bluetooth Connection Setup</h2>
-<p>The on-device debug agent software supports the use of Bluetooth to debug programs running on a target device. To enable communication with a Bluetooth device, a connection must be established between the PC and the device. The on-device debug agent requires a dedicated COM port in order to talk with the device. In some cases, other programs that use the same COM port number will interfere with the TRK debug agent, essentially &quot;fighting&quot; over control of the COM port. Follow the steps below to setup a Bluetooth connection with the Bluetooth enabled device. </p>
-<p class="note"><b>NOTE</b> Ensure that no other program has commandeered the Bluetooth connection. For example, some phone connectivity programs will not release a COM port unless specifically told to do so. </p>
-<p class="note"><b>NOTE</b> Most problems with on-target debugging setup occur here, so be careful when performing each of these steps.</p>
-<div class="step">
-  <h4>Setting up a Bluetooth Connection for On-device Debugging </h4>
-  <p class="note"><b>NOTE</b> This example shows how to setup a Bluetooth connection on a PC running Windows XP SP2 with an internal Bluetooth device. The actions to  setup Bluetooth connections may be different on your version of Windows. Refer to the OS documentation for information on configuring Bluetooth connections. Ensure that the correct Bluetooth drivers are installed.</p>
-  <ol>
-    <li>Open the Bluetooth Configuration window (Start &gt; Settings &gt; Control Panel &gt; Bluetooth Configuration)</li>
-    <li>Verify the following settings in the Accessibility tab (Figure 1):
-      <ul>
-        <li>The option &quot;Let other Bluetooth devices discover this computer&quot; is checkmarked</li>
-        <li>The option &quot;Allow&quot; is set to &quot;All Devices&quot; </li>
-      </ul>
-    </li>
-    <p align="center"><img src="images/wnd_bluetooth_config.png" width="462" height="438" /></p>
-    <p class="figure">Figure 1. Bluetooth Configuration window's Accessibility panel </p>
-    <li>Write down the Bluetooth COM Port number from the  Local Services tab (Figure 2) for later use</li>
-	<p>The Bluetooth COM Port number in the Local Services tab
-	  should match the COM port used in the <a href="../../reference/launch_configs/page_connection.htm">Connections</a> tab of the TRK <a href="../../reference/launch_configs/run_mode_overview.htm">launch<br />
-    configuration</a>.</p>
-    <p align="center"><img src="images/wnd_bluetooth_config_services.png" width="460" height="437" /></p>
-    <p class="figure">Figure 2. Bluetooth Configuration window's Local Services panel </p>
-    <li>Click OK to close the Bluetooth Configuration window</li>
-    <li>Download the Application TRK or System TRK SISX file to the device</li>
-  </ol>
-</div>
-  <h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
-  </ul>
-  <h5>Related references</h5>
-  <ul>
-    <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
-  </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Bluetooth Connectivity Setup</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Bluetooth Connection Setup</h2>
+<p>The on-device debug agent software supports the use of Bluetooth to debug programs running on a target device. To enable communication with a Bluetooth device, a connection must be established between the PC and the device. The on-device debug agent requires a dedicated COM port in order to talk with the device. In some cases, other programs that use the same COM port number will interfere with the TRK debug agent, essentially &quot;fighting&quot; over control of the COM port. Follow the steps below to setup a Bluetooth connection with the Bluetooth enabled device. </p>
+<p class="note"><b>NOTE</b> Ensure that no other program has commandeered the Bluetooth connection. For example, some phone connectivity programs will not release a COM port unless specifically told to do so. </p>
+<p class="note"><b>NOTE</b> Most problems with on-target debugging setup occur here, so be careful when performing each of these steps.</p>
+<div class="step">
+  <h4>Setting up a Bluetooth Connection for On-device Debugging </h4>
+  <p class="note"><b>NOTE</b> This example shows how to setup a Bluetooth connection on a PC running Windows XP SP2 with an internal Bluetooth device. The actions to  setup Bluetooth connections may be different on your version of Windows. Refer to the OS documentation for information on configuring Bluetooth connections. Ensure that the correct Bluetooth drivers are installed.</p>
+  <ol>
+    <li>Open the Bluetooth Configuration window (Start &gt; Settings &gt; Control Panel &gt; Bluetooth Configuration)</li>
+    <li>Verify the following settings in the Accessibility tab (Figure 1):
+      <ul>
+        <li>The option &quot;Let other Bluetooth devices discover this computer&quot; is checkmarked</li>
+        <li>The option &quot;Allow&quot; is set to &quot;All Devices&quot; </li>
+      </ul>
+    </li>
+    <p align="center"><img src="images/wnd_bluetooth_config.png" width="462" height="438" /></p>
+    <p class="figure">Figure 1. Bluetooth Configuration windows Accessibility panel </p>
+    <li>Write down the Bluetooth COM Port number from the  Local Services tab (Figure 2) for later use</li>
+	<p>The Bluetooth COM Port number in the Local Services tab
+	  should match the COM port used in the <a href="../../reference/launch_configs/page_connection.htm">Connections</a> tab of the TRK <a href="../../reference/launch_configs/run_mode_overview.htm">launch<br />
+    configuration</a>.</p>
+    <p align="center"><img src="images/wnd_bluetooth_config_services.png" width="460" height="437" /></p>
+    <p class="figure">Figure 2. Bluetooth Configuration windows Local Services panel </p>
+    <li>Click OK to close the Bluetooth Configuration window</li>
+    <li>Download the Application TRK or System TRK SISX file to the device</li>
+  </ol>
+</div>
+  <h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+  </ul>
+  <h5>Related references</h5>
+  <ul>
+    <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="trk_install_bluetooth.htm">Installing On-device Debug Agents using Bluetooth </a></li>
+  </ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_connection_usb.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -1,55 +1,55 @@
-<!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>USB Connectivity Setup</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>USB Connection Setup</h2>
-<p>On-device debugging  supports the use of USB to debug programs running on a target device. To enable communication with a USB device, a connection must be established between the PC and the device. Doing that requires one of the following USB connectivity cables to physically connect the PC to the device:</p>
-<ul>
-  <li>DKU-2</li>
-  <li>CA-53 </li>
-</ul>
-<div class="step">
-  <h4>Setting up a USB Connection for On-device Debugging </h4>
-  <ol>
-    <li>Install the latest USB connectivity software, for example, S60 devices use Nokia PC Suite</li>
-    <li>Connect the USB connectivity cable  to your PC and then the target device</li>
-    <li>For S60 devices, select PC-Suite from the USB Mode list when the target device is connected</li>
-    <li>Download the Application TRK or System TRK SISX file to the device</li>
-    <li>On the PC 
-    (optional)</li>
-  </ol>
-  <ol>
-    <ol type="a">
-      <li>Open the Window's Computer Management (Windows XP) </li>
-      <p>Right-click <b>My Computer</b> and select <b>Manage</b> from the context menu to open the <b>Computer Management</b> window. Select <b>System Tools &gt; Device Manager &gt; Ports (COM &amp; LPT)</b> to display all active ports. </p>
-      <li>Locate the S60 Phone USB (COMx) item in the list (Figure 2) </li>
-      <p align="center"><img src="../../reference/images/wnd_win_device_mgr.png" width="502" height="339" /></p>
-      <p class="figure">Figure 2. Device Manager showing Ports (COM &amp; LPT) section</p>
-      <li>The USB COM Port number should match the COM port used in the <a href="../../reference/launch_configs/page_connection.htm">Connections</a> tab of the TRK launch
-      configuration.</li>
-      <li>Close the Device Manager window</li>
-    </ol>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
-</ul>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="trk_install_usb.htm">Installing On-device Debug Agents using USB</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>USB Connectivity Setup</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>USB Connection Setup</h2>
+<p>On-device debugging  supports the use of USB to debug programs running on a target device. To enable communication with a USB device, a connection must be established between the PC and the device. Doing that requires one of the following USB connectivity cables to physically connect the PC to the device:</p>
+<ul>
+  <li>DKU-2</li>
+  <li>CA-53 </li>
+</ul>
+<div class="step">
+  <h4>Setting up a USB Connection for On-device Debugging </h4>
+  <ol>
+    <li>Install the latest USB connectivity software, for example, S60 devices use Nokia PC Suite</li>
+    <li>Connect the USB connectivity cable  to your PC and then the target device</li>
+    <li>For S60 devices, select PC-Suite from the USB Mode list when the target device is connected</li>
+    <li>Download the Application TRK or System TRK SISX file to the device</li>
+    <li>On the PC 
+    (optional)</li>
+  </ol>
+  <ol>
+    <ol type="a">
+      <li>Open the Windows Computer Management (Windows XP) </li>
+      <p>Right-click <b>My Computer</b> and select <b>Manage</b> from the context menu to open the <b>Computer Management</b> window. Select <b>System Tools &gt; Device Manager &gt; Ports (COM &amp; LPT)</b> to display all active ports. </p>
+      <li>Locate the S60 Phone USB (COMx) item in the list (Figure 2) </li>
+      <p align="center"><img src="../../reference/images/wnd_win_device_mgr.png" width="502" height="339" /></p>
+      <p class="figure">Figure 2. Device Manager showing Ports (COM &amp; LPT) section</p>
+      <li>The USB COM Port number should match the COM port used in the <a href="../../reference/launch_configs/page_connection.htm">Connections</a> tab of the TRK launch
+      configuration.</li>
+      <li>Close the Device Manager window</li>
+    </ol>
+  </ol>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/trk.htm">On-device Debugging </a></li>
+</ul>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../../reference/launch_configs/run_mode_overview.htm">Debug Window (On-device Debugging) Overview</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="trk_install_usb.htm">Installing On-device Debug Agents using USB</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/intro/whatsnew_IntroExt.xml	Mon Jul 06 14:59:19 2009 -0500
@@ -31,7 +31,7 @@
 		<group style-id="content-group" id="carbide-cpp">
        		<link 
        		label="Hover Help (2.0.4)" 
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm" 
+       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/com.nokia.carbide.cpp.sysdoc.hover/resources/help%20context/dl_hover/html/getting_started.html" 
        		id="carbide-link" 
        		style-id="content-link">
           	<text>See Symbian API Reference information appear when you hover over a Symbian symbol in C/C++ editors.</text>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Jul 06 14:59:19 2009 -0500
@@ -28,20 +28,35 @@
 	</topic>
 
 	<topic label="Carbide Menus " 					href="html/reference/menus/menus.htm" >
+		<topic label="ABLD Actions" 				href="html/reference/menus/abld.htm" />
 
-     	<topic href="html/reference/trk/wnd_on_device_setup.htm" label="On-Device Connection..."/>
+		<topic label="Build All Configurations" 	href="html/reference/menus/build_all_targets.htm" />
+		<topic label="Build PKG File" 				href="html/reference/menus/build_pkg_file.htm" />
+		<topic label="Build Symbian Component" 		href="html/reference/menus/build_symbian_comp.htm" />
+
+		<topic label="Clean Symbian Component" 		href="html/reference/menus/clean_symbian_comp.htm" />
+		<topic label="Compile" 						href="html/reference/menus/compile_source.htm" />
 		<topic label="Context menus" 				href="html/concepts/contextual_menus.htm" />
 
+		<topic label="Freeze Exports" 				href="html/reference/menus/freeze_exports.htm" />
+		<topic label="Freeze Symbian Component" 	href="html/reference/menus/freeze_symbian_comp.htm" />
+
+     	<topic label="On-Device Connections..."		href="html/reference/trk/wnd_on_device_setup.htm" />
 		<topic label="Open Command Window"			href="html/reference/menus/open_cmd_window.htm" />
+
+		<topic label="Preprocess" 					href="html/reference/menus/preprocess_source.htm" />
+
 		<topic label="Run CodeScanner"				href="html/reference/menus/run_codescanner.htm" />
 		<topic label="Run Leavescan"				href="html/reference/menus/run_leavescan.htm" />
+
 		<topic label="S60 UI Designer"				href="html/reference/menus/s60_ui_designer.htm" />
 		<topic label="Show in Explorer"				href="html/reference/menus/open_explorer_window.htm" />
-
 		<topic label="Symbian OS C++ Class"			href="html/tasks/projects/prj_adding_symbian_class.htm"  />
 		<topic label="Symbian OS C++ Project"		href="html/tasks/CreatingNewProjects.html" />
 		<topic label="Symbian OS MMP File"			href="html/reference/NewMMP_wizard.html" />
 
+		<topic label="Toggle HW Breakpoint"          href="html/reference/menus/hardware_breakpoints.htm" />
+
 		<topic label="Update Projects"          	href="html/reference/olderproject_updater.html" />
 
 	</topic>
@@ -124,6 +139,7 @@
 			<topic label="Adding/Removing Build Configurations"		href="html/tasks/projects/prj_new_build_config.htm" />
 	
 			<topic label="Preprocessing Files"						href="html/tasks/projects/prj_preprocess.htm" />
+			<topic label="Dependency Tracking"						href="html/concepts/dependency_tracking.htm" />
 
 			<topic label="Building Projects"						href="html/tasks/projects/prj_build.htm" />
 			<topic label="Cleaning Projects" 					    href="html/tasks/projects/prj_clean.htm" />
--- a/core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/META-INF/MANIFEST.MF	Mon Jul 06 14:59:19 2009 -0500
@@ -15,7 +15,8 @@
  com.nokia.carbide.cpp.epoc.engine,
  org.eclipse.update.core,
  com.nokia.carbide.templatewizard,
- org.eclipse.core.filesystem
+ org.eclipse.core.filesystem,
+ com.nokia.cpp.utils.ui;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp.internal.api.sdk,
  com.nokia.carbide.cpp.internal.sdk.core.model;x-friends:="com.nokia.carbide.cpp.sdk.core.test",
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Mon Jul 06 14:59:19 2009 -0500
@@ -21,6 +21,7 @@
 import com.nokia.carbide.cpp.epoc.engine.model.sbv.ISBVView;
 import com.nokia.carbide.cpp.epoc.engine.preprocessor.*;
 import com.nokia.carbide.cpp.internal.sdk.core.model.SymbianMissingSDKFactory;
+import com.nokia.carbide.cpp.internal.sdk.core.model.SymbianSDK;
 import com.nokia.carbide.cpp.sdk.core.*;
 import com.nokia.carbide.internal.api.cpp.epoc.engine.preprocessor.BasicIncludeFileLocator;
 import com.nokia.carbide.internal.api.cpp.epoc.engine.preprocessor.MacroScanner;
@@ -378,6 +379,17 @@
 				List<IDefine> macros = new ArrayList<IDefine>();
 				Map<String, IDefine> namedMacros = new HashMap<String, IDefine>();
 				File prefixFile = getSDK().getPrefixFile();
+				
+				if (prefixFile == null){
+					// Check that the prefix file may have become available since the SDK was scanned last.
+					// This can happen, for e.g., if the user opens the IDE _then_ does a subst on a drive that already has an SDK entry.
+					IPath prefixCheck = ((SymbianSDK)getSDK()).getPrefixFromVariantCfg();
+					if (prefixCheck != null){
+						prefixFile = prefixCheck.toFile();
+						getSDK().setPrefixFile(prefixCheck);
+					}
+				}
+				
 				if (prefixFile != null) {
 
 					// add any BSF/SBV includes so the headers are picked up from the correct location
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManager.java	Mon Jul 06 14:59:19 2009 -0500
@@ -14,6 +14,7 @@
 
 import java.io.*;
 import java.net.*;
+import java.text.MessageFormat;
 import java.util.*;
 
 import javax.xml.parsers.*;
@@ -25,6 +26,7 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.*;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osgi.service.datalocation.Location;
 import org.eclipse.swt.widgets.Shell;
@@ -41,8 +43,9 @@
 import com.nokia.carbide.cpp.internal.sdk.core.xml.DevicesLoader;
 import com.nokia.carbide.cpp.sdk.core.*;
 import com.nokia.carbide.cpp.sdk.core.ICarbideInstalledSDKChangeListener.SDKChangeEventType;
-import com.nokia.cpp.internal.api.utils.core.FileUtils;
+import com.nokia.cpp.internal.api.utils.core.*;
 import com.nokia.cpp.internal.api.utils.core.ListenerList;
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
 import com.sun.org.apache.xpath.internal.XPathAPI;
 
 public class SDKManager implements ISDKManager, ISDKManagerInternal {
@@ -50,11 +53,13 @@
 	private static List<ISymbianSDK> sdkList = new ArrayList<ISymbianSDK>();
 	private HashMap<String,ISymbianSDK> missingSdkMap = new HashMap<String,ISymbianSDK>();
 
-	public final String SYMBIAN_COMMON_REG_PATH="SOFTWARE\\Symbian\\EPOC SDKs\\";
-	public final String SYMBIAN_COMMON_PATH = "CommonPath";
+	private static final String SYMBIAN_COMMON_REG_PATH = "SOFTWARE\\Symbian\\EPOC SDKs\\";
+	private static final String SYMBIAN_COMMON_PATH = "CommonPath";
 	
-	public final String WINDOWS_SYSTEM_ROOT_REG = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\";
-	public final String WINDOWS_SYSTEM_ROOD_KEY = "SystemRoot";
+	private static final String WINDOWS_SYSTEM_ROOT_REG = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\";
+	private static final String WINDOWS_SYSTEM_ROOT_KEY = "SystemRoot";
+
+	private static final String EMPTY_DEVICES_XML_CONTENT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><devices version=\"1.0\"></devices>";
 	
 	private static final String CARBIDE_SDK_CACHE_FILE_NAME = "carbideSDKCache.xml";
 	private static final String SDK_CACHE_ID_ATTRIB = "id";
@@ -217,7 +222,7 @@
 	}
 
 	
-	public void updateSDK(ISymbianSDK sdk){
+	public void updateSDK(ISymbianSDK sdk) {
 		try {
 			File devicesFile = getDevicesXMLFile();
 			
@@ -225,23 +230,28 @@
 			DevicesLoader.updateDevice(sdk, devicesFile.toURL());
 			updateCarbideSDKCache();
 			
-		} catch (MalformedURLException e) {
-			e.printStackTrace();
-		} catch (URISyntaxException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
+		} catch (Exception e) { 
+			// must catch and rethrow as unchecked exception this 
+			// because no throws clause in API method
+			throw new RuntimeException(e);
 		}
 	}
 	
 	public void addSDK(ISymbianSDK sdk) {
 		synchronized(sdkList)
 		{
-			updateSDK(sdk);
-			sdkList.add(sdk);
-			SDKManagerInternalAPI.removeMissingSdk(sdk.getUniqueId());
-			// tell others about it
-			fireInstalledSdkChanged(SDKChangeEventType.eSDKAdded);
+			try {
+				updateSDK(sdk);
+				sdkList.add(sdk);
+				SDKManagerInternalAPI.removeMissingSdk(sdk.getUniqueId());
+				// tell others about it
+				fireInstalledSdkChanged(SDKChangeEventType.eSDKAdded);
+			}
+			catch (Exception e) {
+				logError("Could not add SDK", e);
+				String message = "Could not add this SDK. Your devices.xml file may be corrupt. If you remove the file from its current location and then rescan SDKs, Carbide will offer to create a new one.";
+				Logging.showErrorDialog(WorkbenchUtils.getSafeShell(), null, message, Logging.newSimpleStatus(1, e));
+			}
 		}
 	}
 	
@@ -323,41 +333,30 @@
 		return true;
 	}
 
-	/**
-	 * Read the devices.xml locaiton from the local machine registry.
-	 * @return String with full path to file if it exists. Empty string File (may be null) if file does not exist or regisry not read.
-	 */
-	private File getDevicesXMLFromRegistry(){
-		WindowsRegistry wr = WindowsRegistry.getRegistry();
-		String regPath = wr.getLocalMachineValue(SYMBIAN_COMMON_REG_PATH, SYMBIAN_COMMON_PATH);
-		boolean devicesFileExists = true;
+	// Read the devices.xml locaiton from the local machine registry.
+	// return IPath with absolute path to file if it exists or null if file does not exist or registry entry not found.
+	private IPath getDevicesXMLFromRegistry(){
+		String regValue = WindowsRegistry.getRegistry().getLocalMachineValue(SYMBIAN_COMMON_REG_PATH, SYMBIAN_COMMON_PATH);
+		IPath regPath = regValue != null ? new Path(regValue) : null;
 		
-		if (regPath == null || !new File(regPath).exists()){
+		if (regPath == null){
 			// No registry entry found...
-			String errMsg = "Could not read registry for local machine key: " +  SYMBIAN_COMMON_REG_PATH + " Cannot get devices.xml for installed SDKs.";
-			ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.getPluginId(), IStatus.ERROR, errMsg, null));
-			devicesFileExists = false;
+			String errMsg = MessageFormat.format(
+							"Could not read registry for local machine key: {0} Cannot get devices.xml for installed SDKs.",
+							SYMBIAN_COMMON_REG_PATH);
+			logError(errMsg, null);
+			return null;
+		}
+
+		// registry entry exists, check existence of file
+		regPath = regPath.append(DEVICES_FILE_NAME);
+		if (!regPath.toFile().exists()){
+			String errMsg = MessageFormat.format("Devices.xml does not exist at: {0}", regPath);
+			logError(errMsg, null);
+			return null;
 		}
 		
-		if (devicesFileExists){
-			// path exists, not try to check for fullpath + file
-			int len = regPath.length();
-			if (regPath.charAt(len-1) != '\\'){
-				regPath += "\\";
-			}
-			regPath += "devices.xml";
-			if (!new File(regPath).exists()){
-				String errMsg = "Devices.xml does not exist at: " + regPath;
-				ResourcesPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.getPluginId(), IStatus.ERROR, errMsg, null));
-				devicesFileExists = false;
-			}
-		}
-		
-		if (!devicesFileExists){
-			regPath = "";
-		}
-		
-		return new File(regPath);
+		return regPath;
 	}
 	
 	private void scanCarbideSDKCache(){
@@ -572,29 +571,19 @@
 	}
 
 	public File getDevicesXMLFile() {
-		File devicesFile = getDevicesXMLFromRegistry();
+		IPath devicesPath = getDevicesXMLFromRegistry();
 		
-		if (!devicesFile.exists()) {
-			// Not in registry, get the OS drive from the windows registry
-			WindowsRegistry wr = WindowsRegistry.getRegistry();
-			String regPath = "";
-			if (wr != null) {
-				regPath = wr.getLocalMachineValue(WINDOWS_SYSTEM_ROOT_REG,
-						WINDOWS_SYSTEM_ROOD_KEY);
-			}
-
-			String osDriveSpec;
-			if (regPath.length() > 2 && regPath.substring(1, 2).equals(":")) {
-				osDriveSpec = regPath.substring(0, 2);
-			} else {
-				osDriveSpec = DEFAULT_DEVICES_DRIVE_SPEC; // Just use the default drive spec, some problem reading the registry
-			}
-
-			devicesFile = new File(osDriveSpec + DEFAULT_DEVICES_XML_DIR
-					+ DEVICES_FILE_NAME);
+		if (devicesPath != null && devicesPath.toFile().exists()) {
+			return devicesPath.toFile();
 		}
 
-		return devicesFile;
+		// Not in registry, get the OS drive from the windows registry
+		String regValue = WindowsRegistry.getRegistry().getLocalMachineValue(WINDOWS_SYSTEM_ROOT_REG, WINDOWS_SYSTEM_ROOT_KEY);
+
+		String osDriveSpec = regValue != null ? new Path(regValue).getDevice() : DEFAULT_DEVICES_DRIVE_SPEC;
+
+		IPath deviceDirPath = new Path(osDriveSpec, DEFAULT_DEVICES_XML_DIR);
+		return deviceDirPath.append(DEVICES_FILE_NAME).toFile();
 	}
 	
 	public String getCSLArmToolchainInstallPathAndCheckReqTools() throws SDKEnvInfoFailureException{
@@ -712,7 +701,7 @@
 				}
 			}
 			catch (IOException e) {
-				// armcc isnt' in this directory, ignore....
+				// armcc isn't in this directory, ignore....
 			}
 		}
 				
@@ -729,50 +718,38 @@
 		
 	}
 	
-	private boolean checkDevicesXMLExistAndCreate(){
-		boolean fileCreated = false;
-		ISDKManager sdkMgr = SDKCorePlugin.getSDKManager();
-		if (sdkMgr == null){
-			return false; 
-		}
-		
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		Shell shell = null;
-		if (window != null) {
-			shell = window.getShell();
-		} else {
-			return false; 
-		}
-		
-		File devicesFile = sdkMgr.getDevicesXMLFile();
+	public boolean checkDevicesXMLExistAndCreate() {
+		Shell shell = WorkbenchUtils.getSafeShell();
+		File devicesFile = getDevicesXMLFile();
 		if (!devicesFile.exists()){
-			if (true == MessageDialog.openQuestion(shell, "Cannot find devices.xml.", "Cannot find devices.xml under:\n\n" + DEFAULT_DEVICES_XML_DIR + DEVICES_FILE_NAME + "\n or \nRegistry: HKEY_LOCAL_MACHINE\\SOFTWARE\\Symbian\\EPOC SDKs\\\n\nThis file is required for Carbide.c++ use.\n\nDo you want Carbide to create this file?\n\n")){
+			if (MessageDialog.openQuestion(shell, "Devices.xml Not Found", 
+					"Carbide.c++ requires a valid devices.xml file to manage SDKs.\n\nDo you want Carbide to create this file?")) {
 				try {
 					// First check to make sure the directory exists....
-					File devicesPath = new File(DEFAULT_DEVICES_XML_DIR);
-					if (!devicesPath.exists()){
-						devicesPath.mkdirs();
+					if (!devicesFile.getParentFile().exists()){
+						devicesFile.getParentFile().mkdirs();
 					}
 					
-					devicesFile = new File(DEFAULT_DEVICES_XML_DIR + DEVICES_FILE_NAME);
 					devicesFile.createNewFile();
+
 					FileWriter fw = new FileWriter(devicesFile);
-					fw.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?><devices version=\"1.0\"></devices>");
+					fw.write(EMPTY_DEVICES_XML_CONTENT);
 					fw.close();
-					fileCreated = true;
-					MessageDialog.openInformation(shell, "Devices.xml added", "Devices.xml was created successfully. Please add an SDK under the SDK Preferences page with the \"Add\" button before you attempt to create a project.");
-					
+
+					MessageDialog.openInformation(shell, "Devices.xml File Created", 
+							MessageFormat.format(
+								"{0} was created successfully. Please add an SDK under the SDK Preferences page with the \"Add\" button before you attempt to create a project.",
+								devicesFile.getAbsolutePath()));
+					return true;
 				} catch (IOException e){
-					MessageDialog.openError(shell, "Cannot create file.", "Could not create file: " + devicesFile.toString());
-					e.printStackTrace();
+					String message = "Could not create file: " + devicesFile.getAbsolutePath();
+					MessageDialog.openError(shell, "Cannot Create File", message);
+					logError(message, e);
 				}
-				
-			} else {
-				MessageDialog.openError(shell, "File not created.", "Devices.xml not created. You will be unable to create projects in Carbide.c++ until this file exists.");
 			}
 		}
 		
-		return fileCreated;
+		return false;
 	}
 	
 	protected void checkPerlInstallation(){
@@ -936,4 +913,8 @@
 			return true;
 		}
 	}
+	
+	private void logError(String message, Throwable t) {
+		SDKCorePlugin.getDefault().getLog().log(new Status(IStatus.ERROR, SDKCorePlugin.getPluginId(), message, t));		
+	}
 }
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SymbianSDK.java	Mon Jul 06 14:59:19 2009 -0500
@@ -1071,7 +1071,7 @@
 	 * Get the full path to the prefix file defined under \epoc32\tools\variant\variant.cfg
 	 * @return A path object, or null if the variant.cfg does not exist. This routine does not check to see if the returned path exists.
 	 */
-	protected IPath getPrefixFromVariantCfg(){
+	public IPath getPrefixFromVariantCfg(){
 		File epocRoot = new File(getEPOCROOT());
 		File variantCfg;
 		variantCfg = new File(epocRoot, SPP_VARIANT_CFG_FILE);
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISDKManager.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISDKManager.java	Mon Jul 06 14:59:19 2009 -0500
@@ -132,8 +132,10 @@
 	public List<BuildPlat> getPlatformList();
 	
 	/**
-	 * Get the full path to the devices.xml file. This scans first the windows registry under 'SOFTWARE\Symbian\EPOC SDKs\CommonPath'.
-	 * If  CommonPath is not defined then the system drive spec is used with the folder location at '\Program Files\Common Files\Symbian'.
+	 * Get the absolute path to the devices.xml file. 
+	 * This first scans the windows registry under 'SOFTWARE\Symbian\EPOC SDKs\CommonPath'.
+	 * If  CommonPath is not defined then the system drive spec is used with the folder location at:
+	 * '\Program Files\Common Files\Symbian'.
 	 * @return File object. Clients should check File.exists() to make sure the file exists on disk.
 	 */
 	public File getDevicesXMLFile();
--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java	Mon Jul 06 14:59:19 2009 -0500
@@ -33,6 +33,7 @@
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.*;
 
+import com.nokia.carbide.cpp.internal.sdk.core.model.SDKManager;
 import com.nokia.carbide.cpp.sdk.core.*;
 import com.nokia.carbide.cpp.sdk.ui.SDKUIPlugin;
 import com.nokia.carbide.cpp.sdk.ui.shared.AddSDKDialog;
@@ -100,7 +101,7 @@
 		GRAY = shell.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
 		
 		// check that devices.xml actually exists
-		checkDevicesXMLExist();
+		((SDKManager) sdkMgr).checkDevicesXMLExistAndCreate();
 		
 		Composite content = new Composite(parent, SWT.NONE);
 		setControl(content);
@@ -533,36 +534,4 @@
 	protected ISDKManager getSDKManager(){
 		return sdkMgr;
 	}
-	
-	private void checkDevicesXMLExist(){
-		if (sdkMgr == null){
-			return;
-		}
-		
-		File devicesFile = sdkMgr.getDevicesXMLFile();
-		if (!devicesFile.exists()){
-			if (true == MessageDialog.openQuestion(shell, "Cannot find devices.xml.", "Devices.xml is required for Carbide.c++ use. Do you want to create this file?\n\n" + ISDKManager.DEFAULT_DEVICES_XML_DIR + ISDKManager.DEVICES_FILE_NAME)){
-				try {
-					//First check to make sure the directory exists....
-					File devicesPath = new File(ISDKManager.DEFAULT_DEVICES_XML_DIR);
-					if (!devicesPath.exists()){
-						devicesPath.mkdirs();
-					}
-					
-					devicesFile = new File(ISDKManager.DEFAULT_DEVICES_XML_DIR + ISDKManager.DEVICES_FILE_NAME);
-					devicesFile.createNewFile();
-					FileWriter fw = new FileWriter(devicesFile);
-					fw.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?><devices version=\"1.0\"></devices>");
-					fw.close();
-				} catch (IOException e){
-					MessageDialog.openError(shell, "Cannot create file.", "Could not create file: " + devicesFile.toString());
-					e.printStackTrace();
-				}
-			} else {
-				MessageDialog.openError(shell, "File not created.", "File not created. You will be unable to create project in Carbide.c++.");
-			}
-			
-		}
-	}
-	
 }
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/setup.html	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp.sysdoc.hover/resources/help context/dl_hover/html/setup.html	Mon Jul 06 14:59:19 2009 -0500
@@ -45,11 +45,8 @@
 		  New versions of the Developer Library plug-in are published regularly.
 		  You can configure Hover Help to use a new version as follows: 
 		</p><ol> 
-		  <li>
- 
-			 
-				Obtain the latest Developer Library plug-in from the
-				<a href="http://symbianfoundation.org/">Symbian Foundation</a> website,
+		  <li> Obtain the latest Developer Library plug-in from the
+				Forum Nokia &gt; <a href="http://www.forum.nokia.com/Tools_Docs_and_Code/Documentation/Symbian_C++/">Symbian/C++ Documentation</a> website,
 				and copy the new plug-in into Carbide&#8217;s <code class="filename">plugins</code> directory. 
 			 
 		        <p class="note"><b>NOTE</b> If you experience problems connecting to the  site, verify that the connection settings are correct in the <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/reference/ref-net-preferences.htm">Network Connections</a> preference panel before trying again. This is especially important if  a proxy setting is required to connect to the internet.</p>
@@ -58,19 +55,16 @@
 		  <li>
  
 			 
-				Restart Carbide. 
-			  
-		  </li>
+				Restart Carbide.		  </li>
  
 	  	<li>
  
 			 
-				From the Window > Preferences > Carbide.c++ > Hover Help preferences panel, make sure the new added Developer Library 
-				is selected. If not, select it from the Developer Libraries drop-down box. 
-			  
-</li>
+				From the Window > Preferences > Carbide.c++ > Hover Help preferences panel, make sure the added Developer Library 
+				is selected. If not, select it from the Developer Libraries drop-down box.</li>
  		  
-		</ol></div>
+		</ol>
+</div>
 <div class="section">
 <a name="hover%2eactivate_HH%2e"></a><h2>Activating Hover Help</h2>
 <p>
--- a/core/com.nokia.carbide.cpp/html/online_banner.html	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp/html/online_banner.html	Mon Jul 06 14:59:19 2009 -0500
@@ -1,49 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<title>Carbide Online Help Center</title>
-     
-<style type="text/css">
-/* need this one for Mozilla */
-HTML { 
-	width:100%;
-	height:100%;
-	margin:0px;
-	padding:0px;
-	border:0px;
- }
-
-BODY {
-	background-color:#CCCCCC;
-	text:white;
-	height:60px;
-}
-
-TABLE {
-	margin:0;
-	border:0;
-	padding:0;
-	height:100%;
-}
-
-</style>
-
-
-</head>
-
-<body marginwidth="0" marginheight="0">
-
-	<table width="100%" cellspacing="0" cellpadding="8" border="0">
-		<tr>
-			<td align="left" valign="center"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon" title="Carbide icon">
-			</td>
-			<td align="right" valign="center"><B>Carbide Online Help Center v2.0</B>
-			</td>
-		</tr>
-	</table>
-
-</body>
-</html>
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+
+<title>Carbide Online Help Center</title>
+     
+<style type="text/css">
+/* need this one for Mozilla */
+HTML { 
+	width:100%;
+	height:100%;
+	margin:0px;
+	padding:0px;
+	border:0px;
+ }
+
+BODY {
+	background-color:#CCCCCC;
+	text:white;
+	height:60px;
+}
+
+TABLE {
+	margin:0;
+	border:0;
+	padding:0;
+	height:100%;
+}
+
+</style>
+
+
+</head>
+
+<body marginwidth="0" marginheight="0">
+
+	<table width="100%" cellspacing="0" cellpadding="8" border="0">
+		<tr>
+			<td align="left" valign="center" bgcolor="#FFC550"><img src="../intro/css/graphics/rootpage/brandmark.gif" alt="Carbide icon" title="Carbide icon">			</td>
+			<td align="right" valign="center" bgcolor="#FFC550"><B>Carbide Online Help Center v2.1</B></td>
+	  </tr>
+	</table>
+
+</body>
+</html>
+
--- a/core/com.nokia.carbide.cpp/html/welcome_note.htm	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp/html/welcome_note.htm	Mon Jul 06 14:59:19 2009 -0500
@@ -14,7 +14,6 @@
 <p>For any other questions, please don't hesitate to contact us.</p>
 <p> Thank you again for choosing Carbide.c++! We hope you like it. </p>
 <p>Carbide.c++ development team<br>
-  <a href="http://www.forum.nokia.com/carbide_cpp">www.forum.nokia.com/carbide_cpp</a> <br>
-  <a href="mailto:Sales.Carbide@Nokia.com">Sales.Carbide@Nokia.com</a></p>
+  <a href="http://www.forum.nokia.com/carbide_cpp">www.forum.nokia.com/carbide_cpp</a></p>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp/introDATA.xml	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp/introDATA.xml	Mon Jul 06 14:59:19 2009 -0500
@@ -50,10 +50,10 @@
       </group>
       <group path="page-content/top-left">
          <extension id="com.nokia.carbide.cpp.doc.user-whatsnew" importance="low"/>
+      </group>
+      <group path="page-content/top-right">
          <extension id="com.nokia.carbide.cpp.uidesigner.doc.user-whatsnew" importance="low"/>
          <extension id="com.nokia.carbide.cpp.pi.doc.user-whatsnew" importance="low"/>
-      </group>
-      <group path="page-content/top-right">
          <extension id="com.nokia.carbide.cpp.codescanner-whatsnew" importance="low"/>
          <extension id="com.nokia.s60tools.appdep.help-whatsnew" importance="low"/>
          <extension id="com.nokia.carbide.epocwindDisplay-whatsnew" importance="low"/>
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/obj48/new_obj.gif has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/icons/obj48/newhov_obj.gif has changed
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css	Mon Jul 06 14:59:19 2009 -0500
@@ -12,12 +12,12 @@
 /* 
  * Set up general fonts, sizes and colors 
  */
-body { font-family : Helvetica, sans-serif; }
+body { font-family : Verdana, Helvetica, sans-serif; }
 
 H1, H2, H3, H4, p, a { color : #0A94D6; }
 
 .intro-header H1 {
-	font-family: Helvetica, sans-serif;
+	font-family: Verdana, Helvetica, sans-serif;
 	font-size: 20px;
 	color: #0A94D6;
 }
@@ -25,7 +25,7 @@
 h2 {
 	font-size : 13pt;
 	font-weight : normal;
-	color : #333333;
+	color : #EEEEEE;
 }
 /* For regular div labels */
 H4 .div-label {
@@ -44,8 +44,8 @@
 /* For the main page content's title */
 #content-header H4 .div-label {
 	font-size : 14pt;
-	font-weight : normal;
-	color : #333333;
+	font-weight : bold;
+	color : #0A94D6;
 	float : none;
 	clear : both;
 }
@@ -75,7 +75,7 @@
 #navigation-links a .link-label {
 	font-size : 9pt;
 	font-weight : normal;
-	color : #00A1D0;
+	color : #0A94D6;
 }
 
 a .text {
@@ -357,7 +357,9 @@
 	vertical-align : middle;
 }	
 
+/* Controls link titles on welcome page */
 #page-content * a .link-label {
+	font-weight : bold;
 	display : block;
 	position : relative;
 	top : -50px;
@@ -367,6 +369,7 @@
 
 #page-content * a > .link-label { left: 65px; }
 
+/* Controls text description 0n welcome page */
 #page-content * a p .text {
 	display : block;
 	position : relative;
@@ -374,6 +377,7 @@
 	margin-bottom: -25px;
 	left : 53px;
 	margin-right: 53px;
+	color: #000;
 }
 
 #page-content * a p > .text { left: 58px; }
@@ -396,7 +400,7 @@
 	float : none;
 	clear : both;
 	text-align : left;
-	color: #0A94D6;
+	/* color: #000000; */
 	/* Carbide branding mod
 	margin-bottom : 0px;
 	/* background-image : url(../graphics/contentpage/page-link-wide.gif); */
--- a/core/com.nokia.cpp.utils.ui/src/com/nokia/cpp/internal/api/utils/ui/QueryWithTristatePrefDialog.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/core/com.nokia.cpp.utils.ui/src/com/nokia/cpp/internal/api/utils/ui/QueryWithTristatePrefDialog.java	Mon Jul 06 14:59:19 2009 -0500
@@ -111,7 +111,7 @@
 		boolean confirmed = false;
 		if (type == QUERY_YES_NO) {
 			dialog = MessageDialogWithToggle.openYesNoQuestion(
-				parentShell, title, prompt, null,
+				parentShell, title, prompt, "Don't ask to manage dependencies again.",
 				initialSetting, preferences, 
 				prefName);
 			confirmed = dialog.getReturnCode() == IDialogConstants.YES_ID;
--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/ISBVViewRunnable.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/ISBVViewRunnable.java	Mon Jul 06 14:59:19 2009 -0500
@@ -21,7 +21,7 @@
 import com.nokia.carbide.cpp.epoc.engine.model.sbv.ISBVView;
 
 /**
- * Instantiate this interface and pass to EpocEnginePlugin#runWithSBVView()
+ * Pass this interface to EpocEnginePlugin#runWithSBVView()
  * to encapsulate some of the bookkeeping of model/view handling. 
  *
  * @noimplement This interface is not intended to be implemented by clients.
--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/parser/ASTTokenManager.java	Mon Jul 06 14:53:12 2009 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/parser/ASTTokenManager.java	Mon Jul 06 14:59:19 2009 -0500
@@ -132,6 +132,8 @@
 			return -1;
 		case IToken.PUNC:
 			return -1;
+		case IToken.CHAR:
+			return -1;
 		case IToken.RAW:
 			if (iToken.getText().length() == 0)
 				return -1;
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/group/Icons_scalable_dc.mk	Mon Jul 06 14:53:12 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/group/Icons_scalable_dc.mk	Mon Jul 06 14:59:19 2009 -0500
@@ -25,7 +25,9 @@
 
 BLD : do_nothing
 
-CLEAN : do_nothing
+CLEAN :
+	@echo ...Deleting $(ICONTARGETFILENAME)
+	del /q /f $(ICONTARGETFILENAME)
 
 LIB : do_nothing
 
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/group/Icons_scalable_dc.mk	Mon Jul 06 14:53:12 2009 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/group/Icons_scalable_dc.mk	Mon Jul 06 14:59:19 2009 -0500
@@ -25,7 +25,9 @@
 
 BLD : do_nothing
 
-CLEAN : do_nothing
+CLEAN :
+	@echo ...Deleting $(ICONTARGETFILENAME)
+	del /q /f $(ICONTARGETFILENAME)
 
 LIB : do_nothing
 
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/group/Icons_aif_scalable_dc.mk	Mon Jul 06 14:53:12 2009 -0500
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/Series 60 v3.0 EXE/group/Icons_aif_scalable_dc.mk	Mon Jul 06 14:59:19 2009 -0500
@@ -32,7 +32,9 @@
 
 BLD : do_nothing
 
-CLEAN : do_nothing
+CLEAN :
+	@echo ...Deleting $(ICONTARGETFILENAME)
+	del /q /f $(ICONTARGETFILENAME)
 
 LIB : do_nothing
 
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/group/icons_aif_scalable_dc.mk	Mon Jul 06 14:53:12 2009 -0500
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/Birthdays/group/icons_aif_scalable_dc.mk	Mon Jul 06 14:59:19 2009 -0500
@@ -32,7 +32,9 @@
 
 BLD : do_nothing
 
-CLEAN : do_nothing
+CLEAN :
+	@echo ...Deleting $(ICONTARGETFILENAME)
+	del /q /f $(ICONTARGETFILENAME)
 
 LIB : do_nothing
 
--- a/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/group/icons_aif_scalable_dc.mk	Mon Jul 06 14:53:12 2009 -0500
+++ b/uidesigner/com.nokia.sdt.series60.componentlibrary/templates/tutorials/YahooImageSearch/group/icons_aif_scalable_dc.mk	Mon Jul 06 14:59:19 2009 -0500
@@ -32,7 +32,9 @@
 
 BLD : do_nothing
 
-CLEAN : do_nothing
+CLEAN :
+	@echo ...Deleting $(ICONTARGETFILENAME)
+	del /q /f $(ICONTARGETFILENAME)
 
 LIB : do_nothing