merge RCL_2_4
authordadubrow
Fri, 16 Apr 2010 11:18:22 -0500
branchRCL_2_4
changeset 1227 a21830a6413e
parent 1226 2304d1963470 (current diff)
parent 1225 a546534a48de (diff)
child 1228 20d15d1ddbfe
merge
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_settings_pane.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm
core/com.nokia.carbide.cpp/plugin_customization.ini
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java	Fri Apr 16 11:18:22 2010 -0500
@@ -16,30 +16,78 @@
 */
 package com.nokia.carbide.cdt.builder;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
+
 import com.nokia.carbide.cdt.builder.builder.CarbideCPPBuilder;
-import com.nokia.carbide.cdt.builder.project.*;
-import com.nokia.carbide.cpp.epoc.engine.*;
-import com.nokia.carbide.cpp.epoc.engine.image.*;
-import com.nokia.carbide.cpp.epoc.engine.model.bldinf.*;
+import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
+import com.nokia.carbide.cdt.builder.project.ICarbideProjectInfo;
+import com.nokia.carbide.cdt.builder.project.ISISBuilderInfo;
+import com.nokia.carbide.cdt.internal.builder.CarbideBuildConfiguration;
+import com.nokia.carbide.cdt.internal.builder.ISBSv2BuildConfigInfo;
+import com.nokia.carbide.cpp.epoc.engine.BldInfDataRunnableAdapter;
+import com.nokia.carbide.cpp.epoc.engine.BldInfViewRunnableAdapter;
+import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
+import com.nokia.carbide.cpp.epoc.engine.ImageMakefileDataRunnableAdapter;
+import com.nokia.carbide.cpp.epoc.engine.MMPDataRunnableAdapter;
+import com.nokia.carbide.cpp.epoc.engine.MMPViewRunnableAdapter;
+import com.nokia.carbide.cpp.epoc.engine.PKGViewRunnableAdapter;
+import com.nokia.carbide.cpp.epoc.engine.image.IBitmapSource;
+import com.nokia.carbide.cpp.epoc.engine.image.IImageSource;
+import com.nokia.carbide.cpp.epoc.engine.image.IMultiImageSource;
+import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IBldInfData;
+import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IBldInfView;
+import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IExport;
 import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IExtension;
+import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IMMPReference;
+import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IMakMakeReference;
+import com.nokia.carbide.cpp.epoc.engine.model.bldinf.IMakefileReference;
 import com.nokia.carbide.cpp.epoc.engine.model.makefile.image.IImageMakefileData;
-import com.nokia.carbide.cpp.epoc.engine.model.mmp.*;
+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.IMMPAIFInfo;
+import com.nokia.carbide.cpp.epoc.engine.model.mmp.IMMPBitmap;
+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.IMMPView;
+import com.nokia.carbide.cpp.epoc.engine.model.mmp.IMMPViewConfiguration;
 import com.nokia.carbide.cpp.epoc.engine.preprocessor.AcceptedNodesViewFilter;
 import com.nokia.carbide.cpp.epoc.engine.preprocessor.AllNodesViewFilter;
+import com.nokia.carbide.cpp.internal.api.sdk.SBSv2Utils;
 import com.nokia.carbide.cpp.internal.api.sdk.SymbianBuildContext;
 import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
 import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
-import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.*;
-import com.nokia.cpp.internal.api.utils.core.*;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-
-import java.io.*;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.EPKGLanguage;
+import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.IPKGEmbeddedSISFile;
+import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.IPKGInstallFile;
+import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.IPKGView;
+import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.PKGModelHelper;
+import com.nokia.cpp.internal.api.utils.core.CommonPathFinder;
+import com.nokia.cpp.internal.api.utils.core.FileUtils;
+import com.nokia.cpp.internal.api.utils.core.Logging;
+import com.nokia.cpp.internal.api.utils.core.TextUtils;
 
 public class EpocEngineHelper {
 
@@ -815,6 +863,13 @@
 					}
 					
 					String releasePlatform = buildConfig.getSDK().getBSFCatalog().getReleasePlatform(buildConfig.getBasePlatformForVariation());
+					if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(buildConfig.getCarbideProject().getProject())){ 
+						// Test is this is an SBSv2 build binary variant (changes the output directory) 
+						ISBSv2BuildConfigInfo sbsv2Info = ((CarbideBuildConfiguration)buildConfig).getSBSv2BuildConfigInfo(); 
+						if ( sbsv2Info != null && SBSv2Utils.getVariantOutputDirModifier(sbsv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT)) != null && !releasePlatform.contains(".") ){ 
+							releasePlatform = releasePlatform + SBSv2Utils.getVariantOutputDirModifier(sbsv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT)); 
+						}
+					}
 					IPath path = buildConfig.getSDK().getReleaseRoot().append(releasePlatform).append(buildConfig.getTargetString());
 
 					// if targetpath is non-null and this is an EKA1 emulator config then add it
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/PKGViewPathHelper.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/PKGViewPathHelper.java	Fri Apr 16 11:18:22 2010 -0500
@@ -22,6 +22,9 @@
 
 import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
 import com.nokia.carbide.cdt.builder.project.ISISBuilderInfo;
+import com.nokia.carbide.cdt.internal.builder.CarbideBuildConfiguration;
+import com.nokia.carbide.cdt.internal.builder.ISBSv2BuildConfigInfo;
+import com.nokia.carbide.cpp.internal.api.sdk.SBSv2Utils;
 import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.IPKGView;
 import com.nokia.cpp.internal.api.utils.core.Check;
 
@@ -69,7 +72,14 @@
 		this.pkgFilePath = view.getModel().getPath();
 		this.buildConfig = buildConfig;
 		this.epocRoot = new Path(buildConfig.getSDK().getEPOCROOT());
-		this.platform = buildConfig.getPlatformString();
+		this.platform = buildConfig.getPlatformString();		
+		if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(buildConfig.getCarbideProject().getProject())){
+			// Test is this is an SBSv2 build binary variant (changes the output directory)
+			ISBSv2BuildConfigInfo sbsv2Info = ((CarbideBuildConfiguration)buildConfig).getSBSv2BuildConfigInfo();
+			if ( sbsv2Info != null && SBSv2Utils.getVariantOutputDirModifier(sbsv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT)) != null && !platform.contains(".") ){
+				this.platform = this.platform + SBSv2Utils.getVariantOutputDirModifier(sbsv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT));
+			}
+		} 
 		this.target = buildConfig.getTargetString();
 		this.mainDirectory = pkgFilePath.removeLastSegments(1);
 	}
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Fri Apr 16 11:18:22 2010 -0500
@@ -59,12 +59,13 @@
 import com.nokia.carbide.cdt.builder.project.IROMBuilderInfo;
 import com.nokia.carbide.cdt.builder.project.ISISBuilderInfo;
 import com.nokia.carbide.cdt.internal.api.builder.SISBuilderInfo2;
+import com.nokia.carbide.cdt.internal.builder.CarbideBuildConfiguration;
 import com.nokia.carbide.cdt.internal.builder.CarbideSBSv1Builder;
 import com.nokia.carbide.cdt.internal.builder.CarbideSBSv2Builder;
 import com.nokia.carbide.cdt.internal.builder.ICarbideBuilder;
+import com.nokia.carbide.cdt.internal.builder.ISBSv2BuildConfigInfo;
 import com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage;
 import com.nokia.carbide.cdt.internal.builder.ui.MMPSelectionDialog;
-import com.nokia.carbide.cdt.internal.builder.ui.Messages;
 import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
 import com.nokia.carbide.cpp.epoc.engine.MMPDataRunnableAdapter;
 import com.nokia.carbide.cpp.epoc.engine.PKGViewRunnableAdapter;
@@ -74,6 +75,7 @@
 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.preprocessor.AcceptedNodesViewFilter;
+import com.nokia.carbide.cpp.internal.api.sdk.SBSv2Utils;
 import com.nokia.carbide.cpp.internal.qt.core.QtCorePlugin;
 import com.nokia.carbide.cpp.internal.x86build.X86BuildPlugin;
 import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
@@ -1919,7 +1921,15 @@
     			pkgFileStr.contains(PKG_SYMBOL_TARGET) ) {
     				// need to create a new PKG file, resolved...
     				pkgFileStr = pkgFileStr.replace(PKG_SYMBOL_EPOCROOT, context.getSDK().getEPOCROOT());
-    				pkgFileStr = pkgFileStr.replace(PKG_SYMBOL_PLATFORM, context.getPlatformString());
+    				String platSubst = context.getPlatformString().toLowerCase(); 
+    				if (context instanceof CarbideBuildConfiguration){ 
+    					// Test is this is an SBSv2 build binary variant (changes the output directory)
+    					ISBSv2BuildConfigInfo sbsv2Info = ((CarbideBuildConfiguration)context).getSBSv2BuildConfigInfo(); 
+    					if (sbsv2Info != null && SBSv2Utils.getVariantOutputDirModifier(sbsv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT)) != null){ 
+    						platSubst = platSubst + SBSv2Utils.getVariantOutputDirModifier(sbsv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT)); 
+    					}
+    				}
+    				pkgFileStr = pkgFileStr.replace(PKG_SYMBOL_PLATFORM, platSubst); 
     				pkgFileStr = pkgFileStr.replace(PKG_SYMBOL_TARGET, context.getTargetString());
     				
     				IPath tmpPKGPath = pkgFile.removeLastSegments(1);
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/project/ICarbideProjectInfo.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/project/ICarbideProjectInfo.java	Fri Apr 16 11:18:22 2010 -0500
@@ -297,13 +297,4 @@
 	 * @since 2.2
 	 */
 	public String extraSBSv2Args();
-	
-	/**
-	 * Appends arbitrary text to a default Carbide/Raptor configuration (the -c parameter). The default name is always given, e.g. armv5_urel, but users can 
-	 * append whatever they want to change the behavior of the build. 
-	 * @return the string to append the text to for the Raptor -c parameter
-	 * 
-	 * @since 2.6
-	 */
-	public String buildConfigAppender();
 }
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildConfiguration.java	Fri Apr 16 11:18:22 2010 -0500
@@ -70,10 +70,6 @@
 	
 	// SBSv2 only config settings
 	protected final static String SBSV2_DATA_ID = "SBSV2_DATA_ID"; //$NON-NLS-1$
-	protected final static String ATRRIB_CONFIG_BASE_PLATFORM = "CONFIG_BASE_PLATFORM"; //$NON-NLS-1$
-	protected final static String ATTRIB_CONFIG_TARGET = "CONFIG_TARGET"; //$NON-NLS-1$
-	protected final static String ATTRIB_SBSV2_BUILD_ALIAS = "SBSV2_BUILD_ALIAS"; //$NON-NLS-1$
-	protected final static String ATTRIB_SBSV2_CONFIG_DISPLAY_STRING = "SBSV2_CONFIG_DISPLAY_STRING"; //$NON-NLS-1$
 
 	protected TrackedResource projectTracker;
 	protected List<ISISBuilderInfo> sisBuilderInfoList;
@@ -81,7 +77,8 @@
 	protected BuildArgumentsInfo buildArgumentsInfo;
 	protected BuildConfigurationData buildConfigData;
 	protected ROMBuilderInfo romBuilderInfo;
-
+	protected SBSv2BuilderInfo sbsv2BuilderInfo; 
+	
 	public CarbideBuildConfiguration(IProject project, ISymbianBuildContext context) {
 		super(context.getSDK(), context.getPlatformString(), context.getTargetString(), context.getSBSv2Alias());
 		projectTracker = new TrackedResource(project);
@@ -90,6 +87,9 @@
 		buildArgumentsInfo = new BuildArgumentsInfo(getSDK());
 		buildConfigData = new BuildConfigurationData(this);
 		romBuilderInfo = new ROMBuilderInfo(getSDK());
+		if (context.getSBSv2Alias() != null){ 
+			sbsv2BuilderInfo = new SBSv2BuilderInfo(context); 
+		}
 	}
 	
 	public void loadFromStorage(ICConfigurationDescription projDes) throws CoreException {
@@ -111,6 +111,8 @@
 					loadBuildArgsFromStorage(se);
 				} else if (se.getName().equals(ROM_BUILDER_DATA_ID)) {
 					romBuilderInfo.loadFromStorage(se);
+				} else if (se.getName().equals(SBSV2_DATA_ID)){ 
+					sbsv2BuilderInfo.loadFromStorage(se); 
 				}
 			}
 		} else {
@@ -133,17 +135,10 @@
 			romBuilderInfo.saveToStorage(rootStorage.createChild(ROM_BUILDER_DATA_ID));
 			
 			if (getSBSv2Alias() != null){
-				saveSBSv2DataToStorage(rootStorage.createChild(SBSV2_DATA_ID));
+				sbsv2BuilderInfo.saveToStorage(rootStorage.createChild(SBSV2_DATA_ID));
 			}
 		}
 	}
-	
-	private void saveSBSv2DataToStorage(ICStorageElement createChild) {
-		createChild.setAttribute(ATRRIB_CONFIG_BASE_PLATFORM, getPlatformString());
-		createChild.setAttribute(ATTRIB_CONFIG_TARGET, getTargetString());
-		createChild.setAttribute(ATTRIB_SBSV2_BUILD_ALIAS, getSBSv2Alias());
-		createChild.setAttribute(ATTRIB_SBSV2_CONFIG_DISPLAY_STRING, getDisplayString());
-	}
 
 	private void loadBuildArgsFromStorage(ICStorageElement rootStorage) {
 		String value = rootStorage.getAttribute(BuildArgumentsInfo.BLDMAKEBLDFILESARGSSTORAGE);
@@ -434,4 +429,12 @@
 		return false;
 	} 
 	
+	public ISBSv2BuildConfigInfo getSBSv2BuildConfigInfo(){ 
+		return sbsv2BuilderInfo; 
+	}
+	
+	public ISBSv2BuildConfigInfo getSBSv2ConfigInfo() { 
+		return sbsv2BuilderInfo; 
+	}
+	
 }
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildData.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideBuildData.java	Fri Apr 16 11:18:22 2010 -0500
@@ -24,6 +24,7 @@
 
 import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
 import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
+import com.nokia.carbide.cpp.internal.api.sdk.SBSv2Utils;
 
 /**
  * Part of the new CDT 4.0 project model requirements.  All this class
@@ -58,7 +59,14 @@
 
 	@Override
 	public ICOutputEntry[] getOutputDirectories() {
-		IPath outputPath = carbideBuildConfig.getSDK().getReleaseRoot().append(carbideBuildConfig.getPlatformString()).append(carbideBuildConfig.getTargetString());
+		String thePlatform = carbideBuildConfig.getPlatformString();
+		if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(carbideBuildConfig.getCarbideProject().getProject())){
+			ISBSv2BuildConfigInfo sbsv2Info = ((CarbideBuildConfiguration)carbideBuildConfig).getSBSv2BuildConfigInfo();
+			if ( sbsv2Info != null && SBSv2Utils.getVariantOutputDirModifier(sbsv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT)) != null ){
+				thePlatform = thePlatform + SBSv2Utils.getVariantOutputDirModifier(sbsv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT));
+			}
+		} 
+		IPath outputPath = carbideBuildConfig.getSDK().getReleaseRoot().append(thePlatform).append(carbideBuildConfig.getTargetString());
 		return new ICOutputEntry[]{new COutputEntry(outputPath, null, 0)};
 	}
 
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectInfo.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectInfo.java	Fri Apr 16 11:18:22 2010 -0500
@@ -61,7 +61,6 @@
 	protected boolean overrideMakeEngine;
 	protected String makeEngineToUse;
 	protected String extraSBSv2Args;
-	protected String buildAliasAppender;
 	
 	// for internal plugin use
 	public static final String OVERRIDE_WORKSPACE_SETTINGS_KEY = "overrideWorkspaceSettings"; //$NON-NLS-1$
@@ -80,7 +79,6 @@
 	public static final String OVERRIDE_MAKE_ENGINE = "overrideMakeEngine"; //$NON-NLS-1$
 	public static final String MAKE_ENGINE_TO_USE = "makeEngineToUse"; //$NON-NLS-1$
 	public static final String EXTRA_SBSV2_ARGS = "extraSBSv2Args"; //$NON-NLS-1$
-	public static final String BUILD_ALIAS_APPENDER = "buildAliasAppendText"; //$NON-NLS-1$
 	
 	public CarbideProjectInfo(IProject project) {
 		this.projectTracker = new TrackedResource(project);
@@ -230,11 +228,6 @@
 					if (orig != null){
 						extraSBSv2Args = orig;
 					}
-					orig = storage.getAttribute(BUILD_ALIAS_APPENDER);
-					if (orig != null){
-						buildAliasAppender = orig;
-					}
-					 
 				}
 			}
 		}
@@ -267,7 +260,6 @@
 		overrideMakeEngine = BuilderPreferencePage.overrideDefaultMakeEngine();
 		makeEngineToUse = BuilderPreferencePage.makeEngine();
 		extraSBSv2Args = BuilderPreferencePage.extraSBSv2ArgsTextStore();
-		buildAliasAppender = ""; // project setting only
 	}
 
 	public List<ICarbideBuildConfiguration> getBuildConfigurations() {
@@ -533,11 +525,6 @@
 		return BuilderPreferencePage.extraSBSv2ArgsTextStore();
 	}
 	
-	public String buildConfigAppender() {
-		// This is a project setting only, i.e. no workspace setting to override
-		return buildAliasAppender;
-	}
-	
 	/*
 	 * The following methods are non-API
 	 */
@@ -597,7 +584,4 @@
 		return extraSBSv2Args;
 	}
 	
-	public String buildAliasAppendTextValue() {
-		return buildAliasAppender;
-	}
 }
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectModifier.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectModifier.java	Fri Apr 16 11:18:22 2010 -0500
@@ -219,8 +219,6 @@
 						makeEngineToUse = settingValue;
 					} else if (settingName.equals(EXTRA_SBSV2_ARGS)) {
 						extraSBSv2Args = settingValue;
-					} else if (settingName.equals(BUILD_ALIAS_APPENDER)) {
-						buildAliasAppender = settingValue;
 					}
 					
 					// now write it to the file
@@ -310,7 +308,6 @@
 					storage.setAttribute(OVERRIDE_MAKE_ENGINE, overrideMakeEngine ? "true" : "false");
 					storage.setAttribute(MAKE_ENGINE_TO_USE, makeEngineToUse);
 					storage.setAttribute(EXTRA_SBSV2_ARGS, extraSBSv2Args);
-					storage.setAttribute(BUILD_ALIAS_APPENDER, buildAliasAppender);
 				}
 			}
 		} catch (CoreException e) {
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java	Fri Apr 16 11:18:22 2010 -0500
@@ -47,7 +47,6 @@
     
     private static final IPath SBS_BAT = new Path("sbs.bat"); //$NON-NLS-1$
     
-    
     public boolean buildAllComponents(ICarbideBuildConfiguration buildConfig, List<IPath> normalMakMakePaths, List<IPath> testMakMakePaths, CarbideCommandLauncher launcher, IProgressMonitor monitor) {
 		
 		SubMonitor progress = SubMonitor.convert(monitor, 3);
@@ -93,7 +92,15 @@
     
     /** Get the build-able configuration from the command line (i.e. build alias). This is passed after the sbs -c parameter */ 
     protected String getConfigName(ICarbideBuildConfiguration buildConfig) {
-    	return buildConfig.getSBSv2Alias(); 
+    	String buildAlias = buildConfig.getSBSv2Alias(); 
+    	ISBSv2BuildConfigInfo sbsv2Info = ((CarbideBuildConfiguration)buildConfig).getSBSv2BuildConfigInfo();
+    	if (sbsv2Info != null){ 
+    		String variant = sbsv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT);
+    		if (variant != null && variant.length() > 1){
+    			buildAlias = buildAlias + variant;
+    		}
+    	}
+    	return buildAlias;
     }
     
 	public boolean buildComponent(ICarbideBuildConfiguration buildConfig, IPath componentPath, boolean isTest, CarbideCommandLauncher launcher, IProgressMonitor monitor) {
@@ -512,10 +519,6 @@
 			configName = configName + ".test"; //$NON-NLS-1$
 		}
 		
-		if (cpi.buildConfigAppender() != null && cpi.buildConfigAppender().length() > 0){
-			configName = configName + cpi.buildConfigAppender();
-		}
-		
 		args.add(configName);
 		
 		//TODO this causes output to go to stdout, but only at the end of the build.  should we specify a logfile name and tail the file?
@@ -598,10 +601,6 @@
 				configName = "error_retrieving_build_alias";
 		}
 		
-		if (cpi.buildConfigAppender() != null && cpi.buildConfigAppender().length() > 0){
-			configName = configName + cpi.buildConfigAppender();
-		}
-		
 		String[] sbsArgs = new String[] {"--source-target=" + file.toOSString(), COMPILE_ARG, configName, COMPONENT_ARG, fullMMPPath.toFile().getName()};
 		launcher.setErrorParserManager(buildConfig.getCarbideProject().getINFWorkingDirectory(), buildConfig.getErrorParserList());
 		
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ISBSv2BuildConfigInfo.java	Fri Apr 16 11:18:22 2010 -0500
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2010 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;
+
+/**
+ * Interface to SBSv2 build configuration specific data
+ */
+public interface ISBSv2BuildConfigInfo {
+
+	// Data attribute id's saved in .cproject file
+	public final static String ATRRIB_CONFIG_BASE_PLATFORM = "CONFIG_BASE_PLATFORM"; //$NON-NLS-1$ 
+	public final static String ATTRIB_CONFIG_TARGET = "CONFIG_TARGET"; //$NON-NLS-1$ 
+	public final static String ATTRIB_SBSV2_BUILD_ALIAS = "SBSV2_BUILD_ALIAS"; //$NON-NLS-1$ 
+	public final static String ATTRIB_SBSV2_CONFIG_DISPLAY_STRING = "SBSV2_CONFIG_DISPLAY_STRING"; //$NON-NLS-1$ 
+	public final static String ATTRIB_SBSV2_VARIANT = "ATTRIB_SBSV2_VARIANT";
+	
+	/** Retrieve a specfic .cproject SBSv2 data value from a given ID */
+	String getSBSv2Setting(String id);
+	
+	/** 
+	 * Set a specific SBSv2 configuration specific data value
+	 * @param id
+	 * @param value
+	 */
+	void setSBSv2Setting(String id, String value);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/SBSv2BuilderInfo.java	Fri Apr 16 11:18:22 2010 -0500
@@ -0,0 +1,109 @@
+/*
+* Copyright (c) 2010 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;
+
+import java.util.HashMap;
+
+import org.eclipse.cdt.core.settings.model.ICStorageElement;
+
+import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
+
+public class SBSv2BuilderInfo implements ISBSv2BuildConfigInfo {
+
+	HashMap<String, String> sbsv2ConfigDataMap = new HashMap<String, String>();
+	
+//	private static String TRUE  = "true";
+//	private static String FALSE = "false";
+	
+	ISymbianBuildContext context;
+	
+	public SBSv2BuilderInfo(ISymbianBuildContext context) {
+		sbsv2ConfigDataMap.put(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_BUILD_ALIAS, context.getSBSv2Alias());
+		sbsv2ConfigDataMap.put(ISBSv2BuildConfigInfo.ATRRIB_CONFIG_BASE_PLATFORM, context.getBasePlatformForVariation());
+		sbsv2ConfigDataMap.put(ISBSv2BuildConfigInfo.ATTRIB_CONFIG_TARGET, context.getTargetString());
+		sbsv2ConfigDataMap.put(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_CONFIG_DISPLAY_STRING, context.getDisplayString());
+		sbsv2ConfigDataMap.put(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT, "");
+		this.context = context;
+	}
+	
+	public void loadFromStorage(ICStorageElement rootStorage) {
+			
+		String value = rootStorage.getAttribute(ATRRIB_CONFIG_BASE_PLATFORM);
+		if (value != null) {
+			sbsv2ConfigDataMap.put(ATRRIB_CONFIG_BASE_PLATFORM, value);
+		}
+		
+		value = rootStorage.getAttribute(ATTRIB_SBSV2_VARIANT);
+		if (value != null) {
+			sbsv2ConfigDataMap.put(ATTRIB_SBSV2_VARIANT, value);
+		}
+		
+		value = rootStorage.getAttribute(ATTRIB_CONFIG_TARGET);
+		if (value != null) {
+			sbsv2ConfigDataMap.put(ATTRIB_CONFIG_TARGET, value);
+		}
+		
+		value = rootStorage.getAttribute(ATTRIB_SBSV2_BUILD_ALIAS);
+		if (value != null) {
+			sbsv2ConfigDataMap.put(ATTRIB_SBSV2_BUILD_ALIAS, value);
+		}
+		
+		value = rootStorage.getAttribute(ATTRIB_SBSV2_CONFIG_DISPLAY_STRING);
+		if (value != null) {
+			sbsv2ConfigDataMap.put(ATTRIB_SBSV2_CONFIG_DISPLAY_STRING, value);
+		}
+		
+	}
+	
+	public void saveToStorage(ICStorageElement rootStorage) {
+		
+		String value = sbsv2ConfigDataMap.get(ATRRIB_CONFIG_BASE_PLATFORM);
+		if (value != null && value.trim().length() > 0){
+			rootStorage.setAttribute(ATRRIB_CONFIG_BASE_PLATFORM, value);
+		}
+		
+		value = sbsv2ConfigDataMap.get(ATTRIB_SBSV2_VARIANT);
+		if (value != null && value.trim().length() > 0){
+			rootStorage.setAttribute(ATTRIB_SBSV2_VARIANT, value);
+		}
+		
+		value = sbsv2ConfigDataMap.get(ATTRIB_CONFIG_TARGET);
+		if (value != null && value.trim().length() > 0){
+			rootStorage.setAttribute(ATTRIB_CONFIG_TARGET, value);
+		}
+		
+		value = sbsv2ConfigDataMap.get(ATTRIB_SBSV2_BUILD_ALIAS);
+		if (value != null && value.trim().length() > 0){
+			rootStorage.setAttribute(ATTRIB_SBSV2_BUILD_ALIAS, value);
+		}
+		
+		value = sbsv2ConfigDataMap.get(ATTRIB_SBSV2_CONFIG_DISPLAY_STRING);
+		if (value != null && value.trim().length() > 0){
+			rootStorage.setAttribute(ATTRIB_SBSV2_CONFIG_DISPLAY_STRING, value);
+		}
+
+	}
+
+	public String getSBSv2Setting(String id) {
+		return sbsv2ConfigDataMap.get(id);
+	}
+
+	public void setSBSv2Setting(String id, String value) {
+		sbsv2ConfigDataMap.put(id, value);
+	}
+
+}
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java	Fri Apr 16 11:18:22 2010 -0500
@@ -65,9 +65,7 @@
 	private Text makeEngineText;
 	private Label extraArgsLabel;
 	private Text  extraArgsText;
-	private Label buildAliasLabel;     // project setting only
-	private Text  buildAliasText; // project setting only
-	
+
 	public BuildSettingsUI(Shell shell, boolean wantsSBSv2, boolean projectSetting) {
 		this.shell = shell;
 		this.wantsSBSv2 = wantsSBSv2;
@@ -258,17 +256,6 @@
 		extraArgsText.setToolTipText(Messages.getString("BuildSettingsUI.ExtraArgsToolTipText")); //$NON-NLS-1$
 		extraArgsText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		
-		if (projectSetting){
-			buildAliasLabel = new Label(content, SWT.NONE);
-			buildAliasLabel.setText(Messages.getString("BuildSettingsUI.AlliasAppendLabel")); //$NON-NLS-1$
-			buildAliasLabel.setToolTipText(Messages.getString("BuildSettingsUI.AlliasAppendToolTipText"));  //$NON-NLS-1$
-			GridData buildAliasGridData = new GridData();
-			buildAliasLabel.setLayoutData(buildAliasGridData);
-			
-			buildAliasText = new Text(content, SWT.BORDER);
-			buildAliasText.setToolTipText(Messages.getString("BuildSettingsUI.AlliasAppendToolTipText")); //$NON-NLS-1$
-			buildAliasText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		}
 		overrideDefaultMakeEngineCheck = new Button(content, SWT.CHECK);
 		overrideDefaultMakeEngineCheck.setText(Messages.getString("BuildSettingsUI.OverrideMakeEngineLabel")); //$NON-NLS-1$
 		overrideDefaultMakeEngineCheck.setToolTipText(Messages.getString("BuildSettingsUI.OverrideMakeEngineToolTip")); //$NON-NLS-1$
@@ -470,14 +457,6 @@
 		extraArgsText.setText(args);
 	}
 	
-	public String getBuildAliasAppendText() {
-		return buildAliasText.getText();
-	}
-
-	public void setBuildAliasAppendText(String args) {
-		buildAliasText.setText(args);
-	}
-	
 	public boolean getDontPromtTrackDeps(){
 		if (!projectSetting){
 			return dontCheckForExternalDependencies.getSelection();
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideBuildConfigurationsPage.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideBuildConfigurationsPage.java	Fri Apr 16 11:18:22 2010 -0500
@@ -154,6 +154,9 @@
 	// rom builder tab
 	ROMBuilderTabComposite romBuilderTabComposite;
 	
+	// SBSv2 config data tab
+	SBSv2BuildConfigTabComposite sbsv2BuildConfigTabComposite;
+	
 	// Configuration management/switching
 	private IProject project;
 	private BuildConfigCombo buildConfigurationCombo;
@@ -224,6 +227,20 @@
 		data.verticalIndent = 18;
 		control.setLayoutData(data);
 
+		//////////////////// SBSv2 Config Data Tab /////////////
+		if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(project)) {
+			
+			TabItem sbsV2TabItem = new TabItem(tabFolder, SWT.NONE);
+			sbsV2TabItem.setText(Messages.getString("CarbideBuildConfigurationsPage.SBSv2_Tab")); //$NON-NLS-1$
+			sbsV2TabItem.setToolTipText(Messages.getString("CarbideBuildConfigurationsPage.Environement_Tab_ToolTip")); //$NON-NLS-1$
+			
+			sbsv2BuildConfigTabComposite = new SBSv2BuildConfigTabComposite(sbsV2TabItem);
+			sbsv2BuildConfigTabComposite.createControls();
+			sbsV2TabItem.setControl(sbsv2BuildConfigTabComposite);
+		}
+		////////////////////////////////////////////////////////
+		
+		
 		////////////////////// Environment Tab ////////////////
 		TabItem envTabItem = new TabItem(tabFolder, SWT.NONE);
 		envTabItem.setText(Messages.getString("CarbideBuildConfigurationsPage.Environment_Tab")); //$NON-NLS-1$
@@ -364,6 +381,9 @@
 				ICarbideBuildConfiguration config = cpi.getDefaultConfiguration();
 				if (config != null) {
 					sisFilesBlock.initData(config);
+					if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(project)) {
+						sbsv2BuildConfigTabComposite.initData(config);
+					}
 					if (argumentsTabcomposite != null) {
 						argumentsTabcomposite.initData(config);
 					}
@@ -638,7 +658,9 @@
 		
 		// Compare each of the settings to see if they are the same
 		boolean sisSettingsEqual = sisFilesBlock.compareConfigurationSettings(selectedConfig, writeToConfig);
-
+		
+		boolean sbsv2ConfigEqual = sbsv2BuildConfigTabComposite.compareConfigurationSettings(selectedConfig, writeToConfig);
+		
 		// Compare envVars settings
 		boolean envVarsSettingsEqual = envVarList.size() == envVarListOrig.size() && envVarList.equals(envVarListOrig);
 		if (!envVarsSettingsEqual && writeToConfig) {
@@ -654,7 +676,7 @@
 
 		boolean romBuilderSettingsEqual = romBuilderTabComposite.compareConfigurationSettings(selectedConfig, writeToConfig);
 
-		return sisSettingsEqual && envVarsSettingsEqual && argsSettingsEqual && pathsAndSynmbolsSettingsEqual && romBuilderSettingsEqual;
+		return sisSettingsEqual && sbsv2ConfigEqual && envVarsSettingsEqual && argsSettingsEqual && pathsAndSynmbolsSettingsEqual && romBuilderSettingsEqual;
 	}
 	
 	private void saveConfigurationSettings(ICarbideBuildConfiguration config) {
@@ -957,6 +979,9 @@
 		ICarbideBuildConfiguration lastConfig = cpi.getNamedConfiguration(lastSelectedConfigName);
 		if (lastConfig != null) {
 			sisFilesBlock.initData(lastConfig);
+			if (CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(project)) {
+				sbsv2BuildConfigTabComposite.initData(lastConfig);
+			}
 			setUpEnvVarsTable(new String[0], null); // refresh env vars info
 			if (argumentsTabcomposite != null) {
 				argumentsTabcomposite.initData(lastConfig);
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideCPPProjectSettingsPage.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/CarbideCPPProjectSettingsPage.java	Fri Apr 16 11:18:22 2010 -0500
@@ -272,9 +272,7 @@
 
 				cpi.writeProjectSetting(CarbideProjectInfo.MAKE_ENGINE_TO_USE, buildSettingsUI.getMakeEngine());
 				
-				cpi.writeProjectSetting(CarbideProjectInfo.EXTRA_SBSV2_ARGS, buildSettingsUI.getExtraSBSv2Args());
-				
-				cpi.writeProjectSetting(CarbideProjectInfo.BUILD_ALIAS_APPENDER, buildSettingsUI.getBuildAliasAppendText());
+				cpi.writeProjectSetting(CarbideProjectInfo.EXTRA_SBSV2_ARGS, buildSettingsUI.getExtraSBSv2Args());				
 			}
 
 			List<String> checkedComponents = getCheckedComponentFilenames();
@@ -330,7 +328,6 @@
         		buildSettingsUI.setOverrideDefaultMakeEngine(cpi.overrideMakeEngineProjectValue());
         		buildSettingsUI.setMakeEngineText(cpi.makeEngineProjectValue());
         		buildSettingsUI.setExtraSBSv2Args(cpi.extraSBSv2ArgsProjectValue());
-        		buildSettingsUI.setBuildAliasAppendText(cpi.buildAliasAppendTextValue());
     		}
     		
     		initMMPSelectionUI(cpi);
--- /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/SBSv2BuildConfigTabComposite.java	Fri Apr 16 11:18:22 2010 -0500
@@ -0,0 +1,134 @@
+/*
+* Copyright (c) 2010 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 java.io.File;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.Text;
+
+import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
+import com.nokia.carbide.cdt.internal.builder.CarbideBuildConfiguration;
+import com.nokia.carbide.cdt.internal.builder.ISBSv2BuildConfigInfo;
+import com.nokia.carbide.cpp.internal.api.sdk.SBSv2Utils;
+import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
+
+public class SBSv2BuildConfigTabComposite extends Composite {
+	
+	private static final String configCmdLabelPrefixText = "Configuration Command: -c "; // $NON-NLS-N$
+	private static final String releaseTreeLabelPrefixText = "Release Tree: "; // $NON-NLS-N$
+	
+	Text variantEdit;
+	
+	Label configCmdLabel;
+	Label releaseTreeLabel;
+	private ICarbideBuildConfiguration config;
+	
+	public SBSv2BuildConfigTabComposite(TabItem tabItem) {
+		super(tabItem.getParent(), SWT.NONE);
+	}
+
+	public void createControls() {
+		setLayout(new GridLayout(2, false));
+
+		Label variantLabel = new Label(this, SWT.NONE);
+		variantLabel.setText(Messages.getString("CarbideSBSv2ConfigTab.VariantLabel")); //$NON-NLS-1$
+		variantLabel.setToolTipText(Messages.getString("CarbideSBSv2ConfigTab.VariantLabel_ToolTip")); //$NON-NLS-1$
+
+		variantEdit = new Text(this, SWT.BORDER);
+		variantEdit.setToolTipText(Messages.getString("CarbideSBSv2ConfigTab.VariantLabel_ToolTip")); //$NON-NLS-1$
+		variantEdit.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		SelectionListener listener;
+		variantEdit.addKeyListener( new KeyListener() {
+			
+			public void keyReleased(KeyEvent e) {
+				setVaraintDetailsText();
+			}
+			
+			public void keyPressed(KeyEvent e) {
+				// ignore
+			}
+		});
+		
+		Group emulatorBuildOptionsGroup;
+		emulatorBuildOptionsGroup = new Group(this, SWT.NONE);
+		emulatorBuildOptionsGroup.setLayout(new GridLayout(1, false));
+		GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1);
+		emulatorBuildOptionsGroup.setLayoutData(gd);
+		emulatorBuildOptionsGroup.setText("Build Variant Details"); //$NON-NLS-1$
+
+		configCmdLabel = new Label(emulatorBuildOptionsGroup, SWT.CHECK);
+		configCmdLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		releaseTreeLabel = new Label(emulatorBuildOptionsGroup, SWT.CHECK);
+		releaseTreeLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+	}
+	
+	public void initData(ICarbideBuildConfiguration buildConfig) {
+		this.config = buildConfig;
+		ISBSv2BuildConfigInfo sbsv2ConfigInfo = ((CarbideBuildConfiguration)buildConfig).getSBSv2ConfigInfo();
+		if (sbsv2ConfigInfo.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT) != null){
+			variantEdit.setText(sbsv2ConfigInfo.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT));
+		}
+		
+		setVaraintDetailsText();
+	}
+	
+	private void setVaraintDetailsText() {
+		
+		String configCmdText = configCmdLabelPrefixText;
+		if (config != null){
+			configCmdText += config.getSBSv2Alias() + variantEdit.getText();
+		}
+		configCmdLabel.setText(configCmdText);
+
+		String variantText = SBSv2Utils.getVariantOutputDirModifier(variantEdit.getText());
+		if (variantText == null) variantText = "";	
+		String relTreeText = releaseTreeLabelPrefixText;
+		if (config != null){
+			relTreeText += " " + config.getSDK().getEPOCROOT() + "epoc32" + File.separator + "release" + File.separator + config.getPlatformString().toLowerCase() + variantText + File.separator + config.getTargetString().toLowerCase();
+		}
+		releaseTreeLabel.setText(relTreeText);
+	}
+
+	
+
+	public boolean compareConfigurationSettings(ICarbideBuildConfiguration selectedConfig, boolean writeToConfig) {
+		boolean settingsEqual = true;
+		
+		ISBSv2BuildConfigInfo currSBSv2Info = ((CarbideBuildConfiguration)selectedConfig).getSBSv2ConfigInfo();
+		settingsEqual = currSBSv2Info.getSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT).equals(variantEdit.getText());
+		
+		if (!settingsEqual && writeToConfig) {
+			currSBSv2Info.setSBSv2Setting(ISBSv2BuildConfigInfo.ATTRIB_SBSV2_VARIANT, variantEdit.getText());
+		}
+		
+		return settingsEqual;
+	}
+	
+	public void performDefaults(ISymbianSDK sdk) {
+		variantEdit.setText("");
+	}
+}
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/messages.properties	Fri Apr 16 11:16:33 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/messages.properties	Fri Apr 16 11:18:22 2010 -0500
@@ -36,6 +36,12 @@
 CarbideBuildConfigurationsPage.Browse_Key_ToolTip=Look for the key in the file system.
 CarbideBuildConfigurationsPage.Additional_Options=Additional Options:
 CarbideBuildConfigurationsPage.Additional_Options_ToolTip=Any other command-line options you want to pass to signsis.
+
+CarbideBuildConfigurationsPage.SBSv2_Tab=SBSv2
+CarbideBuildConfigurationsPage.SBSv2_Tab_ToolTip=SBSv2 Build Configuration Specific Information
+CarbideSBSv2ConfigTab.VariantLabel=Apply variant to build configuration
+CarbideSBSv2ConfigTab.VariantLabel_ToolTip=Appends the text box value to the -c argument to construct a variant build configuration.
+
 CarbideBuildConfigurationsPage.Environment_Tab=Environment
 CarbideBuildConfigurationsPage.Environement_Tab_ToolTip=This tab controls how the Windows environment is set up for each build process invoked.
 CarbideBuildConfigurationsPage.Env_Vars_Group=Environment Variabes (Bold items override the default value)
@@ -98,8 +104,6 @@
 BuildSettingsUI.ExtraArgsLabelToolTip=Pass additional arguments to the sbs command-line.
 BuildSettingsUI.ExtraArgsText=Additional SBSv2 arguments
 BuildSettingsUI.ExtraArgsToolTipText=Add any extra arguments to be passed to sbs.bat here.
-BuildSettingsUI.AlliasAppendLabel=Append to Build Configuration
-BuildSettingsUI.AlliasAppendToolTipText=Appends the text to the default -c SBS parameter exactly as entered in the edit box.
 BuildSettingsUI.KeepGoingLabel=Keep going
 BuildSettingsUI.KeepGoingToolTip=Continue building, even if some build commands fail
 BuildSettingsUI.MakeEngineLabel=Make engine
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/AIFDefWizard.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/AIFDefWizard.html	Fri Apr 16 11:18:22 2010 -0500
@@ -64,7 +64,7 @@
          <li><a href="../reference/AIFEditor.html">AIF Editor</a></li>
          <li><a href="../reference/MMP_Editor.html">MMP Editor</a></li>
 	   </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
    </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/Introduction.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/Introduction.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,51 +1,51 @@
-<!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" />
-<title>Introduction in Getting Started</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body>
-<h2>Getting Started</h2>
-	 <p>
-		The Symbian OS plug-ins for the Eclipse environment help provide support
-		for developers to create and build C++ programs that run on Symbian OS. 
-	 </p> 
-	 <p>
-		The plug-ins provide the following support to Symbian OS developers: 
-	 </p> 
- 
-	 <ul> 
-		<li> 
-		  <p>
-			 <b>Project Support</b>: developers can create new Symbian OS
-			 projects  based on provided templates. Projects can also be
-			 <a href="../tasks/ImportingProjects.html">imported</a> from the traditional <span class="ProgramOutput">bld.inf</span>  file formats. 
-		  </p> 
-		</li> 
-		<li> 
-		  <p>
-			 <b>Build Support</b>: The Symbian OS plug-ins eliminate the
-			 need to use command line build tools to ease Symbian OS development.
-			 Programs can be built and run from within the IDE. The developer can
-			 also choose to build the binary automatically while saving the project. 
-		  </p> 
-		</li> 
-		<li> 
-		  <p>
-			 <b>SDK Support</b>: users of the Carbide.c++  IDE can use a predefined series of <a href="../sos_references.htm">supported SDKs</a>. Developers can choose which of their
-		  installed SDKs to work with for a particular project. </p> 
-		</li> 
-	 </ul>
-
-	 <p>
-		Documentation is available in the <b>C/C++ Development Toolkit User Guide</b> (CDT) for the  Symbian OS plug-ins that work with the C/C++ Development Toolkit (CDT). Programming for Symbian OS based platforms is described in the
-		documentation supplied with the development kit that you use. Please consult
-		that documentation for further information on Symbian OS concepts and
-		development processes.</p>
-     <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" />
+<title>Introduction in Getting Started</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body>
+<h2>Getting Started</h2>
+	 <p>
+		The Symbian OS plug-ins for the Eclipse environment help provide support
+		for developers to create and build C++ programs that run on Symbian OS. 
+	 </p> 
+	 <p>
+		The plug-ins provide the following support to Symbian OS developers: 
+	 </p> 
+ 
+	 <ul> 
+		<li> 
+		  <p>
+			 <b>Project Support</b>: developers can create new Symbian OS
+			 projects  based on provided templates. Projects can also be
+			 <a href="../tasks/ImportingProjects.html">imported</a> from the traditional <span class="ProgramOutput">bld.inf</span>  file formats. 
+		  </p> 
+		</li> 
+		<li> 
+		  <p>
+			 <b>Build Support</b>: The Symbian OS plug-ins eliminate the
+			 need to use command line build tools to ease Symbian OS development.
+			 Programs can be built and run from within the IDE. The developer can
+			 also choose to build the binary automatically while saving the project. 
+		  </p> 
+		</li> 
+		<li> 
+		  <p>
+			 <b>SDK Support</b>: users of the Carbide.c++  IDE can use a predefined series of <a href="../sos_references.htm">supported SDKs</a>. Developers can choose which of their
+		  installed SDKs to work with for a particular project. </p> 
+		</li> 
+	 </ul>
+
+	 <p>
+		Documentation is available in the <b>C/C++ Development Toolkit User Guide</b> (CDT) for the  Symbian OS plug-ins that work with the C/C++ Development Toolkit (CDT). Programming for Symbian OS based platforms is described in the
+		documentation supplied with the development kit that you use. Please consult
+		that documentation for further information on Symbian OS concepts and
+		development processes.</p>
+     <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/MBMDefWizard.html	Fri Apr 16 11:18:22 2010 -0500
@@ -59,7 +59,7 @@
 	 <ul>
        <li><a href="../reference/MBMEditor.html">MBM Editor</a></li>
    </ul>
-	 <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+	 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
    </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/Modify.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/Modify.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,49 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Modify in Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-   </head>
-   <body>
-   <div class="Head1">
-<h2>Modify</h2>
-</div><div class="Bodytext"> 
-  
-
-  <p>
-	 This section explains the changes that can be done to an existing project
-	 and the tools provided to make those changes. Once you have created a new
-	 project or imported an existing project, you can make changes to that project.
-	 The tools provided to support this task are specific to Symbian OS development
-	 and are there to support the Symbian OS developers using the Eclipse IDE. 
-  </p>
-  <p>
-	 The tools that are available to support modification of existing project
-	 are: 
-  </p>
-  <ul>
-<li><a href="MBMDefWizard.html">MBM Definition Wizard</a></li>
-<li><a href="AIFDefWizard.html">AIF Definition Wizard</a></li>
- </ul>
-
-
-
-   </div>
-   <h5>Related  concepts</h5>
-
-   <ul>
-     <li><a href="Projects.html">Projects</a></li>
-   </ul>
-   <h5>Related tasks</h5>
-   <ul>
-     <li><a href="../tasks/CreatingNewProjects.html">Creating Projects </a></li>
-   </ul>
-   <h5>Related references</h5>
-   <ul>
-     <li><a href="../reference/ProjectDirectories.html">Project Directories</a></li>
-     <li><a href="../reference/ProjectPreferences.html">Project Preferences</a></li>
-     <li><a href="../reference/ProjectTypeandSDK.html">Project Types</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>
+<title>Modify in Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+   </head>
+   <body>
+   <div class="Head1">
+<h2>Modify</h2>
+</div><div class="Bodytext"> 
+  
+
+  <p>
+	 This section explains the changes that can be done to an existing project
+	 and the tools provided to make those changes. Once you have created a new
+	 project or imported an existing project, you can make changes to that project.
+	 The tools provided to support this task are specific to Symbian OS development
+	 and are there to support the Symbian OS developers using the Eclipse IDE. 
+  </p>
+  <p>
+	 The tools that are available to support modification of existing project
+	 are: 
+  </p>
+  <ul>
+<li><a href="MBMDefWizard.html">MBM Definition Wizard</a></li>
+<li><a href="AIFDefWizard.html">AIF Definition Wizard</a></li>
+ </ul>
+
+
+
+   </div>
+   <h5>Related  concepts</h5>
+
+   <ul>
+     <li><a href="Projects.html">Projects</a></li>
+   </ul>
+   <h5>Related tasks</h5>
+   <ul>
+     <li><a href="../tasks/CreatingNewProjects.html">Creating Projects </a></li>
+   </ul>
+   <h5>Related references</h5>
+   <ul>
+     <li><a href="../reference/ProjectDirectories.html">Project Directories</a></li>
+     <li><a href="../reference/ProjectPreferences.html">Project Preferences</a></li>
+     <li><a href="../reference/ProjectTypeandSDK.html">Project Types</a></li>
+   </ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/Projects.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/Projects.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,43 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Projects in Concepts</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-   </head>
-   <body>
-   <div class="Head1">
-<h2>Projects</h2>
-</div> 
-  
-
-   <p>
-	 This section of the User Guide provides conceptual overview about working
-	 with different types of projects, including importing an .inf file, modifying
-	 existing projects and accessing help. 
-   </p>
-   <ul>
-  <li><a href="Modify.html">Modify</a></li>
-     </ul>
-   <h5>Related  concepts</h5>
-
-   <ul>
-     <li><a href="Projects.html">Projects</a></li>
-     <li><a href="Modify.html">Project Resources</a> </li>
-   </ul>
-   <h5>Related tasks</h5>
-   <ul>
-     <li><a href="../tasks/CreatingNewProjects.html">Creating Projects </a></li>
-     <li><a href="../tasks/projects/prj_build.htm">Building Projects</a></li>
-     <li><a href="../Tasks/ImportingProjects.html">Importing Projects </a></li>
-     <li><a href="../tasks/ImportingProjects.html">Importing BLD.INF Files</a></li>
-     <li><a href="../tasks/projects/prj_freeze_def_file.htm">Freezing Projects </a></li>
-   </ul>
-   <h5>Related references</h5>
-   <ul>
-     <li><a href="../reference/ProjectDirectories.html">Project Directories</a></li>
-     <li><a href="../reference/ProjectPreferences.html">Project Preferences</a></li>
-     <li><a href="../reference/ProjectTypeandSDK.html">Project Types </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>
+<title>Projects in Concepts</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+   </head>
+   <body>
+   <div class="Head1">
+<h2>Projects</h2>
+</div> 
+  
+
+   <p>
+	 This section of the User Guide provides conceptual overview about working
+	 with different types of projects, including importing an .inf file, modifying
+	 existing projects and accessing help. 
+   </p>
+   <ul>
+  <li><a href="Modify.html">Modify</a></li>
+     </ul>
+   <h5>Related  concepts</h5>
+
+   <ul>
+     <li><a href="Projects.html">Projects</a></li>
+     <li><a href="Modify.html">Project Resources</a> </li>
+   </ul>
+   <h5>Related tasks</h5>
+   <ul>
+     <li><a href="../tasks/CreatingNewProjects.html">Creating Projects </a></li>
+     <li><a href="../tasks/projects/prj_build.htm">Building Projects</a></li>
+     <li><a href="../Tasks/ImportingProjects.html">Importing Projects </a></li>
+     <li><a href="../tasks/ImportingProjects.html">Importing BLD.INF Files</a></li>
+     <li><a href="../tasks/projects/prj_freeze_def_file.htm">Freezing Projects </a></li>
+   </ul>
+   <h5>Related references</h5>
+   <ul>
+     <li><a href="../reference/ProjectDirectories.html">Project Directories</a></li>
+     <li><a href="../reference/ProjectPreferences.html">Project Preferences</a></li>
+     <li><a href="../reference/ProjectTypeandSDK.html">Project Types </a>  </li>
+   </ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/arm_registers.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/arm_registers.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,39 +1,39 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>ARM Registers</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>ARM Registers</h2>
-<p>  Registers are the register contents of the central processing unit (CPU) of the targeted device. When debugging projects on a device, only the target device registers are visible, for example the ARM registers. The ARM microprocessor has 16 general-purpose registers. THUMB has eight general-purpose registers, R0-R7, and access to the high registers, R8-R15. Note that registers R0 through R3 hold the first four words of incoming arguments. The microprocessor constructs remaining arguments in the calling function's argument build area, which does not provide space into which R0 through R3 can be spilled.</p>
-<p>Three registers are best left for special uses. These are:</p>
-<ul>
-  <li>R13 for stack operations</li>
-  <li>R14 is the link register (it is used for storing return addresses in the construction of sub routines)</li>
-  <li>R15 is the program counter (PC)</li>
-</ul>
-<p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with Application TRK, you cannot change the LR, SP, and CPSR registers.</p>
-<p class="note"><b>NOTE</b> When opening the Registers view, the list of available registers will vary depending upon the target devices being debugged. </p>
-<p align="center"><img src="images/ARM_registers.PNG" width="648" height="276" /></p>
-<p align="left" class="figure">Figure 1 - ARM Registers </p>
-<h5>Related concepts <b></b></h5>
-<ul>
-  <li><a href="registers.htm">Emulator  Registers </a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-      <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
-      <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
-</ul>
-    <h5>Related references <b></b></h5>
-<ul>
-  <li><a href="../reference/view_registers.htm">View  Registers</a></li>
-</ul>
-<div id="footer">Copyright &copy; 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>ARM Registers</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>ARM Registers</h2>
+<p>  Registers are the register contents of the central processing unit (CPU) of the targeted device. When debugging projects on a device, only the target device registers are visible, for example the ARM registers. The ARM microprocessor has 16 general-purpose registers. THUMB has eight general-purpose registers, R0-R7, and access to the high registers, R8-R15. Note that registers R0 through R3 hold the first four words of incoming arguments. The microprocessor constructs remaining arguments in the calling function's argument build area, which does not provide space into which R0 through R3 can be spilled.</p>
+<p>Three registers are best left for special uses. These are:</p>
+<ul>
+  <li>R13 for stack operations</li>
+  <li>R14 is the link register (it is used for storing return addresses in the construction of sub routines)</li>
+  <li>R15 is the program counter (PC)</li>
+</ul>
+<p>In most cases, the contents of all the registers can be modified. However,  when debugging applications on a target device with Application TRK, you cannot change the LR, SP, and CPSR registers.</p>
+<p class="note"><b>NOTE</b> When opening the Registers view, the list of available registers will vary depending upon the target devices being debugged. </p>
+<p align="center"><img src="images/ARM_registers.PNG" width="648" height="276" /></p>
+<p align="left" class="figure">Figure 1 - ARM Registers </p>
+<h5>Related concepts <b></b></h5>
+<ul>
+  <li><a href="registers.htm">Emulator  Registers </a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+      <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
+      <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
+</ul>
+    <h5>Related references <b></b></h5>
+<ul>
+  <li><a href="../reference/view_registers.htm">View  Registers</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -18,7 +18,7 @@
 <ul>
   <li><a href="../projects/launch/page_executables.htm">Executables</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,66 +1,66 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Breakpoints</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Breakpoints </h2>
-<p>  A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to halt program execution when encountered by the debugger. After you set a breakpoint at a key point in the program, you can halt its execution, examine its current state, and check register and variable values. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
-<p>A project can have multiple breakpoints set in the source code files. All breakpoints  in a project are shown in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view. Breakpoints are enabled or disabled on the currently selected line within  a source code editor by selecting the <b>Run &gt; Toggle Breakpoint</b> menu option, right-clicking the marker bar in the editor and selecting <b>Toggle Breakpoint</b>, or by pressing <span class="code">CTRL-SHIFT-B</span>.</p>
-<p>You can set a breakpoint on any executable line of code that the debugger can resolve. Lines containing comments and other non executable code cannot be assigned a breakpoint as they are normally stripped from the  compiled   binary. The debugger must load  the symbols for a module before it can attempt to resolve  breakpoints within the module. This is most easily done using the <a href="../reference/view_executables.htm">Executables</a> view to import a binary file, especially if the binary is not in the workspace. </p>
-<p>When the debugger attempts to resolve a breakpoint it will result in:</p>
-<ul>
-  <li><b>resolved</b> &#8212; the symbols for the module  are loaded  and the breakpoint  located in the executable that&#8217;s currently being debugged, circle icon changes to flagged icon </li>
-  <li><b>resolved and moved</b> &#8212;the breakpoint is not found in the executable at the specified point. Debugger moves breakpoint forward in the current function until a line is found that can be resolved. Breakpoint icon moved to source line matching new breakpoint location and changed to flagged icon.</li>
-  <li><b>unresolved</b>  &#8212;  if the symbols for the module  are not loaded or the breakpoint was not able to be set within the current function. This may indicate no executable code in the source line or a deadstripped function  not present in the executable. Breakpoint icon remains in unflagged state indicating unresolved status.</li>
-</ul>
-<p>Breakpoints have enabled and disabled types as well as resolved and unresolved states. Table 1 explains the different breakpoint types and states.</p>
-<h5>Table 1 Breakpoint&mdash;type and states </h5>
-<table width="90%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="15%" scope="col">Type</th>
-    <th width="14%" scope="col">State</th>
-    <th width="14%" scope="col">Icon</th>
-    <th width="71%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td>Enabled</td>
-    <td><div align="center">Unresolved</div></td>
-    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" /></div></td>
-    <td>Indicates that the breakpoint is currently enabled but not located in the executable during a debug session. Debugger cannot halt program execution.</td>
-  </tr>
-  <tr>
-    <td>Enabled</td>
-    <td><div align="center">Resolved</div></td>
-    <td><div align="center"> <img src="../images/icons/breakpoints_enabled_icon.png" width="15" height="12" /></div></td>
-    <td>Indicates that the breakpoint is currently enabled and resolved for the source line. The debugger halts program execution at an enabled breakpoint. </td>
-  </tr>
-  <tr>
-    <td>Disabled</td>
-    <td><div align="center">Unresolved</div></td>
-    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_disabled_icon.png" width="12" height="11" /></div></td>
-    <td>Indicates that the breakpoint is currently disabled but not located in the executable during a debug session. The debugger does not halt program execution at a disabled breakpoint.</td>
-  </tr>
-  <tr>
-    <td>Disabled</td>
-    <td><div align="center">Resolved</div></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_disabled_icon.png" width="15" height="12" /></div></td>
-    <td>Indicates that the breakpoint is currently disabled and resolved for the source line. The debugger does not halt program execution at a disabled breakpoint.</td>
-  </tr>
-</table>
-<p>Other references </p>
-<ul>
-  <li><a href="../reference/view_executables.htm">Executables view</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Clearing Breakpoints</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Breakpoints</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Breakpoints </h2>
+<p>  A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to halt program execution when encountered by the debugger. After you set a breakpoint at a key point in the program, you can halt its execution, examine its current state, and check register and variable values. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
+<p>A project can have multiple breakpoints set in the source code files. All breakpoints  in a project are shown in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view. Breakpoints are enabled or disabled on the currently selected line within  a source code editor by selecting the <b>Run &gt; Toggle Breakpoint</b> menu option, right-clicking the marker bar in the editor and selecting <b>Toggle Breakpoint</b>, or by pressing <span class="code">CTRL-SHIFT-B</span>.</p>
+<p>You can set a breakpoint on any executable line of code that the debugger can resolve. Lines containing comments and other non executable code cannot be assigned a breakpoint as they are normally stripped from the  compiled   binary. The debugger must load  the symbols for a module before it can attempt to resolve  breakpoints within the module. This is most easily done using the <a href="../reference/view_executables.htm">Executables</a> view to import a binary file, especially if the binary is not in the workspace. </p>
+<p>When the debugger attempts to resolve a breakpoint it will result in:</p>
+<ul>
+  <li><b>resolved</b> &#8212; the symbols for the module  are loaded  and the breakpoint  located in the executable that&#8217;s currently being debugged, circle icon changes to flagged icon </li>
+  <li><b>resolved and moved</b> &#8212;the breakpoint is not found in the executable at the specified point. Debugger moves breakpoint forward in the current function until a line is found that can be resolved. Breakpoint icon moved to source line matching new breakpoint location and changed to flagged icon.</li>
+  <li><b>unresolved</b>  &#8212;  if the symbols for the module  are not loaded or the breakpoint was not able to be set within the current function. This may indicate no executable code in the source line or a deadstripped function  not present in the executable. Breakpoint icon remains in unflagged state indicating unresolved status.</li>
+</ul>
+<p>Breakpoints have enabled and disabled types as well as resolved and unresolved states. Table 1 explains the different breakpoint types and states.</p>
+<h5>Table 1 Breakpoint&mdash;type and states </h5>
+<table width="90%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="15%" scope="col">Type</th>
+    <th width="14%" scope="col">State</th>
+    <th width="14%" scope="col">Icon</th>
+    <th width="71%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td>Enabled</td>
+    <td><div align="center">Unresolved</div></td>
+    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" /></div></td>
+    <td>Indicates that the breakpoint is currently enabled but not located in the executable during a debug session. Debugger cannot halt program execution.</td>
+  </tr>
+  <tr>
+    <td>Enabled</td>
+    <td><div align="center">Resolved</div></td>
+    <td><div align="center"> <img src="../images/icons/breakpoints_enabled_icon.png" width="15" height="12" /></div></td>
+    <td>Indicates that the breakpoint is currently enabled and resolved for the source line. The debugger halts program execution at an enabled breakpoint. </td>
+  </tr>
+  <tr>
+    <td>Disabled</td>
+    <td><div align="center">Unresolved</div></td>
+    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_disabled_icon.png" width="12" height="11" /></div></td>
+    <td>Indicates that the breakpoint is currently disabled but not located in the executable during a debug session. The debugger does not halt program execution at a disabled breakpoint.</td>
+  </tr>
+  <tr>
+    <td>Disabled</td>
+    <td><div align="center">Resolved</div></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_disabled_icon.png" width="15" height="12" /></div></td>
+    <td>Indicates that the breakpoint is currently disabled and resolved for the source line. The debugger does not halt program execution at a disabled breakpoint.</td>
+  </tr>
+</table>
+<p>Other references </p>
+<ul>
+  <li><a href="../reference/view_executables.htm">Executables view</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Clearing Breakpoints</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_system.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_system.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,36 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Build System Overview</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Build System Overview </h2>
-<p>The Carbide.c++ build system provides a wrapper around the standard Symbian OS build process utilizing component description files (bld.inf) and project definition files (.mmp files). Because the Carbide.++ build system provides a visual view into this system, it will be useful for new developers to the Symbian OS to become familiar with the basic Symbian OS build process. Further information on the Symbian OS build system can be found in the <a href="http://developer.symbian.com/main/oslibrary/osdocs/index.jsp">Symbian Developer Library</a> under the <b>Build Tools Guide</b> and <b>Build Tools Reference</b> sections. If you are already familiar with the Symbian OS build system then you should feel right at home with the Carbide.c++ builder user interface. </p>
-<p>In Carbide.c++, as in the Symbian OS, a project is described by a <span class="code">bld.inf</span> file. Hence, all projects must start with a <span class="code">bld.inf</span> file. Carbide.c++ supports either building all components of a project (including extension makefiles) or only building selected sub-components. This gives the developer the granularity to either build all of a project&#8217;s dependencies or, if you are working on very large projects, only building a small sub-component of a larger project. </p>
-<h4>Basic Build Commands </h4>
-<p>There are several methods of invoking the Symbian OS build tools on a project or source file. </p>
-<ul>
-  <li><b>Build Project</b> - The is the default build process which invokes the call: calls <span class="code">'abld build &lt;platform&gt; &lt;target&gt;'</span>. The basic build process insures that the project definition makefiles are up to date and calls 'bldmake bldfiles' for the current platform where necessary. </li>
-  <li><b>Compile</b> - This command simply compiles a single file for a project by calling its <span class="code">makefile</span> target directly.</li>
-  <li><b>Build All Configurations</b> - This command invokes the same command as Build Project, but on all configurations in the selected project.</li>
-  <li><b>Build Symbian Component</b> - This is a context menu option available on .mmp and .mk files only. You can use this to build a component outside the normal build process. This command invokes: <span class="code">'abld build &lt;platform&gt; &lt;target&gt;'</span> on the selected component. </li>
-</ul>
-<p class="note"><b>NOTE</b> The debugger has a setting under the Run/Debug &gt; Launching preference page which performs a full build before the start of each debug session. If you prefer to do your own target build only you will want to turn the &#8220;Build (if required) before launching&#8221; setting off. </p>
-<h4>Command Line Arguments</h4>
-<p>The Carbide build system supports the use of command-line arguments for all stages of the build system. You can add these arguments in the <a href="../reference/build_properties/pane_build_config_args.htm">Arguments</a> pane of the 
-<b>Carbide Build Configurations</b> panel in the <b>Properties for &lt;<i>project</i>&gt;</b> window.</p>
-<p>For example, to generate a SYM file for UREL build you need to add the <span class="code">-debug</span> argument to the <b>abld makefile</b> stage of the build process. </p>
-<p>Always refer to the <a href="http://developer.symbian.com/main/oslibrary/osdocs/index.jsp">Symbian Developer Library</a> to learn which arguments are supported by the SDK used by the project. </p>
-<h5>Other references </h5>
-<ul>
-  <li><a href="../reference/menus/build_all_targets.htm">Build All Configurations</a></li>
-  <li><a href="../reference/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 System Overview</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Build System Overview </h2>
+<p>The Carbide.c++ build system provides a wrapper around the standard Symbian OS build process utilizing component description files (bld.inf) and project definition files (.mmp files). Because the Carbide.++ build system provides a visual view into this system, it will be useful for new developers to the Symbian OS to become familiar with the basic Symbian OS build process. Further information on the Symbian OS build system can be found in the <a href="http://developer.symbian.com/main/oslibrary/osdocs/index.jsp">Symbian Developer Library</a> under the <b>Build Tools Guide</b> and <b>Build Tools Reference</b> sections. If you are already familiar with the Symbian OS build system then you should feel right at home with the Carbide.c++ builder user interface. </p>
+<p>In Carbide.c++, as in the Symbian OS, a project is described by a <span class="code">bld.inf</span> file. Hence, all projects must start with a <span class="code">bld.inf</span> file. Carbide.c++ supports either building all components of a project (including extension makefiles) or only building selected sub-components. This gives the developer the granularity to either build all of a project&#8217;s dependencies or, if you are working on very large projects, only building a small sub-component of a larger project. </p>
+<h4>Basic Build Commands </h4>
+<p>There are several methods of invoking the Symbian OS build tools on a project or source file. </p>
+<ul>
+  <li><b>Build Project</b> - The is the default build process which invokes the call: calls <span class="code">'abld build &lt;platform&gt; &lt;target&gt;'</span>. The basic build process insures that the project definition makefiles are up to date and calls 'bldmake bldfiles' for the current platform where necessary. </li>
+  <li><b>Compile</b> - This command simply compiles a single file for a project by calling its <span class="code">makefile</span> target directly.</li>
+  <li><b>Build All Configurations</b> - This command invokes the same command as Build Project, but on all configurations in the selected project.</li>
+  <li><b>Build Symbian Component</b> - This is a context menu option available on .mmp and .mk files only. You can use this to build a component outside the normal build process. This command invokes: <span class="code">'abld build &lt;platform&gt; &lt;target&gt;'</span> on the selected component. </li>
+</ul>
+<p class="note"><b>NOTE</b> The debugger has a setting under the Run/Debug &gt; Launching preference page which performs a full build before the start of each debug session. If you prefer to do your own target build only you will want to turn the &#8220;Build (if required) before launching&#8221; setting off. </p>
+<h4>Command Line Arguments</h4>
+<p>The Carbide build system supports the use of command-line arguments for all stages of the build system. You can add these arguments in the <a href="../reference/build_properties/pane_build_config_args.htm">Arguments</a> pane of the 
+<b>Carbide Build Configurations</b> panel in the <b>Properties for &lt;<i>project</i>&gt;</b> window.</p>
+<p>For example, to generate a SYM file for UREL build you need to add the <span class="code">-debug</span> argument to the <b>abld makefile</b> stage of the build process. </p>
+<p>Always refer to the <a href="http://developer.symbian.com/main/oslibrary/osdocs/index.jsp">Symbian Developer Library</a> to learn which arguments are supported by the SDK used by the project. </p>
+<h5>Other references </h5>
+<ul>
+  <li><a href="../reference/menus/build_all_targets.htm">Build All Configurations</a></li>
+  <li><a href="../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/common_debug_actions.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Common Debugging Actions</h2>
-<p>  This section explains how to perform common debugging actions within the <a href="../reference/perspective_debg.htm">Debug</a> perspective to correct source-code errors, control program execution, and observe memory behavior:</p>
+<p>  This section explains how to perform common debugging actions within the <a href="../reference/perspective_debug.htm">Debug</a> perspective to correct source-code errors, control program execution, and observe memory behavior:</p>
 <ul>
   <li><a href="../debugger/debug/cmds_starting.htm">Start</a> the debugger</li>
   <li>Step <a href="../debugger/debug/cmds_stepping.htm">into</a>, <a href="../debugger/debug/cmds_stepping.htm">out</a> of, or <a href="../debugger/debug/cmds_stepping.htm">over</a> routines</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/data_viewer_plugins.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/data_viewer_plugins.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,18 +1,18 @@
-<!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>Data Viewer Plug-ins</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Data Viewer Plug-ins</h2>
-<p>  Data Viewers are plug-ins that include an user interface to show a custom view of data. These plug-ins are often platform specific. Data editors are data viewers that also let you modify and write data.</p>
-<p>The IDE will keep a registry of plug-ins that can view particular types. The plug-ins will register themselves with the IDE and indicate which formats and platforms they support. When a variable or memory address is selected, you can choose the plugin from the Data menu.</p>
-<p>A Data Viewer plugin may also be designed without a custom user interface. This type of viewer would override the built in debugger methods of showing a variable value as text and parsing an edited value back into variable data.</p>
-<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>Data Viewer Plug-ins</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Data Viewer Plug-ins</h2>
+<p>  Data Viewers are plug-ins that include an user interface to show a custom view of data. These plug-ins are often platform specific. Data editors are data viewers that also let you modify and write data.</p>
+<p>The IDE will keep a registry of plug-ins that can view particular types. The plug-ins will register themselves with the IDE and indicate which formats and platforms they support. When a variable or memory address is selected, you can choose the plugin from the Data menu.</p>
+<p>A Data Viewer plugin may also be designed without a custom user interface. This type of viewer would override the built in debugger methods of showing a variable value as text and parsing an edited value back into variable data.</p>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/debugger_about.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -43,7 +43,7 @@
   <li><a href="../projects/launch/page_debugger.htm">Debugger Pane </a></li>
   <li><a href="../reference/wnd_debugger_prefs.htm">Debugger Preferences</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/dependency_tracking.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/dependency_tracking.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -26,7 +26,7 @@
   <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/fpu_registers.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/fpu_registers.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>FPU Registers</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>FPU Registers</h2>
-<p>The FPU Registers are the register contents of the floating-point unit (FPU) of the host computer. The exact listing of these registers depends on the host FPU and current build target.</p>
-<h5>Related concepts <b></b></h5>
-<ul>
-  <li><a href="general_registers.htm">General Registers</a></li>
-  <li><a href="host_registers.htm">Host-specific Registers</a> </li>
-</ul>
-    <h5>Related tasks <b></b></h5>
-    <ul>
-      <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
-      <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
-    </ul>
-    <h5>Related references <b></b></h5>
-<ul>
-  <li><a href="../reference/view_registers.htm">View  Registers</a></li>
-</ul>
-<div id="footer">Copyright &copy; 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>FPU Registers</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>FPU Registers</h2>
+<p>The FPU Registers are the register contents of the floating-point unit (FPU) of the host computer. The exact listing of these registers depends on the host FPU and current build target.</p>
+<h5>Related concepts <b></b></h5>
+<ul>
+  <li><a href="general_registers.htm">General Registers</a></li>
+  <li><a href="host_registers.htm">Host-specific Registers</a> </li>
+</ul>
+    <h5>Related tasks <b></b></h5>
+    <ul>
+      <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
+      <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
+    </ul>
+    <h5>Related references <b></b></h5>
+<ul>
+  <li><a href="../reference/view_registers.htm">View  Registers</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/general_registers.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/general_registers.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>General Registers</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>General Registers</h2>
-<p> The General Registers are the register contents of the central processing unit (CPU) of the host computer. The exact listing of these registers depends on the host CPU and current build target.</p>
-<h5>Related concepts <b></b></h5>
-<ul>
-  <li><a href="fpu_registers.htm">FPU Registers</a></li>
-  <li><a href="host_registers.htm">Host-specific Registers</a> </li>
-</ul>
-    <h5>Related tasks <b></b></h5>
-    <ul>
-      <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
-      <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
-    </ul>
-    <h5>Related references <b></b></h5>
-<ul>
-  <li><a href="../reference/view_registers.htm">View  Registers</a></li>
-</ul>
-<div id="footer">Copyright &copy; 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>General Registers</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>General Registers</h2>
+<p> The General Registers are the register contents of the central processing unit (CPU) of the host computer. The exact listing of these registers depends on the host CPU and current build target.</p>
+<h5>Related concepts <b></b></h5>
+<ul>
+  <li><a href="fpu_registers.htm">FPU Registers</a></li>
+  <li><a href="host_registers.htm">Host-specific Registers</a> </li>
+</ul>
+    <h5>Related tasks <b></b></h5>
+    <ul>
+      <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
+      <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
+    </ul>
+    <h5>Related references <b></b></h5>
+<ul>
+  <li><a href="../reference/view_registers.htm">View  Registers</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/host_registers.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/host_registers.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Host Registers</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Host-specific Registers</h2>
-<p>The Registers view also lists additional register contents for registers specific to the host. The exact listing of these registers depends on the host computer and current build target. </p>
-<h5>Related concepts <b></b></h5>
-<ul>
-  <li><a href="fpu_registers.htm">FPU Registers</a></li>
-  <li><a href="general_registers.htm">General Registers</a></li>
-</ul>
-    <h5>Related tasks <b></b></h5>
-    <ul>
-      <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
-      <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
-    </ul>
-    <h5>Related references <b></b></h5>
-<ul>
-  <li><a href="../reference/view_registers.htm">View  Registers</a></li>
-</ul>
-<div id="footer">Copyright &copy; 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>Host Registers</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Host-specific Registers</h2>
+<p>The Registers view also lists additional register contents for registers specific to the host. The exact listing of these registers depends on the host computer and current build target. </p>
+<h5>Related concepts <b></b></h5>
+<ul>
+  <li><a href="fpu_registers.htm">FPU Registers</a></li>
+  <li><a href="general_registers.htm">General Registers</a></li>
+</ul>
+    <h5>Related tasks <b></b></h5>
+    <ul>
+      <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
+      <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
+    </ul>
+    <h5>Related references <b></b></h5>
+<ul>
+  <li><a href="../reference/view_registers.htm">View  Registers</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/macros_carbide.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/macros_carbide.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Macros</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide Macros</h2>
-<p> Carbide.c++ supports the macro <span class="code">_CARBIDE_CPP_</span> during the preprocessing of <span class="code">.mmp</span> and <span class="code">.inf</span> files. Use this macro in those files to include Carbide specific files during the preprocessing stage that are never recognized outside of the Carbide.c++ IDE.</p>
-<p>For example within your <span class="code">.mmp</span> or <span class="code">.inf</span> file:</p>
-<p class="listing">#ifdef _CARBIDE_CPP_<br />
-  // Add any makmake statements that you want specific to Carbide.c++ only<br />
-#endif</p>
-<h5>Tasks</h5>
-<ul>
-  <li><a href="../tasks/ImportingProjects.html">Importing a Project from an INF File</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide Macros</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Carbide Macros</h2>
+<p> Carbide.c++ supports the macro <span class="code">_CARBIDE_CPP_</span> during the preprocessing of <span class="code">.mmp</span> and <span class="code">.inf</span> files. Use this macro in those files to include Carbide specific files during the preprocessing stage that are never recognized outside of the Carbide.c++ IDE.</p>
+<p>For example within your <span class="code">.mmp</span> or <span class="code">.inf</span> file:</p>
+<p class="listing">#ifdef _CARBIDE_CPP_<br />
+  // Add any makmake statements that you want specific to Carbide.c++ only<br />
+#endif</p>
+<h5>Tasks</h5>
+<ul>
+  <li><a href="../tasks/ImportingProjects.html">Importing a Project from an INF File</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/ngage_projects.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -95,7 +95,7 @@
 </ol>
 <p>From this point you can use all of the debugger features to debug the project. </p>
 <p>Always refer to the N-Gage documentation for more information on creating, deploying, and debugging N-Gage projects. </p>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/precompiled_headers.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/precompiled_headers.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -30,7 +30,7 @@
 </div>
 <p>The resultant output file, <span class="code">pch_test.mch</span> can be included in other source or prefix files as:</p>
 <p class="listing"> #include pch_test.mch</p>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/symbolic_files_about.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/symbolic_files_about.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,24 +1,24 @@
-<!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>About Symbolics Files</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>About Symbolics Files</h2>
-<p>A symbolics file contains debugging information that the IDE generates for a computer program. The debugger uses this information to control program execution. For example, the debugger uses the symbolics file to find the source code that corresponds to the executing object code of the computer program.</p>
-<p>Symbolics files contain this information:</p>
-<ul>
-  <li>Routine names</li>
-  <li>Variables names</li>
-  <li>Variable locations in source code</li>
-  <li>Variable locations in object code</li>
-</ul>
-<p>The IDE supports several types of symbolics files. Some programs generate separate symbolic files, while others do not. For example, when you use the Freescale CodeView on Windows program, the IDE places the symbolics file inside the generated binary file.</p>
-<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>About Symbolics Files</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>About Symbolics Files</h2>
+<p>A symbolics file contains debugging information that the IDE generates for a computer program. The debugger uses this information to control program execution. For example, the debugger uses the symbolics file to find the source code that corresponds to the executing object code of the computer program.</p>
+<p>Symbolics files contain this information:</p>
+<ul>
+  <li>Routine names</li>
+  <li>Variables names</li>
+  <li>Variable locations in source code</li>
+  <li>Variable locations in object code</li>
+</ul>
+<p>The IDE supports several types of symbolics files. Some programs generate separate symbolic files, while others do not. For example, when you use the Freescale CodeView on Windows program, the IDE places the symbolics file inside the generated binary file.</p>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/symbols_pkg.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/symbols_pkg.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Symbols, .pkg</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbols, .pkg </h2>
-<p>Carbide.c++ supports the following specific symbols in <span class="code">.pkg</span> files:</p>
-<ul>
-  <li><span class="code">$(EPOCROOT)</span> &#8212; the location of the <span class="code">epoc32</span> folder but not including the <span class="code">epoc32</span> folder</li>
-  <li><span class="code">$(PLATFORM)</span> &#8212; platform designator, for example: <span class="code">ARMI</span>, <span class="code">WINSC</span>, <span class="code">GCCE</span>, <span class="code">THUMB</span>, etc. </li>
-  <li><span class="code">$(TARGET)</span> &#8212; target designator <span class="code">UDEB</span> or <span class="code">UREL</span> </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>Symbols, .pkg</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Symbols, .pkg </h2>
+<p>Carbide.c++ supports the following specific symbols in <span class="code">.pkg</span> files:</p>
+<ul>
+  <li><span class="code">$(EPOCROOT)</span> &#8212; the location of the <span class="code">epoc32</span> folder but not including the <span class="code">epoc32</span> folder</li>
+  <li><span class="code">$(PLATFORM)</span> &#8212; platform designator, for example: <span class="code">ARMI</span>, <span class="code">WINSC</span>, <span class="code">GCCE</span>, <span class="code">THUMB</span>, etc. </li>
+  <li><span class="code">$(TARGET)</span> &#8212; target designator <span class="code">UDEB</span> or <span class="code">UREL</span> </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/templates.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/templates.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,51 +1,51 @@
-<!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>Project Templates</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Project Templates</h2>
-<p>Carbide.c++ provides many common  templates to quickly create projects using specific SDKs or feature sets. Every template provides basic support for a specific type of project including sources, libraries, resources, etc. The type and number of templates available are controlled by the SDKs you have  enabled. </p>
-<h4>Table 1. Available project templates</h4>
-<table width="90%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="26%" scope="col">Project Type </th>
-    <th width="74%" scope="col">Available Templates </th>
-  </tr>
-  <tr>
-    <td><b>Generic Symbian OS </b></td>
-    <td><ul>
-      <li>Basic console application (EXE) - used for any SDK </li>
-      <li>Basic dynamically linked library  (DLL) -  used for any SDK </li>
-      <li>Basic static library (LIB) - used for any SDK </li>
-      <li>Empty Project for Symbian  - empty project with minimal bld.inf and MMP and no sources or libraries. For advanced users only. </li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>S60 </b></td>
-    <td><ul>
-      <li> GUI Application</li>
-      <li> GUI Application with UI Designer</li>
-      <li>Open C Console application - project template based on  industry-standard POSIX and middleware C libraries for S60 </li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>Tutorials</b></td>
-    <td><ul>
-      <li>S60 Birthday Tutorial with UI Designer</li>
-      <li> S60 Yahoo! Image Search Tutorial with UI Designer</li>
-    </ul>      </td>
-  </tr>
-</table>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects </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>Project Templates</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Project Templates</h2>
+<p>Carbide.c++ provides many common  templates to quickly create projects using specific SDKs or feature sets. Every template provides basic support for a specific type of project including sources, libraries, resources, etc. The type and number of templates available are controlled by the SDKs you have  enabled. </p>
+<h4>Table 1. Available project templates</h4>
+<table width="90%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="26%" scope="col">Project Type </th>
+    <th width="74%" scope="col">Available Templates </th>
+  </tr>
+  <tr>
+    <td><b>Generic Symbian OS </b></td>
+    <td><ul>
+      <li>Basic console application (EXE) - used for any SDK </li>
+      <li>Basic dynamically linked library  (DLL) -  used for any SDK </li>
+      <li>Basic static library (LIB) - used for any SDK </li>
+      <li>Empty Project for Symbian  - empty project with minimal bld.inf and MMP and no sources or libraries. For advanced users only. </li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>S60 </b></td>
+    <td><ul>
+      <li> GUI Application</li>
+      <li> GUI Application with UI Designer</li>
+      <li>Open C Console application - project template based on  industry-standard POSIX and middleware C libraries for S60 </li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>Tutorials</b></td>
+    <td><ul>
+      <li>S60 Birthday Tutorial with UI Designer</li>
+      <li> S60 Yahoo! Image Search Tutorial with UI Designer</li>
+    </ul>      </td>
+  </tr>
+</table>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/thread_cond_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/thread_cond_breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,17 +1,17 @@
-<!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>Setting a thread-specific conditional breakpoint</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting a Thread-specific Conditional Breakpoint</h2>
-<p>Carbide's debugger supports thread-specific breakpoints. Depending on what the protocol supports, there are several different ways it's supported. You can setup a special condition on a breakpoint. Enter <span class="code">mwThreadID == threadID</span>, where <span class="code">mwThreadID</span> is a keyword recognized by the core debugger and <span class="code">threadID</span> is the number that represents the ID of the thread that you want to stop.<br />
-</p>
-<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>Setting a thread-specific conditional breakpoint</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setting a Thread-specific Conditional Breakpoint</h2>
+<p>Carbide's debugger supports thread-specific breakpoints. Depending on what the protocol supports, there are several different ways it's supported. You can setup a special condition on a breakpoint. Enter <span class="code">mwThreadID == threadID</span>, where <span class="code">mwThreadID</span> is a keyword recognized by the core debugger and <span class="code">threadID</span> is the number that represents the ID of the thread that you want to stop.<br />
+</p>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,88 +1,88 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Tour of the UI</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <div class="Head1">
-<h2>Tour of the UI</h2>
-</div><div class="Bodytext">
-	  
-	 <p>
-		Eclipse and the C/C++ Development Toolkit (CDT) provides a rich
-		collection of views, editors, wizards and preference windows for performing C++
-		development. The Symbian OS plug-ins for Eclipse extend this user interface so
-		that you can perform the tasks involved in Symbian OS development from the
-		Eclipse workbench, instead of needing to use the Symbian OS command-line
-		toolchain. 
-	 </p> 
-	 <p>
-		When you work with a Symbian OS C++ project, the workbench uses the <a href="CarbidePerspective.html">Carbide C/C++ perspective</a>, which will look
-		something like this:</p> 
-     <div class="Figure">
-
-	 <p class="Image"><img src="images/workbench.png" width="815" height="638" /></p>
- 
-	 
-</div> 
-	 <p>
-		For more information on the standard CDT views, refer to the C/C++
-		Development Toolkit documentation. 
-	 </p> 
-	 <p>
-		The Symbian OS plug-ins also add new wizards and editors. You can use
-		these to: 
-	 </p> 
- 
-	 <ul> 
-		<li> 
-		  <p>
-			 Create new Symbian OS projects using the New command, which is available on the File menu, and on the
-		  pop-up menus of the C/C++ Projects and Navigator views.</p> 
-		  <p>
-			 For more information, see <a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>. 
-		  </p> 
-		</li> 
-		<li> 
-		  <p>
-			 Import existing projects from Symbian OS bld.inf files using the Import command, which is
-		  available on the File menu, and on the pop-up menus of the C/C++ Projects and Navigator views.</p> 
-		  <p>
-			 For more information, see <a href="../tasks/ImportingProjects.html">Importing Projects from a Bld.Inf File</a>. 
-		  </p> 
-		</li> 
-		<li> 
-		  <p>
-			 Add scalable graphics (MIF), Symbian OS bitmaps (MBM) and application information (AIF)
-			 resources to projects, and edit these resources. You can add these using the		    New command, which is available on the File menu, and on the pop-up menus of the C/C++ Projects and Navigator views. MBM, MIF and AIF editors are provided to modify
-		  the resources.</p> 
-		  <p>
-			 For more information, see <a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a> and <a href="../tasks/AppInfoFile.html">Creating an AIF File</a>. 
-		  </p> 
-		</li> 
-		<li> 
-		  <p>
-			 Build programs for multiple SDKs and targets. The standard CDT build
-			 commands such as Build Project and Build All Configurations,
-		  which are available in the Project menu, are used.</p> 
-		  <p>
-		  For more information, see <a href="../tasks/projects/prj_build.htm">Building Projects</a>.</p>
-		</li> 
-  </ul>
-
-   
- 
-
-  <ul>
-       <li> 
-	     <p>
-		    Configure the SDKs that are available for use with Carbide.c++ in the	       SDK Preferences settings. Select Window
-         &gt; Preferences, expand the Carbide.c++ group and select SDK Preferences.</p> 
-	     <p>
-		    For more information, see <a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</a>.</p> 
-       </li>
-  </ul>
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-   </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Tour of the UI</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <div class="Head1">
+<h2>Tour of the UI</h2>
+</div><div class="Bodytext">
+	  
+	 <p>
+		Eclipse and the C/C++ Development Toolkit (CDT) provides a rich
+		collection of views, editors, wizards and preference windows for performing C++
+		development. The Symbian OS plug-ins for Eclipse extend this user interface so
+		that you can perform the tasks involved in Symbian OS development from the
+		Eclipse workbench, instead of needing to use the Symbian OS command-line
+		toolchain. 
+	 </p> 
+	 <p>
+		When you work with a Symbian OS C++ project, the workbench uses the <a href="CarbidePerspective.html">Carbide C/C++ perspective</a>, which will look
+		something like this:</p> 
+     <div class="Figure">
+
+	 <p class="Image"><img src="images/workbench.png" width="815" height="638" /></p>
+ 
+	 
+</div> 
+	 <p>
+		For more information on the standard CDT views, refer to the C/C++
+		Development Toolkit documentation. 
+	 </p> 
+	 <p>
+		The Symbian OS plug-ins also add new wizards and editors. You can use
+		these to: 
+	 </p> 
+ 
+	 <ul> 
+		<li> 
+		  <p>
+			 Create new Symbian OS projects using the New command, which is available on the File menu, and on the
+		  pop-up menus of the C/C++ Projects and Navigator views.</p> 
+		  <p>
+			 For more information, see <a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>. 
+		  </p> 
+		</li> 
+		<li> 
+		  <p>
+			 Import existing projects from Symbian OS bld.inf files using the Import command, which is
+		  available on the File menu, and on the pop-up menus of the C/C++ Projects and Navigator views.</p> 
+		  <p>
+			 For more information, see <a href="../tasks/ImportingProjects.html">Importing Projects from a Bld.Inf File</a>. 
+		  </p> 
+		</li> 
+		<li> 
+		  <p>
+			 Add scalable graphics (MIF), Symbian OS bitmaps (MBM) and application information (AIF)
+			 resources to projects, and edit these resources. You can add these using the		    New command, which is available on the File menu, and on the pop-up menus of the C/C++ Projects and Navigator views. MBM, MIF and AIF editors are provided to modify
+		  the resources.</p> 
+		  <p>
+			 For more information, see <a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a> and <a href="../tasks/AppInfoFile.html">Creating an AIF File</a>. 
+		  </p> 
+		</li> 
+		<li> 
+		  <p>
+			 Build programs for multiple SDKs and targets. The standard CDT build
+			 commands such as Build Project and Build All Configurations,
+		  which are available in the Project menu, are used.</p> 
+		  <p>
+		  For more information, see <a href="../tasks/projects/prj_build.htm">Building Projects</a>.</p>
+		</li> 
+  </ul>
+
+   
+ 
+
+  <ul>
+       <li> 
+	     <p>
+		    Configure the SDKs that are available for use with Carbide.c++ in the	       SDK Preferences settings. Select Window
+         &gt; Preferences, expand the Carbide.c++ group and select SDK Preferences.</p> 
+	     <p>
+		    For more information, see <a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</a>.</p> 
+       </li>
+  </ul>
+</div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/trk.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/trk.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,43 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>On-device Debugging</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>On-device Debugging</h2>
-<p>The on-device debug agent (Application TRK or System TRK) is a program that enables on-device debugging of  phone prototypes, reference boards, and retail phones. An on-device debug agent is a program that is installed on a phone or reference board. It communicates with the debugger using a serial-over-Bluetooth or serial-over-USB connection. Through this serial communication, the on-device debug agent acts as the interface between the Carbide.c++ debugger and the target device. An on-device debug agent provides: </p>
-<ul>
-  <li>Debug agent running on Symbian OS</li>
-  <li>Provides a stable &amp; integrated interface to Symbian OS</li>
-  <li>Used to debug applications on actual devices</li>
-  <li>Can be built-in to the OS image or installed as a .sis file</li>
-</ul>
-<p>Using the on-device debug agent, one can use the Carbide.c++ IDE to debug programs running on phone hardware, making the debugging process much easier. The on-device debug agent works on all S60 3rd Edition devices, UIQ 3rd Edition devices, and Symbian TechView devkits.</p>
-<p>The Application TRK debug agents are stored online and can be downloaded and installed using the <a href="../reference/trk/wnd_new_connection_wizard.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
-<p>Some of the key benefits to using an on-device debug agent include:</p>
-<ul>
-  <li>Easy debugging via serial interface (Bluetooth, USB, IrDA, etc)</li>
-  <li>More accurate than emulator debugging</li>
-  <li>Can often avoid using expensive hardware debuggers </li>
-</ul>
-<p>There are two variations of the on-device debug agent, they are:</p>
-<ul>
-  <li><b>Application TRK</b>&#8212;supports application debugging only and available to developers creating applications for devices. Developers do not have access to system level routines,  system ROM,   other user application code, cannot modify the LR and SR registers, and must use a SIS file to debug an application.</li>
-  <li><b>System TRK</b>&#8212;
-  supports both application and limited ROM debugging (includes application executables and limited ROM based components (i.e. no device drivers) and available to original equipment manufacturers (OEM) for device creation and customization</li>
-</ul>
-<p class="note"><b>NOTE</b> The type of on-device debug agent you have is based upon which  Carbide.c++ product you have licensed. System TRK is only available with the Professional or OEM version of the product. </p>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/trk/trk_overview.htm">On-device Debugging Overview</a> </li>
-</ul>
-<div class="step">
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</div>
-</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>On-device Debugging</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>On-device Debugging</h2>
+<p>The on-device debug agent (Application TRK or System TRK) is a program that enables on-device debugging of  phone prototypes, reference boards, and retail phones. An on-device debug agent is a program that is installed on a phone or reference board. It communicates with the debugger using a serial-over-Bluetooth or serial-over-USB connection. Through this serial communication, the on-device debug agent acts as the interface between the Carbide.c++ debugger and the target device. An on-device debug agent provides: </p>
+<ul>
+  <li>Debug agent running on Symbian OS</li>
+  <li>Provides a stable &amp; integrated interface to Symbian OS</li>
+  <li>Used to debug applications on actual devices</li>
+  <li>Can be built-in to the OS image or installed as a .sis file</li>
+</ul>
+<p>Using the on-device debug agent, one can use the Carbide.c++ IDE to debug programs running on phone hardware, making the debugging process much easier. The on-device debug agent works on all S60 3rd Edition devices, UIQ 3rd Edition devices, and Symbian TechView devkits.</p>
+<p>The Application TRK debug agents are stored online and can be downloaded and installed using the <a href="../reference/trk/wnd_new_connection_wizard.htm">On-Device Connections &gt; New Connection Wizard &gt; Install remote agents</a> pane.</p>
+<p>Some of the key benefits to using an on-device debug agent include:</p>
+<ul>
+  <li>Easy debugging via serial interface (Bluetooth, USB, IrDA, etc)</li>
+  <li>More accurate than emulator debugging</li>
+  <li>Can often avoid using expensive hardware debuggers </li>
+</ul>
+<p>There are two variations of the on-device debug agent, they are:</p>
+<ul>
+  <li><b>Application TRK</b>&#8212;supports application debugging only and available to developers creating applications for devices. Developers do not have access to system level routines,  system ROM,   other user application code, cannot modify the LR and SR registers, and must use a SIS file to debug an application.</li>
+  <li><b>System TRK</b>&#8212;
+  supports both application and limited ROM debugging (includes application executables and limited ROM based components (i.e. no device drivers) and available to original equipment manufacturers (OEM) for device creation and customization</li>
+</ul>
+<p class="note"><b>NOTE</b> The type of on-device debug agent you have is based upon which  Carbide.c++ product you have licensed. System TRK is only available with the Professional or OEM version of the product. </p>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/trk/trk_overview.htm">On-device Debugging Overview</a> </li>
+</ul>
+<div class="step">
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/work_mcore_debug.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/work_mcore_debug.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Multi-core Debugging</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Multi-core Debugging</h2>
-<p>    The IDE allows simultaneous debugging of multiple projects. This feature provides multi-core debugging capability for some embedded processors. By configuring each project to operate on a single core, the IDE can debug multiple cores by debugging multiple projects.</p>
-<p>Configuring multi-core debugging involves these tasks</p>
-<ul>
-  <li>configuring specific target settings for each project</li>
-  <li>for some cores, specifying a configuration file for initializing multi-core debugging</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>Multi-core Debugging</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Multi-core Debugging</h2>
+<p>    The IDE allows simultaneous debugging of multiple projects. This feature provides multi-core debugging capability for some embedded processors. By configuring each project to operate on a single core, the IDE can debug multiple cores by debugging multiple projects.</p>
+<p>Configuring multi-core debugging involves these tasks</p>
+<ul>
+  <li>configuring specific target settings for each project</li>
+  <li>for some cores, specifying a configuration file for initializing multi-core debugging</li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_data.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_data.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,19 +1,19 @@
-<!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>Working with Debugger Data</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Working with Debugger Data</h2>
-<p>  This section explains how to work with data that the Carbide.c++ debugger generates. The following windows show various types of debugger data.</p>
-<ul><li><a href="../reference/view_system_browser.htm">System Browser Window</a> view &mdash;shows individual processes and tasks that the debugger can control</li>
-  <li><a href="../reference/view_log.htm">Console view</a> &mdash;shows messages generated during the debugging session</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>Working with Debugger Data</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Working with Debugger Data</h2>
+<p>  This section explains how to work with data that the Carbide.c++ debugger generates. The following windows show various types of debugger data.</p>
+<ul><li><a href="../reference/view_system_browser.htm">System Browser Window</a> view &mdash;shows individual processes and tasks that the debugger can control</li>
+  <li><a href="../reference/view_log.htm">Console view</a> &mdash;shows messages generated during the debugging session</li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -21,7 +21,7 @@
       <li><a href="../debugger/debug/cmds_resuming.htm">Restarting</a> the debugger</li>
     </ul>
   </li>
-  <li>Variable information in the <a href="../reference/view_variables.htm">Variables</a> view&mdash;see the variables in the executing code, their <a href="../tasks/variables/show_variables_view.htm">values</a>, and their <a href="../tasks/variables/set_variable_formats.htm">types</a></li>
+  <li>Variable information in the <a href="../reference/view_variables.htm">Variables</a> view&mdash;see the variables in the executing code, their <a href="../tasks/variables/show_variables_view.htm">values</a>, and their types</li>
   <li>Breakpoint information in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view&mdash;see the <a href="../tasks/breakpoints/pgm_bp_enable.htm">breakpoints</a>, <a href="../tasks/breakpoints/pgm_bp_conditional.htm">conditional</a> breakpoints, and <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm">breakpoint actions</a></li>
   <li>Source code&mdash;see the source code under debugger control</li>
 </ul>
@@ -39,7 +39,7 @@
   <li><a href="../reference/view_variables.htm">Variables View</a></li>
   <li><a href="../reference/view_breakpoints.htm">Breakpoints View </a>  </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_memory.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_memory.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Working with Memory</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Working with Memory</h2>
-<p>  This section explains how to work with memory in a debugging session. Topics include:</p>
-<ul>
-  <li><a href="../reference/view_memory_wnd.htm">Memory</a> view &mdash;shows the memory that your project manipulates as it executes</li>
-  <li><a href="../reference/view_registers.htm">Registers</a> view&mdash;shows the register contents of a processor</li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/memory/view_memory_show.htm">Opening a Memory View</a></li>
-  <li><a href="../tasks/memory/memory_monitor_adding.htm">Adding a Memory Monitor</a></li>
-  <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
-  <li><a href="../tasks/memory/memory_monitor_removing.htm">Removing a Memory Monitor or Rendering</a> </li>
-</ul>
-<h5>Related References </h5>
-<ul>
-  <li><a href="../tasks/memory/view_memory_show.htm">Memory 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>Working with Memory</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Working with Memory</h2>
+<p>  This section explains how to work with memory in a debugging session. Topics include:</p>
+<ul>
+  <li><a href="../reference/view_memory_wnd.htm">Memory</a> view &mdash;shows the memory that your project manipulates as it executes</li>
+  <li><a href="../reference/view_registers.htm">Registers</a> view&mdash;shows the register contents of a processor</li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/memory/view_memory_show.htm">Opening a Memory View</a></li>
+  <li><a href="../tasks/memory/memory_monitor_adding.htm">Adding a Memory Monitor</a></li>
+  <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
+  <li><a href="../tasks/memory/memory_monitor_removing.htm">Removing a Memory Monitor or Rendering</a> </li>
+</ul>
+<h5>Related References </h5>
+<ul>
+  <li><a href="../tasks/memory/view_memory_show.htm">Memory View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -14,7 +14,7 @@
   <li><a href="breakpoints.htm">Breakpoints</a>&mdash;halt program execution on a line of source code that you specify. You can set a breakpoint that always halts program execution, or you can set a breakpoint that halts program execution if a condition that you specify is true.</li>
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm">Breakpoint actions</a>&mdash;perform a task during program execution on a line of source
     code that you specify. Breakpoint actions can play sounds, run scripts, log data, and perform other operations.</li>
-  <li><a href="watchpoints.htm">Watchpoints</a>&mdash;halt program execution after a location in memory changes
+  <li><a href="../debugger/watchpoints/watchpoints.htm">Watchpoints</a><a href="watchpoints.htm"></a>&mdash;halt program execution after a location in memory changes
   value</li>
 </ul>
 <p>After you set these items in your source code, you start a debugging session to use them. As program execution arrives at each of these items, the debugger can halt execution, perform a task, or update data.</p>
@@ -29,7 +29,7 @@
   <li><a href="../reference/view_breakpoints.htm">Breakpoints View</a> </li>
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm">Breakpoint Actions</a> Preferences</li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_variables.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_variables.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,34 +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>Working with Variables</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {color: #FF0000}
-.style2 {color: #000000}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Working with Variables</h2>
-<p>  This section explains how to work with variables in a Carbide&trade; IDE debugging session. The following windows show various types of information about variables.</p>
-<ul>
-  <li><a href="../reference/view_variables.htm">Variables</a> view &mdash; <span class="style2">shows information about global and static variables in your project</span></li>
-  <li><a href="../reference/view_expressions.htm">Expressions</a> window&mdash; shows variable values and lets you form calculation expressions based on those values</li>
-</ul>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../reference/view_expressions.htm">Expressions view</a></li>
-  <li><a href="../reference/view_variables.htm">Variables View</a> </li>
-  <li><a href="../tasks/variables/set_variable_formats.htm">Setting Variable Formats</a></li>
-  <li><a href="../tasks/variables/show_variables_view.htm">Opening a Variables View</a></li>
-  <li><a href="../tasks/variables/show_global_variables.htm">Showing Global Variables</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>Working with Variables</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {color: #FF0000}
+.style2 {color: #000000}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Working with Variables</h2>
+<p>  This section explains how to work with variables in a Carbide&trade; IDE debugging session. The following windows show various types of information about variables.</p>
+<ul>
+  <li><a href="../reference/view_variables.htm">Variables</a> view &mdash; <span class="style2">shows information about global and static variables in your project</span></li>
+  <li><a href="../reference/view_expressions.htm">Expressions</a> window&mdash; shows variable values and lets you form calculation expressions based on those values</li>
+</ul>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../reference/view_expressions.htm">Expressions view</a></li>
+  <li><a href="../reference/view_variables.htm">Variables View</a></li>
+  <li><a href="../tasks/variables/show_variables_view.htm">Opening a Variables View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,34 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Workspace Information</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {
-	color: #FF0000;
-	font-weight: bold;
-}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Workspace Information </h2>
-<p>A workspace is the default place to store and create resources like projects, folders, and files. These are then presented to the user in a perspective which enables the presentation and manipulation of the stored resources.</p>
-<p> When Carbide is launched it asks for a workspace to open. As you can have multiple workspaces, all independent from each other, choosing the workspace containing the projects to work on is important. Projects within a workspace are  shown in the Carbide workbench within the <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/cnav.htm">Project Explorer</a> and <a href="../reference/view_cpp_projects.htm">C/C++ Project</a> views. When you create a new project it is automatically added to the currently open workspace. You can import existing projects into a workspace from INF files.</p>
-<p class="note"><span class="style1">WARNING</span> Bld.inf imported projects are not copied, so do not delete the contents when deleting the project.</p>
-<p>Projects in one workspace cannot refer to projects in a different workspace. Thus, large projects spanning  folders outside of the workspace are not handled at all. Storing all the project files in the workspace makes managing them   easier from a project management perspective. Files accessible inside the workspace, like project source and resource files, are better supported than those outside the workspace (for example, SDK headers). Local History, CVS, MMP/bld.inf editors, etc. are available for files inside the workspace but not for those outside the workspace. </p>
-<p class="note"><b>NOTE</b> Carbide automatically updates MMP and INF files as changes are made within the MMP and INF editors.</p>
-<p><span class="note">Carbide generates project support files, such as </span><span class="code">.project</span><span class="note"> and </span><span class="code">.cproject</span><span class="note"> and a </span><span class="code">.metadata</span><span class="note"> folder, which stores preferences.</span> Metadata files like &quot;.project&quot; are placed in the source tree. If adding these files to CVS causes a problem, these files may be excluded from CVS  using <b>Team &gt; Ignored Resources</b> preference panel to specify name patterns to exclude from version control.</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="CarbidePerspective.html">Carbide.c++ perspective </a></li>
-  <li><a href="../reference/perspective_debug.htm">Debug perspective </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>Workspace Information</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {
+	color: #FF0000;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Workspace Information </h2>
+<p>A workspace is the default place to store and create resources like projects, folders, and files. These are then presented to the user in a perspective which enables the presentation and manipulation of the stored resources.</p>
+<p> When Carbide is launched it asks for a workspace to open. As you can have multiple workspaces, all independent from each other, choosing the workspace containing the projects to work on is important. Projects within a workspace are  shown in the Carbide workbench within the <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/cnav.htm">Project Explorer</a> and <a href="../reference/view_cpp_projects.htm">C/C++ Project</a> views. When you create a new project it is automatically added to the currently open workspace. You can import existing projects into a workspace from INF files.</p>
+<p class="note"><span class="style1">WARNING</span> Bld.inf imported projects are not copied, so do not delete the contents when deleting the project.</p>
+<p>Projects in one workspace cannot refer to projects in a different workspace. Thus, large projects spanning  folders outside of the workspace are not handled at all. Storing all the project files in the workspace makes managing them   easier from a project management perspective. Files accessible inside the workspace, like project source and resource files, are better supported than those outside the workspace (for example, SDK headers). Local History, CVS, MMP/bld.inf editors, etc. are available for files inside the workspace but not for those outside the workspace. </p>
+<p class="note"><b>NOTE</b> Carbide automatically updates MMP and INF files as changes are made within the MMP and INF editors.</p>
+<p><span class="note">Carbide generates project support files, such as </span><span class="code">.project</span><span class="note"> and </span><span class="code">.cproject</span><span class="note"> and a </span><span class="code">.metadata</span><span class="note"> folder, which stores preferences.</span> Metadata files like &quot;.project&quot; are placed in the source tree. If adding these files to CVS causes a problem, these files may be excluded from CVS  using <b>Team &gt; Ignored Resources</b> preference panel to specify name patterns to exclude from version control.</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="CarbidePerspective.html">Carbide.c++ perspective </a></li>
+  <li><a href="../reference/perspective_debug.htm">Debug perspective </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,34 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Breakpoints Overview</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Breakpoints Overview </h2>
-<p>A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to suspend program execution. Breakpoints are shown in the UI both with the associated source code in an editor view as well as a dedicated <a href="viewing_breakpoints.htm">Breakpoints</a> view. </p>
-<p>When a breakpoint is encountered during program execution, the debugger suspends execution and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears so you can examine the executable's current state,  check register and variable values, and use the stepping commands to walk line by line through the program to verify its operation. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
-<p>The following topics cover various breakpoint concepts and actions: </p>
-<ul>
-  <li><a href="viewing_breakpoints.htm">Viewing Breakpoints</a></li>
-  <li><a href="resolving_breakpoints.htm">Breakpoint status indicators </a> </li>
-  <li><a href="toggling_breakpoints.htm">Enabling, Disabling and Removing Breakpoints</a></li>
-  <li><a href="properties_breakpoints.htm">Breakpoint properties </a>
-    <ul>
-      <li><a href="temporary_breakpoints.htm">Creating temporary breakpoints</a> </li>
-      <li><a href="conditional_breakpoints.htm">Creating conditional breakpoints</a> </li>
-    </ul>
-  </li>
-  <li><a href="exporting_breakpoints.htm">Exporting</a> and <a href="importing_breakpoints.htm">importing</a> breakpoints</li>
-  <li><a href="../../reference/menus/hardware_breakpoints.htm">Toggle hardware breakpoints</a> </li>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li>Debugging overview </li>
-</ul>
-<div id="footer">Copyright &copy; 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>Breakpoints Overview</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Breakpoints Overview </h2>
+<p>A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to suspend program execution. Breakpoints are shown in the UI both with the associated source code in an editor view as well as a dedicated <a href="viewing_breakpoints.htm">Breakpoints</a> view. </p>
+<p>When a breakpoint is encountered during program execution, the debugger suspends execution and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears so you can examine the executable's current state,  check register and variable values, and use the stepping commands to walk line by line through the program to verify its operation. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
+<p>The following topics cover various breakpoint concepts and actions: </p>
+<ul>
+  <li><a href="viewing_breakpoints.htm">Viewing Breakpoints</a></li>
+  <li><a href="resolving_breakpoints.htm">Breakpoint status indicators </a> </li>
+  <li><a href="toggling_breakpoints.htm">Enabling, Disabling and Removing Breakpoints</a></li>
+  <li><a href="properties_breakpoints.htm">Breakpoint properties </a>
+    <ul>
+      <li><a href="temporary_breakpoints.htm">Creating temporary breakpoints</a> </li>
+      <li><a href="conditional_breakpoints.htm">Creating conditional breakpoints</a> </li>
+    </ul>
+  </li>
+  <li><a href="exporting_breakpoints.htm">Exporting</a> and <a href="importing_breakpoints.htm">importing</a> breakpoints</li>
+  <li><a href="../../reference/menus/hardware_breakpoints.htm">Toggle hardware breakpoints</a> </li>
+</ul>
+<h4>Other references</h4>
+<ul>
+  <li>Debugging overview </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/conditional_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/conditional_breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Creating Conditional Breakpoints </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2> Creating Conditional Breakpoints </h2>
-<p>Use the <b>Properties for Breakpoint  &gt; Common &gt; Conditional</b> option to create conditional breakpoints. Where regular breakpoints  suspend execution each time they are hit, a condition breakpoint evaluates an expression to determine if it is true or not. If the expression evaluates true, then program execuation is suspended and the <a href="../../reference/perspective_debug.htm">Debug</a> perpective shown. If the expression evaluates to false, execution continues. </p>
-<p align="center"><img src="../images/option_condition.png" width="434" height="202"></p>
-<p class="figure">Figure 1. Condition field in Properties for Breakpoint window </p>
-<p>You create a conditional breakpoint in the <b>Conditional</b> field by entering a valid expression.  Valid expressions include:</p>
-<ul>
-  <li class="code">meters == 10</li>
-  <li class="code">height &gt;= 5</li>
-  <li class="code">count != 10    </li>
-</ul>
-<p>When creating the expression some things to consider include:</p>
-<ul>
-  <li>expressions must evaluate to true </li>
-  <li>the value being examined must be within the scope of the function</li>
-  <li>normal syntax rules apply when creating the expression</li>
-  <li>only a single expression can be evaluated within the Condition field </li>
-  <li>function and method calls cannot be used as part of the expression  </li>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li><a href="breakpoints.htm">Breakpoints 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>
+<!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>Creating Conditional Breakpoints </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2> Creating Conditional Breakpoints </h2>
+<p>Use the <b>Properties for Breakpoint  &gt; Common &gt; Conditional</b> option to create conditional breakpoints. Where regular breakpoints  suspend execution each time they are hit, a condition breakpoint evaluates an expression to determine if it is true or not. If the expression evaluates true, then program execuation is suspended and the <a href="../../reference/perspective_debug.htm">Debug</a> perpective shown. If the expression evaluates to false, execution continues. </p>
+<p align="center"><img src="../images/option_condition.png" width="434" height="202"></p>
+<p class="figure">Figure 1. Condition field in Properties for Breakpoint window </p>
+<p>You create a conditional breakpoint in the <b>Conditional</b> field by entering a valid expression.  Valid expressions include:</p>
+<ul>
+  <li class="code">meters == 10</li>
+  <li class="code">height &gt;= 5</li>
+  <li class="code">count != 10    </li>
+</ul>
+<p>When creating the expression some things to consider include:</p>
+<ul>
+  <li>expressions must evaluate to true </li>
+  <li>the value being examined must be within the scope of the function</li>
+  <li>normal syntax rules apply when creating the expression</li>
+  <li>only a single expression can be evaluated within the Condition field </li>
+  <li>function and method calls cannot be used as part of the expression  </li>
+</ul>
+<h4>Other references</h4>
+<ul>
+  <li><a href="breakpoints.htm">Breakpoints overview </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/exporting_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/exporting_breakpoints.htm	Fri Apr 16 11:18:22 2010 -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>Exporting Breakpoints and Watchpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2> Exporting Breakpoints and Watchpoints</h2>
-<p>Use the <b>Export Breakpoints</b> command to export selected breakpoints and watchpoints to a  file with a <span class="code">.bkpt</span> extension. All the breakpoints set in the source files of the  project and the watchpoints are listed in the <b>Export Breakpoints</b> dialog. Click the specific breakpoints and watchpoints to export or use <b>Select All</b> to include all of them. Specify the destination file name and folder, then click <b>Finish</b>. </p>
-<p align="center"><img src="../images/wnd_export_breakpoints.png" width="438" height="496"></p>
-<p class="figure">Figure 1 - Export Breakpoints dialog </p>
-<table cellspacing="0" cellpadding="5" summary="Import breakpoints page" border="1">
-  <tbody>
-    <tr>
-      <th>Option</th>
-      <th>Description</th>
-      <th>Default</th>
-    </tr>
-    <tr>
-      <td valign="top" align="left"><b>Breakpoint List</b></td>
-      <td valign="top" align="left">Select the breakpoints and watchpoints that you wish to export, and deselect those that you do not. </td>
-      <td valign="top" align="left"><p>not selected </p></td>
-    </tr>
-    <tr>
-      <td valign="top"><b>To file </b></td>
-      <td valign="top">The file to export the breakpoints and watchpoints to, you can also click <b>Browse...</b> to search for a location to export. </td>
-      <td valign="top"><p><b>There can be two possible defaults:</b></p>
-          <ul>
-            <li>If you have never exported breakpoints or watchpoints before it will be blank</li>
-            <li>If you have exported breakpoints and watchpoints before the last file name you exported to will be automatically inserted. </li>
-        </ul></td>
-    </tr>
-    <tr>
-      <td valign="top"><b>Overwrite existing file without warning</b></td>
-      <td valign="top"><dl>
-        <dt><b> </b>When selected, if the file you wish to export to already exists, it will be overwritten automatically by the wizard. </dt>
-      </dl></td>
-      <td valign="top">not selected </td>
-    </tr>
-  </tbody>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="breakpoints.htm">Breakpoints overview </a></li>
-  <li><a href="importing_breakpoints.htm">Importing Breakpoints</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!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>Exporting Breakpoints and Watchpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2> Exporting Breakpoints and Watchpoints</h2>
+<p>Use the <b>Export Breakpoints</b> command to export selected breakpoints and watchpoints to a  file with a <span class="code">.bkpt</span> extension. All the breakpoints set in the source files of the  project and the watchpoints are listed in the <b>Export Breakpoints</b> dialog. Click the specific breakpoints and watchpoints to export or use <b>Select All</b> to include all of them. Specify the destination file name and folder, then click <b>Finish</b>. </p>
+<p align="center"><img src="../images/wnd_export_breakpoints.png" width="438" height="496"></p>
+<p class="figure">Figure 1 - Export Breakpoints dialog </p>
+<table cellspacing="0" cellpadding="5" summary="Import breakpoints page" border="1">
+  <tbody>
+    <tr>
+      <th>Option</th>
+      <th>Description</th>
+      <th>Default</th>
+    </tr>
+    <tr>
+      <td valign="top" align="left"><b>Breakpoint List</b></td>
+      <td valign="top" align="left">Select the breakpoints and watchpoints that you wish to export, and deselect those that you do not. </td>
+      <td valign="top" align="left"><p>not selected </p></td>
+    </tr>
+    <tr>
+      <td valign="top"><b>To file </b></td>
+      <td valign="top">The file to export the breakpoints and watchpoints to, you can also click <b>Browse...</b> to search for a location to export. </td>
+      <td valign="top"><p><b>There can be two possible defaults:</b></p>
+          <ul>
+            <li>If you have never exported breakpoints or watchpoints before it will be blank</li>
+            <li>If you have exported breakpoints and watchpoints before the last file name you exported to will be automatically inserted. </li>
+        </ul></td>
+    </tr>
+    <tr>
+      <td valign="top"><b>Overwrite existing file without warning</b></td>
+      <td valign="top"><dl>
+        <dt><b> </b>When selected, if the file you wish to export to already exists, it will be overwritten automatically by the wizard. </dt>
+      </dl></td>
+      <td valign="top">not selected </td>
+    </tr>
+  </tbody>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="breakpoints.htm">Breakpoints overview </a></li>
+  <li><a href="importing_breakpoints.htm">Importing Breakpoints</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/importing_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/importing_breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,44 +1,44 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Importing Breakpoints and Watchpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2> Importing Breakpoints and Watchpoints</h2>
-<p>Use the <b>Import Breakpoints</b> command to import a <span class="code">.bkpt</span> file containing breakpoint and watchpoint data and apply it to the current project. Right-click in the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view and select <b>Import Breakpoints...</b> from the context menu. You have the options of updating all existing breakpoints with the stored data or simply creating a working set containing the imported data. </p>
-<p align="center"><img src="../images/wnd_import_breakpoints.png" width="438" height="415"></p>
-<p class="figure">Figure 2 - Import Breakpoints dialog </p>
-<table cellspacing="0" cellpadding="5" summary="Import breakpoints page" border="1">
-  <tbody>
-    <tr>
-      <th width="220">Option</th>
-      <th width="466">Description</th>
-    </tr>
-    <tr>
-      <td valign="top"><b>From file </b></td>
-      <td valign="top"><p>Enter the file name to import or click <b>Browse</b> to search for a <span class="code">.bkpt</span> file to import. </p>      </td>
-    </tr>
-    <tr>
-      <td valign="top"><b>Update existing breakpoints </b></td>
-      <td valign="top"><dl>
-        <dt><b> </b>Update all existing project breakpoints found in the imported breakpoint data file. </dt>
-      </dl></td>
-    </tr>
-    <tr>
-      <td valign="top"><b>Create breakpoint working sets </b></td>
-      <td valign="top">Create a new breakpoint working set containing the imported breakpoint data. </td>
-    </tr>
-  </tbody>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="breakpoints.htm">Breakpoints overview </a></li>
-  <li><a href="exporting_breakpoints.htm">Exporting Breakpoints </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Importing Breakpoints and Watchpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2> Importing Breakpoints and Watchpoints</h2>
+<p>Use the <b>Import Breakpoints</b> command to import a <span class="code">.bkpt</span> file containing breakpoint and watchpoint data and apply it to the current project. Right-click in the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view and select <b>Import Breakpoints...</b> from the context menu. You have the options of updating all existing breakpoints with the stored data or simply creating a working set containing the imported data. </p>
+<p align="center"><img src="../images/wnd_import_breakpoints.png" width="438" height="415"></p>
+<p class="figure">Figure 2 - Import Breakpoints dialog </p>
+<table cellspacing="0" cellpadding="5" summary="Import breakpoints page" border="1">
+  <tbody>
+    <tr>
+      <th width="220">Option</th>
+      <th width="466">Description</th>
+    </tr>
+    <tr>
+      <td valign="top"><b>From file </b></td>
+      <td valign="top"><p>Enter the file name to import or click <b>Browse</b> to search for a <span class="code">.bkpt</span> file to import. </p>      </td>
+    </tr>
+    <tr>
+      <td valign="top"><b>Update existing breakpoints </b></td>
+      <td valign="top"><dl>
+        <dt><b> </b>Update all existing project breakpoints found in the imported breakpoint data file. </dt>
+      </dl></td>
+    </tr>
+    <tr>
+      <td valign="top"><b>Create breakpoint working sets </b></td>
+      <td valign="top">Create a new breakpoint working set containing the imported breakpoint data. </td>
+    </tr>
+  </tbody>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="breakpoints.htm">Breakpoints overview </a></li>
+  <li><a href="exporting_breakpoints.htm">Exporting Breakpoints </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/properties_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/properties_breakpoints.htm	Fri Apr 16 11:18:22 2010 -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>Breakpoints Properties</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Breakpoints Properties</h2>
-<p>Use the <b>Properties for Breakpoint</b> window to examine and modify  a specific breakpoints properties. By setting certain options its possible to create both <a href="conditional_breakpoints.htm">conditional</a> and <a href="temporary_breakpoints.htm">temporary</a> breakpoints. </p>
-<p>The pages available include:</p>
-<ul>
-  <li><b>Actions</b> - define one or more specific <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm">breakpoint actions</a> like playing a sound or showing an alert message to this breakpoint </li>
-  <li><b>Common</b> - shows common  information including the class, breakpoint type, file location, and other attributes associated with the breakpoint. </li>
-</ul>
-<p align="center"><img src="../images/wnd_properties_breakpoints.png" width="628" height="544"></p>
-<p class="figure">Figure 1 - <b>Properties for C/C++ breakpoint</b> window</p>
-<h5>Table 1. Breakpoint properties - common page </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="25%" scope="col">Property</th>
-    <th width="75%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Class</b></td>
-    <td>Breakpoint class </td>
-  </tr>
-  <tr>
-    <td><b>Type</b></td>
-    <td>Breakpoint type. Regular is the default software breakpoint type. </td>
-  </tr>
-  <tr>
-    <td><b>File</b></td>
-    <td>The complete path and filename of the file where the breakpoint is located.</td>
-  </tr>
-  <tr>
-    <td><b>Line number</b></td>
-    <td>The breakpoints line number in the file. </td>
-  </tr>
-  <tr>
-    <td><b>Enabled</b></td>
-    <td>Indicates the current status of the breakpoint. When checkmarked, the breakpoint  stops program execution if its condition is met. When unchecked, the breakpoint is ignored during the debug session. </td>
-  </tr>
-  <tr>
-    <td><b>Condition</b></td>
-    <td>The <a href="conditional_breakpoints.htm">conditional</a> expression associated with the item. This conditional expression must evaluate to true in order for the item to perform its specified action. If left blank, execution is suspended each time the breakpoint is hit. If a condition is entered,like <span class="code">n==10</span>, execution only stops when the condition evaluates to true. </td>
-  </tr>
-  <tr>
-    <td><b>Ignore  count</b></td>
-    <td><p>Defines when a breakpoint should be ignored during a debug session. The default count <span class="code">0</span> indicates that the breakpoint should suspend execution each time it is hit. A value of 1 defines this breakpoint as a <a href="temporary_breakpoints.htm">temporary</a> breakpoint, which should be ignored after the first time it is encountered. </p>
-    </td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="breakpoints.htm">Breakpoints 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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Breakpoints Properties</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Breakpoints Properties</h2>
+<p>Use the <b>Properties for Breakpoint</b> window to examine and modify  a specific breakpoints properties. By setting certain options its possible to create both <a href="conditional_breakpoints.htm">conditional</a> and <a href="temporary_breakpoints.htm">temporary</a> breakpoints. </p>
+<p>The pages available include:</p>
+<ul>
+  <li><b>Actions</b> - define one or more specific <a href="../debugger/variables/viewing_variables.htm">breakpoint actions</a> like playing a sound or showing an alert message to this breakpoint </li>
+  <li><b>Common</b> - shows common  information including the class, breakpoint type, file location, and other attributes associated with the breakpoint. </li>
+</ul>
+<p align="center"><img src="../images/wnd_properties_breakpoints.png" width="628" height="544"></p>
+<p class="figure">Figure 1 - <b>Properties for C/C++ breakpoint</b> window</p>
+<h5>Table 1. Breakpoint properties - common page </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="25%" scope="col">Property</th>
+    <th width="75%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Class</b></td>
+    <td>Breakpoint class </td>
+  </tr>
+  <tr>
+    <td><b>Type</b></td>
+    <td>Breakpoint type. Regular is the default software breakpoint type. </td>
+  </tr>
+  <tr>
+    <td><b>File</b></td>
+    <td>The complete path and filename of the file where the breakpoint is located.</td>
+  </tr>
+  <tr>
+    <td><b>Line number</b></td>
+    <td>The breakpoints line number in the file. </td>
+  </tr>
+  <tr>
+    <td><b>Enabled</b></td>
+    <td>Indicates the current status of the breakpoint. When checkmarked, the breakpoint  stops program execution if its condition is met. When unchecked, the breakpoint is ignored during the debug session. </td>
+  </tr>
+  <tr>
+    <td><b>Condition</b></td>
+    <td>The <a href="conditional_breakpoints.htm">conditional</a> expression associated with the item. This conditional expression must evaluate to true in order for the item to perform its specified action. If left blank, execution is suspended each time the breakpoint is hit. If a condition is entered,like <span class="code">n==10</span>, execution only stops when the condition evaluates to true. </td>
+  </tr>
+  <tr>
+    <td><b>Ignore  count</b></td>
+    <td><p>Defines when a breakpoint should be ignored during a debug session. The default count <span class="code">0</span> indicates that the breakpoint should suspend execution each time it is hit. A value of 1 defines this breakpoint as a <a href="temporary_breakpoints.htm">temporary</a> breakpoint, which should be ignored after the first time it is encountered. </p>
+    </td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="breakpoints.htm">Breakpoints overview  </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/resolving_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/resolving_breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,65 +1,65 @@
-<!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>Breakpoint Status Indicators </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2> Breakpoint Status Indicators </h2>
-<p>Breakpoints must be located and resolved by the debugger before they can be hit. When a breakpoint is hit in the module, the debugger halts program execution and displays the state of the program in the <a href="../../reference/perspective_debug.htm">Debug</a> perspective. </p>
-<p>To hit a breakpoint during a debug session, the debugger must first load the symbols for an executable module and then attempt to resolve the breakpoints within the loaded module. Any module listed into the <a href="../../reference/view_executables.htm">Executables</a> view is available for loading by  a debug session. If a module is not present in the Executable view you'll need to import it before the debugger to load and resolve any breakpoints within that module. </p>
-<p>You  set a breakpoint on any executable line of code that the debugger can resolve. Lines containing comments and other non executable code cannot be assigned a breakpoint as they are normally stripped from the  compiled   binary. Carbide helps by preventing you from setting a breakpoint on a non-compilable line of code. </p>
-<p>When the debugger attempts to resolve a breakpoint the possible results are shown in Table 1.</p>
-<h5>Table 1 Breakpoint&mdash;type, icons, and states </h5>
-<table width="90%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="15%" scope="col">Type</th>
-    <th width="14%" scope="col">Icon</th>
-    <th width="14%" scope="col">State</th>
-    <th width="71%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td rowspan="2"><b>Enabled</b></td>
-    <td><div align="center"><img src="../../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" /></div></td>
-    <td><div align="center">Unresolved</div></td>
-    <td><p>The breakpoint is enabled but the symbols for the module  are not loaded or the breakpoint was not able to be set within the current function.Breakpoint icon remains in unflagged state indicating unresolved status.</p>
-      <p>If  the breakpoint has been set in the source file but not resolved: </p>
-      <ul>
-        <li>a debug session has not been launched to resolve the breakpoint. For example, you just set the breakpoint and have yet to launch a debug session. </li>
-        <li>the symbols file containing the breakpoint cannot be found. Ensure the module to debug is present in the Executable view list so the debugger can locate and load the executable for symbol resolution. </li>
-        <li>breakpoint is set on a source line without any executable code</li>
-        <li>breakpoint is located in a deadstripped  function not present in the executable </li>
-      </ul>      </td>
-  </tr>
-  <tr>
-    <td><div align="center"> <img src="../../images/icons/breakpoints_enabled_icon.png" width="15" height="12" /></div></td>
-    <td><div align="center">Resolved</div></td>
-    <td><p>The breakpoint is currently enabled,  the symbols for the module  are loaded,  and the breakpoint  located in the executable   being debugged. The debugger halts program execution at an enabled breakpoint. </p>
-      <ul>
-        <li><b>resolved</b> &#8212; the symbols for the module  are loaded  and the breakpoint  located in the executable that&#8217;s currently being debugged, circle icon changes to flagged icon </li>
-        <li><b>resolved and moved</b> &#8212;the breakpoint is not found in the executable at the specified point. Debugger moves breakpoint forward in the current function until a line is found that can be resolved. Breakpoint icon moved to source line matching new breakpoint location and changed to flagged icon</li>
-    </ul>      
-    </td>
-  </tr>
-  <tr>
-    <td rowspan="2"><b>Disabled</b></td>
-    <td><div align="center"><img src="../../tasks/breakpoints/images/breakpoints_disabled_icon.png" width="12" height="11" /></div></td>
-    <td><div align="center">Unresolved</div></td>
-    <td>Indicates that the breakpoint is currently disabled but not located in the executable during a debug session. The debugger does not halt program execution at a disabled breakpoint.</td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="../../images/icons/breakpoints_disabled_icon.png" width="15" height="12" /></div></td>
-    <td><div align="center">Resolved</div></td>
-    <td>Indicates that the breakpoint is currently disabled and resolved for the source line. The debugger does not halt program execution at a disabled breakpoint.</td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="breakpoints.htm">Breakpoints 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>
+<!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>Breakpoint Status Indicators </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2> Breakpoint Status Indicators </h2>
+<p>Breakpoints must be located and resolved by the debugger before they can be hit. When a breakpoint is hit in the module, the debugger halts program execution and displays the state of the program in the <a href="../../reference/perspective_debug.htm">Debug</a> perspective. </p>
+<p>To hit a breakpoint during a debug session, the debugger must first load the symbols for an executable module and then attempt to resolve the breakpoints within the loaded module. Any module listed into the <a href="../../reference/view_executables.htm">Executables</a> view is available for loading by  a debug session. If a module is not present in the Executable view you'll need to import it before the debugger to load and resolve any breakpoints within that module. </p>
+<p>You  set a breakpoint on any executable line of code that the debugger can resolve. Lines containing comments and other non executable code cannot be assigned a breakpoint as they are normally stripped from the  compiled   binary. Carbide helps by preventing you from setting a breakpoint on a non-compilable line of code. </p>
+<p>When the debugger attempts to resolve a breakpoint the possible results are shown in Table 1.</p>
+<h5>Table 1 Breakpoint&mdash;type, icons, and states </h5>
+<table width="90%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="15%" scope="col">Type</th>
+    <th width="14%" scope="col">Icon</th>
+    <th width="14%" scope="col">State</th>
+    <th width="71%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td rowspan="2"><b>Enabled</b></td>
+    <td><div align="center"><img src="../../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" /></div></td>
+    <td><div align="center">Unresolved</div></td>
+    <td><p>The breakpoint is enabled but the symbols for the module  are not loaded or the breakpoint was not able to be set within the current function.Breakpoint icon remains in unflagged state indicating unresolved status.</p>
+      <p>If  the breakpoint has been set in the source file but not resolved: </p>
+      <ul>
+        <li>a debug session has not been launched to resolve the breakpoint. For example, you just set the breakpoint and have yet to launch a debug session. </li>
+        <li>the symbols file containing the breakpoint cannot be found. Ensure the module to debug is present in the Executable view list so the debugger can locate and load the executable for symbol resolution. </li>
+        <li>breakpoint is set on a source line without any executable code</li>
+        <li>breakpoint is located in a deadstripped  function not present in the executable </li>
+      </ul>      </td>
+  </tr>
+  <tr>
+    <td><div align="center"> <img src="../../images/icons/breakpoints_enabled_icon.png" width="15" height="12" /></div></td>
+    <td><div align="center">Resolved</div></td>
+    <td><p>The breakpoint is currently enabled,  the symbols for the module  are loaded,  and the breakpoint  located in the executable   being debugged. The debugger halts program execution at an enabled breakpoint. </p>
+      <ul>
+        <li><b>resolved</b> &#8212; the symbols for the module  are loaded  and the breakpoint  located in the executable that&#8217;s currently being debugged, circle icon changes to flagged icon </li>
+        <li><b>resolved and moved</b> &#8212;the breakpoint is not found in the executable at the specified point. Debugger moves breakpoint forward in the current function until a line is found that can be resolved. Breakpoint icon moved to source line matching new breakpoint location and changed to flagged icon</li>
+    </ul>      
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2"><b>Disabled</b></td>
+    <td><div align="center"><img src="../../tasks/breakpoints/images/breakpoints_disabled_icon.png" width="12" height="11" /></div></td>
+    <td><div align="center">Unresolved</div></td>
+    <td>Indicates that the breakpoint is currently disabled but not located in the executable during a debug session. The debugger does not halt program execution at a disabled breakpoint.</td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="../../images/icons/breakpoints_disabled_icon.png" width="15" height="12" /></div></td>
+    <td><div align="center">Resolved</div></td>
+    <td>Indicates that the breakpoint is currently disabled and resolved for the source line. The debugger does not halt program execution at a disabled breakpoint.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="breakpoints.htm">Breakpoints overview </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/temporary_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/temporary_breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,24 +1,24 @@
-<!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>Creating Temporary Breakpoints and Watchpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2> Creating Temporary Breakpoints and Watchpoints</h2>
-<p>Use the <b>Properties for Breakpoint  &gt; Common &gt; Ignore Count </b> option to create temporary breakpoints or watchpoints. Where regular breakpoints  or watchpoints suspend execution each time they are hit, a temporary one is removed once it is hit. The default value is 0, which suspends program execution each time the breakpoint or watchpoint are hit. </p>
-<p>To set a temporary breakpoint or watchpoint, change the value of <b>Ignore count</b> to 1. The first time the breakpoint or watchpoint is hit execution is suspended, while any subsequent hits are ignored. </p>
-<p align="center"><img src="../images/option_ignore_count.png" width="434" height="203"></p>
-<p class="figure">Figure 1. Ignore Count option in Properties for Breakpoint window </p>
-<h4>Other references</h4>
-<ul>
-  
-  <li><a href="breakpoints.htm">Breakpoints overview </a></li>
-  <li><a href="../watchpoints/watchpoints.htm">Watchpoints 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>
+<!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>Creating Temporary Breakpoints and Watchpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2> Creating Temporary Breakpoints and Watchpoints</h2>
+<p>Use the <b>Properties for Breakpoint  &gt; Common &gt; Ignore Count </b> option to create temporary breakpoints or watchpoints. Where regular breakpoints  or watchpoints suspend execution each time they are hit, a temporary one is removed once it is hit. The default value is 0, which suspends program execution each time the breakpoint or watchpoint are hit. </p>
+<p>To set a temporary breakpoint or watchpoint, change the value of <b>Ignore count</b> to 1. The first time the breakpoint or watchpoint is hit execution is suspended, while any subsequent hits are ignored. </p>
+<p align="center"><img src="../images/option_ignore_count.png" width="434" height="203"></p>
+<p class="figure">Figure 1. Ignore Count option in Properties for Breakpoint window </p>
+<h4>Other references</h4>
+<ul>
+  
+  <li><a href="breakpoints.htm">Breakpoints overview </a></li>
+  <li><a href="../watchpoints/watchpoints.htm">Watchpoints overview </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/toggling_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/toggling_breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -33,6 +33,6 @@
 <ul>
   <li><a href="breakpoints.htm">Breakpoints overview </a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/viewing_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/breakpoints/viewing_breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,140 +1,140 @@
-<!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>Viewing Breakpoints and Watchpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Viewing Breakpoints and Watchpoints </h2>
-<p>Use the <b>Breakpoints</b> view (Figure 1) to <a href="properties_breakpoints.htm">examine</a> a project's breakpoints and watchpoints, <a href="toggling_breakpoints.htm">toggle</a> individual breakpoints  between enabled and disabled, set <a href="conditional_breakpoints.htm">conditional</a> breakpoints, <a href="exporting_breakpoints.htm">export</a> and <a href="importing_breakpoints.htm">import</a> breakpoints, or remove them from one or more build configurations. </p>
-<p>The <b>Breakpoints</b> view is available in the <a href="../../reference/perspective_debug.htm">Debug</a> perspective by default. To open it in another perspective, use the <b>Window &gt; Show View &gt; Breakpoints</b> menu option. Once open you have  control over breakpoint states and how they are shown. For example: </p>
-<ul>
-  <li>Click a  check box next to a breakpoint to toggle its state between enabled (checked) and disabled (no checkmark) </li>
-  <li>Double-click a breakpoint to open the associated source file at the breakpoint line number  in an editor view</li>
-  <li>Use the <b>Menu &gt; Group By</b> command to control how the breakpoints are shown in the view. For example, by file, by breakpoints, etc. </li>
-  <li>Use the <b>Menu &gt; Working Sets... </b> command to create working sets of breakpoints to quickly switch between different breakpoint settings or groups </li>
-  <li>Right-click to open the Breakpoints view's context menu for additional command options </li>
-</ul>
-<p align="center"><img src="../images/view_breakpoints.png" width="594" height="322"></p>
-<p class="figure">Figure 1 - Breakpoints view showing context menu </p>
-<h3>Breakpoints view toolbar icons</h3>
-<p>The following commands appear on the toolbar within the Breakpoints view: </p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="11%" scope="col">Icon</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Remove Selected Breakpoint </b></td>
-    <td><div align="center"><img src="../../images/icons/breakpoints_remove_one_icon.png" width="19" height="19" /></div></td>
-    <td>Removes the selected breakpoint from the breakpoints list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove All Breakpoints </b></td>
-    <td><div align="center"><img src="../../images/icons/breakpoints_remove_all_icon.png" width="21" height="19" /></div></td>
-    <td>Removes all breakpoints from the breakpoints list. </td>
-  </tr>
-  <tr>
-    <td><b>Show Breakpoints Supported by Selected Target </b></td>
-    <td><div align="center"><img src="../../images/icons/breakpoints_show_icon.png" width="20" height="19" /></div></td>
-    <td>Limits the breakpoints shown to only those supported in the current target. </td>
-  </tr>
-  <tr>
-    <td><b>Go to File for Breakpoint </b></td>
-    <td><div align="center"><img src="../../images/icons/breakpoints_goto_icon.png" width="20" height="19" /></div></td>
-    <td>Displays the breakpoint in an editor view, opening the source file if required. </td>
-  </tr>
-  <tr>
-    <td><b>Skip All Breakpoints </b></td>
-    <td><div align="center"><img src="../../images/icons/breakpoints_skip_all_icon.png" width="19" height="19" /></div></td>
-    <td>Toggles  the debugger to skip all  breakpoints regardless of their current enabled or disabled state, or hit all breakpoints.</td>
-  </tr>
-  <tr>
-    <td><b>Expand All </b></td>
-    <td><div align="center"><img src="../../images/icons/breakpoints_collapse_icon.png" width="19" height="18" /></div></td>
-    <td>Expand all matches in the hierarchical view.</td>
-  </tr>
-  <tr>
-    <td><b>Collapse All </b></td>
-    <td><div align="center"><img src="../../images/icons/breakpoints_expand_icon.png" width="19" height="18" /></div></td>
-    <td>Collapse all matches in the hierarchical view.</td>
-  </tr>
-  <tr>
-    <td><b>Link with Debug View</b></td>
-    <td><div align="center"><img src="../../images/icons/breakpoints_linkto_debug_icon.png" width="20" height="19" /></div></td>
-    <td>When enabled, the breakpoint shown in the editor view is also highlighted in the Breakpoints view. When disabled, the breakpoint selected in the Breakpoints view does not change. </td>
-  </tr>
-  <tr>
-    <td><b>Menu</b></td>
-    <td><div align="center"><img src="../../reference/images/icon_breakpoint_menu.png" width="16" height="9"></div></td>
-    <td><p>Click to display additional Breakpoints view options for paths, grouping choices, and working sets as shown below. </p>
-      <p align="center"><img src="../images/view_breakpoints_menu_cmds.png" width="284" height="150"> </p></td>
-  </tr>
-</table>
-<h3>Breakpoints view context menu options</h3>
-<p>The following commands appear on the context menu when you right-click within the Breakpoints view: </p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Go to File </b></td>
-    <td>Opens the associated file  for the breakpoint in an editor, make it active and highlight the breakpoint location. If the file is already open, make it active and the highlight the breakpoint location.</td>
-  </tr>
-  <tr>
-    <td><b>Enable</b></td>
-    <td>Enables the selected breakpoints.</td>
-  </tr>
-  <tr>
-    <td><b>Disable</b></td>
-    <td>Disables the selected breakpoints. </td>
-  </tr>
-  <tr>
-    <td><b>Remove</b></td>
-    <td>Removes the selected breakpoints from the project and Breakpoints view. </td>
-  </tr>
-  <tr>
-    <td><b>Remove All </b></td>
-    <td>Removes all  breakpoints from the  project and Breakpoints view. </td>
-  </tr>
-  <tr>
-    <td><b>Select All </b></td>
-    <td>Selects all the breakpoints shown in the Breakpoints view. </td>
-  </tr>
-  <tr>
-    <td><b>Copy</b></td>
-    <td>Copies the selected breakpoint to the clipboard. </td>
-  </tr>
-  <tr>
-    <td><b>Paste</b></td>
-    <td>Always disabled. </td>
-  </tr>
-  <tr>
-    <td><b>Export Breakpoints </b></td>
-    <td>Opens the <a href="exporting_breakpoints.htm">Export Breakpoints</a> wizard to store the project's breakpoint data. </td>
-  </tr>
-  <tr>
-    <td><b>Import Breakpoints </b></td>
-    <td>Opens the <a href="importing_breakpoints.htm">Import Breakpoints</a> wizard to import stored breakpoint data (.bkpt). </td>
-  </tr>
-  <tr>
-    <td><b>Add Watchpoint (C/C++)... </b></td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td><b>Properties</b></td>
-    <td>Opens the <a href="properties_breakpoints.htm">Properties for Breakpoint</a> dialog. </td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="breakpoints.htm">Breakpoints 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>
+<!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>Viewing Breakpoints and Watchpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Viewing Breakpoints and Watchpoints </h2>
+<p>Use the <b>Breakpoints</b> view (Figure 1) to <a href="properties_breakpoints.htm">examine</a> a project's breakpoints and watchpoints, <a href="toggling_breakpoints.htm">toggle</a> individual breakpoints  between enabled and disabled, set <a href="conditional_breakpoints.htm">conditional</a> breakpoints, <a href="exporting_breakpoints.htm">export</a> and <a href="importing_breakpoints.htm">import</a> breakpoints, or remove them from one or more build configurations. </p>
+<p>The <b>Breakpoints</b> view is available in the <a href="../../reference/perspective_debug.htm">Debug</a> perspective by default. To open it in another perspective, use the <b>Window &gt; Show View &gt; Breakpoints</b> menu option. Once open you have  control over breakpoint states and how they are shown. For example: </p>
+<ul>
+  <li>Click a  check box next to a breakpoint to toggle its state between enabled (checked) and disabled (no checkmark) </li>
+  <li>Double-click a breakpoint to open the associated source file at the breakpoint line number  in an editor view</li>
+  <li>Use the <b>Menu &gt; Group By</b> command to control how the breakpoints are shown in the view. For example, by file, by breakpoints, etc. </li>
+  <li>Use the <b>Menu &gt; Working Sets... </b> command to create working sets of breakpoints to quickly switch between different breakpoint settings or groups </li>
+  <li>Right-click to open the Breakpoints view's context menu for additional command options </li>
+</ul>
+<p align="center"><img src="../images/view_breakpoints.png" width="594" height="322"></p>
+<p class="figure">Figure 1 - Breakpoints view showing context menu </p>
+<h3>Breakpoints view toolbar icons</h3>
+<p>The following commands appear on the toolbar within the Breakpoints view: </p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="11%" scope="col">Icon</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Remove Selected Breakpoint </b></td>
+    <td><div align="center"><img src="../../images/icons/breakpoints_remove_one_icon.png" width="19" height="19" /></div></td>
+    <td>Removes the selected breakpoint from the breakpoints list. </td>
+  </tr>
+  <tr>
+    <td><b>Remove All Breakpoints </b></td>
+    <td><div align="center"><img src="../../images/icons/breakpoints_remove_all_icon.png" width="21" height="19" /></div></td>
+    <td>Removes all breakpoints from the breakpoints list. </td>
+  </tr>
+  <tr>
+    <td><b>Show Breakpoints Supported by Selected Target </b></td>
+    <td><div align="center"><img src="../../images/icons/breakpoints_show_icon.png" width="20" height="19" /></div></td>
+    <td>Limits the breakpoints shown to only those supported in the current target. </td>
+  </tr>
+  <tr>
+    <td><b>Go to File for Breakpoint </b></td>
+    <td><div align="center"><img src="../../images/icons/breakpoints_goto_icon.png" width="20" height="19" /></div></td>
+    <td>Displays the breakpoint in an editor view, opening the source file if required. </td>
+  </tr>
+  <tr>
+    <td><b>Skip All Breakpoints </b></td>
+    <td><div align="center"><img src="../../images/icons/breakpoints_skip_all_icon.png" width="19" height="19" /></div></td>
+    <td>Toggles  the debugger to skip all  breakpoints regardless of their current enabled or disabled state, or hit all breakpoints.</td>
+  </tr>
+  <tr>
+    <td><b>Expand All </b></td>
+    <td><div align="center"><img src="../../images/icons/breakpoints_collapse_icon.png" width="19" height="18" /></div></td>
+    <td>Expand all matches in the hierarchical view.</td>
+  </tr>
+  <tr>
+    <td><b>Collapse All </b></td>
+    <td><div align="center"><img src="../../images/icons/breakpoints_expand_icon.png" width="19" height="18" /></div></td>
+    <td>Collapse all matches in the hierarchical view.</td>
+  </tr>
+  <tr>
+    <td><b>Link with Debug View</b></td>
+    <td><div align="center"><img src="../../images/icons/breakpoints_linkto_debug_icon.png" width="20" height="19" /></div></td>
+    <td>When enabled, the breakpoint shown in the editor view is also highlighted in the Breakpoints view. When disabled, the breakpoint selected in the Breakpoints view does not change. </td>
+  </tr>
+  <tr>
+    <td><b>Menu</b></td>
+    <td><div align="center"><img src="../../reference/images/icon_breakpoint_menu.png" width="16" height="9"></div></td>
+    <td><p>Click to display additional Breakpoints view options for paths, grouping choices, and working sets as shown below. </p>
+      <p align="center"><img src="../images/view_breakpoints_menu_cmds.png" width="284" height="150"> </p></td>
+  </tr>
+</table>
+<h3>Breakpoints view context menu options</h3>
+<p>The following commands appear on the context menu when you right-click within the Breakpoints view: </p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Go to File </b></td>
+    <td>Opens the associated file  for the breakpoint in an editor, make it active and highlight the breakpoint location. If the file is already open, make it active and the highlight the breakpoint location.</td>
+  </tr>
+  <tr>
+    <td><b>Enable</b></td>
+    <td>Enables the selected breakpoints.</td>
+  </tr>
+  <tr>
+    <td><b>Disable</b></td>
+    <td>Disables the selected breakpoints. </td>
+  </tr>
+  <tr>
+    <td><b>Remove</b></td>
+    <td>Removes the selected breakpoints from the project and Breakpoints view. </td>
+  </tr>
+  <tr>
+    <td><b>Remove All </b></td>
+    <td>Removes all  breakpoints from the  project and Breakpoints view. </td>
+  </tr>
+  <tr>
+    <td><b>Select All </b></td>
+    <td>Selects all the breakpoints shown in the Breakpoints view. </td>
+  </tr>
+  <tr>
+    <td><b>Copy</b></td>
+    <td>Copies the selected breakpoint to the clipboard. </td>
+  </tr>
+  <tr>
+    <td><b>Paste</b></td>
+    <td>Always disabled. </td>
+  </tr>
+  <tr>
+    <td><b>Export Breakpoints </b></td>
+    <td>Opens the <a href="exporting_breakpoints.htm">Export Breakpoints</a> wizard to store the project's breakpoint data. </td>
+  </tr>
+  <tr>
+    <td><b>Import Breakpoints </b></td>
+    <td>Opens the <a href="importing_breakpoints.htm">Import Breakpoints</a> wizard to import stored breakpoint data (.bkpt). </td>
+  </tr>
+  <tr>
+    <td><b>Add Watchpoint (C/C++)... </b></td>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td><b>Properties</b></td>
+    <td>Opens the <a href="properties_breakpoints.htm">Properties for Breakpoint</a> dialog. </td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="breakpoints.htm">Breakpoints overview  </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_other.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_other.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,31 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugging Overview</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Other Useful Commands</h2>
-<p>The <a href="viewing_debug.htm">Debug</a> view has a few other commands that are useful under some debugging situations:</p>
-<h4>Disconnecting from a process</h4>
-<p>Use the <b>Disconnect</b> command  (<img src="../../images/icons/btn_disconnect.png" width="20" height="21" align="absmiddle" />) when debugging with Application TRK or System TRK to detach the debugger from a process on the device while leaving the device running. </p>
-<p>When debugging in stop-mode it will detach the debugger and leave the CPU running on the device. </p>
-<ul>
-  <li>Click the <b>Disconnect</b> button (<img src="../../images/icons/btn_disconnect.png" width="20" height="21" align="absmiddle" />) in the <b>Debug</b> view </li>
-  <li>Right-click the thread in the <b>Debug</b> view and select <b>Disconnect</b> from the  context menu</li>
-</ul>
-<h4>Instruction Stepping Mode </h4>
-<p>Activate to enable instruction stepping mode to examine a program as it steps into disassembled code.</p>
-<h4>Removing all processes</h4>
-<p>Clears all terminated processes in <b>Debug</b> view.</p>
-<h4>Other references</h4>
-<ul>
-  
-  <li><a href="debug.htm">Debugging 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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Debugging Overview</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Other Useful Commands</h2>
+<p>The <a href="viewing_debug.htm">Debug</a> view has a few other commands that are useful under some debugging situations:</p>
+<h4>Disconnecting from a process</h4>
+<p>Use the <b>Disconnect</b> command  (<img src="../../images/icons/btn_disconnect.png" width="20" height="21" align="absmiddle" />) when debugging with Application TRK or System TRK to detach the debugger from a process on the device while leaving the device running. </p>
+<p>When debugging in stop-mode it will detach the debugger and leave the CPU running on the device. </p>
+<ul>
+  <li>Click the <b>Disconnect</b> button (<img src="../../images/icons/btn_disconnect.png" width="20" height="21" align="absmiddle" />) in the <b>Debug</b> view </li>
+  <li>Right-click the thread in the <b>Debug</b> view and select <b>Disconnect</b> from the  context menu</li>
+</ul>
+<h4>Instruction Stepping Mode </h4>
+<p>Activate to enable instruction stepping mode to examine a program as it steps into disassembled code.</p>
+<h4>Removing all processes</h4>
+<p>Clears all terminated processes in <b>Debug</b> view.</p>
+<h4>Other references</h4>
+<ul>
+  
+  <li><a href="debug.htm">Debugging overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_reposition_pc.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_reposition_pc.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,41 +1,41 @@
-<!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>Repositioning the Program Counter</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {
-	color: #FF0000;
-	font-weight: bold;
-}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Repositioning the Program Counter</h2>
-<p>Once you've <a href="cmds_resuming.htm">suspended</a> a program debug session, the <a href="../../reference/view_disassembly.htm">Disassembly</a> view provides commands for move or reposition the program counter (PC). These command include:</p>
-<ul>
-  
-  <li><a href="#RUN_TO">Run to Line (C/C++)</a></li>
-  <li><a href="#MOVE_TO">Move to Line (C/C++)</a></li>
-  <li><a href="#RESUME_AT">Resume at Line (C/C++)</a></li>
-</ul>
-<p class="note"><span class="style1">WARNING</span> Use of the Move to Line and Resume at Line can leave a program in an unstable state. Use at your own risk.</p>
-<h4><a name="RUN_TO" id="MOVE_TO2"></a>Run to Line (C/C++)</h4>
-<p>Use the <b>Run to Line</b> command (<img src="../../reference/images/icon_dis_run_to_line.png" width="18" height="18" align="absmiddle">) to execute the program from the currently executed line to the selected line.</p>
-<h4><a name="MOVE_TO" id="MOVE_TO"></a>Move to Line (C/C++)</h4>
-<p>Use the  <b>Move to Line (C/C++)</b> command (<img src="../../reference/images/icon_dis_move_to_line.png" width="19" height="15" align="absmiddle">) to move the program counter to the selected line, skipping all intermediate lines but not resume execution. This enables you to skip suspect code and continue stepping through your program.</p>
-<h4><a name="RESUME_AT" id="STEP_OVER2"></a>Resume at Line (C/C++)</h4>
-<p>Use the <b>Resume at Line</b> <b> (C/C++)</b> command (<img src="../../reference/images/icon_dis_resume_at_line.png" width="18" height="14" align="absmiddle">) to begin program execution at the selected line, skipping all lines between it and the currently executed line. </p>
-<h4>Other references</h4>
-<ul>
-<li><a href="debug.htm">Debugging overview</a></li>
-<li><a href="../../reference/images/view_disassembly.png">Disassembly 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>Repositioning the Program Counter</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {
+	color: #FF0000;
+	font-weight: bold;
+}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Repositioning the Program Counter</h2>
+<p>Once you've <a href="cmds_resuming.htm">suspended</a> a program debug session, the <a href="../../reference/view_disassembly.htm">Disassembly</a> view provides commands for move or reposition the program counter (PC). These command include:</p>
+<ul>
+  
+  <li><a href="#RUN_TO">Run to Line (C/C++)</a></li>
+  <li><a href="#MOVE_TO">Move to Line (C/C++)</a></li>
+  <li><a href="#RESUME_AT">Resume at Line (C/C++)</a></li>
+</ul>
+<p class="note"><span class="style1">WARNING</span> Use of the Move to Line and Resume at Line can leave a program in an unstable state. Use at your own risk.</p>
+<h4><a name="RUN_TO" id="MOVE_TO2"></a>Run to Line (C/C++)</h4>
+<p>Use the <b>Run to Line</b> command (<img src="../../reference/images/icon_dis_run_to_line.png" width="18" height="18" align="absmiddle">) to execute the program from the currently executed line to the selected line.</p>
+<h4><a name="MOVE_TO" id="MOVE_TO"></a>Move to Line (C/C++)</h4>
+<p>Use the  <b>Move to Line (C/C++)</b> command (<img src="../../reference/images/icon_dis_move_to_line.png" width="19" height="15" align="absmiddle">) to move the program counter to the selected line, skipping all intermediate lines but not resume execution. This enables you to skip suspect code and continue stepping through your program.</p>
+<h4><a name="RESUME_AT" id="STEP_OVER2"></a>Resume at Line (C/C++)</h4>
+<p>Use the <b>Resume at Line</b> <b> (C/C++)</b> command (<img src="../../reference/images/icon_dis_resume_at_line.png" width="18" height="14" align="absmiddle">) to begin program execution at the selected line, skipping all lines between it and the currently executed line. </p>
+<h4>Other references</h4>
+<ul>
+<li><a href="debug.htm">Debugging overview</a></li>
+<li><a href="../../reference/images/view_disassembly.png">Disassembly view</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_resuming.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_resuming.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -37,6 +37,6 @@
 <ul>
   <li><a href="debug.htm">Debugging overview</a> </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_stepping.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_stepping.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -63,6 +63,6 @@
 <ul>
 <li><a href="debug.htm">Debugging overview</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/debug.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/debug.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,28 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Debugging Overview</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugging Overview </h2>
-<p>The Debug view provides an overview of the debug session as it relates to the executing program.</p>
-<p>The following topics cover various breakpoint concepts and actions: </p>
-<ul>
-  <li><a href="viewing_debug.htm">Debug view</a></li>
-  <li><a href="cmds_starting.htm">Starting and terminating a debug session</a> </li>
-  <li><a href="cmds_starting.htm">Suspending  and resuming a debug session</a> </li>
-  <li><a href="cmds_stepping.htm">Stepping over, into, and returning from functions</a></li>
-  <li><a href="cmds_other.htm">Other useful commands</a></li>
-  <li><a href="cmds_reposition_pc.htm">Repositioning the program counter</a></li>
-</ul>
-<h4>Other references</h4>
-<ul>
-  <li><a href="../../reference/perspective_debug.htm">Debug perspective</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>Debugging Overview</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debugging Overview </h2>
+<p>The Debug view provides an overview of the debug session as it relates to the executing program.</p>
+<p>The following topics cover various breakpoint concepts and actions: </p>
+<ul>
+  <li><a href="viewing_debug.htm">Debug view</a></li>
+  <li><a href="cmds_starting.htm">Starting and terminating a debug session</a> </li>
+  <li><a href="cmds_starting.htm">Suspending  and resuming a debug session</a> </li>
+  <li><a href="cmds_stepping.htm">Stepping over, into, and returning from functions</a></li>
+  <li><a href="cmds_other.htm">Other useful commands</a></li>
+  <li><a href="cmds_reposition_pc.htm">Repositioning the program counter</a></li>
+</ul>
+<h4>Other references</h4>
+<ul>
+  <li><a href="../../reference/perspective_debug.htm">Debug perspective</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/viewing_debug.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/viewing_debug.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -99,6 +99,6 @@
   
   <li><a href="debug.htm">Debugging overview</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Adding and Removing Global Variables</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Adding and Removing Global Variables </h2>
-<p>The <a href="viewing_variables.htm">Variables</a> view can also display global variables used by the program. Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. There you can select one or more global variables to display in the Variables view, clickiing <b>OK</b> when done. </p>
-<p align="center"><img src="../../images/views/wnd_select_global_variables.png" width="345" height="430" /></p>
-<p class="figure">Figure 1 - Global Variables selection dialog</p>
-<p>&nbsp;</p>
-<h4>Removing Global Variables</h4>
-<p>Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. Locate and uncheckmark the global variable to stop displaying, then click <b>OK</b>. This removes the selected global variable from the variables list.</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="variables.htm">Variables and Expressions 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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Adding and Removing Global Variables</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Adding and Removing Global Variables </h2>
+<p>The <a href="viewing_variables.htm">Variables</a> view can also display global variables used by the program. Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. There you can select one or more global variables to display in the Variables view, clickiing <b>OK</b> when done. </p>
+<p align="center"><img src="../../images/views/wnd_select_global_variables.png" width="345" height="430" /></p>
+<p class="figure">Figure 1 - Global Variables selection dialog</p>
+<p>&nbsp;</p>
+<h4>Removing Global Variables</h4>
+<p>Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. Locate and uncheckmark the global variable to stop displaying, then click <b>OK</b>. This removes the selected global variable from the variables list.</p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/variables.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/variables.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Variables and Expressions Overview </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Variables and Expressions Overview </h2>
-<p>Variables are symbols used in programs to store values or expressions that can change during the life of the program. Being able to view a variable's value is helpful when debugging a program. Expressions are the result of one or more variables being combined to produce a result based on the variable values and the way they are calculated. Variables are shown in the <a href="viewing_variables.htm">Variables</a> view while expressions are shown in the <a href="viewing_expressions.htm">Expressions</a> view.</p>
-<p>The following  cover various variable and expression concepts and actions: </p>
-<ul>
-  <li><a href="viewing_variables.htm">Viewing Variables</a> 
-    <ul>
-      <li><a href="adding_variables.htm">Adding and Removing Global Variables</a></li>
-    </ul>
-  </li>
-  <li><a href="viewing_expressions.htm">Viewing Expressions
-    </a>
-    <ul>
-      <li><a href="adding_expressions.htm">Adding and Removing Expressions</a></li>
-      <li><a href="editing_expressions.htm">Editing Expressions</a></li>
-    </ul>
-  </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>Variables and Expressions Overview </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Variables and Expressions Overview </h2>
+<p>Variables are symbols used in programs to store values or expressions that can change during the life of the program. Being able to view a variable's value is helpful when debugging a program. Expressions are the result of one or more variables being combined to produce a result based on the variable values and the way they are calculated. Variables are shown in the <a href="viewing_variables.htm">Variables</a> view while expressions are shown in the <a href="viewing_expressions.htm">Expressions</a> view.</p>
+<p>The following  cover various variable and expression concepts and actions: </p>
+<ul>
+  <li><a href="viewing_variables.htm">Viewing Variables</a> 
+    <ul>
+      <li><a href="adding_variables.htm">Adding and Removing Global Variables</a></li>
+    </ul>
+  </li>
+  <li><a href="viewing_expressions.htm">Viewing Expressions
+    </a>
+    <ul>
+      <li><a href="adding_expressions.htm">Adding and Removing Expressions</a></li>
+      <li><a href="editing_expressions.htm">Editing Expressions</a></li>
+    </ul>
+  </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_expressions.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_expressions.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,122 +1,122 @@
-<!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>Viewing Expressions</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Viewing Expressions </h2>
-<p>The <b>Expressions</b> view allows manipulation of  expressions. An <i>expression</i> is a snippet of code that is evaluated to produce a value. In Carbide they are defined using C/C++ expressions. Some expressions may need to be evaluated at a specific location in the program so that its variables can be referenced. </p>
-<p>The Expressions view displays these panes: </p>
-<ul>
-  <li>Expressions list pane&#8212;Lists expressions and expression hierarchies. Click the hierarchical controls to expand or collapse the expression. Right-click to open the Expressions view context menu.</li>
-  <li>Value pane&#8212;Shows the current value of each corresponding expression. Double-click a value to change it. Right-click to set viewing options.</li>
-</ul>
-<p align="center"><img src="../images/view_expressions.png" width="439" height="144"></p>
-<p class="figure">Figure 1 - Expressions view </p>
-<h3>Expressions view toolbar icons</h3>
-<p>The following commands appear on the Expressions view toolbar:</p>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="34%" scope="col">Item</th>
-    <th width="14%" scope="col">Icons</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Show Type Names </b></td>
-    <td><div align="center"><img src="../images/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
-    <td>Toggles the display of type names in the Expressions view. </td>
-  </tr>
-  <tr>
-    <td><b>Show Logical Structure </b></td>
-    <td><div align="center"><img src="../images/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
-    <td>Not available in C/C++ yet. </td>
-  </tr>
-  <tr>
-    <td><b>Collapse All </b></td>
-    <td><div align="center"><img src="../images/var_collapse_all_icon.png" width="17" height="18" /></div></td>
-    <td>Collapses all expanded expressions into the top level. </td>
-  </tr>
-  <tr>
-    <td><b>Remove Selected Expression </b></td>
-    <td><div align="center"><img src="../images/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
-    <td>Click to remove all currently selected expressions from the expressions list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove All Expressions </b></td>
-    <td><div align="center"><img src="../images/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
-    <td>Click to remove all expressions from the expressions list. </td>
-  </tr>
-</table>
-<h3>Expressions view context menu options</h3>
-<p>Right-click in the Expression's pane in the <span class="style1">Expressions</span> view to access the context menu commands shown in Figure 2.</p>
-<p align="center"><img src="../images/view_expressions_menu_cmds.png" width="226" height="223"></p>
-<p class="figure">Figure 2. <span class="style1">Expressions</span> view context menu commands (Expression list pane)</p>
-<p>The  commands include: </p>
-<table width="800"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="25%" scope="col">Item</th>
-    <th width="75%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Select All</b></td>
-    <td>Selects all the expressions shown in the Expressions view.</td>
-  </tr>
-  <tr>
-    <td><b>Copy Expressions</b></td>
-    <td>Copies the selected expressions to the clipboard.</td>
-  </tr>
-  <tr>
-    <td><b>Remove</b></td>
-    <td>Remove the selected expressions from the Expressions view list.</td>
-  </tr>
-  <tr>
-    <td><b>Remove All</b></td>
-    <td>Remove all expressions from the Expressions view list.</td>
-  </tr>
-  <tr>
-    <td><b>Find...</b></td>
-    <td>Opens a <b>Find</b> dialog to search the Expressions view list.</td>
-  </tr>
-  <tr>
-    <td><b>Change Value...</b></td>
-    <td><p>Opens the <b>Set Value</b> dialog where you can modify the value assigned to the selected expressions. Change the value and click <b>OK</b>.</p>
-        <p align="center"><img src="../images/wnd_set_value.png" width="401" height="214"></p></td>
-  </tr>
-  <tr>
-    <td><b>Add Watch Expression...</b></td>
-    <td><p>Opens the <a href="adding_expressions.htm">Add Watch Exression</a> dialog for creation of a new expression.</p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Disable</b></td>
-    <td>Disables automatic evaluation of the selected expression and appends <span class="code">(disabled)</span> to the expression name. Useful when you have lots of expressions but are concentrating on only a few. The more expressions that need evaluaton, the longer it takes to update the Expressions view.</td>
-  </tr>
-  <tr>
-    <td><b>Enable</b></td>
-    <td>Enables automatic evaluation of the selected expression. Enables a disabled expression so that it is evaluated during the debug session.</td>
-  </tr>
-  <tr>
-    <td><b>Edit Watch Expression...</b></td>
-    <td>Opens the <b>Edit Watch Expression</b> dialog where you can modify the expression and enable it for automatic evaluation.</td>
-  </tr>
-  <tr>
-    <td><b>Reevaluate Watch Expression</b></td>
-    <td>Forces the expression to be reevaluated. Useful after the expressions has been edited or not evaluated due to being disabled.</td>
-  </tr>
-</table>
-<h5>Other references</h5>
-<ul>
-  <li><a href="variables.htm">Variables and Expressions 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>
+<!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>Viewing Expressions</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {font-weight: bold}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Viewing Expressions </h2>
+<p>The <b>Expressions</b> view allows manipulation of  expressions. An <i>expression</i> is a snippet of code that is evaluated to produce a value. In Carbide they are defined using C/C++ expressions. Some expressions may need to be evaluated at a specific location in the program so that its variables can be referenced. </p>
+<p>The Expressions view displays these panes: </p>
+<ul>
+  <li>Expressions list pane&#8212;Lists expressions and expression hierarchies. Click the hierarchical controls to expand or collapse the expression. Right-click to open the Expressions view context menu.</li>
+  <li>Value pane&#8212;Shows the current value of each corresponding expression. Double-click a value to change it. Right-click to set viewing options.</li>
+</ul>
+<p align="center"><img src="../images/view_expressions.png" width="439" height="144"></p>
+<p class="figure">Figure 1 - Expressions view </p>
+<h3>Expressions view toolbar icons</h3>
+<p>The following commands appear on the Expressions view toolbar:</p>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="14%" scope="col">Icons</th>
+    <th width="52%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Show Type Names </b></td>
+    <td><div align="center"><img src="../images/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
+    <td>Toggles the display of type names in the Expressions view. </td>
+  </tr>
+  <tr>
+    <td><b>Show Logical Structure </b></td>
+    <td><div align="center"><img src="../images/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
+    <td>Not available in C/C++ yet. </td>
+  </tr>
+  <tr>
+    <td><b>Collapse All </b></td>
+    <td><div align="center"><img src="../images/var_collapse_all_icon.png" width="17" height="18" /></div></td>
+    <td>Collapses all expanded expressions into the top level. </td>
+  </tr>
+  <tr>
+    <td><b>Remove Selected Expression </b></td>
+    <td><div align="center"><img src="../images/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
+    <td>Click to remove all currently selected expressions from the expressions list. </td>
+  </tr>
+  <tr>
+    <td><b>Remove All Expressions </b></td>
+    <td><div align="center"><img src="../images/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
+    <td>Click to remove all expressions from the expressions list. </td>
+  </tr>
+</table>
+<h3>Expressions view context menu options</h3>
+<p>Right-click in the Expression's pane in the <span class="style1">Expressions</span> view to access the context menu commands shown in Figure 2.</p>
+<p align="center"><img src="../images/view_expressions_menu_cmds.png" width="226" height="223"></p>
+<p class="figure">Figure 2. <span class="style1">Expressions</span> view context menu commands (Expression list pane)</p>
+<p>The  commands include: </p>
+<table width="800"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="25%" scope="col">Item</th>
+    <th width="75%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Select All</b></td>
+    <td>Selects all the expressions shown in the Expressions view.</td>
+  </tr>
+  <tr>
+    <td><b>Copy Expressions</b></td>
+    <td>Copies the selected expressions to the clipboard.</td>
+  </tr>
+  <tr>
+    <td><b>Remove</b></td>
+    <td>Remove the selected expressions from the Expressions view list.</td>
+  </tr>
+  <tr>
+    <td><b>Remove All</b></td>
+    <td>Remove all expressions from the Expressions view list.</td>
+  </tr>
+  <tr>
+    <td><b>Find...</b></td>
+    <td>Opens a <b>Find</b> dialog to search the Expressions view list.</td>
+  </tr>
+  <tr>
+    <td><b>Change Value...</b></td>
+    <td><p>Opens the <b>Set Value</b> dialog where you can modify the value assigned to the selected expressions. Change the value and click <b>OK</b>.</p>
+        <p align="center"><img src="../images/wnd_set_value.png" width="401" height="214"></p></td>
+  </tr>
+  <tr>
+    <td><b>Add Watch Expression...</b></td>
+    <td><p>Opens the <a href="adding_expressions.htm">Add Watch Exression</a> dialog for creation of a new expression.</p>
+    </td>
+  </tr>
+  <tr>
+    <td><b>Disable</b></td>
+    <td>Disables automatic evaluation of the selected expression and appends <span class="code">(disabled)</span> to the expression name. Useful when you have lots of expressions but are concentrating on only a few. The more expressions that need evaluaton, the longer it takes to update the Expressions view.</td>
+  </tr>
+  <tr>
+    <td><b>Enable</b></td>
+    <td>Enables automatic evaluation of the selected expression. Enables a disabled expression so that it is evaluated during the debug session.</td>
+  </tr>
+  <tr>
+    <td><b>Edit Watch Expression...</b></td>
+    <td>Opens the <b>Edit Watch Expression</b> dialog where you can modify the expression and enable it for automatic evaluation.</td>
+  </tr>
+  <tr>
+    <td><b>Reevaluate Watch Expression</b></td>
+    <td>Forces the expression to be reevaluated. Useful after the expressions has been edited or not evaluated due to being disabled.</td>
+  </tr>
+</table>
+<h5>Other references</h5>
+<ul>
+  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,149 +1,149 @@
-<!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>Viewing Variables</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Viewing Variables </h2>
-<p>The <b>Variables</b> view allows manipulation of project  variables and the variable hierarchy used in the source code. For example, you can change the variable format, change a variable value, add watch expressions, or add global variables. </p>
-<p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled. The default view shows the variables list and include the Name and Value for all the variables within scope. In addition, when you select a variable its value is also shown in a different pane within the view.</p>
-<p align="center"><img src="../images/view_variables.png" width="583" height="262"></p>
-<p class="figure">Figure 1 - Variables view </p>
-<h3>Variables view toolbar icons</h3>
-<p>The following commands appear on the Variables view toolbar: </p>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="34%" scope="col">Item</th>
-    <th width="14%" scope="col">Icons</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Show Type Names </b></td>
-    <td><div align="center"><img src="../images/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
-    <td>Toggles the display of type names in the <b>Variables</b> view. </td>
-  </tr>
-  <tr>
-    <td><b>Show Logical Structure </b></td>
-    <td><div align="center"><img src="../images/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
-    <td>Not available in C/C++ yet. </td>
-  </tr>
-  <tr>
-    <td><b>Collapse All </b></td>
-    <td><div align="center"><img src="../images/var_collapse_all_icon.png" width="17" height="18" /></div></td>
-    <td>Collapses all expanded variables into the top level. </td>
-  </tr>
-  <tr>
-    <td><b>Add Global Variables </b></td>
-    <td><div align="center"><img src="../images/var_add_global_vars_icon.png" width="19" height="19" /></div></td>
-    <td>Click to open the <a href="adding_variables.htm">Global Variables</a> dialog where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove Selected Global Variables </b></td>
-    <td><div align="center"><img src="../images/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
-    <td>Click to remove all currently selected global variables from the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove All Global Variables </b></td>
-    <td><div align="center"><img src="../images/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
-    <td>Click to remove all global variables from the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Menu</b></td>
-    <td><div align="center"><img src="../images/icon_menu_white.png" width="12" height="12"></div></td>
-    <td><p>Enables you to modifiy the <b>Layout</b> to change the view orientation between: horizontal, vertical, or variables pane only.</p>
-        <p>In addition, use <b>Show All Variables</b> to toggle between showing only those variables that are in scope and live or   show all local variables, even if redundant. With this option on you will see all of the variables including the multiple defined variables like &ldquo;i&rdquo; for your loops  and ones that may no longer have accurate values.</p></td>
-  </tr>
-</table>
-<h3>Variables view context menu options</h3>
-<p>Right-click in the <b>Variables</b> view to access the commands on the Variables view context menu.</p>
-<p align="center"><img src="../images/view_variables_menu_cmds.png" width="236" height="334"></p>
-<p class="figure">Figure 2. Variables view context menu commands</p>
-<p>The  commands include: </p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Select All</b></td>
-    <td>Selects all the variables shown in the <b>Variables</b> view.</td>
-  </tr>
-  <tr>
-    <td><b>Copy Variables</b></td>
-    <td>Copies the selected variables to the clipboard.</td>
-  </tr>
-  <tr>
-    <td><b>Enable</b></td>
-    <td>Enables the selected variable.</td>
-  </tr>
-  <tr>
-    <td><b>Disable</b></td>
-    <td>Disables the selected variable.</td>
-  </tr>
-  <tr>
-    <td><b>Display as Array...</b></td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td><b>Cast To Type...</b></td>
-    <td>Opens the <b>Cast to Type</b> dialog where you can assign a new type to the variable.</td>
-  </tr>
-  <tr>
-    <td><p><b>Restore Original Type</b></p>    </td>
-    <td>Resets the selected variable to the original type assigned by the program.</td>
-  </tr>
-  <tr>
-    <td><b>View Memory</b></td>
-    <td>Opens a <b>Memory</b> view on the selected variable so you can examine it.</td>
-  </tr>
-  <tr>
-    <td><b>Find...</b></td>
-    <td>Opens a <b>Find</b> dialog to search for variables.</td>
-  </tr>
-  <tr>
-    <td><b>Change Value...</b></td>
-    <td><p>Opens the <b>Set Value</b> dialog where you can modify the value assigned to the selected variable. Change the value and click <b>OK</b>.</p>
-    <p align="center"><img src="../images/wnd_set_value.png" width="401" height="214"></p></td>
-  </tr>
-  <tr>
-    <td><b>Add Watchpoint (C/C++)...</b></td>
-    <td>Opens the <a href="../watchpoints/setting_watchpoints.htm">Add Watchpoint</a> dialog enabling you to define a watchpoint on the variable.</td>
-  </tr>
-  <tr>
-    <td><b>Add Global Variables...</b></td>
-    <td>Select  to open the <a href="adding_variables.htm">Global Variables</a> dialog where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove Global Variables</b></td>
-    <td>Remove the selected global variables from the Variables view.</td>
-  </tr>
-  <tr>
-    <td><b>Remove All Global Variables</b></td>
-    <td>Remove all  global variables from the Variables view.</td>
-  </tr>
-  <tr>
-    <td><b>Create Watch Expression</b></td>
-    <td>Creates a watchpoint on the selected variable and displays it in the <a href="../watchpoints/watchpoints.htm">Watchpoint</a> view. </td>
-  </tr>
-  <tr>
-    <td><b>Format</b></td>
-    <td><p>Change the selected variable's  display format. The default setting is Natural, or the format assigned when the variable is defined. For example, the decimal value of 256 would appear as:</p>
-      <ul>
-        <li>Binary (<span class="code">0b100000</span>)</li>
-        <li>Natural (<span class="code">256</span>)</li>
-        <li>Decimal (<span class="code">256</span>)</li>
-        <li>Hexadecimal (<span class="code">0x100</span>)</li>
-    </ul>      </td>
-  </tr>
-</table>
-<h5>Other references</h5>
-<ul>
-  <li><a href="variables.htm">Variables and Expressions 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>
+<!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>Viewing Variables</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Viewing Variables </h2>
+<p>The <b>Variables</b> view allows manipulation of project  variables and the variable hierarchy used in the source code. For example, you can change the variable format, change a variable value, add watch expressions, or add global variables. </p>
+<p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled. The default view shows the variables list and include the Name and Value for all the variables within scope. In addition, when you select a variable its value is also shown in a different pane within the view.</p>
+<p align="center"><img src="../images/view_variables.png" width="583" height="262"></p>
+<p class="figure">Figure 1 - Variables view </p>
+<h3>Variables view toolbar icons</h3>
+<p>The following commands appear on the Variables view toolbar: </p>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="14%" scope="col">Icons</th>
+    <th width="52%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Show Type Names </b></td>
+    <td><div align="center"><img src="../images/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
+    <td>Toggles the display of type names in the <b>Variables</b> view. </td>
+  </tr>
+  <tr>
+    <td><b>Show Logical Structure </b></td>
+    <td><div align="center"><img src="../images/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
+    <td>Not available in C/C++ yet. </td>
+  </tr>
+  <tr>
+    <td><b>Collapse All </b></td>
+    <td><div align="center"><img src="../images/var_collapse_all_icon.png" width="17" height="18" /></div></td>
+    <td>Collapses all expanded variables into the top level. </td>
+  </tr>
+  <tr>
+    <td><b>Add Global Variables </b></td>
+    <td><div align="center"><img src="../images/var_add_global_vars_icon.png" width="19" height="19" /></div></td>
+    <td>Click to open the <a href="adding_variables.htm">Global Variables</a> dialog where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
+  </tr>
+  <tr>
+    <td><b>Remove Selected Global Variables </b></td>
+    <td><div align="center"><img src="../images/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
+    <td>Click to remove all currently selected global variables from the variables list. </td>
+  </tr>
+  <tr>
+    <td><b>Remove All Global Variables </b></td>
+    <td><div align="center"><img src="../images/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
+    <td>Click to remove all global variables from the variables list. </td>
+  </tr>
+  <tr>
+    <td><b>Menu</b></td>
+    <td><div align="center"><img src="../images/icon_menu_white.png" width="12" height="12"></div></td>
+    <td><p>Enables you to modifiy the <b>Layout</b> to change the view orientation between: horizontal, vertical, or variables pane only.</p>
+        <p>In addition, use <b>Show All Variables</b> to toggle between showing only those variables that are in scope and live or   show all local variables, even if redundant. With this option on you will see all of the variables including the multiple defined variables like &ldquo;i&rdquo; for your loops  and ones that may no longer have accurate values.</p></td>
+  </tr>
+</table>
+<h3>Variables view context menu options</h3>
+<p>Right-click in the <b>Variables</b> view to access the commands on the Variables view context menu.</p>
+<p align="center"><img src="../images/view_variables_menu_cmds.png" width="236" height="334"></p>
+<p class="figure">Figure 2. Variables view context menu commands</p>
+<p>The  commands include: </p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Select All</b></td>
+    <td>Selects all the variables shown in the <b>Variables</b> view.</td>
+  </tr>
+  <tr>
+    <td><b>Copy Variables</b></td>
+    <td>Copies the selected variables to the clipboard.</td>
+  </tr>
+  <tr>
+    <td><b>Enable</b></td>
+    <td>Enables the selected variable.</td>
+  </tr>
+  <tr>
+    <td><b>Disable</b></td>
+    <td>Disables the selected variable.</td>
+  </tr>
+  <tr>
+    <td><b>Display as Array...</b></td>
+    <td>&nbsp;</td>
+  </tr>
+  <tr>
+    <td><b>Cast To Type...</b></td>
+    <td>Opens the <b>Cast to Type</b> dialog where you can assign a new type to the variable.</td>
+  </tr>
+  <tr>
+    <td><p><b>Restore Original Type</b></p>    </td>
+    <td>Resets the selected variable to the original type assigned by the program.</td>
+  </tr>
+  <tr>
+    <td><b>View Memory</b></td>
+    <td>Opens a <b>Memory</b> view on the selected variable so you can examine it.</td>
+  </tr>
+  <tr>
+    <td><b>Find...</b></td>
+    <td>Opens a <b>Find</b> dialog to search for variables.</td>
+  </tr>
+  <tr>
+    <td><b>Change Value...</b></td>
+    <td><p>Opens the <b>Set Value</b> dialog where you can modify the value assigned to the selected variable. Change the value and click <b>OK</b>.</p>
+    <p align="center"><img src="../images/wnd_set_value.png" width="401" height="214"></p></td>
+  </tr>
+  <tr>
+    <td><b>Add Watchpoint (C/C++)...</b></td>
+    <td>Opens the <a href="../watchpoints/setting_watchpoints.htm">Add Watchpoint</a> dialog enabling you to define a watchpoint on the variable.</td>
+  </tr>
+  <tr>
+    <td><b>Add Global Variables...</b></td>
+    <td>Select  to open the <a href="adding_variables.htm">Global Variables</a> dialog where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
+  </tr>
+  <tr>
+    <td><b>Remove Global Variables</b></td>
+    <td>Remove the selected global variables from the Variables view.</td>
+  </tr>
+  <tr>
+    <td><b>Remove All Global Variables</b></td>
+    <td>Remove all  global variables from the Variables view.</td>
+  </tr>
+  <tr>
+    <td><b>Create Watch Expression</b></td>
+    <td>Creates a watchpoint on the selected variable and displays it in the <a href="../watchpoints/watchpoints.htm">Watchpoint</a> view. </td>
+  </tr>
+  <tr>
+    <td><b>Format</b></td>
+    <td><p>Change the selected variable's  display format. The default setting is Natural, or the format assigned when the variable is defined. For example, the decimal value of 256 would appear as:</p>
+      <ul>
+        <li>Binary (<span class="code">0b100000</span>)</li>
+        <li>Natural (<span class="code">256</span>)</li>
+        <li>Decimal (<span class="code">256</span>)</li>
+        <li>Hexadecimal (<span class="code">0x100</span>)</li>
+    </ul>      </td>
+  </tr>
+</table>
+<h5>Other references</h5>
+<ul>
+  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/setting_watchpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/setting_watchpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,56 +1,56 @@
-<!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>Setting and Removing Watchpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting and Removing Watchpoints</h2>
-<p>You create a watchpoint to monitor a value in a specified memory location. The debugger halts program execution on the line of source code that triggered the watchpoint. This is different than a breakpoint, which halts program execution prior to executing the line of source code on which the breakpoint is set.</p>
-<h4>Setting watchpoints</h4>
-<p>Right-click in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view and choose the  <b>Add Watchpoint (C/C++)...</b> command to open the <b>Add Watchpoint</b> window. A watchpoint suspends program execution when the memory location that you specify is accessed with a write or read operation and it's based on the access setting. Use the <b>Add Watchpoint</b> window to specify the  memory location, its memory size, unit size, and define whether the watchpoint  triggers on a read, write, or on both operations. Watchpoints can also be added directly in the <a href="../../reference/view_variables.htm">Variables</a>, <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a>, and the <a href="../../reference/view_memory_wnd.htm">Memory Rendering</a> views.</p>
-<p align="center"><img src="../images/wnd_add_watchpoint.png" width="220" height="261"></p>
-<p align="center" class="figure">Figure 1. Add Watchpoint window </p>
-<h5>Table 1. Add Watchpoint options </h5>
-  <table width="88%"  border="0" cellpadding="2" cellspacing="0">
-    <tr>
-      <th width="32%" scope="col">Name</th>
-      <th width="52%" scope="col">Description</th>
-    </tr>
-    <tr>
-      <td><div align="left"><b>Expression to watch </b></div></td>
-      <td>If not already entered, you can enter any arbitrary memory location for watching. </td>
-    </tr>
-    <tr>
-      <td><b>Memory space</b></td>
-      <td>Not supported.</td>
-    </tr>
-    <tr>
-      <td><b>Units</b></td>
-      <td>Define the size of the units to monitor. This setting defaults to the size of the variable to watch. If an arbitrary memory address is entered, then the default unit size is set to 1 byte. Once you enable the units checkbox, you're must enter a value for it.</td>
-    </tr>
-    <tr>
-      <td><b>Access: Write/Read </b></td>
-      <td><p>Check the appropriate access type to trigger  the watchpoint for the specified memory location. This setting is shown as a unique icon in the Breakpoints view next to the listed watchpoint. The following list shows the resolved version of the icons used to indicate the type of watchpoint set:</p>
-        <ul>
-          <li>Read only (<img src="../images/icon_watchpoint_read_resolved.png" width="18" height="13" align="absmiddle">)</li>
-          <li>Write only (<img src="../../tasks/watchpoints/images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle">)</li>
-          <li>Read/Write (<img src="../../tasks/watchpoints/images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle">)</li>
-      </ul></td>
-    </tr>
-</table>
-  <h4>Removing Watchpoints</h4>
-  <p>In the <b>Breakpoints</b> view, locate the watchpoint to remove and: </p>
-  <ul>
-    <li>Right-click the watchpoint and choose <b>Remove</b> from the context menu</li>
-  </ul>
-  <h4>Other references</h4>
-<ul>
-  <li><a href="..//watchpoints/watchpoints.htm">Watchpoints 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>
+<!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>Setting and Removing Watchpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setting and Removing Watchpoints</h2>
+<p>You create a watchpoint to monitor a value in a specified memory location. The debugger halts program execution on the line of source code that triggered the watchpoint. This is different than a breakpoint, which halts program execution prior to executing the line of source code on which the breakpoint is set.</p>
+<h4>Setting watchpoints</h4>
+<p>Right-click in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view and choose the  <b>Add Watchpoint (C/C++)...</b> command to open the <b>Add Watchpoint</b> window. A watchpoint suspends program execution when the memory location that you specify is accessed with a write or read operation and it's based on the access setting. Use the <b>Add Watchpoint</b> window to specify the  memory location, its memory size, unit size, and define whether the watchpoint  triggers on a read, write, or on both operations. Watchpoints can also be added directly in the <a href="../../reference/view_variables.htm">Variables</a>, <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a>, and the <a href="../../reference/view_memory_wnd.htm">Memory Rendering</a> views.</p>
+<p align="center"><img src="../images/wnd_add_watchpoint.png" width="220" height="261"></p>
+<p align="center" class="figure">Figure 1. Add Watchpoint window </p>
+<h5>Table 1. Add Watchpoint options </h5>
+  <table width="88%"  border="0" cellpadding="2" cellspacing="0">
+    <tr>
+      <th width="32%" scope="col">Name</th>
+      <th width="52%" scope="col">Description</th>
+    </tr>
+    <tr>
+      <td><div align="left"><b>Expression to watch </b></div></td>
+      <td>If not already entered, you can enter any arbitrary memory location for watching. </td>
+    </tr>
+    <tr>
+      <td><b>Memory space</b></td>
+      <td>Not supported.</td>
+    </tr>
+    <tr>
+      <td><b>Units</b></td>
+      <td>Define the size of the units to monitor. This setting defaults to the size of the variable to watch. If an arbitrary memory address is entered, then the default unit size is set to 1 byte. Once you enable the units checkbox, you're must enter a value for it.</td>
+    </tr>
+    <tr>
+      <td><b>Access: Write/Read </b></td>
+      <td><p>Check the appropriate access type to trigger  the watchpoint for the specified memory location. This setting is shown as a unique icon in the Breakpoints view next to the listed watchpoint. The following list shows the resolved version of the icons used to indicate the type of watchpoint set:</p>
+        <ul>
+          <li>Read only (<img src="../images/icon_watchpoint_read_resolved.png" width="18" height="13" align="absmiddle">)</li>
+          <li>Write only (<img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle">)</li>
+          <li>Read/Write (<img src="../images/icon_watchpoint_rw_enabled.png" width="16" height="16" align="absmiddle">)</li>
+      </ul></td>
+    </tr>
+</table>
+  <h4>Removing Watchpoints</h4>
+  <p>In the <b>Breakpoints</b> view, locate the watchpoint to remove and: </p>
+  <ul>
+    <li>Right-click the watchpoint and choose <b>Remove</b> from the context menu</li>
+  </ul>
+  <h4>Other references</h4>
+<ul>
+  <li><a href="..//watchpoints/watchpoints.htm">Watchpoints overview </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/status_watchpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/status_watchpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,99 +1,99 @@
-<!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>Watchpoint Status Indicators</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Watchpoint Status Indicators</h2>
-<p>Use <em>watchpoints</em> (sometimes referred to as access breakpoints) to halt program execution when a specific global location is accessed. After you set a watchpoint at a key point in memory, you can halt program execution whenever that point in memory is written to or read from. You can then examine the call chain, check register and variable values, and step through your code. You can also change values and alter the flow of normal program execution.</p>
-<p>A watchpoint must be both enabled and resolved during a debug session in order to halt program execution. The <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view indicates the status of any watchpoint using a set of common icons and checkmark status badge. These include:</p>
-<ul>
-  <li>An <b>enabled</b> watchpoint has a non-gray icon (<img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle" />) indicating that program execution  halts when encountered.</li>
-  <li>A <b>disabled</b> watchpoint displays a gray icon (<img src="../images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
-  <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle" /> ) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
-</ul>
-<p>In effect, a watchpoint that is enabled by the user and resolved by the debugger during program launch can halt program execution. The table below shows the various states that cause the debugger to halt program execution: </p>
-<h5>Table 1 Watchpoint&mdash;stop execution chart </h5>
-<table width="50%"  border="0" align="left" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="32%" scope="col">Watchpoint</th>
-    <th width="32%" scope="col"><div align="center">Resolved</div></th>
-    <th width="36%" scope="col"><div align="center">Unresolved</div></th>
-  </tr>
-  <tr>
-    <th scope="col">Enabled</th>
-    <td><div align="center"><b>Stops execution </b></div></td>
-    <td><div align="center"><b>No</b></div></td>
-  </tr>
-  <tr>
-    <th scope="col">Disabled</th>
-    <td><div align="center"><b>No</b></div></td>
-    <td><div align="center"><b>No</b></div></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>In addition, you can use these types of watchpoints:</p>
-<ul>
-  <li><a href="setting_watchpoints.htm">regular</a> watchpoints&mdash;halt program execution</li>
-  <li><a href="../breakpoints/temporary_breakpoints.htm">conditional</a> watchpoints&mdash;halt program execution after meeting a condition that you specify (same as for breakpoints)</li>
-</ul>
-<p>A watchpoint is equivalent to a memory breakpoint.</p>
-<p>Unlike a breakpoint, a watchpoint can detect when any part of your program affects memory. For example, if a write or write/read watchpoint is set, when the program writes a new value to the address or area of memory that has the watchpoint, the debugger suspends program execution.</p>
-<p class="note"><b>NOTE</b> You cannot set a watchpoint on a local variable, because the debugger cannot detect watchpoints for variables stored on the stack or in registers.</p>
-<h5>Table 2 Watchpoint&mdash;types and states </h5>
-<table width="90%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="14%" scope="col">Type</th>
-    <th width="14%" scope="col">State</th>
-    <th width="10%" scope="col">Icon</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td rowspan="2"><b>Write</b></td>
-    <td>enabled</td>
-    <td><div align="center"><img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" /></div></td>
-    <td><p>The watchpoint is activated for write access operations on the specific memory location and if resolved, will halt program execution on a write operation at the watchpoint. </p></td>
-  </tr>
-  <tr>
-    <td>disabled</td>
-    <td><div align="center"><img src="../images/icon_watchpoint_write_disabled.png" width="16" height="16" /></div></td>
-    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a write operation. </p></td>
-  </tr>
-  <tr>
-    <td rowspan="2"><b>Read</b></td>
-    <td>enabled</td>
-    <td><div align="center"><img src="../images/icon_watchpoint_read_enabled.png" width="16" height="16" /></div></td>
-    <td><p>The watchpoint is activated for read access operations on the specific memory location and if resolved, will halt program execution on a read operation at the watchpoint. </p></td>
-  </tr>
-  <tr>
-    <td>disabled</td>
-    <td><div align="center"><img src="../images/icon_watchpoint_read_disabled.png" width="16" height="16" /></div></td>
-    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read operation. </p></td>
-  </tr>
-  <tr>
-    <td rowspan="2"><b>Write/Read</b></td>
-    <td>enabled</td>
-    <td><div align="center"><img src="../images/icon_watchpoint_rw_enabled.png" width="16" height="16" /></div></td>
-    <td><p>The watchpoint is activated for both read and write access operations on the specific memory location and if resolved, will halt program execution  on any read or write operation at the watchpoint. </p></td>
-  </tr>
-  <tr>
-    <td>disabled</td>
-    <td><div align="center"><img src="../images/icon_watchpoint_rw_disabled.png" width="16" height="16" /></div></td>
-    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read or write operation. </p></td>
-  </tr>
-</table>
-<p>A project can have a different maximum number of watchpoints, depending on the build target. The IDE generally limits the acceptable range for watchpoints to memory that it can write-protect. This range also depends on the host and on the application. </p>
-<p>All set watchpoints appear in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view list.</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="..//watchpoints/watchpoints.htm">Watchpoints 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>
+<!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>Watchpoint Status Indicators</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Watchpoint Status Indicators</h2>
+<p>Use <em>watchpoints</em> (sometimes referred to as access breakpoints) to halt program execution when a specific global location is accessed. After you set a watchpoint at a key point in memory, you can halt program execution whenever that point in memory is written to or read from. You can then examine the call chain, check register and variable values, and step through your code. You can also change values and alter the flow of normal program execution.</p>
+<p>A watchpoint must be both enabled and resolved during a debug session in order to halt program execution. The <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view indicates the status of any watchpoint using a set of common icons and checkmark status badge. These include:</p>
+<ul>
+  <li>An <b>enabled</b> watchpoint has a non-gray icon (<img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle" />) indicating that program execution  halts when encountered.</li>
+  <li>A <b>disabled</b> watchpoint displays a gray icon (<img src="../images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
+  <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle" /> ) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
+</ul>
+<p>In effect, a watchpoint that is enabled by the user and resolved by the debugger during program launch can halt program execution. The table below shows the various states that cause the debugger to halt program execution: </p>
+<h5>Table 1 Watchpoint&mdash;stop execution chart </h5>
+<table width="50%"  border="0" align="left" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="32%" scope="col">Watchpoint</th>
+    <th width="32%" scope="col"><div align="center">Resolved</div></th>
+    <th width="36%" scope="col"><div align="center">Unresolved</div></th>
+  </tr>
+  <tr>
+    <th scope="col">Enabled</th>
+    <td><div align="center"><b>Stops execution </b></div></td>
+    <td><div align="center"><b>No</b></div></td>
+  </tr>
+  <tr>
+    <th scope="col">Disabled</th>
+    <td><div align="center"><b>No</b></div></td>
+    <td><div align="center"><b>No</b></div></td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>In addition, you can use these types of watchpoints:</p>
+<ul>
+  <li><a href="setting_watchpoints.htm">regular</a> watchpoints&mdash;halt program execution</li>
+  <li><a href="../breakpoints/temporary_breakpoints.htm">conditional</a> watchpoints&mdash;halt program execution after meeting a condition that you specify (same as for breakpoints)</li>
+</ul>
+<p>A watchpoint is equivalent to a memory breakpoint.</p>
+<p>Unlike a breakpoint, a watchpoint can detect when any part of your program affects memory. For example, if a write or write/read watchpoint is set, when the program writes a new value to the address or area of memory that has the watchpoint, the debugger suspends program execution.</p>
+<p class="note"><b>NOTE</b> You cannot set a watchpoint on a local variable, because the debugger cannot detect watchpoints for variables stored on the stack or in registers.</p>
+<h5>Table 2 Watchpoint&mdash;types and states </h5>
+<table width="90%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="14%" scope="col">Type</th>
+    <th width="14%" scope="col">State</th>
+    <th width="10%" scope="col">Icon</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td rowspan="2"><b>Write</b></td>
+    <td>enabled</td>
+    <td><div align="center"><img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" /></div></td>
+    <td><p>The watchpoint is activated for write access operations on the specific memory location and if resolved, will halt program execution on a write operation at the watchpoint. </p></td>
+  </tr>
+  <tr>
+    <td>disabled</td>
+    <td><div align="center"><img src="../images/icon_watchpoint_write_disabled.png" width="16" height="16" /></div></td>
+    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a write operation. </p></td>
+  </tr>
+  <tr>
+    <td rowspan="2"><b>Read</b></td>
+    <td>enabled</td>
+    <td><div align="center"><img src="../images/icon_watchpoint_read_enabled.png" width="16" height="16" /></div></td>
+    <td><p>The watchpoint is activated for read access operations on the specific memory location and if resolved, will halt program execution on a read operation at the watchpoint. </p></td>
+  </tr>
+  <tr>
+    <td>disabled</td>
+    <td><div align="center"><img src="../images/icon_watchpoint_read_disabled.png" width="16" height="16" /></div></td>
+    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read operation. </p></td>
+  </tr>
+  <tr>
+    <td rowspan="2"><b>Write/Read</b></td>
+    <td>enabled</td>
+    <td><div align="center"><img src="../images/icon_watchpoint_rw_enabled.png" width="16" height="16" /></div></td>
+    <td><p>The watchpoint is activated for both read and write access operations on the specific memory location and if resolved, will halt program execution  on any read or write operation at the watchpoint. </p></td>
+  </tr>
+  <tr>
+    <td>disabled</td>
+    <td><div align="center"><img src="../images/icon_watchpoint_rw_disabled.png" width="16" height="16" /></div></td>
+    <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read or write operation. </p></td>
+  </tr>
+</table>
+<p>A project can have a different maximum number of watchpoints, depending on the build target. The IDE generally limits the acceptable range for watchpoints to memory that it can write-protect. This range also depends on the host and on the application. </p>
+<p>All set watchpoints appear in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view list.</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="..//watchpoints/watchpoints.htm">Watchpoints overview </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/toggling_watchpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/toggling_watchpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,39 +1,39 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Enabling and Disabling Watchpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Enabling and Disabling Watchpoints</h2>
-<p>In the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view use the checkboxes that appear next to a watchpoint to enable or disable that watchpoint. When enabled, if the value in the watchpoint location changes per the read/write condition, then program execution is suspended. If the watchpoint is disabled and the value changes, no action is taken by the debugger.</p>
-<h4>Enabling Watchpoints</h4>
-<p>In the <b>Breakpoints</b> view, locate the watchpoint to enable and:</p>
-<ul>
-  <li>
-    <p>Click the checkbox next to the watchpoint in the Breakpoints view list</p>
-  </li>
-</ul>
-<ol>
-  <p>A  checkmark in the checkbox (<img src="../../images/icons/icon_checkmark_box.png" width="15" height="15" align="absmiddle" />)  next to the watchpoint indicates the watchpoint is enabled. </p>
-</ol>
-<h4>Disabling Watchpoints</h4>
-<p>In the <b>Breakpoints</b> view, locate the watchpoint to disable and: </p>
-<ul>
-  <li>Click the checkbox next to the watchpoint in the Breakpoints view list</li>
-</ul>
-<ol>
-  <p>An empty  checkbox (<img src="../../images/icons/icon_uncheckmark_box.png" width="15" height="15" align="absmiddle" />)  next to the  watchpoint indicates the watchpoint is disabled. </p>
-</ol>
-<p>See <a href="../breakpoints/exporting_breakpoints.htm">Saving and importing breakpoints</a> for information on storing breakpoint and watchpoint data sets for sharing or re-use. </p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="watchpoints.htm">Watchpoints 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>
-<h5>&nbsp;</h5>
-</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>Enabling and Disabling Watchpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Enabling and Disabling Watchpoints</h2>
+<p>In the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view use the checkboxes that appear next to a watchpoint to enable or disable that watchpoint. When enabled, if the value in the watchpoint location changes per the read/write condition, then program execution is suspended. If the watchpoint is disabled and the value changes, no action is taken by the debugger.</p>
+<h4>Enabling Watchpoints</h4>
+<p>In the <b>Breakpoints</b> view, locate the watchpoint to enable and:</p>
+<ul>
+  <li>
+    <p>Click the checkbox next to the watchpoint in the Breakpoints view list</p>
+  </li>
+</ul>
+<ol>
+  <p>A  checkmark in the checkbox (<img src="../../images/icons/icon_checkmark_box.png" width="15" height="15" align="absmiddle" />)  next to the watchpoint indicates the watchpoint is enabled. </p>
+</ol>
+<h4>Disabling Watchpoints</h4>
+<p>In the <b>Breakpoints</b> view, locate the watchpoint to disable and: </p>
+<ul>
+  <li>Click the checkbox next to the watchpoint in the Breakpoints view list</li>
+</ul>
+<ol>
+  <p>An empty  checkbox (<img src="../../images/icons/icon_uncheckmark_box.png" width="15" height="15" align="absmiddle" />)  next to the  watchpoint indicates the watchpoint is disabled. </p>
+</ol>
+<p>See <a href="../breakpoints/exporting_breakpoints.htm">Saving and importing breakpoints</a> for information on storing breakpoint and watchpoint data sets for sharing or re-use. </p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="watchpoints.htm">Watchpoints overview </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<h5>&nbsp;</h5>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,24 +1,24 @@
-<!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>Watchpoints Overview</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Watchpoints Overview </h2>
-<p>A <b>watchpoint</b> is a marker set on a specific memory location which is designed to suspend program execution when the value at that location changes. Watchpoints are closely related to breakpoints and are shown in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view. </p>
-<p>When a watchpoint is encountered during program execution, the debugger suspends execution and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears so you can examine the executable's current state,  check register and variable values, and use the stepping commands to walk line by line through the program to verify its operation. You can also change values and alter the flow of normal program execution. Setting watchpoints helps you debug your program and verify its efficiency.</p>
-<p>The following topics cover various breakpoint concepts and actions: </p>
-<ul>
-  <li><a href="../breakpoints/viewing_breakpoints.htm">Viewing Breakpoints and Watchpoints</a> </li>
-  <li><a href="status_watchpoints.htm">Watchpoint Status Indicators</a></li>
-  <li><a href="setting_watchpoints.htm">Setting and Removing Watchpoints</a></li>
-  <li><a href="toggling_watchpoints.htm">Enabling and Disabling Watchpoints</a></li>
-  <li><a href="../breakpoints/exporting_breakpoints.htm">Exporting</a> and <a href="../breakpoints/importing_breakpoints.htm">importing</a> watchpoints</li>
-</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>Watchpoints Overview</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Watchpoints Overview </h2>
+<p>A <b>watchpoint</b> is a marker set on a specific memory location which is designed to suspend program execution when the value at that location changes. Watchpoints are closely related to breakpoints and are shown in the <a href="../breakpoints/viewing_breakpoints.htm">Breakpoints</a> view. </p>
+<p>When a watchpoint is encountered during program execution, the debugger suspends execution and the <a href="../../reference/perspective_debug.htm">Debug</a> perspective appears so you can examine the executable's current state,  check register and variable values, and use the stepping commands to walk line by line through the program to verify its operation. You can also change values and alter the flow of normal program execution. Setting watchpoints helps you debug your program and verify its efficiency.</p>
+<p>The following topics cover various breakpoint concepts and actions: </p>
+<ul>
+  <li><a href="../breakpoints/viewing_breakpoints.htm">Viewing Breakpoints and Watchpoints</a> </li>
+  <li><a href="status_watchpoints.htm">Watchpoint Status Indicators</a></li>
+  <li><a href="setting_watchpoints.htm">Setting and Removing Watchpoints</a></li>
+  <li><a href="toggling_watchpoints.htm">Enabling and Disabling Watchpoints</a></li>
+  <li><a href="../breakpoints/exporting_breakpoints.htm">Exporting</a> and <a href="../breakpoints/importing_breakpoints.htm">importing</a> watchpoints</li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/legal.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/legal.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -10,7 +10,7 @@
 <body>
 <h2>License Information</h2>
 <h5>COPYRIGHTS</h5>
-<p>Copyright &copy; 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 &quot;Symbian Foundation License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.symbianfoundation.org/legal/sfl-v10.html">http://www.symbianfoundation.org/legal/sfl-v10.html</a>&quot;.  </p>
+<p>Copyright &copy; 2010 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 &quot;Symbian Foundation License v1.0&quot; which accompanies this distribution, and is available at the URL &quot;<a href="http://www.symbianfoundation.org/legal/sfl-v10.html">http://www.symbianfoundation.org/legal/sfl-v10.html</a>&quot;.  </p>
 <h5>Initial Contributors:  </h5>
 <p>Nokia Corporation - initial contribution</p>
 <h5>NOTICES</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,19 +1,19 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Applications Launch Configuration</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2>Applications  Launch Configuration</h2>
-<p>Use the <b>Symbian OS Applications</b> launch configuration to launch projects using the best launch configuration match. When chosen, Carbide examines the project and determines which specific launch configuration  works best for the project, then launches it with the selected launch configuration. It is essentially identical to clicking the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) in the toolbar.</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 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.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Applications Launch Configuration</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Applications  Launch Configuration</h2>
+<p>Use the <b>Symbian OS Applications</b> launch configuration to launch projects using the best launch configuration match. When chosen, Carbide examines the project and determines which specific launch configuration  works best for the project, then launches it with the selected launch configuration. It is essentially identical to clicking the <b>Debug</b> icon (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle">) in the toolbar.</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -21,7 +21,7 @@
   <li>The <a href="page_debugger.htm">Debugger</a> tab defines debug configurations, such as entry point to begin debugging, target options, and instruction set.</li>
   <li>The <a href="page_rom_log.htm">ROM Log </a> tab allows you to  specify where the ROM log file is stored and the <span class="code">Epoc32</span> directory.</li>
   <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug that are part of the project.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="../../reference/trk/wnd_new_connection_wizard.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
   <li>The <a href="wiz_new_launch_config.htm">Common</a> tab  (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
 </ul>
 <h4>Other references</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/customizing_launch_configs.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -70,6 +70,6 @@
   </li>
 </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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/emulation.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/emulation.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -21,7 +21,7 @@
   <li>The <a href="page_debugger.htm">Debugger</a> tab provides common debugger options for the project.</li>
   <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables are debugged by your project.</li>
   <li>The <a href="page_exceptions.htm">x86 Exceptions</a> tab  lists all the x86 exceptions that the debugger can catch.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="../../reference/trk/wnd_new_connection_wizard.htm">Source</a> tab (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
   <li>The <a href="wiz_new_launch_config.htm">Common</a> tab (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file and specify which perspectives become active when the launch configuration is launched. </li>
 </ul>
 <h4>Other references</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,29 +1,29 @@
-<!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>Launch Configuration Filtering</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Launch Configuration Filtering </h2>
-<p>Use the  <b>Launch Configuration </b> preference panel to  filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs. As shown in Figure 1, all the configurations related to TRK have been enabled and won't appear in the configurations list. </p>
-<p align="center"><img src="images/filter_launch_config.png" width="627" height="574" /></p>
-<p class="figure">Figure 1 - Launch Configurations preference panel </p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_debug_configuration.htm">Debug Window</a> </li>
-</ul>
-<h5>Related tasks </h5>
-<ul>
-  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  <li><a href="../../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
-  <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
-</ul>
-<div class="step">
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</div>
-</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>Launch Configuration Filtering</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Launch Configuration Filtering </h2>
+<p>Use the  <b>Launch Configuration </b> preference panel to  filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs. As shown in Figure 1, all the configurations related to TRK have been enabled and won't appear in the configurations list. </p>
+<p align="center"><img src="images/filter_launch_config.png" width="627" height="574" /></p>
+<p class="figure">Figure 1 - Launch Configurations preference panel </p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_debug_configuration.htm">Debug Window</a> </li>
+</ul>
+<h5>Related tasks </h5>
+<ul>
+  <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  <li><a href="../../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
+  <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
+</ul>
+<div class="step">
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_connection.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_connection.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,54 +1,54 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Connection page</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Connection page</h2>
-<p>The <b>Connection</b> page  specifies the method used to transfer files to the target device. Once a Serial Port type is chosen, the remaining options contain default values for the specific connection type. Users can change these remaining options to match the target device's communication specifications. </p>
-<p align="center"><span class="figure"><img src="images/page_connection.png" width="598" height="224"></span></p>
-<p class="figure">Figure 1. Connection page</p>
-<h5>Table 1. <span class="figure">Connection</span> page &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>
-
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide Connection page</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Connection page</h2>
+<p>The <b>Connection</b> page  specifies the method used to transfer files to the target device. Once a Serial Port type is chosen, the remaining options contain default values for the specific connection type. Users can change these remaining options to match the target device's communication specifications. </p>
+<p align="center"><span class="figure"><img src="images/page_connection.png" width="598" height="224"></span></p>
+<p class="figure">Figure 1. Connection page</p>
+<h5>Table 1. <span class="figure">Connection</span> page &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>
+
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_exceptions.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_exceptions.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,41 +1,41 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide x86 Exceptions page</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>x86 Exceptions page </h2>
-<p>  Use the <b>x86 Exceptions</b> page in the <a href="emulation.htm">Emulation</a> launch configuration to set  the x86 exceptions  the debugger should catch. If you want the debugger to catch all the exceptions, enable all of the options in this page. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you want to handle.</p>
-<p align="center"><img src="images/page_exceptions.png" width="627" height="270" /></p>
-<p align="center" class="figure">Figure 1 - x86 Exceptions page</p>
-<h5>Table 1. x86 Exceptions page &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>Exceptions to catch </b></td>
-    <td>Click to enable by exception which x86 exceptions the debugger should catch. </td>
-  </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>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-<h5>&nbsp;</h5>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide x86 Exceptions page</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>x86 Exceptions page </h2>
+<p>  Use the <b>x86 Exceptions</b> page in the <a href="emulation.htm">Emulation</a> launch configuration to set  the x86 exceptions  the debugger should catch. If you want the debugger to catch all the exceptions, enable all of the options in this page. However, if you prefer to handle only certain exceptions, enable only those options that reflect the exceptions you want to handle.</p>
+<p align="center"><img src="images/page_exceptions.png" width="627" height="270" /></p>
+<p align="center" class="figure">Figure 1 - x86 Exceptions page</p>
+<h5>Table 1. x86 Exceptions page &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>Exceptions to catch </b></td>
+    <td>Click to enable by exception which x86 exceptions the debugger should catch. </td>
+  </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>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<h5>&nbsp;</h5>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_executables.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_executables.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,54 +1,54 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Carbide Executables page</title>
-<link href="../../../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2>Executables page </h2>
-<p>The <b>Executables</b> page specifies the executables   available to debug with your project based on the chosen rule. The Executables page gives you project level control over the executables associated with it. The page 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="../../reference/view_executables.htm">Executables</a> view for information on controlling  executables from the workspace. </p>
-<p align="center"><img src="images/page_executables.png" width="598" height="224"></p>
-<p class="figure">Figure 1 - Executables page (System TRK example) </p>
-<h5>Table 1.  Executable page &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 governs the executable support used by this project for debugging. 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>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Carbide Executables page</title>
+<link href="../../../book.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h2>Executables page </h2>
+<p>The <b>Executables</b> page specifies the executables   available to debug with your project based on the chosen rule. The Executables page gives you project level control over the executables associated with it. The page 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="../../reference/view_executables.htm">Executables</a> view for information on controlling  executables from the workspace. </p>
+<p align="center"><img src="images/page_executables.png" width="598" height="224"></p>
+<p class="figure">Figure 1 - Executables page (System TRK example) </p>
+<h5>Table 1.  Executable page &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 governs the executable support used by this project for debugging. 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>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_file_transfer.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_file_transfer.htm	Fri Apr 16 11:18:22 2010 -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>Carbide File Transfer page</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>File Transfer page</h2>
-<p>The <b>File Transfer</b> page displays an auto-populated list of files for <a href="stop_mode.htm">System TRK</a> that the IDE transfers to the target device at the start of each launch. For RnD device images, the target location for files is normally <span class="code">c:\sys\bin</span> or another protected area. For production device images <a href="run_mode.htm">Application TRK</a> does not support the transfer of files to <span class="code">c:\sys\bin</span> or other protected areas.</p>
-<p>Users can add, edit, or delete files in the list and sort   by clicking on a column header. By default, any file added is automatically checked for downloading to the device. Users can uncheck a file to remove it from the download list without removing the file itself. System TRK users can  use this panel to download any type of file, like bitmaps, HTML, sounds, and more, to the phone and applicable to Application TRK for transfering any files outside of the installation file.</p>
-<p align="center"><img src="images/page_file_transfer.png" width="598" height="224"></p>
-<p class="figure">Figure 1. File Transfer page</p>
-<h5>Table 1. <span class="figure">File Transfer</span> page &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 directory</b>&#8212;the path to the target directory where transfered files are placed on the device.</li>
-      </ul>      
-      <blockquote>
-        <p> The target directories where files can be installed depends upon the type of device image you have on the device and which version of TRK you are using.      </p>
-        <ul>
-          <li>Application TRK - public folders only on  production device images</li>
-          <li>System TRK - public and protected folders, like <span class="code">c:\sys\bin</span>, on  RnD device images</li>
-        </ul>
-    </blockquote></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>
-</table>
-
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-<h5>&nbsp;</h5>
-</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>Carbide File Transfer page</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>File Transfer page</h2>
+<p>The <b>File Transfer</b> page displays an auto-populated list of files for <a href="stop_mode.htm">System TRK</a> that the IDE transfers to the target device at the start of each launch. For RnD device images, the target location for files is normally <span class="code">c:\sys\bin</span> or another protected area. For production device images <a href="run_mode.htm">Application TRK</a> does not support the transfer of files to <span class="code">c:\sys\bin</span> or other protected areas.</p>
+<p>Users can add, edit, or delete files in the list and sort   by clicking on a column header. By default, any file added is automatically checked for downloading to the device. Users can uncheck a file to remove it from the download list without removing the file itself. System TRK users can  use this panel to download any type of file, like bitmaps, HTML, sounds, and more, to the phone and applicable to Application TRK for transfering any files outside of the installation file.</p>
+<p align="center"><img src="images/page_file_transfer.png" width="598" height="224"></p>
+<p class="figure">Figure 1. File Transfer page</p>
+<h5>Table 1. <span class="figure">File Transfer</span> page &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 directory</b>&#8212;the path to the target directory where transfered files are placed on the device.</li>
+      </ul>      
+      <blockquote>
+        <p> The target directories where files can be installed depends upon the type of device image you have on the device and which version of TRK you are using.      </p>
+        <ul>
+          <li>Application TRK - public folders only on  production device images</li>
+          <li>System TRK - public and protected folders, like <span class="code">c:\sys\bin</span>, on  RnD device images</li>
+        </ul>
+    </blockquote></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>
+</table>
+
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<h5>&nbsp;</h5>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_installation.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_installation.htm	Fri Apr 16 11:18:22 2010 -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>Installation page</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Installation page</h2>
-<p>The  <b>Installation</b> page specifies the .sis file to install on the target device when using <a href="run_mode.htm">Application TRK</a>. This is required when using the TRK debug agent with 9.x based SDK&rsquo;s.</p>
-<p align="center"><img src="images/page_installation.png" width="686" height="284" /></p>
-<p class="figure">Figure 1. Installation page</p>
-<h5>Table 1. Installation page &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>
-  <tr>
-    <td><b>Partial upgrade sis/sisx path</b></td>
-    <td>Shows the path to the partial upgrade SIS file once it has been created.</td>
-  </tr>
-  <tr>
-    <td><b>Open SIS Builder settings...</b></td>
-    <td>Click to open the <a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Builder</a> page of the Carbide Build Configurations properties panel where you can enable the partial upgrade feature for subsequent builds.</td>
-  </tr>
-</table>
-
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-<p>&nbsp;</p>
-</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 page</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Installation page</h2>
+<p>The  <b>Installation</b> page specifies the .sis file to install on the target device when using <a href="run_mode.htm">Application TRK</a>. This is required when using the TRK debug agent with 9.x based SDK&rsquo;s.</p>
+<p align="center"><img src="images/page_installation.png" width="686" height="284" /></p>
+<p class="figure">Figure 1. Installation page</p>
+<h5>Table 1. Installation page &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>
+  <tr>
+    <td><b>Partial upgrade sis/sisx path</b></td>
+    <td>Shows the path to the partial upgrade SIS file once it has been created.</td>
+  </tr>
+  <tr>
+    <td><b>Open SIS Builder settings...</b></td>
+    <td>Click to open the <a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Builder</a> page of the Carbide Build Configurations properties panel where you can enable the partial upgrade feature for subsequent builds.</td>
+  </tr>
+</table>
+
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<p>&nbsp;</p>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_image.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_image.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,70 +1,70 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide ROM Image page</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>ROM Image page </h2>
-<p>Use the <b>ROM Image</b> page in a <a href="stop_mode.htm">System TRK</a> launch configuration to define startup options and ROM image download information.</p>
-<p align="center"><img src="images/page_rom_image.png" width="583" height="327"></p>
-<p class="figure">Figure 1 - ROM Image page in launch configuration </p>
-  <h5>Table 4. Launch configuration window&mdash;ROM Image  tab 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>Parse Rom Log File</b></td>
-      <td>Check this option to parse the ROM log file. </td>
-    </tr>
-    <tr>
-      <td><b>Symbian Rom Log File</b></td>
-      <td>Enter or browse to the Rom log file that is generated when the Symbian OS image is built. This is necessary for debugging any Symbian OS module.</td>
-    </tr>
-    <tr>
-      <td><b>Symbian Epoc32 Directory </b></td>
-      <td><p>Enter or browse to the epoc32 directory for the Symbian OS kit that is being targeted for debugging. This is necessary for the debugger to resolve the full paths for each module in the log file since the log file does not contain the full paths.</p></td>
-    </tr>
-    <tr>
-      <td><b>Log unresolved modules</b></td>
-      <td>Check this option to log unresolved modules. If the actual binary in the log file doesn&rsquo;t exist on the PC, then a warning message will be logged in a Rom Log console window.</td>
-    </tr>
-    <tr>
-      <td><b>Debug non-XIP executables</b></td>
-      <td>Check this option to target non-XIP executables. This allows the debugger to target a non-XIP module whenever it&rsquo;s loaded.</td>
-    </tr>
-    <tr>
-      <td><b>Download Rom Image </b></td>
-      <td>Check this box to enable downloading. </td>
-    </tr>
-    <tr>
-      <td><b>Symbian Rom Image</b></td>
-      <td>Enter or browse to the Symbian OS image (.img file) that will be downloaded onto the target at the specified download address.</td>
-    </tr>
-    <tr>
-      <td><b>Download Address (hex) </b></td>
-      <td><p>Specify the address where the image is to be downloaded. This address is target-specific. The address should be in hexadecimal format with the 0x prefix.</p></td>
-    </tr>
-    <tr>
-      <td><b>Same as start address</b></td>
-      <td>Check this option to make the download address the same as the start address.</td>
-    </tr>
-    <tr>
-      <td><b>Ask for download at the start of each debug session</b></td>
-      <td>Select this option  to prompt you to download the image at the start of the debug session.</td>
-    </tr>
-  </table>
-  <h4>Other references</h4>
-  <ul>
-    <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-  </ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-  <h5>&nbsp;</h5>
-</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>Carbide ROM Image page</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>ROM Image page </h2>
+<p>Use the <b>ROM Image</b> page in a <a href="stop_mode.htm">System TRK</a> launch configuration to define startup options and ROM image download information.</p>
+<p align="center"><img src="images/page_rom_image.png" width="583" height="327"></p>
+<p class="figure">Figure 1 - ROM Image page in launch configuration </p>
+  <h5>Table 4. Launch configuration window&mdash;ROM Image  tab 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>Parse Rom Log File</b></td>
+      <td>Check this option to parse the ROM log file. </td>
+    </tr>
+    <tr>
+      <td><b>Symbian Rom Log File</b></td>
+      <td>Enter or browse to the Rom log file that is generated when the Symbian OS image is built. This is necessary for debugging any Symbian OS module.</td>
+    </tr>
+    <tr>
+      <td><b>Symbian Epoc32 Directory </b></td>
+      <td><p>Enter or browse to the epoc32 directory for the Symbian OS kit that is being targeted for debugging. This is necessary for the debugger to resolve the full paths for each module in the log file since the log file does not contain the full paths.</p></td>
+    </tr>
+    <tr>
+      <td><b>Log unresolved modules</b></td>
+      <td>Check this option to log unresolved modules. If the actual binary in the log file doesn&rsquo;t exist on the PC, then a warning message will be logged in a Rom Log console window.</td>
+    </tr>
+    <tr>
+      <td><b>Debug non-XIP executables</b></td>
+      <td>Check this option to target non-XIP executables. This allows the debugger to target a non-XIP module whenever it&rsquo;s loaded.</td>
+    </tr>
+    <tr>
+      <td><b>Download Rom Image </b></td>
+      <td>Check this box to enable downloading. </td>
+    </tr>
+    <tr>
+      <td><b>Symbian Rom Image</b></td>
+      <td>Enter or browse to the Symbian OS image (.img file) that will be downloaded onto the target at the specified download address.</td>
+    </tr>
+    <tr>
+      <td><b>Download Address (hex) </b></td>
+      <td><p>Specify the address where the image is to be downloaded. This address is target-specific. The address should be in hexadecimal format with the 0x prefix.</p></td>
+    </tr>
+    <tr>
+      <td><b>Same as start address</b></td>
+      <td>Check this option to make the download address the same as the start address.</td>
+    </tr>
+    <tr>
+      <td><b>Ask for download at the start of each debug session</b></td>
+      <td>Select this option  to prompt you to download the image at the start of the debug session.</td>
+    </tr>
+  </table>
+  <h4>Other references</h4>
+  <ul>
+    <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+  </ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+  <h5>&nbsp;</h5>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_log.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_rom_log.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,46 +1,46 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<title>Carbide ROM Log page</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF" dir="ltr">
-<h2> ROM Log page</h2>
-<p>Use the <b>ROM Log</b> page ina <a href="stop_mode.htm">Sysem TRK</a> launch configuration to specify where the ROM log file is stored and the Epoc32 directory. </p>
-<p align="center"><img src="images/page_rom_log.png" width="590" height="213"></p>
-<p class="figure">Figure 1. ROM Log page </p>
-<h5>Table 1. ROM Log page&mdash;items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Parse Rom Log File </b></td>
-    <td>Activate the <b>Parse ROM Log File</b> option and specify the information that the debugger needs in order to show detailed stack information, set breakpoints, and show source level debugging information for ROM images.</td>
-  </tr>
-  <tr>
-    <td><b>Symbian Rom Log File </b></td>
-    <td> In the <b>Symbian Rom Log File</b> text field, browse to or enter the full path and name of the log file that corresponds to the ROM image on the target device. This log file is generated by default when the ROM image is built.</td>
-  </tr>
-  <tr>
-    <td><b>Symbian Epoc32 Directory </b></td>
-    <td><p>Specifies the epoc32 directory in which the ROM image and log files are stored. Since the log file may not contain full paths to the ROM components on the host PC, you need to enter this epoc32 directory.</p>
-    <p class="note"><b>NOTE</b> Always include the epoc32 folder in this path.</p></td>
-  </tr>
-  <tr>
-    <td><b>Log unresolved modules </b></td>
-    <td><p>Activate the  <b>Log unresolved modules </b> option to have the debugger output a list of components from the specified ROMBUILD log file that do not have debugger symbolic information. The list is displayed in the debugger console window at the beginning of the debug session.</p>
-      <p class="note"><b>NOTE</b> You cannot perform source-level debugging on components that do not include symbolic information.</p></td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-<h5>&nbsp;</h5>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<title>Carbide ROM Log page</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF" dir="ltr">
+<h2> ROM Log page</h2>
+<p>Use the <b>ROM Log</b> page ina <a href="stop_mode.htm">Sysem TRK</a> launch configuration to specify where the ROM log file is stored and the Epoc32 directory. </p>
+<p align="center"><img src="images/page_rom_log.png" width="590" height="213"></p>
+<p class="figure">Figure 1. ROM Log page </p>
+<h5>Table 1. ROM Log page&mdash;items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Parse Rom Log File </b></td>
+    <td>Activate the <b>Parse ROM Log File</b> option and specify the information that the debugger needs in order to show detailed stack information, set breakpoints, and show source level debugging information for ROM images.</td>
+  </tr>
+  <tr>
+    <td><b>Symbian Rom Log File </b></td>
+    <td> In the <b>Symbian Rom Log File</b> text field, browse to or enter the full path and name of the log file that corresponds to the ROM image on the target device. This log file is generated by default when the ROM image is built.</td>
+  </tr>
+  <tr>
+    <td><b>Symbian Epoc32 Directory </b></td>
+    <td><p>Specifies the epoc32 directory in which the ROM image and log files are stored. Since the log file may not contain full paths to the ROM components on the host PC, you need to enter this epoc32 directory.</p>
+    <p class="note"><b>NOTE</b> Always include the epoc32 folder in this path.</p></td>
+  </tr>
+  <tr>
+    <td><b>Log unresolved modules </b></td>
+    <td><p>Activate the  <b>Log unresolved modules </b> option to have the debugger output a list of components from the specified ROMBUILD log file that do not have debugger symbolic information. The list is displayed in the debugger console window at the beginning of the debug session.</p>
+      <p class="note"><b>NOTE</b> You cannot perform source-level debugging on components that do not include symbolic information.</p></td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<h5>&nbsp;</h5>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -20,9 +20,9 @@
   <li><a href="page_rom_image.htm">ROM Image</a></li>
   <li><a href="page_rom_log.htm">ROM Log</a></li>
   <li><a href="page_exceptions.htm">x86 Exceptions</a></li>
-  <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> (<i>standard CDT page</i>) </li>
+  <li><a href="../../reference/trk/wnd_new_connection_wizard.htm">Source</a> (<i>standard CDT page</i>) </li>
   <li><a href="wiz_new_launch_config.htm">Common</a> (<i>standard CDT page</i>) </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/run_mode.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -21,7 +21,7 @@
   <li>The <a href="page_file_transfer.htm">File Transfer</a> tab displays an auto-populated list of files that the IDE transfers to the target device at the start of each launch. </li>
   <li>The <a href="page_installation.htm">Installation</a> tab specifies the .sis file(s) to install on the target device.</li>
   <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="../../reference/trk/wnd_new_connection_wizard.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
   <li>The <a href="wiz_new_launch_config.htm">Common</a> tab (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file</li>
 </ul>
 <h4>Other references</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/stop_mode.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -19,7 +19,7 @@
   <li>The <a href="page_debugger.htm">Debugger</a> tab defines debug configurations, such as entry point to begin debugging and target options.</li>
   <li>The <a href="page_rom_image.htm">ROM Image</a> tab allows you to define startup options and ROM image download information.</li>
   <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="../../reference/trk/wnd_new_connection_wizard.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
   <li>The <a href="wiz_new_launch_config.htm">Common</a> tab (<i>standard CDT page</i>)  defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
 </ul>
 <h4>Other references</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/trace32.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/trace32.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -20,7 +20,7 @@
   <li>The <a href="page_debugger.htm">Debugger</a> tab defines debug configurations, such as entry point to begin debugging and target options.</li>
   <li>The <a href="page_rom_image.htm">ROM Image</a> tab allows you to define startup options and ROM image download information.</li>
   <li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug  that are part of the project.</li>
-  <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+  <li>The <a href="../../reference/trk/wnd_new_connection_wizard.htm">Source</a> tab  (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
   <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a> tab (<i>standard CDT page</i>)  defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
 </ul>
 <h4>Other references</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/wnd_debug_configuration.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -61,6 +61,6 @@
   <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
   <li><a href="pages_overview.htm">Configuration Pages</a> </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_01.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -27,6 +27,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_02.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -27,6 +27,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_03.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -46,6 +46,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_04.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -43,6 +43,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_05.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -28,6 +28,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_creating_projs_06.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -37,6 +37,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_01.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_01.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -23,6 +23,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_02.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_02.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -25,6 +25,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_03.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_03.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -35,6 +35,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_importing_projs_04.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -42,6 +42,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_overview.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -26,6 +26,6 @@
   <li>Qt SDK help  &#8212;  look in the <span class="code">qt_sdk_install/doc/html</span> directory of the Qt SDK</li>
   <li>Qt information  &#8212; visit <a href="http://wiki.forum.nokia.com/index.php/Category:Qt">Forum Nokia Qt</a> wiki topic for more information</li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_perspectives.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_perspectives.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Qt Projects Overview</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Qt Perspective </h2>
-<p>The Qt C/C++ perspective defines a set of common views that make developing Qt programs faster and easier. It is essentially the same as the <a href="../concepts/CarbidePerspective.html">Carbide C/C++ perspective</a> except that the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view is removed, and the following views  added: </p>
-<ul>
-  <li>Qt C/C++ Action Editor</li>
-  <li>Qt C/C++ Object Inspector</li>
-  <li>Qt C/C++ Property Editor</li>
-  <li>Qt C/C++ Signal Slot Editor</li>
-  <li>Qt C/C++ Widget Box</li>
-</ul>
-<p>See the Qt SDK documentation for more information on these views.</p>
-<p align="center"><img src="images/perspective_qt.png"></p>
-<p class="figure">Figure 1. Qt C/C++ perspective</p>
-<p>The Qt perspective watches the <span class="code">.pro</span> file associated with the project and will update the derived project <span class="code">bld.inf</span> and <span class="code">.mmp</span> files to match. You can control this behavior with the <b>Run qmake when .pro file changes</b> option in the <a href="qt_project_properties.htm">Qt Properties</a> panel.</p>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</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>Qt Projects Overview</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Qt Perspective </h2>
+<p>The Qt C/C++ perspective defines a set of common views that make developing Qt programs faster and easier. It is essentially the same as the <a href="../concepts/CarbidePerspective.html">Carbide C/C++ perspective</a> except that the <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> view is removed, and the following views  added: </p>
+<ul>
+  <li>Qt C/C++ Action Editor</li>
+  <li>Qt C/C++ Object Inspector</li>
+  <li>Qt C/C++ Property Editor</li>
+  <li>Qt C/C++ Signal Slot Editor</li>
+  <li>Qt C/C++ Widget Box</li>
+</ul>
+<p>See the Qt SDK documentation for more information on these views.</p>
+<p align="center"><img src="images/perspective_qt.png"></p>
+<p class="figure">Figure 1. Qt C/C++ perspective</p>
+<p>The Qt perspective watches the <span class="code">.pro</span> file associated with the project and will update the derived project <span class="code">bld.inf</span> and <span class="code">.mmp</span> files to match. You can control this behavior with the <b>Run qmake when .pro file changes</b> option in the <a href="qt_project_properties.htm">Qt Properties</a> panel.</p>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_pref_panel.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_pref_panel.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,60 +1,60 @@
-<!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>Qt Preference Panel</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Qt Preference Panel</h2>
-<p>The <b>Qt</b> preference panel provides global settings for Qt-based projects. Use it to add, edit, remove, and assign the default Qt version for projects.</p>
-<p align="center"><img src="images/qt_pref_panel.png" width="627" height="544"></p>
-<p class="figure">Figure 1. Qt preference panel</p>
-<p>The following commands appear on the toolbar within the Qt preference panel: </p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="25%" scope="col">Item</th>
-    <th width="75%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Qt Versions</b></td>
-    <td>Shows a list of installed Qt versions installed and available for Qt projects.</td>
-  </tr>
-  <tr>
-    <td><p><b>Add...</b></p>    </td>
-    <td><p>Click <b>Add</b> to open the <b>Add new Qt version</b> dialog where you can specify a Qt SDK by name and location.</p>
-    <p align="center"><img src="images/qt_dlg_add_version.png" width="450" height="415"></p>
-    <p class="figure">Figure 2. Add new Qt version dialog</p></td>
-  </tr>
-  <tr>
-    <td><b>Edit...</b></td>
-    <td><p>Click <b>Edit</b> to open the <b>Edit Qt Version</b> dialog where you can modify the Qt SDK information for the selected Qt version.</p>
-    <p align="center"><img src="images/qt_dlg_edit_version.png" width="450" height="415"></p>
-    <p class="figure">Figure 3. Edit Qt Version dialog</p></td>
-  </tr>
-  <tr>
-    <td><b>Remove</b></td>
-    <td>Click <b>Remove</b> to delete the selected Qt SDK from the Qt version list.</td>
-  </tr>
-  <tr>
-    <td><b>Default</b></td>
-    <td>Click <b>Default</b> to identify the selected Qt SDK as the default SDK to use for Qt projects.</td>
-  </tr>
-  <tr>
-    <td><b>Auto update QMAKESPEC when applying changes</b></td>
-    <td>Enable to automatically update QMAKESPEC when any changes are made to a Qt version. The default setting is enabled.</td>
-  </tr>
-  <tr>
-    <td><b>Auto update make command when applying changes</b></td>
-    <td>Enable to automatically update make when any changes are made to a Qt version. The default setting is enabled.</td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</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>Qt Preference Panel</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Qt Preference Panel</h2>
+<p>The <b>Qt</b> preference panel provides global settings for Qt-based projects. Use it to add, edit, remove, and assign the default Qt version for projects.</p>
+<p align="center"><img src="images/qt_pref_panel.png" width="627" height="544"></p>
+<p class="figure">Figure 1. Qt preference panel</p>
+<p>The following commands appear on the toolbar within the Qt preference panel: </p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="25%" scope="col">Item</th>
+    <th width="75%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Qt Versions</b></td>
+    <td>Shows a list of installed Qt versions installed and available for Qt projects.</td>
+  </tr>
+  <tr>
+    <td><p><b>Add...</b></p>    </td>
+    <td><p>Click <b>Add</b> to open the <b>Add new Qt version</b> dialog where you can specify a Qt SDK by name and location.</p>
+    <p align="center"><img src="images/qt_dlg_add_version.png" width="450" height="415"></p>
+    <p class="figure">Figure 2. Add new Qt version dialog</p></td>
+  </tr>
+  <tr>
+    <td><b>Edit...</b></td>
+    <td><p>Click <b>Edit</b> to open the <b>Edit Qt Version</b> dialog where you can modify the Qt SDK information for the selected Qt version.</p>
+    <p align="center"><img src="images/qt_dlg_edit_version.png" width="450" height="415"></p>
+    <p class="figure">Figure 3. Edit Qt Version dialog</p></td>
+  </tr>
+  <tr>
+    <td><b>Remove</b></td>
+    <td>Click <b>Remove</b> to delete the selected Qt SDK from the Qt version list.</td>
+  </tr>
+  <tr>
+    <td><b>Default</b></td>
+    <td>Click <b>Default</b> to identify the selected Qt SDK as the default SDK to use for Qt projects.</td>
+  </tr>
+  <tr>
+    <td><b>Auto update QMAKESPEC when applying changes</b></td>
+    <td>Enable to automatically update QMAKESPEC when any changes are made to a Qt version. The default setting is enabled.</td>
+  </tr>
+  <tr>
+    <td><b>Auto update make command when applying changes</b></td>
+    <td>Enable to automatically update make when any changes are made to a Qt version. The default setting is enabled.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_properties.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_properties.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Qt Project Properties</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Qt Project Properties</h2>
-<p>The <b>Qt Properties</b> panel provides project-level settings for Qt projects. Qmake will be invoked whenever the <span class="code">.pro</span> file changes so that the <span class="code">bld.inf </span>and <span class="code">.mmp</span> file will always be in sync.</p>
-<p align="center"><img src="images/qt_project_properties.png" width="682" height="544"></p>
-<p class="figure">Figure 1. Qt Properties panel</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Use Qt version</b></td>
-    <td>Select the Qt version to associate with this project. Choose <b>Default</b> to always use the default Qt version as set in the <a href="qt_pref_panel.htm">Qt preference panel</a> or select from any Qt version listed.</td>
-  </tr>
-  <tr>
-    <td><b>Run qmake when .pro file changes</b></td>
-    <td>Enable to keep the Carbide project and <span class="code">.pro</span> file in sync during development. Qmake will be invoked whenever the <span class="code">.pro</span> file changes so that the <span class="code">bld.inf </span>and <span class="code">.mmp</span> file will always be in sync. The default setting is enabled.</td>
-  </tr>
-</table>
-<h4>Other references</h4>
-<ul>
-  <li><a href="qt_overview.htm">Qt Project Support</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</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>Qt Project Properties</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Qt Project Properties</h2>
+<p>The <b>Qt Properties</b> panel provides project-level settings for Qt projects. Qmake will be invoked whenever the <span class="code">.pro</span> file changes so that the <span class="code">bld.inf </span>and <span class="code">.mmp</span> file will always be in sync.</p>
+<p align="center"><img src="images/qt_project_properties.png" width="682" height="544"></p>
+<p class="figure">Figure 1. Qt Properties panel</p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Use Qt version</b></td>
+    <td>Select the Qt version to associate with this project. Choose <b>Default</b> to always use the default Qt version as set in the <a href="qt_pref_panel.htm">Qt preference panel</a> or select from any Qt version listed.</td>
+  </tr>
+  <tr>
+    <td><b>Run qmake when .pro file changes</b></td>
+    <td>Enable to keep the Carbide project and <span class="code">.pro</span> file in sync during development. Qmake will be invoked whenever the <span class="code">.pro</span> file changes so that the <span class="code">bld.inf </span>and <span class="code">.mmp</span> file will always be in sync. The default setting is enabled.</td>
+  </tr>
+</table>
+<h4>Other references</h4>
+<ul>
+  <li><a href="qt_overview.htm">Qt Project Support</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/qt_help/qt_project_setup.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -30,6 +30,6 @@
 <ul>
   <li><a href="qt_overview.htm">Qt Project Support</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/AIFEditor.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/AIFEditor.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,98 +1,98 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>AIF Editor in AIF Definition File</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>AIF Editor</h2>
-	  
-	 <p>
-		The <b>AIF Editor</b> allows you to specify the Symbian OS
-		resource file and bitmaps that should be included in a Symbian OS application
-		information (AIF) file. Use of AIF files is restricted to using <span class="filename">.bmp</span> files and works for versions 2.x and later releases of the Symbian OS SDKs. For more information, see <a href="../concepts/AIFDefWizard.html">AIF File</a>.</p>
-	 <p>
-		The AIF Editor is shown when a new AIF file is created or an existing file is edited in the Resources group of the MMP editor's  Sources tab. Refer to <a href="../tasks/AppInfoFile.html">Creating an AIF File</a> for more information.</p>
-	 
-	<p align="center" class="Image"><img src="../tasks/projects/images/AIF_editor2.png" width="700" height="575" /></p>
-		<h5>Table 1. AIF Editor &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>Target File </b></td>
-         <td><p>Specifies the filename of the compiled AIF file, relative to the target path. Click the untitled.aif button to set the target file based on the SDK and project name.</p></td>
-       </tr>
-       <tr>
-         <td><b>Resource File Path </b></td>
-         <td>Choose a resource file from the current project, browse the file system or enter the path. For relative paths use the Carbide project as the reference point, not the MMP file location. </td>
-       </tr>
-       <tr>
-         <td><b>Up</b></td>
-         <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
-       </tr>
-       <tr>
-         <td><b>Down</b></td>
-         <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
-       </tr>
-       <tr>
-         <td><b>Pair Image and Mask </b></td>
-         <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
-       </tr>
-       <tr>
-         <td><b>Split Image and Mask </b></td>
-         <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
-       </tr>
-       <tr>
-         <td><b>Swap Image and Mask </b></td>
-         <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
-       </tr>
-       <tr>
-         <td><b><a href="add_from_project.htm">Add From Project</a> </b></td>
-         <td>Click this button to open an Add Images from Project dialog to reference available images in the project.</td>
-       </tr>
-       <tr>
-         <td><b><a href="add_from_filesys.htm">Add From Filesystem</a></b></td>
-         <td>Click this button to open an Add Images From Filesystem dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
-       </tr>
-       <tr>
-         <td><b>Remove</b></td>
-         <td>Select an image and click Remove to remove image entry from the list. This does not delete file from directory.</td>
-       </tr>
-       <tr>
-         <td><b>Color depth </b></td>
-         <td>Select the bit depth used to encode the image at build time.</td>
-       </tr>
-       <tr>
-         <td><b>Mask depth </b></td>
-         <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
-             <ul>
-               <li>n/a - Do not apply mask depth to images </li>
-               <li>1 - A 1-bit mask treats pixels as &quot;on/off&quot; bits, where black is opaque and white is transparent. </li>
-               <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
-           </ul></td>
-       </tr>
-       <tr>
-         <td><b>Color format </b></td>
-         <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
-       </tr>
-       <tr>
-         <td><b>Preview</b></td>
-         <td>A preview of the image as it will appear at runtime. </td>
-       </tr>
-     </table>
-	 <p>&nbsp;</p>
-	 <h5>Related  concepts</h5>
-       <ul>
-         <li><a href="../concepts/AIFDefWizard.html">AIF File</a></li>
-       </ul>
-       <h5>Related tasks</h5>
-       <ul>
-         <li><a href="../tasks/AppInfoFile.html">Creating an AIF File</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>
+<title>AIF Editor in AIF Definition File</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>AIF Editor</h2>
+	  
+	 <p>
+		The <b>AIF Editor</b> allows you to specify the Symbian OS
+		resource file and bitmaps that should be included in a Symbian OS application
+		information (AIF) file. Use of AIF files is restricted to using <span class="filename">.bmp</span> files and works for versions 2.x and later releases of the Symbian OS SDKs. For more information, see <a href="../concepts/AIFDefWizard.html">AIF File</a>.</p>
+	 <p>
+		The AIF Editor is shown when a new AIF file is created or an existing file is edited in the Resources group of the MMP editor's  Sources tab. Refer to <a href="../tasks/AppInfoFile.html">Creating an AIF File</a> for more information.</p>
+	 
+	<p align="center" class="Image"><img src="../tasks/projects/images/AIF_editor2.png" width="700" height="575" /></p>
+		<h5>Table 1. AIF Editor &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>Target File </b></td>
+         <td><p>Specifies the filename of the compiled AIF file, relative to the target path. Click the untitled.aif button to set the target file based on the SDK and project name.</p></td>
+       </tr>
+       <tr>
+         <td><b>Resource File Path </b></td>
+         <td>Choose a resource file from the current project, browse the file system or enter the path. For relative paths use the Carbide project as the reference point, not the MMP file location. </td>
+       </tr>
+       <tr>
+         <td><b>Up</b></td>
+         <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
+       </tr>
+       <tr>
+         <td><b>Down</b></td>
+         <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
+       </tr>
+       <tr>
+         <td><b>Pair Image and Mask </b></td>
+         <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
+       </tr>
+       <tr>
+         <td><b>Split Image and Mask </b></td>
+         <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
+       </tr>
+       <tr>
+         <td><b>Swap Image and Mask </b></td>
+         <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
+       </tr>
+       <tr>
+         <td><b><a href="add_from_project.htm">Add From Project</a> </b></td>
+         <td>Click this button to open an Add Images from Project dialog to reference available images in the project.</td>
+       </tr>
+       <tr>
+         <td><b><a href="add_from_filesys.htm">Add From Filesystem</a></b></td>
+         <td>Click this button to open an Add Images From Filesystem dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
+       </tr>
+       <tr>
+         <td><b>Remove</b></td>
+         <td>Select an image and click Remove to remove image entry from the list. This does not delete file from directory.</td>
+       </tr>
+       <tr>
+         <td><b>Color depth </b></td>
+         <td>Select the bit depth used to encode the image at build time.</td>
+       </tr>
+       <tr>
+         <td><b>Mask depth </b></td>
+         <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
+             <ul>
+               <li>n/a - Do not apply mask depth to images </li>
+               <li>1 - A 1-bit mask treats pixels as &quot;on/off&quot; bits, where black is opaque and white is transparent. </li>
+               <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
+           </ul></td>
+       </tr>
+       <tr>
+         <td><b>Color format </b></td>
+         <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
+       </tr>
+       <tr>
+         <td><b>Preview</b></td>
+         <td>A preview of the image as it will appear at runtime. </td>
+       </tr>
+     </table>
+	 <p>&nbsp;</p>
+	 <h5>Related  concepts</h5>
+       <ul>
+         <li><a href="../concepts/AIFDefWizard.html">AIF File</a></li>
+       </ul>
+       <h5>Related tasks</h5>
+       <ul>
+         <li><a href="../tasks/AppInfoFile.html">Creating an AIF File</a></li>
+   </ul>
+       <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+</html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,80 +1,80 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>MMP Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>MMP Editor</h2>
-   
-   <p>
-   The MMP Editor allows you to view and modify your project definitions.  Changes made in the MMP editor are automatically written to the project's .MMP file. You can view the .mmp file by selecting the <em>project_name</em>.mmp tab located along the bottom of the MMP editor.</p>
-   <p>
-	  The MMP Editor is shown when an MMP  file is
-   opened from the Project Explorer, C/C++ Projects, or Symbian Project Navigator views. The MMP Editor is shown in Figure 1. MMP editor fields are validated for existing or correct entries. For example, if the UID 2 field is blank the label is highlighted in red. If an error exists in the mmp file, the line where the error occurs is marked and also displayed in the Problems view.</p>
-   <p align="center"><img src="images/mmp_editor.png" width="656" height="428" /></p>
-   <p align="left" class="figure">Figure 1 - MMP Editor</p>
-   <table cellpadding="2" cellspacing="0"
-border="0">
-	 <tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
-		    <p>
-			   <b>Target name</b></p></td><td class="Cell">
-			 <p>
-				Enter the name of the target file. 
-			 </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Target type</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Select the type of target file from the dropdown list.</p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Target path</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Enter the path to the target file. 
-			 </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>UID 2</b> 
-			 </p></td><td class="Cell">
-			 <p>UID 2 is a unique identifier number that identifies the type of interface that the project implements. The values are defined by Symbian:</p>
-			 <ul>
-			   <li>For GUI applications, it is always 0x100039CE</li>
-			   <li>For static interface DLLs, the UID 2 is always 0x1000008d</li>
-			   <li>For polymorphic DLLs, the UID2 is defined by the framework which is being implemented</li>
-			 </ul>
-			 </td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>UID 3</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Application UID (or UID3) is used to uniquely identify the binary (EXE or DLL) within the system. The purpose of UID 3 is to prevent one executable from interfering the operation of another executable.</p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Project definition</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				The Project definition group provides links to the Sources, Libraries, and Options windows. You can also select the Sources, Libraries, and Options tabs to open the related window. </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Common tasks</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				This group provides links to the User and System include path options located in the Options window. 
-			 </p></td></tr>
-   </table>
-	 <p>Any changes made to the MMP file either in Carbide or using an external editor are detected. If the build is for emulation, these changes are detected and used automatically. </p>
-	 <p>For other build types like GCCE you are  presented with the <b>Modified MMP Files Detected</b> dialog (Figure 2) and asked which build action to take for each MMP file that has changed. Set the build option for each listed MMP file and click <b>OK</b>.</p>
-	 <p align="center"><img src="images/wnd_modified_mmp_files.png" width="617" height="300"></p>
-	 <p align="left" class="figure">Figure 2 - Modified MMP Files Detected dialog </p>
-	 <p align="left">The options  are  identical to the workspace setting <b>Default action to take when MMP files are modified </b>option in the <b>Build</b> preference panel. Click the <b>Configure Workspace Settings...</b> to open the <a href="wnd_build_prefs.htm">Build</a><b> </b>preference panel to set the default build options for the workspace. The options  can also be modified at the  project level in the <b>Properties for &lt;<i>project</i>&gt; &gt; </b><a href="build_properties/pane_project_settings.htm">Carbide Project Settings</a> panel. </p>
-	 <h5>Related references</h5>
-       <ul>
-      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
-      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
-      <li><a href="MMP_Editor_options.html">MMP Editor Options window</a></li>
-      <li><a href="MMP_Editor_mmp_tab.html">MMP File Window</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>
+<title>MMP Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>MMP Editor</h2>
+   
+   <p>
+   The MMP Editor allows you to view and modify your project definitions.  Changes made in the MMP editor are automatically written to the project's .MMP file. You can view the .mmp file by selecting the <em>project_name</em>.mmp tab located along the bottom of the MMP editor.</p>
+   <p>
+	  The MMP Editor is shown when an MMP  file is
+   opened from the Project Explorer, C/C++ Projects, or Symbian Project Navigator views. The MMP Editor is shown in Figure 1. MMP editor fields are validated for existing or correct entries. For example, if the UID 2 field is blank the label is highlighted in red. If an error exists in the mmp file, the line where the error occurs is marked and also displayed in the Problems view.</p>
+   <p align="center"><img src="images/mmp_editor.png" width="656" height="428" /></p>
+   <p align="left" class="figure">Figure 1 - MMP Editor</p>
+   <table cellpadding="2" cellspacing="0"
+border="0">
+	 <tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+		    <p>
+			   <b>Target name</b></p></td><td class="Cell">
+			 <p>
+				Enter the name of the target file. 
+			 </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Target type</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Select the type of target file from the dropdown list.</p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Target path</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Enter the path to the target file. 
+			 </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>UID 2</b> 
+			 </p></td><td class="Cell">
+			 <p>UID 2 is a unique identifier number that identifies the type of interface that the project implements. The values are defined by Symbian:</p>
+			 <ul>
+			   <li>For GUI applications, it is always 0x100039CE</li>
+			   <li>For static interface DLLs, the UID 2 is always 0x1000008d</li>
+			   <li>For polymorphic DLLs, the UID2 is defined by the framework which is being implemented</li>
+			 </ul>
+			 </td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>UID 3</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Application UID (or UID3) is used to uniquely identify the binary (EXE or DLL) within the system. The purpose of UID 3 is to prevent one executable from interfering the operation of another executable.</p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Project definition</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				The Project definition group provides links to the Sources, Libraries, and Options windows. You can also select the Sources, Libraries, and Options tabs to open the related window. </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Common tasks</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				This group provides links to the User and System include path options located in the Options window. 
+			 </p></td></tr>
+   </table>
+	 <p>Any changes made to the MMP file either in Carbide or using an external editor are detected. If the build is for emulation, these changes are detected and used automatically. </p>
+	 <p>For other build types like GCCE you are  presented with the <b>Modified MMP Files Detected</b> dialog (Figure 2) and asked which build action to take for each MMP file that has changed. Set the build option for each listed MMP file and click <b>OK</b>.</p>
+	 <p align="center"><img src="images/wnd_modified_mmp_files.png" width="617" height="300"></p>
+	 <p align="left" class="figure">Figure 2 - Modified MMP Files Detected dialog </p>
+	 <p align="left">The options  are  identical to the workspace setting <b>Default action to take when MMP files are modified </b>option in the <b>Build</b> preference panel. Click the <b>Configure Workspace Settings...</b> to open the <a href="wnd_build_prefs.htm">Build</a><b> </b>preference panel to set the default build options for the workspace. The options  can also be modified at the  project level in the <b>Properties for &lt;<i>project</i>&gt; &gt; </b><a href="build_properties/pane_project_settings.htm">Carbide Project Settings</a> panel. </p>
+	 <h5>Related references</h5>
+       <ul>
+      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
+      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
+      <li><a href="MMP_Editor_options.html">MMP Editor Options window</a></li>
+      <li><a href="MMP_Editor_mmp_tab.html">MMP File Window</a></li>
+    </ul>
+  
+   
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+</html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_libraries.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_libraries.html	Fri Apr 16 11:18:22 2010 -0500
@@ -44,7 +44,7 @@
     </ul>
   
    
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_mmp_tab.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_mmp_tab.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,27 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>MMP Editor MMP File</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-   </head>
-   <body>
-   <h2>MMP File Window</h2>
-   
-   <p>
-   The MMP file tab in the MMP editor window shows the source text of the mmp file. Changes made directly in the mmp file are reflected in related tabs of the MMP editor and changes made in editor tabs are written to the mmp file. Errors are identified in red and  markers are placed in mmp files at the locations errors exist.</p>
-   <p align="center"><img src="images/mmp_editor_mmpfile.png" width="560" height="424" /></p>
-   <p align="left" class="figure">Figure 1 - MMP Editor MMP File</p>
-   <p></p>
-   <h5>Related references</h5>
-    <ul>
-      <li><a href="MMP_Editor.html">MMP Editor</a></li>
-      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
-      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
-      <li><a href="MMP_Editor_options.html">MMP Editor Options window</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>
+<title>MMP Editor MMP File</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+   </head>
+   <body>
+   <h2>MMP File Window</h2>
+   
+   <p>
+   The MMP file tab in the MMP editor window shows the source text of the mmp file. Changes made directly in the mmp file are reflected in related tabs of the MMP editor and changes made in editor tabs are written to the mmp file. Errors are identified in red and  markers are placed in mmp files at the locations errors exist.</p>
+   <p align="center"><img src="images/mmp_editor_mmpfile.png" width="560" height="424" /></p>
+   <p align="left" class="figure">Figure 1 - MMP Editor MMP File</p>
+   <p></p>
+   <h5>Related references</h5>
+    <ul>
+      <li><a href="MMP_Editor.html">MMP Editor</a></li>
+      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
+      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
+      <li><a href="MMP_Editor_options.html">MMP Editor Options window</a></li>
+    </ul>
+  
+   
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+</html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_options.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_options.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,77 +1,77 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>MMP Editor Options</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>MMP Editor Options Window</h2>
-   
-   <p>
-   The MMP editor options window allows you to edit compiler, linker, and runtime settings. The MMP editor options window is shown in Figure 1.</p>
-   <p align="center"><img src="images/mmp_editor_options.png" width="939" height="450" /></p>
-   <p align="left" class="figure">Figure 1 - MMP Editor Options window</p>
-   <p></p>
-   <table cellpadding="2" cellspacing="0"
-border="0">
-	 <tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
-		    <p>
-			   <b>Runtime</b></p></td><td class="Cell">
-			 <p>
-				This group allows you to define various runtime options.</p>
-			 <p><b>Capabilities</b> - Click the Choose... button to select Capabilities. A capability is an access token that corresponds to permission to access sensitive system resources. Platform security permits access to sensitive APIs according to capabilities. Capabilities are used to specify what functionality an application is trusted to use; they are allocated to the application at build time and are policed at run time. Once the capabilities are assigned to the application, they cannot be changed. Thus an application has a set of unalterable capabilities that describe what access the application has to the APIs.</p>
-			 <p>There are three suggested ways to establish which capabilities an application requires.</p>
-			 <ul>
-			   <li>The first method is initially to allocate capabilities based on the general operations that the application performs. For example, an instant messaging application would probably require NetworkServices to access the Internet and ReadUserData to read the user&rsquo;s contacts.</li>
-			   <li>The second method is to use the Symbian Developer Library, which lists the capabilities required by each API. Note that some APIs may be marked as &ldquo;Dependent&rdquo;, meaning that the need for the capability depends on the parameters being passed. For example, accessing a file in an application&rsquo;s private data area requires no capabilities, but accessing a file in \sys\bin requires the <span class="code">AllFiles</span> capability.</li>
-			   <li>The third method is to run the application in the emulator, analyzing the debug file (in the system temporary directory) for capability violations. The output will state the API that caused the violation and what capability was expected.</li>
-			 </ul>
-			 <p><b>Minimum heap size</b> - Set the heap size that you need.</p>
-			 <p><b>Maximum heap size</b> - Set the heap size that you need.</p>
-			 <p><b>Stack  size</b> - Set the stack size that you need.</p>
-			 <p><b>Process priority </b> - Select the process priority from the dropdown list.</p>
-			 <p><b>Secure ID</b> - Enter the Secure ID. The SID is used to determine which private directory a process can access. It is also used to identify the caller applications. An application's SID is defined within its .mmp file, and is used to uniquely identify the application. SID values are requested from the Symbian Signed Web site (www.symbiansigned.com).  The Software Installer (SWI) is responsible for ensuring that SIDs are locally unique, i.e., that no two applications have the same SID value on a particular target device.</p>
-			 <p><b>Vendor ID</b> - Enter the Vendor ID. This ID uniquely identifies the source of the application. If an application needs a VID, it must be certified. Noncertified applications must use a VID of 0 (KNullUid), which is the value applied by default.</p>
-			 <p><b>Enable debugging (Symbian OS 9.4+) </b>- Activate to enable on-device debugging for Symbian OS 9.4 and later. When activated, the <span class="code">DEBUGGABLE_UDEBONLY</span> flag is added to the project .MMP file. </p>
-			 <p><b>Paging Mode  (Symbian OS 9.3+)</b> - specify the paging mode to: not specified, paged, or unpaged. </p></td>
-	 </tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Compiler Settings</b></p></td><td class="Cell">
-			 <p>
-				<b>User includes</b> - Use the Add, Edit, and Remove buttons to add, edit, or remove the paths to the user header files used to compile source files. Use the Up and Down buttons to arrange the list of paths. </p>
-			 <p><b>System includes</b> - Use the Add, Edit, and Remove buttons to add, edit, or remove the paths to the system header files used to compile source files. Use the Up and Down buttons to arrange the list of paths.</p>
-			 <p><b>Macros</b> - Use the Add, Edit, and Remove buttons to add, edit, or remove a macro identifier. Use the Up and Down buttons to arrange the list of macro identifiers.</p>
-			 <p><b>Compiler options</b> - Use the Add, Edit, and Remove buttons to add, edit, or remove compiler options. In the Edit Compiler Options dialog, select the tool chain (for example: ARMCC, CW, GCC, GCCE, or MSVC) and enter your custom options.</p>
-			 <p><b>Linker options</b> - Use the Add, Edit, and Remove buttons to add, edit, or remove linker options. In the Edit Linker Options dialog, select the tool chain (for example: ARMCC, CW, GCC, GCCE, or MSVC) and enter your custom options.</p>
-			 <p><b>Per-variant include dependencies</b> - Check this option to include dependencies for a specific variant when building a target. For example build a release variant with optimized code, a debug variant with debugging info and a profiling variant with timing hooks.</p>
-			 <p><b>Disable optimizations in debug builds</b> - Check this option to disable optimizations when building a debug version of your application. Since optimization changes the code created by the compiler, it is best to optimize your code after you have fully tested and debugged it. If a program works in a debug build, but fails in a release build, it is likely that one of the compiler optimizations is exposing a defect in your source code. To isolate the problem, you should disable selected optimizations for each source code file, until you locate the file and the optimization that is causing the problem.</p></td>
-	 </tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>Linker</b></td>
-			   <td class="Cell"><p><b>Linker definition file</b> - Select a linker definition file or click Browse... to locate a definition file.</p>
-		       <p><b>Export unfrozen</b> - Check this option to tell the build process that exports are not yet frozen.</p>
-		       <p><b>Don't export library</b> - Check this option to not export a copy of the library. </p>
-		       <p><b>No strict .def file</b> - Check this option to specify no strict linker definition file.</p>
-		       <p><b>Compress target executable</b> - Check this option to compress the target executable. </p>
-		       <p><b>Link as internal name</b> - Specify an internal name.</p>
-		       <p><b>Win32 base address</b> - Specify the Win32 base address.</p></td>
-     </tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>Kernel</b></td>
-			   <td class="Cell"><p><b>ASSP ABI </b>- Check this option to build the ASSP application binary interface. </p>
-		       <p><b>ASSP exports</b> - Check this option to enable ASSP exports. </p></td>
-     </tr>
-   </table>
-	 <h5>Related references</h5>
-    <ul>
-      <li><a href="MMP_Editor.html">MMP Editor</a></li>
-      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
-      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
-      <li><a href="MMP_Editor_mmp_tab.html">MMP File Window</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>
+<title>MMP Editor Options</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>MMP Editor Options Window</h2>
+   
+   <p>
+   The MMP editor options window allows you to edit compiler, linker, and runtime settings. The MMP editor options window is shown in Figure 1.</p>
+   <p align="center"><img src="images/mmp_editor_options.png" width="939" height="450" /></p>
+   <p align="left" class="figure">Figure 1 - MMP Editor Options window</p>
+   <p></p>
+   <table cellpadding="2" cellspacing="0"
+border="0">
+	 <tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+		    <p>
+			   <b>Runtime</b></p></td><td class="Cell">
+			 <p>
+				This group allows you to define various runtime options.</p>
+			 <p><b>Capabilities</b> - Click the Choose... button to select Capabilities. A capability is an access token that corresponds to permission to access sensitive system resources. Platform security permits access to sensitive APIs according to capabilities. Capabilities are used to specify what functionality an application is trusted to use; they are allocated to the application at build time and are policed at run time. Once the capabilities are assigned to the application, they cannot be changed. Thus an application has a set of unalterable capabilities that describe what access the application has to the APIs.</p>
+			 <p>There are three suggested ways to establish which capabilities an application requires.</p>
+			 <ul>
+			   <li>The first method is initially to allocate capabilities based on the general operations that the application performs. For example, an instant messaging application would probably require NetworkServices to access the Internet and ReadUserData to read the user&rsquo;s contacts.</li>
+			   <li>The second method is to use the Symbian Developer Library, which lists the capabilities required by each API. Note that some APIs may be marked as &ldquo;Dependent&rdquo;, meaning that the need for the capability depends on the parameters being passed. For example, accessing a file in an application&rsquo;s private data area requires no capabilities, but accessing a file in \sys\bin requires the <span class="code">AllFiles</span> capability.</li>
+			   <li>The third method is to run the application in the emulator, analyzing the debug file (in the system temporary directory) for capability violations. The output will state the API that caused the violation and what capability was expected.</li>
+			 </ul>
+			 <p><b>Minimum heap size</b> - Set the heap size that you need.</p>
+			 <p><b>Maximum heap size</b> - Set the heap size that you need.</p>
+			 <p><b>Stack  size</b> - Set the stack size that you need.</p>
+			 <p><b>Process priority </b> - Select the process priority from the dropdown list.</p>
+			 <p><b>Secure ID</b> - Enter the Secure ID. The SID is used to determine which private directory a process can access. It is also used to identify the caller applications. An application's SID is defined within its .mmp file, and is used to uniquely identify the application. SID values are requested from the Symbian Signed Web site (www.symbiansigned.com).  The Software Installer (SWI) is responsible for ensuring that SIDs are locally unique, i.e., that no two applications have the same SID value on a particular target device.</p>
+			 <p><b>Vendor ID</b> - Enter the Vendor ID. This ID uniquely identifies the source of the application. If an application needs a VID, it must be certified. Noncertified applications must use a VID of 0 (KNullUid), which is the value applied by default.</p>
+			 <p><b>Enable debugging (Symbian OS 9.4+) </b>- Activate to enable on-device debugging for Symbian OS 9.4 and later. When activated, the <span class="code">DEBUGGABLE_UDEBONLY</span> flag is added to the project .MMP file. </p>
+			 <p><b>Paging Mode  (Symbian OS 9.3+)</b> - specify the paging mode to: not specified, paged, or unpaged. </p></td>
+	 </tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Compiler Settings</b></p></td><td class="Cell">
+			 <p>
+				<b>User includes</b> - Use the Add, Edit, and Remove buttons to add, edit, or remove the paths to the user header files used to compile source files. Use the Up and Down buttons to arrange the list of paths. </p>
+			 <p><b>System includes</b> - Use the Add, Edit, and Remove buttons to add, edit, or remove the paths to the system header files used to compile source files. Use the Up and Down buttons to arrange the list of paths.</p>
+			 <p><b>Macros</b> - Use the Add, Edit, and Remove buttons to add, edit, or remove a macro identifier. Use the Up and Down buttons to arrange the list of macro identifiers.</p>
+			 <p><b>Compiler options</b> - Use the Add, Edit, and Remove buttons to add, edit, or remove compiler options. In the Edit Compiler Options dialog, select the tool chain (for example: ARMCC, CW, GCC, GCCE, or MSVC) and enter your custom options.</p>
+			 <p><b>Linker options</b> - Use the Add, Edit, and Remove buttons to add, edit, or remove linker options. In the Edit Linker Options dialog, select the tool chain (for example: ARMCC, CW, GCC, GCCE, or MSVC) and enter your custom options.</p>
+			 <p><b>Per-variant include dependencies</b> - Check this option to include dependencies for a specific variant when building a target. For example build a release variant with optimized code, a debug variant with debugging info and a profiling variant with timing hooks.</p>
+			 <p><b>Disable optimizations in debug builds</b> - Check this option to disable optimizations when building a debug version of your application. Since optimization changes the code created by the compiler, it is best to optimize your code after you have fully tested and debugged it. If a program works in a debug build, but fails in a release build, it is likely that one of the compiler optimizations is exposing a defect in your source code. To isolate the problem, you should disable selected optimizations for each source code file, until you locate the file and the optimization that is causing the problem.</p></td>
+	 </tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>Linker</b></td>
+			   <td class="Cell"><p><b>Linker definition file</b> - Select a linker definition file or click Browse... to locate a definition file.</p>
+		       <p><b>Export unfrozen</b> - Check this option to tell the build process that exports are not yet frozen.</p>
+		       <p><b>Don't export library</b> - Check this option to not export a copy of the library. </p>
+		       <p><b>No strict .def file</b> - Check this option to specify no strict linker definition file.</p>
+		       <p><b>Compress target executable</b> - Check this option to compress the target executable. </p>
+		       <p><b>Link as internal name</b> - Specify an internal name.</p>
+		       <p><b>Win32 base address</b> - Specify the Win32 base address.</p></td>
+     </tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>Kernel</b></td>
+			   <td class="Cell"><p><b>ASSP ABI </b>- Check this option to build the ASSP application binary interface. </p>
+		       <p><b>ASSP exports</b> - Check this option to enable ASSP exports. </p></td>
+     </tr>
+   </table>
+	 <h5>Related references</h5>
+    <ul>
+      <li><a href="MMP_Editor.html">MMP Editor</a></li>
+      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
+      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
+      <li><a href="MMP_Editor_mmp_tab.html">MMP File Window</a></li>
+    </ul>
+  
+   
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+</html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_resource_block.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_resource_block.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,60 +1,60 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>MMP Editor Resource Block</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-   </head>
-   <body>
-   <h2>MMP Editor Resource Block</h2>
-   
-   <p>
-   The MMP editor resource block dialog allows you to add or remove resource files to your project. The Edit Resource Block dialog is shown in Figure 1.  You can add, remove or edit resource files to be included with your project.</p>
-   <p align="center"><img src="images/mmp_editor_resrcblock.png" width="444" height="350" /></p>
-   <p align="left" class="figure">Figure 1 - MMP Editor Resource Block Dialog</p>
-   <p></p>
-   <table cellpadding="2" cellspacing="0"
-border="0">
-	 <tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
-		    <p>
-			   <b>Project RSS files</b></p></td><td class="Cell">
-			 <p>
-				Select or browse to the resource file to be included in all builds.</p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>RSS file path</b></p></td><td class="Cell">
-			 <p>
-				Enter the path to the resource file. </p></td></tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>Target file name</b></td>
-			   <td class="Cell">Enter the target file name.</td>
-     </tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>Target file path</b></td>
-			   <td class="Cell">Select the target file path, such as the executable directory or /resource directory on the target device.</td>
-     </tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>UID 2</b></td>
-			   <td class="Cell">Enter the unique identifier. UID2 may need to be a specific value for some kinds of DLLs, especially those used by plug-in frameworks.</td>
-     </tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>UID 3 </b></td>
-			   <td class="Cell"><p>Enter the unique identifier. In the current implementation of platform security, UID3 is used as the Secure ID if SECUREID is not specified in the .mmp file. If it is specified, UID3 will be used to identify the application as its original purpose.</p>
-		       <p>However, the SID is used to determine which private directory a process can access as well as to identify the caller applications, whereas the UID is used to uniquely identify an application. It is theoretically possible that these two identifiers could have different values, but to avoid confusion Symbian recommends that a SECUREID not be specified in the application's MMP file; UID3 should always be specified instead.</p></td>
-     </tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>Generate header file</b></td>
-			   <td class="Cell">Check this option to generate a header file for the resource files.</td>
-     </tr>
-   </table>
-	 <h5>Related references</h5>
-    <ul>
-      <li><a href="MMP_Editor.html">MMP Editor</a></li>
-      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
-      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
-      <li><a href="MMP_Editor_options.html">MMP Editor Options window</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>
+<title>MMP Editor Resource Block</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+   </head>
+   <body>
+   <h2>MMP Editor Resource Block</h2>
+   
+   <p>
+   The MMP editor resource block dialog allows you to add or remove resource files to your project. The Edit Resource Block dialog is shown in Figure 1.  You can add, remove or edit resource files to be included with your project.</p>
+   <p align="center"><img src="images/mmp_editor_resrcblock.png" width="444" height="350" /></p>
+   <p align="left" class="figure">Figure 1 - MMP Editor Resource Block Dialog</p>
+   <p></p>
+   <table cellpadding="2" cellspacing="0"
+border="0">
+	 <tr valign="top"><th width="173" class="Cell">Name</th><th width="516" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+		    <p>
+			   <b>Project RSS files</b></p></td><td class="Cell">
+			 <p>
+				Select or browse to the resource file to be included in all builds.</p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>RSS file path</b></p></td><td class="Cell">
+			 <p>
+				Enter the path to the resource file. </p></td></tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>Target file name</b></td>
+			   <td class="Cell">Enter the target file name.</td>
+     </tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>Target file path</b></td>
+			   <td class="Cell">Select the target file path, such as the executable directory or /resource directory on the target device.</td>
+     </tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>UID 2</b></td>
+			   <td class="Cell">Enter the unique identifier. UID2 may need to be a specific value for some kinds of DLLs, especially those used by plug-in frameworks.</td>
+     </tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>UID 3 </b></td>
+			   <td class="Cell"><p>Enter the unique identifier. In the current implementation of platform security, UID3 is used as the Secure ID if SECUREID is not specified in the .mmp file. If it is specified, UID3 will be used to identify the application as its original purpose.</p>
+		       <p>However, the SID is used to determine which private directory a process can access as well as to identify the caller applications, whereas the UID is used to uniquely identify an application. It is theoretically possible that these two identifiers could have different values, but to avoid confusion Symbian recommends that a SECUREID not be specified in the application's MMP file; UID3 should always be specified instead.</p></td>
+     </tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>Generate header file</b></td>
+			   <td class="Cell">Check this option to generate a header file for the resource files.</td>
+     </tr>
+   </table>
+	 <h5>Related references</h5>
+    <ul>
+      <li><a href="MMP_Editor.html">MMP Editor</a></li>
+      <li><a href="MMP_Editor_sources.html">MMP Editor Sources window</a></li>
+      <li><a href="MMP_Editor_libraries.html">MMP Editor Libraries window</a></li>
+      <li><a href="MMP_Editor_options.html">MMP Editor Options window</a></li>
+    </ul>
+  
+   
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+</html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_sources.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor_sources.html	Fri Apr 16 11:18:22 2010 -0500
@@ -36,7 +36,7 @@
     </ul>
   
    
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_selection.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_selection.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>MMP Selection</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>MMP Selection</h2>
-   
-   <p>
-   The MMP Selection dialog displays a list of mmp project files that your source files should be added to for debugging specific components. </p>
-   <p align="center"><img src="images/MMP_selection.png" width="326" height="381" /></p>
-   <p align="left" class="figure">Figure 1 - MMP Selection Dialog</p>
-   <p></p>
-   <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>MMP Selection</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>MMP Selection</h2>
+   
+   <p>
+   The MMP Selection dialog displays a list of mmp project files that your source files should be added to for debugging specific components. </p>
+   <p align="center"><img src="images/MMP_selection.png" width="326" height="381" /></p>
+   <p align="left" class="figure">Figure 1 - MMP Selection Dialog</p>
+   <p></p>
+   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+</html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>References</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>References</h2>
-	 <p>The topics include:</p>
-	 <ul>
-	   <li><a href="../concepts/cvs.htm">Concurrent Versions System (CVS)</a></li>
-	   <li><a href="../concepts/contextual_menus.htm">Context Menus</a></li>
-	   <li><a href="menus/menus.htm">Menus</a></li>
-	   <li><a href="menus/open_cmd_window.htm">Open Command Window</a></li>
-	   <li><a href="menus/run_leavescan.htm">Run Leavescan</a></li>
-	   <li><a href="menus/s60_ui_designer.htm">S60 UI Designer</a></li>
-	   <li><a href="menus/open_explorer_window.htm">Show in Explorer</a></li>
-	   <li><a href="menus/new_symbian_class.htm">Symbian OS Class</a></li>
-	   <li><a href="menus/new_symbian_project.htm">Symbian OS C++ Project</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>
+<title>References</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>References</h2>
+	 <p>The topics include:</p>
+	 <ul>
+	   <li><a href="../concepts/cvs.htm">Concurrent Versions System (CVS)</a></li>
+	   <li><a href="../concepts/contextual_menus.htm">Context Menus</a></li>
+	   <li><a href="menus/menus.htm">Menus</a></li>
+	   <li><a href="menus/open_cmd_window.htm">Open Command Window</a></li>
+	   <li><a href="menus/run_leavescan.htm">Run Leavescan</a></li>
+	   <li><a href="menus/s60_ui_designer.htm">S60 UI Designer</a></li>
+	   <li><a href="menus/open_explorer_window.htm">Show in Explorer</a></li>
+	   <li><a href="menus/new_symbian_class.htm">Symbian OS Class</a></li>
+	   <li><a href="menus/new_symbian_project.htm">Symbian OS C++ Project</a></li>
+   </ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/NewClassWizard.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/NewClassWizard.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,101 +1,101 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>New Class Wizard in Reference</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <div class="AuthoredContent">
-    
- 
-  <a name="ref_newclass_wizard"></a>
-   </div><div class="Head1">
-<h2>New Class Wizard</h2>
-</div><div class="Bodytext">
-	  
-	 <p>
-		The New Class wizard allows a developer to add a new C++ class to
-		existing or new header and source files. This wizard is supplied by the C/C++
-		Development Toolkit (CDT), and is not customised for Symbian OS development.
-		However, as it is not currently described in the C/C++ Development Toolkit User
-		Guide, you may find this extra information about it useful.</p>
-	 <p>See <a href="../tasks/projects/prj_adding_symbian_class.htm">Adding a Symbian OS Class</a> for information on adding Symbian-based classes to a project. </p>
-	 <p>
-	 To invoke the wizard, click File &gt; New &gt; Class from the menu bar. The New Class wizard appears. </p> 
-	 <div class="Figure">
-
-		<p class="Image"><a name=""><img src="../images/newclasswiz.gif" alt="" width="500" height="568"  border="0" /></a></p>
- 
-	 
-</div>
-	 <table cellpadding="2" cellspacing="0"
-border="0">
-	 <tr valign="top"><th width="145" class="Cell">Name</th><th width="639" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Source Folder</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Specifies the source folder where the header and source files are
-				to be created. 
-			 </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Namespace</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Select the checkbox to specify whether you want to add the new
-				class under a namespace or not. If yes, click Browse to select an existing
-				namespace or type a new namespace. 
-			 </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Class Name</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Specifies the name of new C++ class. 
-			 </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Base Classes</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Lists all the base types from which the new C++ class is derived. 
-			 </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Method Stubs</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Specifies whether to generate stubs for constructor and destructors
-				of the class. 
-			 </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Use Default</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Specifies whether the class declaration and definition are added to
-				default header and source files or not. 
-			 </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Header</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Specifies the header file which contains the class declaration. 
-			 </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Source</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Specifies the source file which contains the class definition. 
-			 </p></td></tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>Use Default </b></td>
-			   <td class="Cell">Disable to select different Header and Source files to use as the template for the new class. </td>
-	   </tr>
-	 </table>
-
-	 </div>
-	   <h5>Related tasks</h5>
-	   <ul>
-         <li><a href="../tasks/AddingClasses.html">Adding Classes</a></li>
-         <li><a href="../tasks/projects/prj_adding_symbian_class.htm">Adding Symbian OS Classes </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>
+<title>New Class Wizard in Reference</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <div class="AuthoredContent">
+    
+ 
+  <a name="ref_newclass_wizard"></a>
+   </div><div class="Head1">
+<h2>New Class Wizard</h2>
+</div><div class="Bodytext">
+	  
+	 <p>
+		The New Class wizard allows a developer to add a new C++ class to
+		existing or new header and source files. This wizard is supplied by the C/C++
+		Development Toolkit (CDT), and is not customised for Symbian OS development.
+		However, as it is not currently described in the C/C++ Development Toolkit User
+		Guide, you may find this extra information about it useful.</p>
+	 <p>See <a href="../tasks/projects/prj_adding_symbian_class.htm">Adding a Symbian OS Class</a> for information on adding Symbian-based classes to a project. </p>
+	 <p>
+	 To invoke the wizard, click File &gt; New &gt; Class from the menu bar. The New Class wizard appears. </p> 
+	 <div class="Figure">
+
+		<p class="Image"><a name=""><img src="../images/newclasswiz.gif" alt="" width="500" height="568"  border="0" /></a></p>
+ 
+	 
+</div>
+	 <table cellpadding="2" cellspacing="0"
+border="0">
+	 <tr valign="top"><th width="145" class="Cell">Name</th><th width="639" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Source Folder</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Specifies the source folder where the header and source files are
+				to be created. 
+			 </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Namespace</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Select the checkbox to specify whether you want to add the new
+				class under a namespace or not. If yes, click Browse to select an existing
+				namespace or type a new namespace. 
+			 </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Class Name</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Specifies the name of new C++ class. 
+			 </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Base Classes</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Lists all the base types from which the new C++ class is derived. 
+			 </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Method Stubs</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Specifies whether to generate stubs for constructor and destructors
+				of the class. 
+			 </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Use Default</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Specifies whether the class declaration and definition are added to
+				default header and source files or not. 
+			 </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Header</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Specifies the header file which contains the class declaration. 
+			 </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Source</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Specifies the source file which contains the class definition. 
+			 </p></td></tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>Use Default </b></td>
+			   <td class="Cell">Disable to select different Header and Source files to use as the template for the new class. </td>
+	   </tr>
+	 </table>
+
+	 </div>
+	   <h5>Related tasks</h5>
+	   <ul>
+         <li><a href="../tasks/AddingClasses.html">Adding Classes</a></li>
+         <li><a href="../tasks/projects/prj_adding_symbian_class.htm">Adding Symbian OS Classes </a></li>
+	   </ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -60,7 +60,7 @@
   <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
   <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a .PKG file</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_args.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,44 +1,44 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<meta name="keywords" content="abld, abld build, abld export, abld makefile, abld library, abld resource, abld target, abld final, abld clean, abld freeze, bldmake, bldmake bldfiles, bldmake clean" >
-<title>Arguments page</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Arguments page </h2>
-<p>  The <b>Arguments </b> pane allows you to add arguments to  the <span class="code">bldmake</span> and <span class="code">abld</span> processes for the project. Carbide passes the arguments entered here to the command line tools during the build process. By default, the majority of  arguments are left blank. </p>
-<p class="note"><b>NOTE</b> Always refer to the <a href="http://developer.symbian.com/main/oslibrary/osdocs/index.jsp">Symbian Developer Library</a> to learn which arguments are supported by the project's SDK. </p>
-<p align="center"><img src="../images/page_build_config_args.png" width="558" height="346"></p>
-<p class="figure">Figure 1 - Arguments pane</p>
-<h5>Table 1 Environment variable items</h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>BldMake Arguments </b></td>
-    <td><p>Enter arguments into the various text boxes to customize the <b>bldmake</b> process. See the Symbian OS documentation for a complete list of arguments for these commands. </p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Abld Arguments </b></td>
-    <td><p>Enter arguments into the various text boxes to customize the <b>abld</b> process.  See the Symbian OS documentation for a complete list of arguments for these commands. </p>
-    <p class="note"><b>NOTE</b> To create a SYM file for UREL builds, enter <span class="code">-debug</span> into the <b>makefile</b> text box in the Abld Arguments group. </p></td>
-  </tr>
-</table>
-<h5>Other references </h5>
-<ul>
-  <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
-  <li><a href="pane_build_config.htm">SIS Builder</a></li>
-  <li><a href="pane_build_config_env.htm">Environment</a></li>
-  <li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
-</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 build, abld export, abld makefile, abld library, abld resource, abld target, abld final, abld clean, abld freeze, bldmake, bldmake bldfiles, bldmake clean" >
+<title>Arguments page</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Arguments page </h2>
+<p>  The <b>Arguments </b> pane allows you to add arguments to  the <span class="code">bldmake</span> and <span class="code">abld</span> processes for the project. Carbide passes the arguments entered here to the command line tools during the build process. By default, the majority of  arguments are left blank. </p>
+<p class="note"><b>NOTE</b> Always refer to the <a href="http://developer.symbian.com/main/oslibrary/osdocs/index.jsp">Symbian Developer Library</a> to learn which arguments are supported by the project's SDK. </p>
+<p align="center"><img src="../images/page_build_config_args.png" width="558" height="346"></p>
+<p class="figure">Figure 1 - Arguments pane</p>
+<h5>Table 1 Environment variable items</h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>BldMake Arguments </b></td>
+    <td><p>Enter arguments into the various text boxes to customize the <b>bldmake</b> process. See the Symbian OS documentation for a complete list of arguments for these commands. </p>
+    </td>
+  </tr>
+  <tr>
+    <td><b>Abld Arguments </b></td>
+    <td><p>Enter arguments into the various text boxes to customize the <b>abld</b> process.  See the Symbian OS documentation for a complete list of arguments for these commands. </p>
+    <p class="note"><b>NOTE</b> To create a SYM file for UREL builds, enter <span class="code">-debug</span> into the <b>makefile</b> text box in the Abld Arguments group. </p></td>
+  </tr>
+</table>
+<h5>Other references </h5>
+<ul>
+  <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
+  <li><a href="pane_build_config.htm">SIS Builder</a></li>
+  <li><a href="pane_build_config_env.htm">Environment</a></li>
+  <li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_macro_settings.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_macro_settings.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,43 +1,43 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Macro Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide Macro Settings</h2>
-<p>  The <b>Carbide Macro Settings</b> properties page allows you to specify a file containing macros that CDT will use when parsing the source code. </p>
-<p align="center"><img src="../images/carbide_macro_settings.png" width="670" height="488"></p>
-<p class="figure">Figure 1 - Carbide Macros Settings panel </p>
-<h5>Table 1 Carbide <span class="figure">Macros Settings</span> items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="28%" scope="col">Item</th>
-    <th width="72%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td width="28%"><b>Macro File </b></td>
-    <td>Enter the macro file path and name into the text box or click <b>Browse</b> to locate a macro file. </td>
-  </tr>
-  <tr>
-    <td><b>Use preprocessor symbols from mmp MACRO statements for parsers </b></td>
-    <td>Your code will be parsed by the CDT indexer. Enable this option to use MMP macros during parsing. </td>
-  </tr>
-  <tr>
-    <td width="28%"><b>Show paths and symbols page... </b></td>
-    <td><p>Click to open the <a href="pane_build_config_paths.htm">Paths and Symbols</a> page under Carbide Build Configuration. </p>      </td>
-  </tr>
-</table>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
-  <li><a href="pane_build_config.htm">Carbide Build Configuration</a></li>
-  <li>Carbide Rom Build Settings </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>Carbide Macro Settings</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Carbide Macro Settings</h2>
+<p>  The <b>Carbide Macro Settings</b> properties page allows you to specify a file containing macros that CDT will use when parsing the source code. </p>
+<p align="center"><img src="../images/carbide_macro_settings.png" width="670" height="488"></p>
+<p class="figure">Figure 1 - Carbide Macros Settings panel </p>
+<h5>Table 1 Carbide <span class="figure">Macros Settings</span> items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="28%" scope="col">Item</th>
+    <th width="72%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td width="28%"><b>Macro File </b></td>
+    <td>Enter the macro file path and name into the text box or click <b>Browse</b> to locate a macro file. </td>
+  </tr>
+  <tr>
+    <td><b>Use preprocessor symbols from mmp MACRO statements for parsers </b></td>
+    <td>Your code will be parsed by the CDT indexer. Enable this option to use MMP macros during parsing. </td>
+  </tr>
+  <tr>
+    <td width="28%"><b>Show paths and symbols page... </b></td>
+    <td><p>Click to open the <a href="pane_build_config_paths.htm">Paths and Symbols</a> page under Carbide Build Configuration. </p>      </td>
+  </tr>
+</table>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
+  <li><a href="pane_build_config.htm">Carbide Build Configuration</a></li>
+  <li>Carbide Rom Build Settings </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_pkg_config.htm	Fri Apr 16 11:18:22 2010 -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>PKG File Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Set PKG File for  Build Configuration</h2>
-<p>The <b>Set PKG File for  Build Configuration</b> dialog appears when an Application TRK build configuration does not include a PKG file. Use it to assign a PKG file to the project's current build configuration that will be used to create a project's SIS installation file. If you define a launch configuration used for on-device debugging with the TRK debug agent, you will need to specify a PKG file for the project. A PKG file primarily provides a list of program and resource files to install on the device.</p>
-<p align="center"><img src="../images/set_pkg.png" width="544" height="359" /></p>
-<p class="figure">Figure 1 - Set PKG File for Build Configuration</p>
-<h5>Table 1 Items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>PKG File </b></td>
-    <td>Choose a PKG file relative to the project's file system or click Browse to locate a PKG file that will be used to create the SIS file. The default option is &ldquo;none&rdquo;, which indicates to not build a PKG file.</td>
-  </tr>
-  <tr>
-    <td><b>Signed SIS File Name</b></td>
-    <td>Final output signed file name. Default is  PKG filename with &lsquo;sisx&rsquo; extension.</td>
-  </tr>
-  <tr>
-    <td><b>Certificate</b></td>
-    <td><p>Enter or browse to certificate.</p>
-    <p class="note"><b>NOTE</b> On Symbian OS 9.x builds, if the key/cert pair are not defined, <span class="code">makekeys</span> will be called and temporary ones will be generated for you to      &quot;self-sign&quot; the application. Self-signed applications should be in the
-    0xE0000000-0xEFFFFFFF range.</p></td>
-  </tr>
-  <tr>
-    <td><b>Key</b></td>
-    <td><p>Enter or browse to key.</p>
-    </td>
-  </tr>
-</table>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a .PKG file</a></li>
-</ul>
-<h5>Related reference </h5>
-<ul>
-  <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
-  <li><a href="pane_build_config_env.htm">Environment variables</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>PKG File Settings</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Set PKG File for  Build Configuration</h2>
+<p>The <b>Set PKG File for  Build Configuration</b> dialog appears when an Application TRK build configuration does not include a PKG file. Use it to assign a PKG file to the project's current build configuration that will be used to create a project's SIS installation file. If you define a launch configuration used for on-device debugging with the TRK debug agent, you will need to specify a PKG file for the project. A PKG file primarily provides a list of program and resource files to install on the device.</p>
+<p align="center"><img src="../images/set_pkg.png" width="544" height="359" /></p>
+<p class="figure">Figure 1 - Set PKG File for Build Configuration</p>
+<h5>Table 1 Items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>PKG File </b></td>
+    <td>Choose a PKG file relative to the project's file system or click Browse to locate a PKG file that will be used to create the SIS file. The default option is &ldquo;none&rdquo;, which indicates to not build a PKG file.</td>
+  </tr>
+  <tr>
+    <td><b>Signed SIS File Name</b></td>
+    <td>Final output signed file name. Default is  PKG filename with &lsquo;sisx&rsquo; extension.</td>
+  </tr>
+  <tr>
+    <td><b>Certificate</b></td>
+    <td><p>Enter or browse to certificate.</p>
+    <p class="note"><b>NOTE</b> On Symbian OS 9.x builds, if the key/cert pair are not defined, <span class="code">makekeys</span> will be called and temporary ones will be generated for you to      &quot;self-sign&quot; the application. Self-signed applications should be in the
+    0xE0000000-0xEFFFFFFF range.</p></td>
+  </tr>
+  <tr>
+    <td><b>Key</b></td>
+    <td><p>Enter or browse to key.</p>
+    </td>
+  </tr>
+</table>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a .PKG file</a></li>
+</ul>
+<h5>Related reference </h5>
+<ul>
+  <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
+  <li><a href="pane_build_config_env.htm">Environment variables</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/leavescan_pref.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/leavescan_pref.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,36 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Leavescan Preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-   <body>
-   <h2>Leavescan Preferences</h2>
-   <p>Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.leavescan.ui.LeavescanPreferences)")'>
-Leavescan Preferences</a> page in the <b>Preferences</b> window to define the location where the <span class="code">leavescan.exe</span> program exists on the file system. Symbian OS has a standard convention for functions that may Leave. Therefore, any function that Leaves, or calls a function that Leaves (other than in a TRAP harness), must have a name ending in "L". Leavescan verifies that your code satisfies this convention.</p>
-   <p align="center"><img src="images/leavescan_pref.png" width="671" height="359" alt="Leavescan preferences panel" /></p>
-   <p align="center" class="figure">Figure 1. Leavescan preference page </p>
-   <h5>Table 1. Leavescan Preferences &mdash;items</h5>
-   <div class="Figure"></div>
-   <table cellpadding="2" cellspacing="0"
-border="0">
-	 <tr valign="top"><th width="221" class="Cell">Name</th><th width="558" class="Cell">Function</th></tr>
-         <tr valign="top">
-           <td class="Cell"><b>Leavescan Directory </b></td>
-           <td class="Cell"><p>Enter or Browse to the directory where <span class="code">leavescan.exe</span> resides. <span class="code">Leavescan.exe</span> is normally found in the <span class="code">${EPOCROOT}\epoc32\tools</span> directory.</p>
-             <p class="note"><b>NOTE</b> The path to the Leavescan directory should not contain  space characters.</p></td>
-        </tr>
-         <tr valign="top">
-           <td class="Cell"><b>Very noisy output </b></td>
-           <td class="Cell"><p>If enabled, the <span class="code">-N</span> option is passed to <span class="code">leavescan.exe</span> and produces verbose output. If unchecked, minimal output is produced. </p>
-           </td>
-     </tr>
-   </table>
-	 <h5>Related Tasks</h5>
-	 <ul>
-	   <li><a href="menus/run_leavescan.htm">Run Leavescan</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>
+<title>Leavescan Preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+   <body>
+   <h2>Leavescan Preferences</h2>
+   <p>Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.leavescan.ui.LeavescanPreferences)")'>
+Leavescan Preferences</a> page in the <b>Preferences</b> window to define the location where the <span class="code">leavescan.exe</span> program exists on the file system. Symbian OS has a standard convention for functions that may Leave. Therefore, any function that Leaves, or calls a function that Leaves (other than in a TRAP harness), must have a name ending in "L". Leavescan verifies that your code satisfies this convention.</p>
+   <p align="center"><img src="images/leavescan_pref.png" width="671" height="359" alt="Leavescan preferences panel" /></p>
+   <p align="center" class="figure">Figure 1. Leavescan preference page </p>
+   <h5>Table 1. Leavescan Preferences &mdash;items</h5>
+   <div class="Figure"></div>
+   <table cellpadding="2" cellspacing="0"
+border="0">
+	 <tr valign="top"><th width="221" class="Cell">Name</th><th width="558" class="Cell">Function</th></tr>
+         <tr valign="top">
+           <td class="Cell"><b>Leavescan Directory </b></td>
+           <td class="Cell"><p>Enter or Browse to the directory where <span class="code">leavescan.exe</span> resides. <span class="code">Leavescan.exe</span> is normally found in the <span class="code">${EPOCROOT}\epoc32\tools</span> directory.</p>
+             <p class="note"><b>NOTE</b> The path to the Leavescan directory should not contain  space characters.</p></td>
+        </tr>
+         <tr valign="top">
+           <td class="Cell"><b>Very noisy output </b></td>
+           <td class="Cell"><p>If enabled, the <span class="code">-N</span> option is passed to <span class="code">leavescan.exe</span> and produces verbose output. If unchecked, minimal output is produced. </p>
+           </td>
+     </tr>
+   </table>
+	 <h5>Related Tasks</h5>
+	 <ul>
+	   <li><a href="menus/run_leavescan.htm">Run Leavescan</a></li>
+   </ul>
+	 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/memory_rendering_options.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/memory_rendering_options.htm	Fri Apr 16 11:18:22 2010 -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>Memory Rendering Options</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Memory Rendering Options</h2>
-<p>You can configure the Memory Rendering pane to display data in the memory location in a variety of ways. The following options are visible on the context menu for the Memory Rendering pane. </p>
-<p>Right-click to select an option shown in Table 1. </p>
-<h5>Table 1. Memory Rendering context menu options </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="24%" scope="col">Option</th>
-    <th width="76%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Panes</b></td>
-    <td><p>Specifies how the memory space is rendered in the pane:</p>
-      <ul>
-        <li>Address</li>
-        <li>Binary</li>
-        <li>Text</li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>Endian</b></td>
-    <td><p>Choose one of the following:</p>
-      <ul>
-        <li>Big</li>
-        <li>Little</li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>Text</b></td>
-    <td><p>Choose one of the following:</p>
-      <ul>
-        <li>ISO-8859-1</li>
-        <li>US-ASCII</li>
-        <li>UTF-8</li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>Cell size </b></td>
-    <td><p>Specifies the byte size of the memory rendering. The choices include:</p>
-      <ul>
-        <li>1 byte</li>
-        <li>2 bytes</li>
-        <li>4 bytes</li>
-        <li>8 bytes    </li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>Radix</b></td>
-    <td><p>Choose one of the following:</p>
-      <ul>
-        <li>Hex</li>
-        <li>Decimal Signed </li>
-        <li>Decimal Unsigned</li>
-        <li>Octal</li>
-        <li>Binary</li>
-    </ul></td>
-  </tr>
-</table>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../concepts/working_with_memory.htm">Working with Memory </a> </li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/memory/view_memory_show.htm">Opening a Memory View</a></li>
-  <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
-  <li><a href="../tasks/memory/memory_monitor_removing.htm">Removing a Memory Monitor or Rendering</a> </li>
-</ul>
-<h5>Related References </h5>
-<ul>
-  <li><a href="view_memory_wnd.htm">Memory 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>Memory Rendering Options</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Memory Rendering Options</h2>
+<p>You can configure the Memory Rendering pane to display data in the memory location in a variety of ways. The following options are visible on the context menu for the Memory Rendering pane. </p>
+<p>Right-click to select an option shown in Table 1. </p>
+<h5>Table 1. Memory Rendering context menu options </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="24%" scope="col">Option</th>
+    <th width="76%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Panes</b></td>
+    <td><p>Specifies how the memory space is rendered in the pane:</p>
+      <ul>
+        <li>Address</li>
+        <li>Binary</li>
+        <li>Text</li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>Endian</b></td>
+    <td><p>Choose one of the following:</p>
+      <ul>
+        <li>Big</li>
+        <li>Little</li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>Text</b></td>
+    <td><p>Choose one of the following:</p>
+      <ul>
+        <li>ISO-8859-1</li>
+        <li>US-ASCII</li>
+        <li>UTF-8</li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>Cell size </b></td>
+    <td><p>Specifies the byte size of the memory rendering. The choices include:</p>
+      <ul>
+        <li>1 byte</li>
+        <li>2 bytes</li>
+        <li>4 bytes</li>
+        <li>8 bytes    </li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>Radix</b></td>
+    <td><p>Choose one of the following:</p>
+      <ul>
+        <li>Hex</li>
+        <li>Decimal Signed </li>
+        <li>Decimal Unsigned</li>
+        <li>Octal</li>
+        <li>Binary</li>
+    </ul></td>
+  </tr>
+</table>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../concepts/working_with_memory.htm">Working with Memory </a> </li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/memory/view_memory_show.htm">Opening a Memory View</a></li>
+  <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
+  <li><a href="../tasks/memory/memory_monitor_removing.htm">Removing a Memory Monitor or Rendering</a> </li>
+</ul>
+<h5>Related References </h5>
+<ul>
+  <li><a href="view_memory_wnd.htm">Memory View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Build All Configurations</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Build All Configurations </h2>
-<p>Select a project in the  Project Explorer, C/C++ Projects,  or Symbian Project Navigator view and use the Project menu or right-click to display the context menu. Select <b>Build All Configurations</b> (CTRL+ALT+A) to build all target build configurations enabled for the current project.</p>
-<p align="center"><img src="../images/build_all_targets.png" width="368" height="500" /></p>
-<p align="center" class="figure">Figure 1. Build All Configurations context menu </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>
+<!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 All Configurations</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Build All Configurations </h2>
+<p>Select a project in the  Project Explorer, C/C++ Projects,  or Symbian Project Navigator view and use the Project menu or right-click to display the context menu. Select <b>Build All Configurations</b> (CTRL+ALT+A) to build all target build configurations enabled for the current project.</p>
+<p align="center"><img src="../images/build_all_targets.png" width="368" height="500" /></p>
+<p align="center" class="figure">Figure 1. Build All Configurations context menu </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -19,7 +19,7 @@
   <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -17,7 +17,7 @@
   <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -17,7 +17,7 @@
   <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Compile</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Compile</h2>
-<p>Select a .c, .cpp, or .cia source file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view, right-click the file and choose <b> Compile</b> (<span class="code">CTRL+ALT+C</span>) to compile it. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The build progress is displayed in the Console view.</p>
-<p align="center"><img src="../images/menu_compile_source.png" width="330" height="346"></p>
-<p class="figure">Figure 1 - Right-click to compile a source file </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>Compile</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Compile</h2>
+<p>Select a .c, .cpp, or .cia source file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view, right-click the file and choose <b> Compile</b> (<span class="code">CTRL+ALT+C</span>) to compile it. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The build progress is displayed in the Console view.</p>
+<p align="center"><img src="../images/menu_compile_source.png" width="330" height="346"></p>
+<p class="figure">Figure 1 - Right-click to compile a source file </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_exports.htm	Fri Apr 16 11:18:22 2010 -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>Freeze Exports </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Freeze Exports </h2>
-<p>Right click  a project in the Project Explorer, or Symbian Project Navigator view, then  choose <b> Freeze Exports</b>. This command calls the appropriate <b>abld</b> command  and a .def file is generated. This  enables released versions of DLLs to freeze their exports, ensuring backward compatibility of a library.</p>
-<p align="center"><img src="../images/menu_freeze_exports.png" width="335" height="410"></p>
-<p class="figure">Figure 1. Choosing Freeze Exports on a project </p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a></li>
-  <li><a href="../../tasks/projects/prj_freeze_def_file.htm">Freezing DLL Projects</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>Freeze Exports </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Freeze Exports </h2>
+<p>Right click  a project in the Project Explorer, or Symbian Project Navigator view, then  choose <b> Freeze Exports</b>. This command calls the appropriate <b>abld</b> command  and a .def file is generated. This  enables released versions of DLLs to freeze their exports, ensuring backward compatibility of a library.</p>
+<p align="center"><img src="../images/menu_freeze_exports.png" width="335" height="410"></p>
+<p class="figure">Figure 1. Choosing Freeze Exports on a project </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+  <li><a href="../../tasks/projects/prj_freeze_def_file.htm">Freezing DLL Projects</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/freeze_symbian_comp.htm	Fri Apr 16 11:18:22 2010 -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>Freeze Symbian Component</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Freeze Symbian Component </h2>
-<p>Right-click  a Symbian OS MMP file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Freeze Symbian  Component</b> (<span class="code">CTRL+ALT+F</span>). This command only freezes the selected MMP file and not the entire project.</p>
-<p align="center"><img src="../images/menu_freeze_symbian_comp.png" width="443" height="506"></p>
-<p class="figure">Figure 1. Choosing Freeze Symbian  Component on a file </p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a></li>
-  <li><a href="../../tasks/projects/prj_freeze_def_file.htm">Freezing DLL Projects</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>Freeze Symbian Component</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Freeze Symbian Component </h2>
+<p>Right-click  a Symbian OS MMP file in the <a href="../view_cpp_projects.htm">Project Explorer</a>, or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view, then  choose <b> Freeze Symbian  Component</b> (<span class="code">CTRL+ALT+F</span>). This command only freezes the selected MMP file and not the entire project.</p>
+<p align="center"><img src="../images/menu_freeze_symbian_comp.png" width="443" height="506"></p>
+<p class="figure">Figure 1. Choosing Freeze Symbian  Component on a file </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+  <li><a href="../../tasks/projects/prj_freeze_def_file.htm">Freezing DLL Projects</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/hardware_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/hardware_breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Toggle HW Breakpoint </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Toggle HW Breakpoint </h2>
-<p>Use the <b>Toggle HW Breakpoint</b> command  in stop-mode debugging to set or unset a hardware breakpoint on a device that supports hardware breakpoints. The debugger treats hardware breakpoints  exactly like software breakpoints for purposes of debugging. If the device does not support hardware breakpoints, toggling the command will do nothing. </p>
-<div class="step">
-  <h4>Setting a Hardware Breakpoint in an Editor View</h4>
-  <ul>
-    <li>Right-click in the marker bar and select Toggle  HW Breakpoint</li>
-  </ul>
-  <ul>
-    <p>The active breakpoint dot appears (<img src="../../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" />) in the marker bar. If the breakpoint is <a href="../../concepts/breakpoints.htm">resolved</a> during the debug session,  the debugger halts program execution at the line with the resolved breakpoint (<img src="../../images/icons/breakpoints_enabled_icon.png" width="15" height="12" />).</p>
-  </ul>
-</div>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a></li>
-  <li><a href="../../debugger/breakpoints/breakpoints.htm">Breakpoints 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>
+<!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>Toggle HW Breakpoint </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Toggle HW Breakpoint </h2>
+<p>Use the <b>Toggle HW Breakpoint</b> command  in stop-mode debugging to set or unset a hardware breakpoint on a device that supports hardware breakpoints. The debugger treats hardware breakpoints  exactly like software breakpoints for purposes of debugging. If the device does not support hardware breakpoints, toggling the command will do nothing. </p>
+<div class="step">
+  <h4>Setting a Hardware Breakpoint in an Editor View</h4>
+  <ul>
+    <li>Right-click in the marker bar and select Toggle  HW Breakpoint</li>
+  </ul>
+  <ul>
+    <p>The active breakpoint dot appears (<img src="../../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" />) in the marker bar. If the breakpoint is <a href="../../concepts/breakpoints.htm">resolved</a> during the debug session,  the debugger halts program execution at the line with the resolved breakpoint (<img src="../../images/icons/breakpoints_enabled_icon.png" width="15" height="12" />).</p>
+  </ul>
+</div>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+  <li><a href="../../debugger/breakpoints/breakpoints.htm">Breakpoints overview </a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/menus.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -31,7 +31,7 @@
   <li><a href="new_symbian_project.htm">Symbian OS MMP File </a></li>
   <li><a href="hardware_breakpoints.htm">Toggle HW Breakpoint</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_class.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_class.htm	Fri Apr 16 11:18:22 2010 -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>Symbian OS C++ Class</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbian OS C++ Class</h2>
-<p>Click <b>File &gt; New &gt; Symbian OS C++ Class</b> to launch the <b><a href="../../tasks/AddingClasses.html">Symbian OS C++ Class</a></b> wizard.</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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Symbian OS C++ Class</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Symbian OS C++ Class</h2>
+<p>Click <b>File &gt; New &gt; Symbian OS C++ Class</b> to launch the <b><a href="../../tasks/AddingClasses.html">Symbian OS C++ Class</a></b> wizard.</p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_mmp_file.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_mmp_file.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,22 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Symbian OS MMP File</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbian OS MMP File</h2>
-<p>Click <b>File &gt; New &gt; Symbian OS MMP File</b> to launch the <b><a href="../NewMMP_wizard.html">Symbian OS MMP File</a></b> wizard.</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a></li>
-  <li><a href="../MMP_Editor.html">MMP Editor</a></li>
-  <li><a href="../../concepts/mmpfiles.htm">MMP Files </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>Symbian OS MMP File</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Symbian OS MMP File</h2>
+<p>Click <b>File &gt; New &gt; Symbian OS MMP File</b> to launch the <b><a href="../NewMMP_wizard.html">Symbian OS MMP File</a></b> wizard.</p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+  <li><a href="../MMP_Editor.html">MMP Editor</a></li>
+  <li><a href="../../concepts/mmpfiles.htm">MMP Files </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_project.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/new_symbian_project.htm	Fri Apr 16 11:18:22 2010 -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>Symbian OS C++ Project</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Symbian OS C++  Project </h2>
-<p>Click <b>File &gt; New &gt; New Symbian OS C++ Project</b> to launch  the <b><a href="../../tasks/CreatingNewProjects.html">New Symbian OS C++  Project</a> </b> wizard. </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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Symbian OS C++ Project</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Symbian OS C++  Project </h2>
+<p>Click <b>File &gt; New &gt; New Symbian OS C++ Project</b> to launch  the <b><a href="../../tasks/CreatingNewProjects.html">New Symbian OS C++  Project</a> </b> wizard. </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/on_device_setup.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/on_device_setup.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<meta name="keywords" content="abld, abld target, abld export, abld cleanexport, abld resource, abld final, abld tidy" >
-<title>On-Device Setup menu</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>On-Device Setup  </h2>
-<p>Use the <b>On-Device Setup </b> menu option to open the <a href="../trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog for the downloading and installation of Carbide software to a device. </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>On-Device Setup menu</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>On-Device Setup  </h2>
+<p>Use the <b>On-Device Setup </b> menu option to open the <a href="../trk/wnd_on_device_setup.htm">On-Device Setup</a> dialog for the downloading and installation of Carbide software to a device. </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menu</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_cmd_window.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_cmd_window.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -14,7 +14,7 @@
 <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/open_explorer_window.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -14,7 +14,7 @@
 <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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/preprocess_source.htm	Fri Apr 16 11:18:22 2010 -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>Preprocess</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Preprocess</h2>
-<p>Right-click to select a .c, .cpp, or .cia source file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view,  and choose <b> Preprocess </b>  to preprocess the file. You define the preprocess command in the <a href="../wnd_preprocess_prefs.htm">Preprocess preference panel</a>. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The preprocess progress is displayed in the Console view.</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>Preprocess</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Preprocess</h2>
+<p>Right-click to select a .c, .cpp, or .cia source file in the <a href="../view_cpp_projects.htm">Project Explorer</a> or <a href="../view_sym_proj_nav.htm">Symbian Project Navigator</a> view,  and choose <b> Preprocess </b>  to preprocess the file. You define the preprocess command in the <a href="../wnd_preprocess_prefs.htm">Preprocess preference panel</a>. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The preprocess progress is displayed in the Console view.</p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/run_codescanner.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/run_codescanner.htm	Fri Apr 16 11:18:22 2010 -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>Run CodeScanner </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run CodeScanner </h2>
-<p>CodeScanner is a static source code analysis tool for Symbian OS&trade; programs written in C++. Use <b>Run CodeScanner</b> to examine your project code and report any issues. </p>
-<p>Static analysis tools delve deep into code, exploring line by line for the sources of defects.  CodeScanner is specifically for use with Symbian OS&trade; code. As well as identifying C++ coding  convention deviations, CodeScanner identifies incorrect descriptor usage, cleanup stack errors,  UID clashes, and other subtle problems that are hard to track down. </p>
-<p align="center"><img src="../images/codescanner_run.png" width="311" height="375" /></p>
-<p align="center" class="figure">Figure 1. Invoking Run CodeScanner on a project <br />
-</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a></li>
-  <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.codescanner/html/pref_codescanner_01.htm">CodeScanner Preferences</a><br />
-  </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</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>Run CodeScanner </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Run CodeScanner </h2>
+<p>CodeScanner is a static source code analysis tool for Symbian OS&trade; programs written in C++. Use <b>Run CodeScanner</b> to examine your project code and report any issues. </p>
+<p>Static analysis tools delve deep into code, exploring line by line for the sources of defects.  CodeScanner is specifically for use with Symbian OS&trade; code. As well as identifying C++ coding  convention deviations, CodeScanner identifies incorrect descriptor usage, cleanup stack errors,  UID clashes, and other subtle problems that are hard to track down. </p>
+<p align="center"><img src="../images/codescanner_run.png" width="311" height="375" /></p>
+<p align="center" class="figure">Figure 1. Invoking Run CodeScanner on a project <br />
+</p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+  <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.codescanner/html/pref_codescanner_01.htm">CodeScanner Preferences</a><br />
+  </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/run_leavescan.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/run_leavescan.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,34 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Leavescan</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Leavescan</h2>
-<p>Symbian OS has a standard convention for functions that may Leave. Therefore, any function that Leaves, or calls a function that Leaves (other than in a TRAP harness), must have a name ending in L. Leavescan verifies that your code satisfies this convention. LeaveScan ignores calls in trapped functions, commented out code, ( // and /* and */). It also checks for calls to LD, LC and LX functions as well as normal L functions. It also checks for <span class="code">User::Leave()</span>, <span class="code">ELeave</span>, and <span class="code">User::LeaveIfError()</span>. </p>
-<p>To start,  define where  the path to the <span class="code">leavescan.exe</span> program using  the <a href="../leavescan_pref.html">Leavescan preference panel</a>.</p>
-<p>Next, to  run Leavescan:</p>
-<ul>
-  <li><b>on a source file</b>  &#8212;  right-click a .cpp source file in the C/C++ Projects or Symbian Project Navigator view and select <b>Run Leavescan</b></li>
-  <li><b>on all source files in the Active Build Configuration</b> &#8212; right-click a .mmp file and select <b>Run Leavescan on Project MMP</b>. The source statements in the .mmp file are scanned to obtain a list of source files to be processed by leavescan.</li>
-  <li><b>from the command line</b>  &#8212; scan whole directories and output to a file. For example,</li>
-</ul>
-<blockquote>
-  <p class="code">for /R %i in (*.cpp) do leavescan %i &gt;&gt; leavescan.out</p>
-  <p>This will scan all cpp files in or below the current directory, placing the result in <span class="code">leavescan.out</span>.</p>
-</blockquote>
-<p align="center"><img src="../images/leavescan_menu.png" width="384" height="326" /></p>
-<p align="center" class="figure">Figure 1. Invoking Run Leavescan on a single source file</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="menus.htm">Carbide Menus</a></li>
-  <li><a href="../leavescan_pref.html">Leavescan Preferences</a><br />
-  </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</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>Leavescan</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Run Leavescan</h2>
+<p>Symbian OS has a standard convention for functions that may Leave. Therefore, any function that Leaves, or calls a function that Leaves (other than in a TRAP harness), must have a name ending in L. Leavescan verifies that your code satisfies this convention. LeaveScan ignores calls in trapped functions, commented out code, ( // and /* and */). It also checks for calls to LD, LC and LX functions as well as normal L functions. It also checks for <span class="code">User::Leave()</span>, <span class="code">ELeave</span>, and <span class="code">User::LeaveIfError()</span>. </p>
+<p>To start,  define where  the path to the <span class="code">leavescan.exe</span> program using  the <a href="../leavescan_pref.html">Leavescan preference panel</a>.</p>
+<p>Next, to  run Leavescan:</p>
+<ul>
+  <li><b>on a source file</b>  &#8212;  right-click a .cpp source file in the C/C++ Projects or Symbian Project Navigator view and select <b>Run Leavescan</b></li>
+  <li><b>on all source files in the Active Build Configuration</b> &#8212; right-click a .mmp file and select <b>Run Leavescan on Project MMP</b>. The source statements in the .mmp file are scanned to obtain a list of source files to be processed by leavescan.</li>
+  <li><b>from the command line</b>  &#8212; scan whole directories and output to a file. For example,</li>
+</ul>
+<blockquote>
+  <p class="code">for /R %i in (*.cpp) do leavescan %i &gt;&gt; leavescan.out</p>
+  <p>This will scan all cpp files in or below the current directory, placing the result in <span class="code">leavescan.out</span>.</p>
+</blockquote>
+<p align="center"><img src="../images/leavescan_menu.png" width="384" height="326" /></p>
+<p align="center" class="figure">Figure 1. Invoking Run Leavescan on a single source file</p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a></li>
+  <li><a href="../leavescan_pref.html">Leavescan Preferences</a><br />
+  </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/s60_ui_designer.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/s60_ui_designer.htm	Fri Apr 16 11:18:22 2010 -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>S60 UI Designer</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>S60 UI Designer</h2>
-<p>Click <b>File &gt; New &gt; S60 UI Design</b> to launch the <b><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.uidesigner.doc.user/html/reference/uidesign/ref_ui_design_wizard.htm">S60 UI Design</a></b> wizard to add a new design to a project. </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>S60 UI Designer</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>S60 UI Designer</h2>
+<p>Click <b>File &gt; New &gt; S60 UI Design</b> to launch the <b><a href="PLUGINS_ROOT/com.nokia.carbide.cpp.uidesigner.doc.user/html/reference/uidesign/ref_ui_design_wizard.htm">S60 UI Design</a></b> wizard to add a new design to a project. </p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="menus.htm">Carbide Menus</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/olderproject_updater.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/olderproject_updater.html	Fri Apr 16 11:18:22 2010 -0500
@@ -21,7 +21,7 @@
    <p align="center"><img src="images/project_updater_changes.png" width="537" height="704" /> </p>
    <p class="figure">Figure 3 - Carbide.c++ Files Updater window</p>
    <p>Changes to be performed by the updater are shown in the Text Compare area. You can use the yellow up and down arrows to move to the next or previous change to be performed. Click cancel if you do not want the change to be made. Click Finish to accept the changes. </p>
-   <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/perspective_debug.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -46,7 +46,7 @@
   <li><a href="view_memory_wnd.htm">Memory view</a></li>
   <li><a href="view_symbian_kernel.htm">Symbian OS Data 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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/prefs_carbide_news.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/prefs_carbide_news.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -36,7 +36,7 @@
 <ul>
   <li><a href="view_carbide_news.htm">Carbide.c++ News view</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
   License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/search/view_system_search.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/search/view_system_search.htm	Fri Apr 16 11:18:22 2010 -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>System Search view</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>System Search view </h2>
-<p>The <b>System Search</b> view displays the results of a search based on the criteria used in the <a href="wnd_system_search.htm">System Search</a> page. This view (Figure 1) appears automatically when a directory search is performed. You can also open it using the <b>Window &gt; Show View &gt; Other...</b> option where it is found in the Show View dialog under the System Search category. </p>
-<p align="center"><img src="../images/view_system_search.png" width="589" height="169"></p>
-<p class="figure">Figure 1. System Search view after a system search</p>
-<p>The System Search view displays these  columns:</p>
-<ul>
-  <li><b>Name</b> &#8212; name of the matched file and the number of matches found within it </li>
-  <li><b>Type</b> &#8212; the file type extension (.c, .c++, etc.) </li>
-  <li><b>Size</b> &#8212; size of the file in bytes </li>
-  <li><b>Date Modified</b> &#8212; last date the file was modified </li>
-  <li><b>Path</b>   &#8212; complete path to locate the file </li>
-</ul>
-<p>These columns are sortable, simply click the column title to sort in ascending or descending order. Most reordering is based on strings and will be instant, but sorting by Size may take longer  depending upon how many file matches have been made. </p>
-<h4>System Search view toolbar icons</h4>
-<p>The table below lists the icons displayed in the System Search view toolbar.   </p>
-<table width="600"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="11%" scope="col">Icon</th>
-    <th width="31%" scope="col">Item</th>
-    <th width="58%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="../images/icon_next_match.png" width="16" height="16"></div></td>
-    <td><b>Show Next Match </b></td>
-    <td><p>Opens the file in an editor if not already open and shows the first match in the file. If an editor is already open then show the next match in the file. </p>    </td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="../images/icon_prev_match.png" width="15" height="16"></div></td>
-    <td><b>Show Previous Match </b></td>
-    <td>Opens the file in an editor if not already open and shows the last match in the file. If an editor is already open then show the previous match in the file. </td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="../../images/icons/breakpoints_remove_one_icon.png" width="19" height="19"></div></td>
-    <td><b>Remove Selected Matches </b></td>
-    <td>Removes the currently selected files from the search list. </td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="../../images/icons/breakpoints_remove_all_icon.png" width="21" height="19"></div></td>
-    <td><b>Remove All Matches </b></td>
-    <td>Removes all files from the search list. </td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="../images/icon_run_search.png" width="19" height="18"></div></td>
-    <td><b>Run the Current Search Again </b></td>
-    <td>Repeat the search using the same criteria. </td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="../../images/icons/btn_terminate.png" width="17" height="15"></div></td>
-    <td><b>Cancel Current Search </b></td>
-    <td>Click to cancel the current search in progress. </td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="../images/icon_show_searches.png" width="31" height="20"></div></td>
-    <td><b>Show Previous Searches </b></td>
-    <td>Shows a menu with the 10 previous searches. Select a search to show its results in the view. Select History to manage the list of all previous searches or change the number of histories you can save. Choose Clear History to delete the stored searches. </td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="../images/icon_pin_view.png" width="16" height="15"></div></td>
-    <td><b>Pin the Search View </b></td>
-    <td background="view_system_search.htm">Toggles the pin state of  the <a href="view_system_search.htm">System Search</a> view. </td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="../images/icon_menu_white.png" width="12" height="12"></div></td>
-    <td><b>Menu</b></td>
-    <td>Set filters for the view or open the <a href="wnd_system_search_prefs.htm">System Search</a> preference panel. </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>
+<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>System Search view</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>System Search view </h2>
+<p>The <b>System Search</b> view displays the results of a search based on the criteria used in the <a href="wnd_system_search.htm">System Search</a> page. This view (Figure 1) appears automatically when a directory search is performed. You can also open it using the <b>Window &gt; Show View &gt; Other...</b> option where it is found in the Show View dialog under the System Search category. </p>
+<p align="center"><img src="../images/view_system_search.png" width="589" height="169"></p>
+<p class="figure">Figure 1. System Search view after a system search</p>
+<p>The System Search view displays these  columns:</p>
+<ul>
+  <li><b>Name</b> &#8212; name of the matched file and the number of matches found within it </li>
+  <li><b>Type</b> &#8212; the file type extension (.c, .c++, etc.) </li>
+  <li><b>Size</b> &#8212; size of the file in bytes </li>
+  <li><b>Date Modified</b> &#8212; last date the file was modified </li>
+  <li><b>Path</b>   &#8212; complete path to locate the file </li>
+</ul>
+<p>These columns are sortable, simply click the column title to sort in ascending or descending order. Most reordering is based on strings and will be instant, but sorting by Size may take longer  depending upon how many file matches have been made. </p>
+<h4>System Search view toolbar icons</h4>
+<p>The table below lists the icons displayed in the System Search view toolbar.   </p>
+<table width="600"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="11%" scope="col">Icon</th>
+    <th width="31%" scope="col">Item</th>
+    <th width="58%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="../images/icon_next_match.png" width="16" height="16"></div></td>
+    <td><b>Show Next Match </b></td>
+    <td><p>Opens the file in an editor if not already open and shows the first match in the file. If an editor is already open then show the next match in the file. </p>    </td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="../images/icon_prev_match.png" width="15" height="16"></div></td>
+    <td><b>Show Previous Match </b></td>
+    <td>Opens the file in an editor if not already open and shows the last match in the file. If an editor is already open then show the previous match in the file. </td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="../../images/icons/breakpoints_remove_one_icon.png" width="19" height="19"></div></td>
+    <td><b>Remove Selected Matches </b></td>
+    <td>Removes the currently selected files from the search list. </td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="../../images/icons/breakpoints_remove_all_icon.png" width="21" height="19"></div></td>
+    <td><b>Remove All Matches </b></td>
+    <td>Removes all files from the search list. </td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="../images/icon_run_search.png" width="19" height="18"></div></td>
+    <td><b>Run the Current Search Again </b></td>
+    <td>Repeat the search using the same criteria. </td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="../../images/icons/btn_terminate.png" width="17" height="15"></div></td>
+    <td><b>Cancel Current Search </b></td>
+    <td>Click to cancel the current search in progress. </td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="../images/icon_show_searches.png" width="31" height="20"></div></td>
+    <td><b>Show Previous Searches </b></td>
+    <td>Shows a menu with the 10 previous searches. Select a search to show its results in the view. Select History to manage the list of all previous searches or change the number of histories you can save. Choose Clear History to delete the stored searches. </td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="../images/icon_pin_view.png" width="16" height="15"></div></td>
+    <td><b>Pin the Search View </b></td>
+    <td background="view_system_search.htm">Toggles the pin state of  the <a href="view_system_search.htm">System Search</a> view. </td>
+  </tr>
+  <tr>
+    <td><div align="center"><img src="../images/icon_menu_white.png" width="12" height="12"></div></td>
+    <td><b>Menu</b></td>
+    <td>Set filters for the view or open the <a href="wnd_system_search_prefs.htm">System Search</a> preference panel. </td>
+  </tr>
+</table>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/search/wnd_system_search.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/search/wnd_system_search.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,60 +1,60 @@
-<!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>System Search</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>System Search </h2>
-<p>Use the <b>System Search</b> page of the <b>Search</b> window to perform a textual search of files by directory, on   your  hard drive. This enables you to search for files inside directories located outside of the project workspace. In addition, there are additional search choices including:</p>
-<ul>
-  <li>File Search - does a textual search of files in the workspace. This search comes from the Eclipse platform.</li>
-  <li>C/C++ Search  - searches via the C++ index, not a simple textual search. This search comes from CDT. </li>
-</ul>
-<p>Choose <b>Search &gt; System Search</b> to open  the Search window and perform a directory defined textual search. The results  are then shown  in the <a href="view_system_search.htm">System Search</a> view. Some of the search behaviors and apperance are controlled by settings in the <a href="wnd_system_search_prefs.htm">System Search</a> preference panel.</p>
-<p align="center"><img src="../images/wnd_system_search.png" width="519" height="391"></p>
-<p class="figure">Figure 1. System Search page in the Search window  </p>
-<h5>Table 1. System Search page options </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>Search string </b></td>
-    <td><p>Enter text into the <b>Search string</b> text box to search for specific strings within files. Leave empty if you are only looking for files by name and not content. You can control how the text is interpreted using these options: </p>
-      <ul>
-        <li>Case sensitive &#8212; enable to make the search case sensitive </li>
-        <li>Regular expression   &#8212; enable to use regular expression in the Search string text box </li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>File name patterns </b></td>
-    <td>Enter the file types to search for seperated by commas, or click <b>Choose</b> to select file types in the preset list in the <b>Select Types</b> dialog. </td>
-  </tr>
-  <tr>
-    <td><b>Folder</b></td>
-    <td><p>Enter text into the <b>Folder</b> text box or click Browse to search to search a specific folder. You can control how the folder search is conducted  using these options: </p>
-      <ul>
-        <li>Search subfolders  &#8212; enable to recusively search subfolders in the selected folder for matching files </li>
-        <li>Search hidden files    &#8212; enable to also search the folder/subfolders  hidden files</li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><b>Customize...</b></td>
-    <td><p>Specify which search tabs should appear in the Search window. </p>
-    <p class="note"><b>NOTE</b> Use the Window &gt; Customize Perspective &gt; Commands page to hide specific commands you never use. </p></td>
-  </tr>
-</table>
-<h5>Other references </h5>
-<ul>
-  <li><a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/reference/ref-26.htm">Search view</a> </li>
-  <li><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-menu-search.htm">Search actions</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>System Search</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>System Search </h2>
+<p>Use the <b>System Search</b> page of the <b>Search</b> window to perform a textual search of files by directory, on   your  hard drive. This enables you to search for files inside directories located outside of the project workspace. In addition, there are additional search choices including:</p>
+<ul>
+  <li>File Search - does a textual search of files in the workspace. This search comes from the Eclipse platform.</li>
+  <li>C/C++ Search  - searches via the C++ index, not a simple textual search. This search comes from CDT. </li>
+</ul>
+<p>Choose <b>Search &gt; System Search</b> to open  the Search window and perform a directory defined textual search. The results  are then shown  in the <a href="view_system_search.htm">System Search</a> view. Some of the search behaviors and apperance are controlled by settings in the <a href="wnd_system_search_prefs.htm">System Search</a> preference panel.</p>
+<p align="center"><img src="../images/wnd_system_search.png" width="519" height="391"></p>
+<p class="figure">Figure 1. System Search page in the Search window  </p>
+<h5>Table 1. System Search page options </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>Search string </b></td>
+    <td><p>Enter text into the <b>Search string</b> text box to search for specific strings within files. Leave empty if you are only looking for files by name and not content. You can control how the text is interpreted using these options: </p>
+      <ul>
+        <li>Case sensitive &#8212; enable to make the search case sensitive </li>
+        <li>Regular expression   &#8212; enable to use regular expression in the Search string text box </li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>File name patterns </b></td>
+    <td>Enter the file types to search for seperated by commas, or click <b>Choose</b> to select file types in the preset list in the <b>Select Types</b> dialog. </td>
+  </tr>
+  <tr>
+    <td><b>Folder</b></td>
+    <td><p>Enter text into the <b>Folder</b> text box or click Browse to search to search a specific folder. You can control how the folder search is conducted  using these options: </p>
+      <ul>
+        <li>Search subfolders  &#8212; enable to recusively search subfolders in the selected folder for matching files </li>
+        <li>Search hidden files    &#8212; enable to also search the folder/subfolders  hidden files</li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td><b>Customize...</b></td>
+    <td><p>Specify which search tabs should appear in the Search window. </p>
+    <p class="note"><b>NOTE</b> Use the Window &gt; Customize Perspective &gt; Commands page to hide specific commands you never use. </p></td>
+  </tr>
+</table>
+<h5>Other references </h5>
+<ul>
+  <li><a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/reference/ref-26.htm">Search view</a> </li>
+  <li><a href="PLUGINS_ROOT/org.eclipse.jdt.doc.user/reference/ref-menu-search.htm">Search actions</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/search/wnd_system_search_prefs.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/search/wnd_system_search_prefs.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,49 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>System Search preferences</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>System Search preferences </h2>
-<p>Use the <b>System Search</b> preference panel to control  System Search behaviors. Choose <b>Window &gt; Preferences &gt; System Search</b> to open  the System Search preference panel. </p>
-<p align="center"><img src="../images/wnd_system_search_prefs.png" width="671" height="543"></p>
-<p class="figure">Figure 1. System Search preference panel  </p>
-<h5>Table 1. System Search page options </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="39%" scope="col">Item</th>
-    <th width="61%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Reuse editors to show matches</b></td>
-    <td><p>Enable this option  to keep using the same editor for search results to reduce the number of open editors. </p>    </td>
-  </tr>
-  <tr>
-    <td><b>Ignore potential matches </b></td>
-    <td>Enable this option if you only want to see exact matches. </td>
-  </tr>
-  <tr>
-    <td><b>Emphasize potential matches </b></td>
-    <td>Enable this option  to highlight potential matches in the System Search view. If the search engine isn't 100% sure about the match then it is considered a potential match. </td>
-  </tr>
-  <tr>
-    <td><b>Foreground color for potential matches </b></td>
-    <td>Enable this option to select the foreground color for potential matches. </td>
-  </tr>
-  <tr>
-    <td><b>Default perspective for the Search view </b></td>
-    <td>This option allows you to define which perspective should be brought to the front when there are new search results. </td>
-  </tr>
-</table>
-<h5>Other references </h5>
-<ul>
-  <li><a href="wnd_system_search.htm">System Search page </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>System Search preferences</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>System Search preferences </h2>
+<p>Use the <b>System Search</b> preference panel to control  System Search behaviors. Choose <b>Window &gt; Preferences &gt; System Search</b> to open  the System Search preference panel. </p>
+<p align="center"><img src="../images/wnd_system_search_prefs.png" width="671" height="543"></p>
+<p class="figure">Figure 1. System Search preference panel  </p>
+<h5>Table 1. System Search page options </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="39%" scope="col">Item</th>
+    <th width="61%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Reuse editors to show matches</b></td>
+    <td><p>Enable this option  to keep using the same editor for search results to reduce the number of open editors. </p>    </td>
+  </tr>
+  <tr>
+    <td><b>Ignore potential matches </b></td>
+    <td>Enable this option if you only want to see exact matches. </td>
+  </tr>
+  <tr>
+    <td><b>Emphasize potential matches </b></td>
+    <td>Enable this option  to highlight potential matches in the System Search view. If the search engine isn't 100% sure about the match then it is considered a potential match. </td>
+  </tr>
+  <tr>
+    <td><b>Foreground color for potential matches </b></td>
+    <td>Enable this option to select the foreground color for potential matches. </td>
+  </tr>
+  <tr>
+    <td><b>Default perspective for the Search view </b></td>
+    <td>This option allows you to define which perspective should be brought to the front when there are new search results. </td>
+  </tr>
+</table>
+<h5>Other references </h5>
+<ul>
+  <li><a href="wnd_system_search.htm">System Search page </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/exporting_remote_conns.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/exporting_remote_conns.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,37 +1,37 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Exporting Remote Connections</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Exporting Remote Connections</h2>
-<p>You can export remote connection settings for sharing and import  settings created by others using the  Import/Export commands.</p>
-<ul>
-  <li><b>Exporting Remote Connections</b></li>
-  <li><a href="exporting_remote_conns.htm">Importing Remote Connections</a></li>
-</ul>
-<p>To export one or more remote connections:</p>
-<ol>
-  <li>Click the <b>File &gt; Export..</b>. menu option.</li>
-  <li>Select the <b>Remote Connections &gt; Remote Connections Data</b> wizard in the Select page (Figure 1), then click <b>Next</b>.</li>
-<p align="center"><img src="../images/export_rc_01_select.png" width="470" height="550"></p>
-<p class="figure">Figure 1. Select page showing Remote Connections Data wizard</p>
-  <li>Choose file and remote connections to export (Figure 2) in the <b>Export Remote Connections Data</b> page.</li>
-<p align="center"><img src="../images/export_rc_02_export_data.png" width="470" height="550"></p>
-<p class="figure">Figure 2. Enable remote connections to export to chosen file</p>
-  <li>Click <b>Finish</b> to save the selected remote connections to the file.</li>
-</ol>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Exporting Remote Connections</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Exporting Remote Connections</h2>
+<p>You can export remote connection settings for sharing and import  settings created by others using the  Import/Export commands.</p>
+<ul>
+  <li><b>Exporting Remote Connections</b></li>
+  <li><a href="exporting_remote_conns.htm">Importing Remote Connections</a></li>
+</ul>
+<p>To export one or more remote connections:</p>
+<ol>
+  <li>Click the <b>File &gt; Export..</b>. menu option.</li>
+  <li>Select the <b>Remote Connections &gt; Remote Connections Data</b> wizard in the Select page (Figure 1), then click <b>Next</b>.</li>
+<p align="center"><img src="../images/export_rc_01_select.png" width="470" height="550"></p>
+<p class="figure">Figure 1. Select page showing Remote Connections Data wizard</p>
+  <li>Choose file and remote connections to export (Figure 2) in the <b>Export Remote Connections Data</b> page.</li>
+<p align="center"><img src="../images/export_rc_02_export_data.png" width="470" height="550"></p>
+<p class="figure">Figure 2. Enable remote connections to export to chosen file</p>
+  <li>Click <b>Finish</b> to save the selected remote connections to the file.</li>
+</ol>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/importing_remote_conns.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/importing_remote_conns.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,37 +1,37 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Importing Remote Connections</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Importing Remote Connections</h2>
-<p>You can export remote connection settings for sharing and import  settings created by others using the  Import/Export commands.</p>
-<ul>
-  <li><a href="importing_remote_conns.htm">Exporting Remote Connections</a></li>
-  <li><b>Importing Remote Connections</b></li>
-</ul>
-<p>To import one or more remote connections:</p>
-<ol>
-  <li>Click the <b>File &gt; Import..</b>. menu option.</li>
-  <li>Select the <b>Remote Connections &gt; Remote Connections Data</b> wizard in the Select page (Figure 1), then click <b>Next</b>.</li>
-<p align="center"><img src="../images/import_rc_01_select.png" width="470" height="550"></p>
-<p class="figure">Figure 1. Select page showing Remote Connections Data wizard</p>
-  <li>Choose file and remote connections to export (Figure 2) in the <b>Import Remote Connections Data</b> page.</li>
-<p align="center"><img src="../images/import_rc_02_import_data.png" width="470" height="550"></p>
-<p class="figure">Figure 2. Enable remote connections to import</p>
-  <li>Click <b>Finish</b> to import the selected remote connections into Carbide.</li>
-</ol>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="keywords" content="Check TRK, TRK, Install TRK"
+><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Importing Remote Connections</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Importing Remote Connections</h2>
+<p>You can export remote connection settings for sharing and import  settings created by others using the  Import/Export commands.</p>
+<ul>
+  <li><a href="importing_remote_conns.htm">Exporting Remote Connections</a></li>
+  <li><b>Importing Remote Connections</b></li>
+</ul>
+<p>To import one or more remote connections:</p>
+<ol>
+  <li>Click the <b>File &gt; Import..</b>. menu option.</li>
+  <li>Select the <b>Remote Connections &gt; Remote Connections Data</b> wizard in the Select page (Figure 1), then click <b>Next</b>.</li>
+<p align="center"><img src="../images/import_rc_01_select.png" width="470" height="550"></p>
+<p class="figure">Figure 1. Select page showing Remote Connections Data wizard</p>
+  <li>Choose file and remote connections to export (Figure 2) in the <b>Import Remote Connections Data</b> page.</li>
+<p align="center"><img src="../images/import_rc_02_import_data.png" width="470" height="550"></p>
+<p class="figure">Figure 2. Enable remote connections to import</p>
+  <li>Click <b>Finish</b> to import the selected remote connections into Carbide.</li>
+</ol>
+<h5>Related references</h5>
+<ul>
+  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
+  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_filter.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -4,14 +4,14 @@
 <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>Filter Preferences</title>
+<title>Launch Configurations</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2> Launch Configuration Filters</h2>
-<p>The    Launch Configuration Filters Preference window provides additional options for filtering out the launch configurations that appear in the list of configurations.</p>
+<h2> Launch Configurations</h2>
+<p>The    <b>Launch Configuration</b> preference panel provides additional options for filtering out the launch configurations that appear in the list of configurations.</p>
 <div class="step">
-  <h4>To access the Launch Configurations Filter Window</h4>
+  <h4>To access the Launch Configurations preference panel</h4>
 </div>
 <ol>
   <li>Select the <b>Run &gt; Debug As</b> menu item</li>
@@ -29,8 +29,8 @@
       <li>Expand the Run/Debug group</li>
       <li>Expand Launching and select Launch Configurations</li>
     </ol>
-    <p align="center"><img src="../images/filter_launch_config.png" width="580" height="573" /></p>
-    <p align="left" class="figure">Figure 2 - Launch Configurations Filter</p>
+    <p align="center"><img src="../images/filter_launch_config.png" width="627" height="557" /></p>
+  <p align="left" class="figure">Figure 2 - Launch Configurations Filter</p>
 </div>
 <h5>Related concepts</h5>
   <ul>
@@ -52,7 +52,7 @@
   <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
 </ul>
 <p>&nbsp;</p>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -20,7 +20,7 @@
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a>&#8212;specifies the location of source files used when debugging a C or C++ application</li>
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_comm.htm">Common</a>&#8212;specifies the location to store your run configuration, how to access it and what perspective to open when running an application</li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/view_remote_connection.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -164,7 +164,6 @@
 <ul>
   <li><a href="../trk/wnd_on_device_setup.htm">On-Device Connections</a><a href="wnd_on_device_setup.htm"></a></li>
   <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a></li>
-  <li><a href="../../tasks/trk/trk_plug_n_play_01.htm">Plug-n-Play TRK Setup</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.htm</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -11,7 +11,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Install Remote Agents</h2>
-<p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
+<p>Use  the <b>New Conection &gt; </b><strong>Install Remote Agents</strong> page to select the latest remote agent version  to download and install to the device. </p>
 <p align="center"><img src="../images/tab_new_conn_install_agent.png" width="464" height="554"></p>
 <p class="figure">Figure 2 - New Connection wizard Install remote agents page</p>
 <p>Table 1. Install Remote Agents pane</p>
@@ -41,7 +41,7 @@
 <ul>
   <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
   <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
-  <li><a href="#CONN_SET">Test Connection</a></li>
+  <li><a href="wnd_on_device_check_tab.htm">Test Connection</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
   License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_settings_pane.htm	Fri Apr 16 11:16:33 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Install Remote Agents pane</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Install Remote Agents pane</h2>
-<p>Use  the <strong>Install remote agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
-        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
-  </tr>
-  <tr>
-    <td><strong>Save</strong></td>
-    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
-  </tr>
-  <tr>
-    <td><strong>Install</strong></td>
-    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install latest TRK list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
-        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
-  </tr>
-</table>
-<p></p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="wnd_on_device_check_tab.htm">Set Connection 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_add.htm	Fri Apr 16 11:16:33 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Adding, Editing, and Deleting Connections</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Adding, Editing, and Deleting Connections</h2>
-<p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common remote connection settings.</p>
-<ul>
-  <li><a href="#CONN_EDIT">Edit connection name and type</a></li>
-  <li><a href="#CONN_SET">Set Connection Settings pane</a></li>
-  <li><a href="#INSTALL">Install Remote Agents pane</a></li>
-</ul>
-<h3><strong><a name="CONN_EDIT" id="INSTALL3"></a></strong>Edit connection name and type</h3>
-<p>Use the <b>Edit connection name and type</b> page to assign a name and connection type to the new connection setup.</p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="456" height="554"></p>
-<p class="figure">Figure 1 - New Connection wizard Edit connection name and type page</p>
-<p>Table 1. Edit connection name and type page - options</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="28%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Connetion Name</strong></td>
-    <td><p>Enter a name for the connection.</p>    </td>
-  </tr>
-  <tr>
-    <td><strong>Conection Type</strong></td>
-    <td>Select the type of connection this setup will use.</td>
-  </tr>
-  <tr>
-    <td><strong>Supported Services</strong></td>
-    <td><p>Shows a list of services supported by the connection type chosen.</p>    </td>
-  </tr>
-</table>
-<h3><strong><a name="CONN_SET" id="INSTALL2"></a></strong>Set Connection Settings pane</h3>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote agent installed on the device with the latest version available for Carbide. In this pane you can:</p>
-<ul>
-  <li>Set  the device OS used by the device and supported by the selected remote agent</li>
-  <li>Allow easy serial port selection when connecting to a device </li>
-  <li>Verify that you have the latest remote agent installed on a device</li>
-</ul>
-<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 2. Serial Connection Setting page - Set Connection Settings tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Serial Port </strong></td>
-    <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
-  </tr>
-  <tr>
-    <td><b>Baud Rate</b></td>
-    <td>a dropdown list of baud rates common to serial connections.</td>
-  </tr>
-  <tr>
-    <td><strong>Device OS </strong></td>
-    <td><p>A dropdown list of device OSes that are supported by the remote  agent  software. Select the OS used by the device before running a check. </p></td>
-  </tr>
-  <tr>
-    <td><b>Select a service to test</b></td>
-    <td>Click to select a listed service for testing.</td>
-  </tr>
-  <tr>
-    <td><strong>Test Service Status</strong></td>
-    <td><p>Click <strong>Test Service Status</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Check TRK version operation requires more than a few seconds.</p>
-        <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote agent version check.</p>
-      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
-      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
-      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
-      <ul>
-          <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
-        <li><strong>TRK not responding</strong> - this indicates that the COM port is open but TRK is not responding. First, verify that TRK is up and running on the device. Second, TRK may be listening on a different COM port, so choose another named COM port and try again.</li>
-      </ul>
-      <p align="left">&nbsp;</p></td>
-  </tr>
-</table>
-<h3><strong><a name="INSTALL" id="INSTALL"></a>Install Remote Agents</strong> pane</h3>
-<p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Serial Connection Settings page</p>
-<p>Table 3. Serial Connection Setting page - Install Remote Agents tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
-        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
-  </tr>
-  <tr>
-    <td><strong>Save</strong></td>
-    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
-  </tr>
-  <tr>
-    <td><strong>Install</strong></td>
-    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install latest TRK list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
-        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_wiz_edit.htm	Fri Apr 16 11:16:33 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="keywords" content="Check TRK, TRK, Install TRK"
-><meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Editing connections</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Editing connections</h2>
-<p>Use  the <strong>Remote Connections</strong> view to monitor, create, edit, or remove  common remote connection settings.</p>
-<ul>
-  <li><a href="#CONN_EDIT">Edit connection name and type</a></li>
-  <li><a href="#CONN_SET">Set Connection Settings pane</a></li>
-  <li><a href="#INSTALL">Install Remote Agents pane</a></li>
-</ul>
-<h3><strong><a name="CONN_EDIT" id="INSTALL3"></a></strong>Edit connection name and type</h3>
-<p>Use the <b>Edit connection name and type</b> page to assign a name and connection type to the new connection setup.</p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_01.png" width="456" height="554"></p>
-<p class="figure">Figure 1 - New Connection wizard Edit connection name and type page</p>
-<p>Table 1. Edit connection name and type page - options</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="28%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Connetion Name</strong></td>
-    <td><p>Enter a name for the connection.</p>    </td>
-  </tr>
-  <tr>
-    <td><strong>Conection Type</strong></td>
-    <td>Select the type of connection this setup will use.</td>
-  </tr>
-  <tr>
-    <td><strong>Supported Services</strong></td>
-    <td><p>Shows a list of services supported by the connection type chosen.</p>    </td>
-  </tr>
-</table>
-<h3><strong><a name="CONN_SET" id="INSTALL2"></a></strong>Set Connection Settings pane</h3>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote agent installed on the device with the latest version available for Carbide. In this pane you can:</p>
-<ul>
-  <li>Set  the device OS used by the device and supported by the selected remote agent</li>
-  <li>Allow easy serial port selection when connecting to a device </li>
-  <li>Verify that you have the latest remote agent installed on a device</li>
-</ul>
-<p align="center"><img src="../images/wnd_new_connection_wizard_02.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Set Connection Settings tab</p>
-<p>Table 2. Bluetooth Setting page - Set Connection Settings tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Serial Port </strong></td>
-    <td>A dropdown list of serial ports with known identifiers for selecting the communication port used by the PC to communicate with the device. A named COM port (<span class="code">COM4 - BthModem0</span>) indicates an active port. Unnamed port numbers have usually not been opened and assigned by the PC.</td>
-  </tr>
-  <tr>
-    <td><b>Baud Rate</b></td>
-    <td>a dropdown list of baud rates common to serial connections.</td>
-  </tr>
-  <tr>
-    <td><strong>Device OS </strong></td>
-    <td><p>A dropdown list of device OSes that are supported by the remote  agent  software. Select the OS used by the device before running a check. </p></td>
-  </tr>
-  <tr>
-    <td><b>Select a service to test</b></td>
-    <td>Click to select a listed service for testing.</td>
-  </tr>
-  <tr>
-    <td><strong>Test Service Status</strong></td>
-    <td><p>Click <strong>Initiate service testing</strong> to query the remote agent software on the device for its version number. It then compares the version number found with the latest version available for Carbide. A progress bar will appear should the Check TRK version operation requires more than a few seconds.</p>
-        <p class="note"><strong>NOTE</strong> The PC must have an internet connection to perform a remote agent version check.</p>
-      <p>Once the comparison is complete the Status text is updated with the result and further instructions as required.</p>
-      <p align="center"><img src="../images/wnd_on_device_setup_install_new_version.png" width="466" height="67"></p>
-      <p align="left">If a connection fails, the errors normally fall into these two categories: </p>
-      <ul>
-          <li><strong>connection failure</strong> - this usually indicates the chosen COM port  is not open. Try selecting a different COM port, specifically one with a name attached to it (<span class="code">COM4 - BthModem0</span>) for the type of connection you are using (USB or Bluetooth). Repeat as necessary until you get a successful response. </li>
-        <li><strong>TRK not responding</strong> - this indicates that the COM port is open but TRK is not responding. First, verify that TRK is up and running on the device. Second, TRK may be listening on a different COM port, so choose another named COM port and try again.</li>
-      </ul>
-      <p align="left">&nbsp;</p></td>
-  </tr>
-</table>
-<h3><strong><a name="INSTALL" id="INSTALL"></a>Install Remote Agents</strong> pane</h3>
-<p>Use  the <strong>Install Remote Agents</strong> pane to select the latest remote agent version  to download and install to the device. </p>
-<p align="center"><img src="../images/wnd_new_connection_wizard_03.png" width="456" height="554"></p>
-<p class="figure">Figure 2 - New Connection wizard Install remote agents tab</p>
-<p>Table 3. Bluetooth Setting page - Install Remote Agents tab</p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="30%" scope="col">Item</th>
-    <th width="59%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><strong>Install remote agents</strong></td>
-    <td><p>A list of the most current versions of remote agents sorted by SDK and version. Select the version most compatable with the device. For example, a device running S60 3.1.0 needs a version of the TRK software compiled for that SDK, which in the image above is Application TRK 2.8.7. </p>
-        <p>Additional information about the selected entry is displayed to the right to help you choose the correct version of TRK for the target device. </p></td>
-  </tr>
-  <tr>
-    <td><strong>Save</strong></td>
-    <td>Click <strong>Save</strong> to store a local copy of the currently selected TRK to disk. You can then manually install the file to your devices using the method of your choice. </td>
-  </tr>
-  <tr>
-    <td><strong>Install</strong></td>
-    <td><p>Click <strong>Install</strong> to download and install the TRK selected in the Install latest TRK list. A progress bar is shown if the install operation requires more than a few seconds to complete. </p>
-        <p class="note"><strong>NOTE</strong> The SIS and SISX file types must be associated with an installer application like Nokia PC Suite in order to install them onto the device. Use the Save command above to perform a manual install to the device if you don't have an installer application. </p></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="wnd_on_device_setup.htm">On-Device Setup</a></li>
-  <li><a href="wnd_new_conn_install_tab.htm">Install latest TRK</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -11,7 +11,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Setup Connection</h2>
-<p>Use the <b>Edit Connection</b> page to assign a connection type, name, and connection settings to the new connection setup.</p>
+<p>Use the <b>New Conection &gt; Setup Connection</b> page to assign a connection type, name, and connection settings to the new connection setup.</p>
 <p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
 <p class="figure">Figure 1 - New Connection wizard Setup Connection tab</p>
 <p>Table 1. Setup Connection page - options</p>
@@ -41,19 +41,21 @@
   </tr>
   <tr>
     <td><strong>Connection Settings</strong></td>
-    <td><p>Shows a list of services supported by the connection type chosen.</p>
-      <ul>
-        <li>Bluetooth - serial port connection through Bluetooth</li>
-        <li>Serial - serial port connection through a COM serial port</li>
-        <li>USB - serial port connection through USB that  supports TRK 3.x</li>
+    <td><p>Displays COM Port, Baud Rate, IP Addresss, Channel and Port settings according to the chosen connection type.</p>
+      <ul><li>Bluetooth - select which COM port to use </li>
+        <li>PlatSim - shows what IP address it will use </li>
+        <li>Serial - select which COM port and baud rate to use. </li>
+        <li>TPC IP - enter your IP address </li>
+        <li> TCP IP Musti - enter your IP address, Musti channel, Port number </li>
+        <li>USB - select which COM port to use</li>
     </ul></td>
   </tr>
 </table>
 <h5>Related references</h5>
 <ul>
   <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
-  <li><a href="#CONN_SET">Test Connection</a></li>
-  <li><a href="#INSTALL">Install	Remote Agents</a></li>
+  <li><a href="wnd_on_device_setup.htm">Test Connection</a></li>
+  <li><a href="wnd_new_conn_install_tab.htm">Install Remote Agents</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -11,7 +11,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Test Connection</h2>
-<p>Use  the <b>Set Connection Settings</b> pane to compare the version of remote service installed on the device with the latest version available for Carbide. A remote service is any software on the device that can communicate with Carbide. This includes TRK, Trace, Performance Investigator, and other services. In this pane you can:</p>
+<p>Use  the <b>New Conection &gt; Test Connection </b> page to compare the version of remote service installed on the device with the latest version available for Carbide. A remote service is any software on the device that can communicate with Carbide. This includes TRK, Trace, Performance Investigator, and other services. In this pane you can:</p>
 <ul><li>Set  the device OS used by the device and supported by the remote service</li>
   <li>Verify that Carbide can communicate with the remote service via the chosen connection setting</li>
   <li>Verify that you have the latest version of the remote service  installed on the device</li>
@@ -50,7 +50,7 @@
 <ul>
   <li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
   <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
-  <li><a href="#INSTALL">Install	Remote Agents</a></li>
+  <li><a href="wnd_new_conn_install_tab.htm">Install	Remote Agents</a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
   License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -14,16 +14,16 @@
 <p>Use the <strong>New Connection</strong> wizard to verify and update Carbide software services on a device. Click the <strong>Help &gt; On-Device Connections...</strong> menu option to open. Current services available include TRK, Tracing, and others. The following tabs are present:</p>
 <ul>
   <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a> - define connection type, name and settings</li>
-  <li><a href="#CONN_SET">Test Connection</a> - verify connection operates as intended</li>
-  <li><a href="#INSTALL">Install	Remote Agents</a> - download and install remote agents</li>
+  <li><a href="wnd_on_device_check_tab.htm">Test Connection</a> - verify connection operates as intended</li>
+  <li><a href="wnd_new_conn_install_tab.htm">Install	Remote Agents</a> - download and install remote agents</li>
 </ul>
 <p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
 <p class="figure">Figure 1 - New Connection dialog</p>
 <h5>Related references</h5>
 <ul>
   <li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
-  <li><a href="#CONN_SET">Test Connection</a></li>
-  <li><a href="#INSTALL">Install	Remote Agents</a></li>
+  <li><a href="wnd_on_device_check_tab.htm">Test Connection</a><a href="#CONN_SET"></a></li>
+  <li><a href="wnd_new_conn_install_tab.htm">Install	Remote Agents</a><a href="#INSTALL"></a></li>
 </ul>
 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
   License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_breakpoints.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_breakpoints.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,80 +1,80 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Breakpoints View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Breakpoints View </h2>
-<p>Use the <b>Breakpoints</b> view to <a href="../tasks/breakpoints/pgm_bp_setting.htm">set</a>, <a href="../tasks/breakpoints/pgm_bp_view_props.htm">examine</a>, <a href="../tasks/breakpoints/pgm_bp_enable.htm">enable</a>,  <a href="../tasks/breakpoints/pgm_bp_disable.htm">disable</a>, and <a href="../tasks/breakpoints/pgm_bp_clearing.htm">remove</a> breakpoints and <a href="../tasks/watchpoints/pgm_watchpoints.htm">watchpoints</a> in one or more <a href="../concepts/build_configurations.htm">build configurations</a>. Table 1  explains items in the view.</p>
-<p align="center"><img src="images/view_breakpoints.png" width="544" height="264" /></p>
-<p class="figure">Figure 1 - Breakpoints view</p>
-<h5>Table 1. Breakpoints view&mdash;items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="11%" scope="col">Icon</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Remove Selected Breakpoint </b></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_remove_one_icon.png" width="19" height="19" /></div></td>
-    <td>Removes the selected breakpoint from the breakpoints list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove All Breakpoints </b></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_remove_all_icon.png" width="21" height="19" /></div></td>
-    <td>Removes all breakpoints from the breakpoints list. </td>
-  </tr>
-  <tr>
-    <td><b>Show Breakpoints Supported by Selected Target </b></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_show_icon.png" width="20" height="19" /></div></td>
-    <td>Limits the breakpoints shown to only those supported in the current target. </td>
-  </tr>
-  <tr>
-    <td><b>Go to File for Breakpoint </b></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_goto_icon.png" width="20" height="19" /></div></td>
-    <td>Displays the breakpoint in an editor view, opening the source file if required. </td>
-  </tr>
-  <tr>
-    <td><b>Skip All Breakpoints </b></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_skip_all_icon.png" width="19" height="19" /></div></td>
-    <td>Toggles  the debugger to skip all  breakpoints regardless of their current enabled or disabled state, or hit all breakpoints.</td>
-  </tr>
-  <tr>
-    <td><b>Expand All </b></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_collapse_icon.png" width="19" height="18" /></div></td>
-    <td>Expand all matches in the hierarchical view.</td>
-  </tr>
-  <tr>
-    <td><b>Collapse All </b></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_expand_icon.png" width="19" height="18" /></div></td>
-    <td>Collapse all matches in the hierarchical view.</td>
-  </tr>
-  <tr>
-    <td><b>Link with Debug View</b></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_linkto_debug_icon.png" width="20" height="19" /></div></td>
-    <td>When enabled, the breakpoint shown in the editor view is also highlighted in the Breakpoints view. When disabled, the breakpoint selected in the Breakpoints view does not change. </td>
-  </tr>
-  <tr>
-    <td><b>Menu</b></td>
-    <td><div align="center"><img src="images/icon_breakpoint_menu.png" width="16" height="9" /></div></td>
-    <td>Click to display additional Breakpoint view options for paths and working sets. </td>
-  </tr>
-</table>
-  <h5>Other  references</h5>
-  <ul>
-    <li><a href="perspective_debug.htm">Debug Perspective </a></li>
-    <li><a href="../concepts/breakpoints.htm">Breakpoints</a></li>
-    <li><a href="../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
-    <li><a href="../tasks/breakpoints/pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-    <li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-    <li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Removing  Breakpoints</a></li>
-</ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Breakpoints View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Breakpoints View </h2>
+<p>Use the <b>Breakpoints</b> view to <a href="../tasks/breakpoints/pgm_bp_setting.htm">set</a>, <a href="../tasks/breakpoints/pgm_bp_view_props.htm">examine</a>, <a href="../tasks/breakpoints/pgm_bp_enable.htm">enable</a>,  <a href="../tasks/breakpoints/pgm_bp_disable.htm">disable</a>, and <a href="../tasks/breakpoints/pgm_bp_clearing.htm">remove</a> breakpoints and <a href="../tasks/watchpoints/pgm_watchpoints.htm">watchpoints</a> in one or more <a href="../concepts/build_configurations.htm">build configurations</a>. Table 1  explains items in the view.</p>
+<p align="center"><img src="images/view_breakpoints.png" width="544" height="264" /></p>
+<p class="figure">Figure 1 - Breakpoints view</p>
+<h5>Table 1. Breakpoints view&mdash;items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="11%" scope="col">Icon</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Remove Selected Breakpoint </b></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_remove_one_icon.png" width="19" height="19" /></div></td>
+    <td>Removes the selected breakpoint from the breakpoints list. </td>
+  </tr>
+  <tr>
+    <td><b>Remove All Breakpoints </b></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_remove_all_icon.png" width="21" height="19" /></div></td>
+    <td>Removes all breakpoints from the breakpoints list. </td>
+  </tr>
+  <tr>
+    <td><b>Show Breakpoints Supported by Selected Target </b></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_show_icon.png" width="20" height="19" /></div></td>
+    <td>Limits the breakpoints shown to only those supported in the current target. </td>
+  </tr>
+  <tr>
+    <td><b>Go to File for Breakpoint </b></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_goto_icon.png" width="20" height="19" /></div></td>
+    <td>Displays the breakpoint in an editor view, opening the source file if required. </td>
+  </tr>
+  <tr>
+    <td><b>Skip All Breakpoints </b></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_skip_all_icon.png" width="19" height="19" /></div></td>
+    <td>Toggles  the debugger to skip all  breakpoints regardless of their current enabled or disabled state, or hit all breakpoints.</td>
+  </tr>
+  <tr>
+    <td><b>Expand All </b></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_collapse_icon.png" width="19" height="18" /></div></td>
+    <td>Expand all matches in the hierarchical view.</td>
+  </tr>
+  <tr>
+    <td><b>Collapse All </b></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_expand_icon.png" width="19" height="18" /></div></td>
+    <td>Collapse all matches in the hierarchical view.</td>
+  </tr>
+  <tr>
+    <td><b>Link with Debug View</b></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_linkto_debug_icon.png" width="20" height="19" /></div></td>
+    <td>When enabled, the breakpoint shown in the editor view is also highlighted in the Breakpoints view. When disabled, the breakpoint selected in the Breakpoints view does not change. </td>
+  </tr>
+  <tr>
+    <td><b>Menu</b></td>
+    <td><div align="center"><img src="images/icon_breakpoint_menu.png" width="16" height="9" /></div></td>
+    <td>Click to display additional Breakpoint view options for paths and working sets. </td>
+  </tr>
+</table>
+  <h5>Other  references</h5>
+  <ul>
+    <li><a href="perspective_debug.htm">Debug Perspective </a></li>
+    <li><a href="../concepts/breakpoints.htm">Breakpoints</a></li>
+    <li><a href="../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
+    <li><a href="../tasks/breakpoints/pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+    <li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+    <li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Removing  Breakpoints</a></li>
+</ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_carbide_news.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -54,7 +54,7 @@
 <ul>
   <li><a href="prefs_carbide_news.htm">Carbide.c++ News preference panel</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
   License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_cpp_projects.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_cpp_projects.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,39 +1,39 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Project Explorer View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Project Explorer View </h2>
-<p>  The <b>Project Explorer</b> view (Figure 1) display<span><span>s  relevant C/C++ projects located in the current workspace using a tree structure</span></span>. Use this view to manage all the projects located in the workspace. The view is customizable and takes advantage of working sets. </p>
-<p>The content of a project is dependent upon how it was created in the workspace.</p>
-<p align="center"><img src="images/view_cpp_projects.png" width="273" height="413" /></p>
-<p class="figure">Figure 1 - Project Explorer view showing projects in the current workspace</p>
-<p>The directories that appear in the project include:</p>
-<ul>
-  <li><b>sis</b>&#8212;the storage location for the final output files. The output file is linked from the top level of the project with a file of the same name.  Both the binary and link files can be expanded to show the source files used to build the program.</li>
-  <li><b>Includes</b>&#8212;a listing of all the include files used to build the project.</li>
-  <li><b>Executables</b> - a listing of debuggable executables imported into the <a href="view_executables.htm">Executables</a> view </li>
-  <li><b>User specified</b>&#8212;many other directories like <span class="code">src</span>, <span class="code">inc</span>, <span class="code">data</span>, and others are used to store specific types of project files. The names used for the directories are defined in the <a href="ProjectDirectories.html">Project Directories</a> page when the project is created. </li>
-</ul>
-<blockquote>
-  <p class="note"><b>NOTE</b> Only the directories specified by the mmp file are created during import. </p>
-</blockquote>
-<p>The files that appear in the project directories can be either:</p>
-<ul>
-  <li><b>files</b> (<img src="images/icon_project_file.png" width="15" height="16" align="absmiddle" />)&#8212;these files are located in the workspace within the project directories. Double-click a file icon to open it for editing.</li>
-  <li><b>folder links</b>&#8212;these are links pointing to folders that enable the project to support  cvs related sources. </li>
-</ul>
-<p>See  <b>C/C++ Development User Guide &gt; Reference &gt; C/C++ Views and Editors &gt; <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_project_explorer_view.htm">Project Explorer view</a></b> for more info. </p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../concepts/CarbidePerspective.html">Carbide C/C++ Perspective  </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>Project Explorer View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Project Explorer View </h2>
+<p>  The <b>Project Explorer</b> view (Figure 1) display<span><span>s  relevant C/C++ projects located in the current workspace using a tree structure</span></span>. Use this view to manage all the projects located in the workspace. The view is customizable and takes advantage of working sets. </p>
+<p>The content of a project is dependent upon how it was created in the workspace.</p>
+<p align="center"><img src="images/view_cpp_projects.png" width="273" height="413" /></p>
+<p class="figure">Figure 1 - Project Explorer view showing projects in the current workspace</p>
+<p>The directories that appear in the project include:</p>
+<ul>
+  <li><b>sis</b>&#8212;the storage location for the final output files. The output file is linked from the top level of the project with a file of the same name.  Both the binary and link files can be expanded to show the source files used to build the program.</li>
+  <li><b>Includes</b>&#8212;a listing of all the include files used to build the project.</li>
+  <li><b>Executables</b> - a listing of debuggable executables imported into the <a href="view_executables.htm">Executables</a> view </li>
+  <li><b>User specified</b>&#8212;many other directories like <span class="code">src</span>, <span class="code">inc</span>, <span class="code">data</span>, and others are used to store specific types of project files. The names used for the directories are defined in the <a href="ProjectDirectories.html">Project Directories</a> page when the project is created. </li>
+</ul>
+<blockquote>
+  <p class="note"><b>NOTE</b> Only the directories specified by the mmp file are created during import. </p>
+</blockquote>
+<p>The files that appear in the project directories can be either:</p>
+<ul>
+  <li><b>files</b> (<img src="images/icon_project_file.png" width="15" height="16" align="absmiddle" />)&#8212;these files are located in the workspace within the project directories. Double-click a file icon to open it for editing.</li>
+  <li><b>folder links</b>&#8212;these are links pointing to folders that enable the project to support  cvs related sources. </li>
+</ul>
+<p>See  <b>C/C++ Development User Guide &gt; Reference &gt; C/C++ Views and Editors &gt; <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_project_explorer_view.htm">Project Explorer view</a></b> for more info. </p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../concepts/CarbidePerspective.html">Carbide C/C++ Perspective  </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_executables.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -97,7 +97,7 @@
 <ul>
   <li><a href="perspective_debug.htm">Debug perspective </a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -66,7 +66,7 @@
   </tr>
 </table>
 <p>&nbsp;</p>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_module_wnd.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_module_wnd.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -18,7 +18,7 @@
 <ul>
   <li> <a href="../debugger/debug/viewing_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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_reg_details.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_reg_details.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,138 +1,138 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Registers Details Window</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Registers Details Window</h2>
-<p>  The Register Details window (Windows OS) lets you view detailed information about individual bits of registers from 2 bits to 32 bits in size. This window shows information for both system registers and memory-mapped registers. To open the Register Details window, click View &gt; Register Details or Window &gt; Register Details Window.</p>
-<p>The Register Details window has fields that describe the register, its bitfields, and the values of those bitfields. XML files in the Registers folder of your Carbide installation provide the information that appears in the window. The Registers folder is inside the Support folder. The Support folder is inside the Plugins folder of your Carbide installation.</p>
-<p>Figure 1  shows the Register Details window. Table 1  explains items in the window.</p>
-<p class="figure">Figure 1 Register Details window<br />
-</p>
-<h5>Table 1. Register Details window&mdash;items </h5>
-<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="17%" scope="col">Icon</th>
-    <th width="54%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td>Description File text box</td>
-    <td>&nbsp;</td>
-    <td>Enter the name or full path to the XML file for the register you want to view, or click the Browse button to open a dialog box that you can use to specify the file.</td>
-  </tr>
-  <tr>
-    <td>Register Name</td>
-    <td>&nbsp;</td>
-    <td>Shows the name of the register depicted in the window.</td>
-  </tr>
-  <tr>
-    <td>Address text box</td>
-    <td>&nbsp;</td>
-    <td><p>Enter the starting address of the register values that you want to see in the Register Display.</p>
-    <p> An error message appears if you enter an invalid starting address.</p></td>
-  </tr>
-  <tr>
-    <td>Format list box</td>
-    <td>&nbsp;</td>
-    <td><p>Specify the data format for bit values in the Register Display:</p>
-      <ul>
-        <li>Binary</li>
-        <li>Character</li>
-        <li>Decimal</li>
-        <li>Unsigned Decimal</li>
-        <li>Hexadeccimal</li>
-        <li>Default&mdash;have the IDE determine the best format</li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td>Register Display</td>
-    <td>&nbsp;</td>
-    <td>Shows a depiction of the register that you specify in the Description File text box, including individual register bits and their values.</td>
-  </tr>
-  <tr>
-    <td>Bitfield Name list box</td>
-    <td>&nbsp;</td>
-    <td><p>Specify a bitfield to highlight in the Register Display. The Description portion of the window reflects available information for the bitfield.</p>
-    <p> Select None to have the Description portion of the window reflect information for the entire register and not a bitfield in that register.</p></td>
-  </tr>
-  <tr>
-    <td>Bit Value text box</td>
-    <td>&nbsp;</td>
-    <td><p>Shows the current value of the bits in the Bitfield Name list box, according to the format that you specify in the Format list box.</p>
-      <p>Click the spin buttons to increment or decrement the current value, or enter a new value in the text box.</p>
-    <p>Changing the value changes only the Register Display. You must click the Write button to write the new value to the register itself.</p></td>
-  </tr>
-  <tr>
-    <td>Bit Value Modifier list box</td>
-    <td>&nbsp;</td>
-    <td><p>Specify a new value for the selected bitfield, or view a brief explanation of specific bitfield values.</p>
-    <p> Changing the value changes only the Register Display. You must click the Write button to write the new value to the register.</p></td>
-  </tr>
-  <tr>
-    <td>Description</td>
-    <td>&nbsp;</td>
-    <td><p>Shows a description of the register or a selected bitfield in the register.</p>
-      <p> Use the Description File text box to specify the register.</p>
-    <p>Use the Text View list box to view specific register information, such as register descriptions, bitfield descriptions, and register details.</p></td>
-  </tr>
-  <tr>
-    <td>Revert button</td>
-    <td>&nbsp;</td>
-    <td><p>Click to change a modified value in the Register Display to its original value.</p>
-    <p> If you clicked the Write button to write a new value to the register, you cannot revert that value.</p></td>
-  </tr>
-  <tr>
-    <td>Read button</td>
-    <td>&nbsp;</td>
-    <td>Click to have the Register Display reflect current bit values from the register itself.</td>
-  </tr>
-  <tr>
-    <td>Write button</td>
-    <td>&nbsp;</td>
-    <td><p>Click to write the bit values in the Register Display to the register.</p>
-    <p> After you write new values to the register, you cannot revert them.</p></td>
-  </tr>
-  <tr>
-    <td>Reset Value button</td>
-    <td>&nbsp;</td>
-    <td><p>Click to restore the default value for the selected bitfield.</p>
-    <p> The IDE disables this button if the selected bitfield does not have a default value.</p></td>
-  </tr>
-  <tr>
-    <td>Text View list box</td>
-    <td>&nbsp;</td>
-    <td>Use to specify information that appears in the Description portion of the window.</td>
-  </tr>
-</table>
-<h4> Description File</h4>
-<p> Enter in this text box the name of the register that you want to see in the Register Display of the Register Details window. Alternatively, enter the full path to the register description file on your computer, or click the Browse button to open a dialog box that lets you specify the register description file. The text box is not case sensitive.</p>
-<p>After you enter a name or path, the debugger searches for a matching register description file in the Registers folder of your Carbide installation and the project access paths. If the debugger finds a matching file, the Register Display updates the information in the Register Details window. If the debugger does not find a matching name, an error message appears.</p>
-<p>For example, to view the contents of the Opcode register, you can:</p>
-<ul>
-  <li>type <span class="code">Opcode</span> in the Description File text box and press Enter or Return, or</li>
-  <li>type the full path to the <span class="code">opcode.xml</span> file in the Registers folder and press Enter or Return.</li>
-</ul>
-<p>The debugger matches your entry with the <span class="code">opcode.xml</span> file in the Registers folder. The Register Display in the Register Details window updates its information to show Opcode register details.</p>
-<p>The debugger also updates the Register Display to show the current values in the register. If the debugger fails to update the display, an error message appears.</p>
-<h4>Register Display</h4>
-<p>This display shows the current contents of 32 bits of register data, starting at the address that you specify in the Address text box. The data appears according to the format that you specify in the Format list box.</p>
-<p>The Register Display groups the 32 bits of data into register bitfields. Clicking one of the bits selects its associated bitfield. Additional information about the bitfield, such as its name and permissions, appears in the Description portion of the Register Details window.</p>
-<h4>Text View</h4>
-<p>Use this list box to change the information that appears in the Description portion of the Register Details window:</p>
-<ul>
-  <li><b>Auto</b>&mdash;select to have the IDE determine which information to display in the window</li>
-  <li><b>Register Description</b>&mdash;select to show information about the entire register, such as the name of the register itself and the meaning of its contents</li>
-  <li><b>Bitfield Description</b>&mdash;select to show information about the selected bitfield in the Register Display, such as the name of the bitfield and its access permissions</li>
-  <li><b>Register Details</b>&mdash;select to show in-depth information about the current register, such as its name, its bit values, and bit-value explanations<br />
-  </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Registers Details Window</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Registers Details Window</h2>
+<p>  The Register Details window (Windows OS) lets you view detailed information about individual bits of registers from 2 bits to 32 bits in size. This window shows information for both system registers and memory-mapped registers. To open the Register Details window, click View &gt; Register Details or Window &gt; Register Details Window.</p>
+<p>The Register Details window has fields that describe the register, its bitfields, and the values of those bitfields. XML files in the Registers folder of your Carbide installation provide the information that appears in the window. The Registers folder is inside the Support folder. The Support folder is inside the Plugins folder of your Carbide installation.</p>
+<p>Figure 1  shows the Register Details window. Table 1  explains items in the window.</p>
+<p class="figure">Figure 1 Register Details window<br />
+</p>
+<h5>Table 1. Register Details window&mdash;items </h5>
+<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="17%" scope="col">Icon</th>
+    <th width="54%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td>Description File text box</td>
+    <td>&nbsp;</td>
+    <td>Enter the name or full path to the XML file for the register you want to view, or click the Browse button to open a dialog box that you can use to specify the file.</td>
+  </tr>
+  <tr>
+    <td>Register Name</td>
+    <td>&nbsp;</td>
+    <td>Shows the name of the register depicted in the window.</td>
+  </tr>
+  <tr>
+    <td>Address text box</td>
+    <td>&nbsp;</td>
+    <td><p>Enter the starting address of the register values that you want to see in the Register Display.</p>
+    <p> An error message appears if you enter an invalid starting address.</p></td>
+  </tr>
+  <tr>
+    <td>Format list box</td>
+    <td>&nbsp;</td>
+    <td><p>Specify the data format for bit values in the Register Display:</p>
+      <ul>
+        <li>Binary</li>
+        <li>Character</li>
+        <li>Decimal</li>
+        <li>Unsigned Decimal</li>
+        <li>Hexadeccimal</li>
+        <li>Default&mdash;have the IDE determine the best format</li>
+    </ul></td>
+  </tr>
+  <tr>
+    <td>Register Display</td>
+    <td>&nbsp;</td>
+    <td>Shows a depiction of the register that you specify in the Description File text box, including individual register bits and their values.</td>
+  </tr>
+  <tr>
+    <td>Bitfield Name list box</td>
+    <td>&nbsp;</td>
+    <td><p>Specify a bitfield to highlight in the Register Display. The Description portion of the window reflects available information for the bitfield.</p>
+    <p> Select None to have the Description portion of the window reflect information for the entire register and not a bitfield in that register.</p></td>
+  </tr>
+  <tr>
+    <td>Bit Value text box</td>
+    <td>&nbsp;</td>
+    <td><p>Shows the current value of the bits in the Bitfield Name list box, according to the format that you specify in the Format list box.</p>
+      <p>Click the spin buttons to increment or decrement the current value, or enter a new value in the text box.</p>
+    <p>Changing the value changes only the Register Display. You must click the Write button to write the new value to the register itself.</p></td>
+  </tr>
+  <tr>
+    <td>Bit Value Modifier list box</td>
+    <td>&nbsp;</td>
+    <td><p>Specify a new value for the selected bitfield, or view a brief explanation of specific bitfield values.</p>
+    <p> Changing the value changes only the Register Display. You must click the Write button to write the new value to the register.</p></td>
+  </tr>
+  <tr>
+    <td>Description</td>
+    <td>&nbsp;</td>
+    <td><p>Shows a description of the register or a selected bitfield in the register.</p>
+      <p> Use the Description File text box to specify the register.</p>
+    <p>Use the Text View list box to view specific register information, such as register descriptions, bitfield descriptions, and register details.</p></td>
+  </tr>
+  <tr>
+    <td>Revert button</td>
+    <td>&nbsp;</td>
+    <td><p>Click to change a modified value in the Register Display to its original value.</p>
+    <p> If you clicked the Write button to write a new value to the register, you cannot revert that value.</p></td>
+  </tr>
+  <tr>
+    <td>Read button</td>
+    <td>&nbsp;</td>
+    <td>Click to have the Register Display reflect current bit values from the register itself.</td>
+  </tr>
+  <tr>
+    <td>Write button</td>
+    <td>&nbsp;</td>
+    <td><p>Click to write the bit values in the Register Display to the register.</p>
+    <p> After you write new values to the register, you cannot revert them.</p></td>
+  </tr>
+  <tr>
+    <td>Reset Value button</td>
+    <td>&nbsp;</td>
+    <td><p>Click to restore the default value for the selected bitfield.</p>
+    <p> The IDE disables this button if the selected bitfield does not have a default value.</p></td>
+  </tr>
+  <tr>
+    <td>Text View list box</td>
+    <td>&nbsp;</td>
+    <td>Use to specify information that appears in the Description portion of the window.</td>
+  </tr>
+</table>
+<h4> Description File</h4>
+<p> Enter in this text box the name of the register that you want to see in the Register Display of the Register Details window. Alternatively, enter the full path to the register description file on your computer, or click the Browse button to open a dialog box that lets you specify the register description file. The text box is not case sensitive.</p>
+<p>After you enter a name or path, the debugger searches for a matching register description file in the Registers folder of your Carbide installation and the project access paths. If the debugger finds a matching file, the Register Display updates the information in the Register Details window. If the debugger does not find a matching name, an error message appears.</p>
+<p>For example, to view the contents of the Opcode register, you can:</p>
+<ul>
+  <li>type <span class="code">Opcode</span> in the Description File text box and press Enter or Return, or</li>
+  <li>type the full path to the <span class="code">opcode.xml</span> file in the Registers folder and press Enter or Return.</li>
+</ul>
+<p>The debugger matches your entry with the <span class="code">opcode.xml</span> file in the Registers folder. The Register Display in the Register Details window updates its information to show Opcode register details.</p>
+<p>The debugger also updates the Register Display to show the current values in the register. If the debugger fails to update the display, an error message appears.</p>
+<h4>Register Display</h4>
+<p>This display shows the current contents of 32 bits of register data, starting at the address that you specify in the Address text box. The data appears according to the format that you specify in the Format list box.</p>
+<p>The Register Display groups the 32 bits of data into register bitfields. Clicking one of the bits selects its associated bitfield. Additional information about the bitfield, such as its name and permissions, appears in the Description portion of the Register Details window.</p>
+<h4>Text View</h4>
+<p>Use this list box to change the information that appears in the Description portion of the Register Details window:</p>
+<ul>
+  <li><b>Auto</b>&mdash;select to have the IDE determine which information to display in the window</li>
+  <li><b>Register Description</b>&mdash;select to show information about the entire register, such as the name of the register itself and the meaning of its contents</li>
+  <li><b>Bitfield Description</b>&mdash;select to show information about the selected bitfield in the Register Display, such as the name of the bitfield and its access permissions</li>
+  <li><b>Register Details</b>&mdash;select to show in-depth information about the current register, such as its name, its bit values, and bit-value explanations<br />
+  </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -46,7 +46,7 @@
 <ul><li><a href="view_symbian_kernel.htm">Symbian OS View</a></li>
   <li><a href="../debugger/debug/viewing_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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_variables.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,86 +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>Variables View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Variables View </h2>
-<p>The <b>Variables</b> view allows manipulation of the variables or variable hierarchy used in source code. For example, you can change the variable format, change a variables value, add watchpoints, and add global variables. </p>
-<p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled.</p>
-<p align="center"><img src="../images/views/view_variables.png" width="544" height="221" /></p>
-<p class="figure">Figure 1 - Variables view showing type names </p>
-<h5>Table 1. Variables view&mdash;items </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="34%" scope="col">Item</th>
-    <th width="14%" scope="col">Icons</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Show Type Names </b></td>
-    <td><div align="center"><img src="../images/icons/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
-    <td>Toggles the display of type names in the Variables view. </td>
-  </tr>
-  <tr>
-    <td><b>Show Logical Structure </b></td>
-    <td><div align="center"><img src="../images/icons/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
-    <td>Not available in C/C++ yet. </td>
-  </tr>
-  <tr>
-    <td><b>Collapse All </b></td>
-    <td><div align="center"><img src="../images/icons/var_collapse_all_icon.png" width="17" height="18" /></div></td>
-    <td>Collapses all expanded variables into the top level. </td>
-  </tr>
-  <tr>
-    <td><b>Add Global Variables </b></td>
-    <td><div align="center"><img src="../images/icons/var_add_global_vars_icon.png" width="19" height="19" /></div></td>
-    <td>Click to open a window where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove Selected Global Variables </b></td>
-    <td><div align="center"><img src="../images/icons/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
-    <td>Click to remove all currently selected global variables from the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove All Global Variables </b></td>
-    <td><div align="center"><img src="../images/icons/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
-    <td>Click to remove all global variables from the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Menu</b></td>
-    <td><div align="center"><img src="images/icon_menu_white.png" width="12" height="12"></div></td>
-    <td><p>Enables you to modifiy the <b>Layout</b> to change the view orientation between: horizontal, vertical, or variables pane only.</p>
-    <p>In addition, use <b>Show All Variables</b> to toggle between showing only those variables that are in scope and live or   show all local variables, even if redundant. With this option on you will see all of the variables including the multiple defined variables like &ldquo;i&rdquo; for your loops  and ones that may no longer have accurate values.</p></td>
-  </tr>
-</table>
-<div class="step">
-  <h4>To open the Variables view </h4>
-  <ul>
-    <li>Click Window &gt; Show View &gt; Variables </li>
-	<p>The Variables view appears.</p>
-  </ul>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../concepts/common_debug_actions.htm">Common Debug Actions </a></li>
-  <li><a href="../concepts/working_with_memory.htm">Working with Memory</a></li>
-  <li><a href="../concepts/working_with_variables.htm">Working with Variables</a> </li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/variables/show_variables_view.htm">Showing the Variables View</a> </li>
-  <li><a href="../tasks/variables/show_global_variables.htm">Showing Global Variables</a> </li>
-</ul>
-<h5>Related References </h5>
-<ul>
-  <li><a href="view_expressions.htm">Expressions View</a></li>
-  <li><a href="../concepts/working_with_variables.htm">Variables 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>Variables View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Variables View </h2>
+<p>The <b>Variables</b> view allows manipulation of the variables or variable hierarchy used in source code. For example, you can change the variable format, change a variables value, add watchpoints, and add global variables. </p>
+<p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled.</p>
+<p align="center"><img src="../images/views/view_variables.png" width="544" height="221" /></p>
+<p class="figure">Figure 1 - Variables view showing type names </p>
+<h5>Table 1. Variables view&mdash;items </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="14%" scope="col">Icons</th>
+    <th width="52%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Show Type Names </b></td>
+    <td><div align="center"><img src="../images/icons/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
+    <td>Toggles the display of type names in the Variables view. </td>
+  </tr>
+  <tr>
+    <td><b>Show Logical Structure </b></td>
+    <td><div align="center"><img src="../images/icons/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
+    <td>Not available in C/C++ yet. </td>
+  </tr>
+  <tr>
+    <td><b>Collapse All </b></td>
+    <td><div align="center"><img src="../images/icons/var_collapse_all_icon.png" width="17" height="18" /></div></td>
+    <td>Collapses all expanded variables into the top level. </td>
+  </tr>
+  <tr>
+    <td><b>Add Global Variables </b></td>
+    <td><div align="center"><img src="../images/icons/var_add_global_vars_icon.png" width="19" height="19" /></div></td>
+    <td>Click to open a window where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
+  </tr>
+  <tr>
+    <td><b>Remove Selected Global Variables </b></td>
+    <td><div align="center"><img src="../images/icons/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
+    <td>Click to remove all currently selected global variables from the variables list. </td>
+  </tr>
+  <tr>
+    <td><b>Remove All Global Variables </b></td>
+    <td><div align="center"><img src="../images/icons/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
+    <td>Click to remove all global variables from the variables list. </td>
+  </tr>
+  <tr>
+    <td><b>Menu</b></td>
+    <td><div align="center"><img src="images/icon_menu_white.png" width="12" height="12"></div></td>
+    <td><p>Enables you to modifiy the <b>Layout</b> to change the view orientation between: horizontal, vertical, or variables pane only.</p>
+    <p>In addition, use <b>Show All Variables</b> to toggle between showing only those variables that are in scope and live or   show all local variables, even if redundant. With this option on you will see all of the variables including the multiple defined variables like &ldquo;i&rdquo; for your loops  and ones that may no longer have accurate values.</p></td>
+  </tr>
+</table>
+<div class="step">
+  <h4>To open the Variables view </h4>
+  <ul>
+    <li>Click Window &gt; Show View &gt; Variables </li>
+	<p>The Variables view appears.</p>
+  </ul>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../concepts/common_debug_actions.htm">Common Debug Actions </a></li>
+  <li><a href="../concepts/working_with_memory.htm">Working with Memory</a></li>
+  <li><a href="../concepts/working_with_variables.htm">Working with Variables</a> </li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/variables/show_variables_view.htm">Showing the Variables View</a> </li>
+  <li><a href="../debugger/variables/viewing_variables.htm">Showing Global Variables</a> </li>
+</ul>
+<h5>Related References </h5>
+<ul>
+  <li><a href="view_expressions.htm">Expressions View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/views.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/views.htm	Fri Apr 16 11:18:22 2010 -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>Working with Memory</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Working with Memory</h2>
-<p>  This section explains how to work with variables in a Carbide.c++ debugging session. The following views show various types of information about variables:</p>
-<ul>
-  <li><a href="view_variables.htm">Memory</a> view &mdash;shows the memory that your project manipulates as it executes</li>
-  <li><a href="view_registers.htm">Registers</a> view&mdash;shows the register contents of a processor</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>Working with Memory</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Working with Memory</h2>
+<p>  This section explains how to work with variables in a Carbide.c++ debugging session. The following views show various types of information about variables:</p>
+<ul>
+  <li><a href="view_variables.htm">Memory</a> view &mdash;shows the memory that your project manipulates as it executes</li>
+  <li><a href="view_registers.htm">Registers</a> view&mdash;shows the register contents of a processor</li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref_x86.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref_x86.htm	Fri Apr 16 11:18:22 2010 -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>Unsetting Built-in Environment</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Unsetting Built-in Environment</h2>
-<p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand(&quot;org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage)&quot;)'> Build</a> page in the <b>Preferences</b> window provides an option   to use the local x86 build tools for each emulator build. A directory named x86Build at the root of the product installation contains the build tools, libraries, and <span class="code">env_update.exe</span> file.</p>
-<p>Uncheck the &quot;Use built-in Nokia x86 environment variables for WINSCW builds&quot; option if you do not want to use the built-in compiler.</p>
-<p>Figure 1 shows the <a href="wnd_build_prefs.htm">Build</a> preferences window.</p>
-<p align="center"><img src="images/carbide_preferences2.png" width="670" height="373" /></p>
-<p class="figure">Figure 1 -Build preferences window showing Emulator Build Options </p>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
-  <li><a href="SDKPreferences.html">SDK Preferences</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>Unsetting Built-in Environment</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Unsetting Built-in Environment</h2>
+<p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand(&quot;org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage)&quot;)'> Build</a> page in the <b>Preferences</b> window provides an option   to use the local x86 build tools for each emulator build. A directory named x86Build at the root of the product installation contains the build tools, libraries, and <span class="code">env_update.exe</span> file.</p>
+<p>Uncheck the &quot;Use built-in Nokia x86 environment variables for WINSCW builds&quot; option if you do not want to use the built-in compiler.</p>
+<p>Figure 1 shows the <a href="wnd_build_prefs.htm">Build</a> preferences window.</p>
+<p align="center"><img src="images/carbide_preferences2.png" width="670" height="373" /></p>
+<p class="figure">Figure 1 -Build preferences window showing Emulator Build Options </p>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
+  <li><a href="SDKPreferences.html">SDK Preferences</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debugger_prefs.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debugger_prefs.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,60 +1,60 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide.c++ Debugger Preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide.c++ Debugger preferences</h2>
-<p>The <b>Debug</b> &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.cdt.debug.cw.symbian.ui.GlobalSettings)")'>
-Carbide.c++ Debugger</a> preference panel provides global debugger settings for the Carbide.c++ tools. </p>
-<p align="center"><img src="images/panel_global_debugger.png" width="688" height="586" alt="" /></p>
-<p class="figure">Figure 1 - Carbide.c++ Debugger preference panel</p>
-<h5>Table 1. Carbide.c++ Debugger panel&mdash;items </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="35%" scope="col">Item</th>
-    <th width="65%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Attempt to show the dynamic runtime type of objects </b></td>
-    <td>Enable this option to have the debugger deduce the actual type of an object at runtime and display it in the Variables view (applies to <b>x86 only</b>). By default, the debugger does not attempt to determine the type of an object at runtime and will simply show its declared type. Enabling this option can slow the start of a debug session.</td>
-  </tr>
-  <tr>
-    <td><b>Do not step into runtime support code </b></td>
-    <td><p>Select this option to avoid stepping into runtime support code. Runtime support code is generated by the compiler to support C++ features like <span class="code">new</span> and <span class="code">delete</span>. When enabled the debugger  attempts to identify and skip this glue code and step directly into your code. If this option is disabled the debugger steps into this language support code. For example if you are debugging this line of code and step in: </p>
-      <p class="code">MyClass* var = new MyClass(); </p>
-    <p>With this option selected the debugger will skip the code that implements the operator <span class="code">new</span> and step into the constructor for <span class="code">MyClass</span>. If this option is disabled the debugger would step into the code in <span class="code">new</span> that allocates the object.</p></td>
-  </tr>
-  <tr>
-    <td><b>Default size for unbounded arrays </b></td>
-    <td>Enter the number of array objects to display by default. </td>
-  </tr>
-  <tr>
-    <td><b>Find source files outside the SDK </b></td>
-    <td>Enable to have the debugger automatically search for source files outside of the SDK. If disabled, the debugger will only look within the SDK epocroot directory.</td>
-  </tr>
-  <tr>
-    <td><b>Time interval for auto-refreshing OS View</b></td>
-    <td>Determines how often to refresh data in the <a href="view_symbian_kernel.htm">Symbian OS Data</a> view which is available to the developer when using TRK or stop-mode debugging. </td>
-  </tr>
-</table>
-<div class="step">
-  <h4>To access the Carbide.c++ Debugger Preferences</h4>
-  <ol>
-    <li>Select the Window &gt; Preferences menu item<br />
-    <p>The Preferences window (Figure 1) appears. </p></li>
-    <li>Expand the C/C++ and Debug sections</li>
-    <li>Select the Carbide.c++ Debugger item <br />
-    <p>The Carbide.c++ Debugger preference panel appears. </p>
-    </li>
-  </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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Carbide.c++ Debugger Preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Carbide.c++ Debugger preferences</h2>
+<p>The <b>Debug</b> &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.cdt.debug.cw.symbian.ui.GlobalSettings)")'>
+Carbide.c++ Debugger</a> preference panel provides global debugger settings for the Carbide.c++ tools. </p>
+<p align="center"><img src="images/panel_global_debugger.png" width="688" height="586" alt="" /></p>
+<p class="figure">Figure 1 - Carbide.c++ Debugger preference panel</p>
+<h5>Table 1. Carbide.c++ Debugger panel&mdash;items </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="35%" scope="col">Item</th>
+    <th width="65%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Attempt to show the dynamic runtime type of objects </b></td>
+    <td>Enable this option to have the debugger deduce the actual type of an object at runtime and display it in the Variables view (applies to <b>x86 only</b>). By default, the debugger does not attempt to determine the type of an object at runtime and will simply show its declared type. Enabling this option can slow the start of a debug session.</td>
+  </tr>
+  <tr>
+    <td><b>Do not step into runtime support code </b></td>
+    <td><p>Select this option to avoid stepping into runtime support code. Runtime support code is generated by the compiler to support C++ features like <span class="code">new</span> and <span class="code">delete</span>. When enabled the debugger  attempts to identify and skip this glue code and step directly into your code. If this option is disabled the debugger steps into this language support code. For example if you are debugging this line of code and step in: </p>
+      <p class="code">MyClass* var = new MyClass(); </p>
+    <p>With this option selected the debugger will skip the code that implements the operator <span class="code">new</span> and step into the constructor for <span class="code">MyClass</span>. If this option is disabled the debugger would step into the code in <span class="code">new</span> that allocates the object.</p></td>
+  </tr>
+  <tr>
+    <td><b>Default size for unbounded arrays </b></td>
+    <td>Enter the number of array objects to display by default. </td>
+  </tr>
+  <tr>
+    <td><b>Find source files outside the SDK </b></td>
+    <td>Enable to have the debugger automatically search for source files outside of the SDK. If disabled, the debugger will only look within the SDK epocroot directory.</td>
+  </tr>
+  <tr>
+    <td><b>Time interval for auto-refreshing OS View</b></td>
+    <td>Determines how often to refresh data in the <a href="view_symbian_kernel.htm">Symbian OS Data</a> view which is available to the developer when using TRK or stop-mode debugging. </td>
+  </tr>
+</table>
+<div class="step">
+  <h4>To access the Carbide.c++ Debugger Preferences</h4>
+  <ol>
+    <li>Select the Window &gt; Preferences menu item<br />
+    <p>The Preferences window (Figure 1) appears. </p></li>
+    <li>Expand the C/C++ and Debug sections</li>
+    <li>Select the Carbide.c++ Debugger item <br />
+    <p>The Carbide.c++ Debugger preference panel appears. </p>
+    </li>
+  </ol>
+</div>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_diagnostic_logs_pref.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_diagnostic_logs_pref.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -34,7 +34,7 @@
 <ul>
   <li><a href="build_properties/pane_project_settings.htm">Carbide Project 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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_import_bitmaps.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_import_bitmaps.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,58 +1,58 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Import Bitmaps</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Import Bitmaps</h2>
-<p>Use the <b>Import</b>  window to import bitmap resources from the file system. </p>
-<p align="center"><img src="../images/wnd_import_bitmaps.png" width="543" height="584" /></p>
-<p class="figure">Figure 1 - Import Bitmaps window </p>
-<h5>Table 1. Import Bitmaps window&mdash;items </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="34%" scope="col">Item</th>
-    <th width="66%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>From directory </b></td>
-    <td>Path to folder containing bitmaps files to import. Click Browse to choose a different location. </td>
-  </tr>
-  <tr>
-    <td><b>Filter Types... </b></td>
-    <td>Click to open a dialog and select filter options. </td>
-  </tr>
-  <tr>
-    <td><b>Select All </b></td>
-    <td>Click to select all files. </td>
-  </tr>
-  <tr>
-    <td><b>Deselect All </b></td>
-    <td>Click to deselect all files. </td>
-  </tr>
-  <tr>
-    <td><b>Into folder </b></td>
-    <td>Specify the location within the project to store the imported files. </td>
-  </tr>
-  <tr>
-    <td><b>Overwrite existing resources without warning </b></td>
-    <td>Enable to overwrite existing resources using the same names with the new ones being imported. </td>
-  </tr>
-  <tr>
-    <td><b>Create complete folder structure </b></td>
-    <td>Create a duplicate of the system folder structure at the project location set in the Into folder text box. </td>
-  </tr>
-  <tr>
-    <td><b>Create selected folders only </b></td>
-    <td>Create  folder structures at the project location set in the Into folder text box only for the selected folders.</td>
-  </tr>
-</table>
-<h5>&nbsp;</h5>
-<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>Import Bitmaps</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Import Bitmaps</h2>
+<p>Use the <b>Import</b>  window to import bitmap resources from the file system. </p>
+<p align="center"><img src="../images/wnd_import_bitmaps.png" width="543" height="584" /></p>
+<p class="figure">Figure 1 - Import Bitmaps window </p>
+<h5>Table 1. Import Bitmaps window&mdash;items </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="66%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>From directory </b></td>
+    <td>Path to folder containing bitmaps files to import. Click Browse to choose a different location. </td>
+  </tr>
+  <tr>
+    <td><b>Filter Types... </b></td>
+    <td>Click to open a dialog and select filter options. </td>
+  </tr>
+  <tr>
+    <td><b>Select All </b></td>
+    <td>Click to select all files. </td>
+  </tr>
+  <tr>
+    <td><b>Deselect All </b></td>
+    <td>Click to deselect all files. </td>
+  </tr>
+  <tr>
+    <td><b>Into folder </b></td>
+    <td>Specify the location within the project to store the imported files. </td>
+  </tr>
+  <tr>
+    <td><b>Overwrite existing resources without warning </b></td>
+    <td>Enable to overwrite existing resources using the same names with the new ones being imported. </td>
+  </tr>
+  <tr>
+    <td><b>Create complete folder structure </b></td>
+    <td>Create a duplicate of the system folder structure at the project location set in the Into folder text box. </td>
+  </tr>
+  <tr>
+    <td><b>Create selected folders only </b></td>
+    <td>Create  folder structures at the project location set in the Into folder text box only for the selected folders.</td>
+  </tr>
+</table>
+<h5>&nbsp;</h5>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_pref_code_style.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_pref_code_style.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -20,7 +20,7 @@
        <li><a href="../tasks/code_style_workspace.htm">Setting the Workspace Code Style</a> </li>
        <li><a href="../tasks/code_style_reformatting_sources.htm">Reformatting a Source File</a> </li>
    </ul>
-	 <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+	 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
    </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_preprocess_prefs.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_preprocess_prefs.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,46 +1,46 @@
-<!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>Preprocess preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Preprocess preferences</h2>
-<p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.builder.utils.ui.PreprocessPreferencePage)")'> Preprocess</a> page in the <b>Preferences</b> window provides global settings for the Carbide preprocessor. </p>
-<p align="center"><img src="images/prefs_preprocess.png" width="645" height="551" /></p>
-<p class="figure">Figure 1 - Preprocess preferences page </p>
-<h5>Table 1 <span class="figure">Preprocess</span> p references &mdash;items</h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="20%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td width="20%"><b>Send output to the build console </b></td>
-    <td><p>Enable to direct preprocessor output to a console view. </p>
-    </td>
-  </tr>
-  <tr>
-    <td width="20%"><b>Send output to the editor </b></td>
-    <td><p>Enable to direct preprocessor output to an editor. </p>
-    </td>
-  </tr>
-  <tr>
-    <td width="20%"><b>CPP arguments </b></td>
-    <td><p>Enter the preprocessor arguments used by the preprocessor. </p>
-    </td>
-  </tr>
-</table>
-<h5>Other references</h5>
-<ul>
-  <li><a href="../tasks/projects/prj_preprocess.htm">Preprocessing Files</a> </li>
-</ul>
-<p>&nbsp; </p>
-<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>Preprocess preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Preprocess preferences</h2>
+<p>The Carbide.c++ &gt; <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cdt.builder.utils.ui.PreprocessPreferencePage)")'> Preprocess</a> page in the <b>Preferences</b> window provides global settings for the Carbide preprocessor. </p>
+<p align="center"><img src="images/prefs_preprocess.png" width="645" height="551" /></p>
+<p class="figure">Figure 1 - Preprocess preferences page </p>
+<h5>Table 1 <span class="figure">Preprocess</span> p references &mdash;items</h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="20%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td width="20%"><b>Send output to the build console </b></td>
+    <td><p>Enable to direct preprocessor output to a console view. </p>
+    </td>
+  </tr>
+  <tr>
+    <td width="20%"><b>Send output to the editor </b></td>
+    <td><p>Enable to direct preprocessor output to an editor. </p>
+    </td>
+  </tr>
+  <tr>
+    <td width="20%"><b>CPP arguments </b></td>
+    <td><p>Enter the preprocessor arguments used by the preprocessor. </p>
+    </td>
+  </tr>
+</table>
+<h5>Other references</h5>
+<ul>
+  <li><a href="../tasks/projects/prj_preprocess.htm">Preprocessing Files</a> </li>
+</ul>
+<p>&nbsp; </p>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ClassesToc.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ClassesToc.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,17 +1,17 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Classes</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>Classes </h2>
-	 <p>The topics include:</p>
-	 <ul>
-	   <li><a href="AddingClasses.html">Adding Classes </a></li>
-	   <li><a href="ImportingProjects.html">New Class Wizard </a></li>
-	   <li><a href="projects/prj_adding_symbian_class.htm">Adding Symbian OS Class Wizard </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>
+<title>Classes</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>Classes </h2>
+	 <p>The topics include:</p>
+	 <ul>
+	   <li><a href="AddingClasses.html">Adding Classes </a></li>
+	   <li><a href="ImportingProjects.html">New Class Wizard </a></li>
+	   <li><a href="projects/prj_adding_symbian_class.htm">Adding Symbian OS Class Wizard </a></li>
+   </ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ExportingtoMMP_BLDinf.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ExportingtoMMP_BLDinf.html	Fri Apr 16 11:18:22 2010 -0500
@@ -264,7 +264,7 @@
      LIBRARY euser.lib apparc.lib cone.lib eikcore.lib avkon.lib commonengine.lib<br>
      LIBRARY efsrv.lib estor.lib<br>
      /*&amp; END_LINKAGE_INFORMATION &amp;*/</p>
-   <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </code></code></code></code></code></code></body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html	Fri Apr 16 11:18:22 2010 -0500
@@ -121,7 +121,7 @@
          <li><a href="../reference/ProjectPreferences.html">Project Preferences</a></li>
          <li><a href="../reference/ProjectTypeandSDK.html">Project Types </a></li>
        </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
    </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ModifyingResources.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ModifyingResources.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,32 +1,32 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Modifying Resources in Tasks</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-   </head>
-   <body>
-   <div class="Head1">
-<h2>Modifying Resources</h2>
-</div><div class="Bodytext"> 
-  
-
-  <p>
-	 This section describes the steps for adding and modifying resources of an
-	 existing project. The resources may be a bitmap resource (MBM) or an
-	 application information file (AIF) definition file.
-  </p>
-  <p>
-	 Note that the Symbian OS plug-ins do not provide a graphical editor for the
-	 Symbian OS resource (.rss) file format. Files of this type though
-	 can be created and edited as text files. Any .rss files in a project are built using the Symbian OS
-  resource compiler.</p>
-  <ul>
-<li><a href="Multi-BitmapFile.html">Creating an MBM File</a></li>
-<li><a href="AppInfoFile.html">Creating an AIF File</a></li>
-</ul>
-
-
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-   </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Modifying Resources in Tasks</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+   </head>
+   <body>
+   <div class="Head1">
+<h2>Modifying Resources</h2>
+</div><div class="Bodytext"> 
+  
+
+  <p>
+	 This section describes the steps for adding and modifying resources of an
+	 existing project. The resources may be a bitmap resource (MBM) or an
+	 application information file (AIF) definition file.
+  </p>
+  <p>
+	 Note that the Symbian OS plug-ins do not provide a graphical editor for the
+	 Symbian OS resource (.rss) file format. Files of this type though
+	 can be created and edited as text files. Any .rss files in a project are built using the Symbian OS
+  resource compiler.</p>
+  <ul>
+<li><a href="Multi-BitmapFile.html">Creating an MBM File</a></li>
+<li><a href="AppInfoFile.html">Creating an AIF File</a></li>
+</ul>
+
+
+</div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/Multi-BitmapFile.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/Multi-BitmapFile.html	Fri Apr 16 11:18:22 2010 -0500
@@ -36,7 +36,7 @@
 	   <ul>
      <li><a href="../concepts/MBMDefWizard.html">MBM File</a> </li>
    </ul>
-   <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
    </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/RmvngandVwngPropsosSDK.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/RmvngandVwngPropsosSDK.html	Fri Apr 16 11:18:22 2010 -0500
@@ -41,7 +41,7 @@
 <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
 <li><a href="sdks/sdk_view_properties.htm">SDK Properties</a></li>
    </ul>
-	 <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+	 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
    </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/RunModeToc.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/RunModeToc.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Run Mode Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>Run Mode Projects </h2>
-	 <p>The topics include:</p>
-	 <ul>
-	   <li><a href="start/carbide_example_trk.htm">Run Mode Debug Example (Application TRK) </a></li>
-	   <li><a href="trk/trk_troubleshooting.htm">Troubleshooting</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>
+<title>Run Mode Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>Run Mode Projects </h2>
+	 <p>The topics include:</p>
+	 <ul>
+	   <li><a href="start/carbide_example_trk.htm">Run Mode Debug Example (Application TRK) </a></li>
+	   <li><a href="trk/trk_troubleshooting.htm">Troubleshooting</a></li>
+   </ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/StopModeToc.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/StopModeToc.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,18 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Stop Mode Projects</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>Stop Mode Projects </h2>
-	 <p>The topics include:</p>
-	 <ul>
-	   <li><a href="debugger/stop_mode_debug.htm">Stop Mode Debug Example </a></li>
-	   <li><a href="../reference/ROM_build_settings.html">Building a ROM Image File</a></li>
-       <li><a href="../concepts/arm_registers.htm">ARM Registers</a></li>
-       <li><a href="../reference/view_symbian_kernel.htm">Symbian OS Data 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>
+<title>Stop Mode Projects</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>Stop Mode Projects </h2>
+	 <p>The topics include:</p>
+	 <ul>
+	   <li><a href="debugger/stop_mode_debug.htm">Stop Mode Debug Example </a></li>
+	   <li><a href="../reference/ROM_build_settings.html">Building a ROM Image File</a></li>
+       <li><a href="../concepts/arm_registers.htm">ARM Registers</a></li>
+       <li><a href="../reference/view_symbian_kernel.htm">Symbian OS Data View  </a></li>
+   </ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/WorkingwithSDKs.html	Fri Apr 16 11:18:22 2010 -0500
@@ -21,7 +21,7 @@
     <li><a href="../tasks/RmvngandVwngPropsosSDK.html">Editing SDK Properties</a></li>
     <li><a href="sdks/sdk_add_custkits.htm">Adding Symbian Custom Kits</a></li>
    </ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
    </body>
    </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/WritingCode.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/WritingCode.html	Fri Apr 16 11:18:22 2010 -0500
@@ -1,24 +1,24 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Writing Code in Tasks</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-   </head>
-   <body>
-   <h2>Writing Code</h2>
-   <div class="Bodytext"> 
-  
-
-  <p>
-	 This section explains how to work with Symbian OS C++ projects with the
-	 help of the tools provided. 
-  </p>
-  <ul>
-<li><a href="ModifyingResources.html">Modifying Resources</a></li>
-</ul>
-
-</div>
-
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-   </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Writing Code in Tasks</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+   </head>
+   <body>
+   <h2>Writing Code</h2>
+   <div class="Bodytext"> 
+  
+
+  <p>
+	 This section explains how to work with Symbian OS C++ projects with the
+	 help of the tools provided. 
+  </p>
+  <ul>
+<li><a href="ModifyingResources.html">Modifying Resources</a></li>
+</ul>
+
+</div>
+
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_clearing.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_clearing.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,74 +1,74 @@
-<!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>Removing Breakpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Removing Breakpoints</h2>
-<p>You can remove one or more breakpoints set for a debug session using the <a href="../../reference/view_breakpoints.htm">Breakpoints</a>, <a href="../../reference/view_disassembly.htm">Disassembly</a>, or  editor views.</p>
-<div class="step">
-  <h4>Removing a Breakpoint</h4>
-  <ol>
-    <li>To remove a breakpoint in the Breakpoints view:
-      <ul>
-        <li>Right-click the breakpoint, click Remove </li>
-      </ul>
-    </li>
-    <ul>
-      <p>OR</p>
-          <li>Click the Remove Selected Breakpoints (<img src="../../images/icons/breakpoints_remove_one_icon.png" align="absmiddle" />) button</li>
-    </ul>
-    <li>To remove a breakpoint in an editor  or  Disassembly views:</li>
-      <ul>
-        <li>Double-click the breakpoint dot in the marker bar</li>
-          <p>
-            OR          </p>
-            <li>Select the source line with the breakpoint, click Run &gt; Toggle Line Breakpoint</li>
-            <p>OR </p>
-            <li>Right-click the breakpoint dot in the marker bar and select Toggle Breakpoint</li>
-    </ul>
-<p>The breakpoint disappears in the Breakpoints view.</p>
-  </ol>
-
-  <h4>Removing all Breakpoints</h4>
-  <ol>
-    <li>To remove all breakpoints in the Breakpoints view:
-      <ul>
-        <li>Right-click a breakpoint, click Remove All</li>
-      </ul>
-    </li>
-    <ul>
-      <p>OR</p>
-          <li>Click the Remove All Breakpoints (<img src="../../images/icons/breakpoints_remove_all_icon.png" width="21" height="19" align="absmiddle" />)  button</li>
-    </ul>
-    <li>To remove all breakpoint in an editor  or  Disassembly views:
-      <ul>
-        <li>Click the Run &gt; Remove all Breakpoints menu item</li>
-      </ul>
-    </li>
-    <p>All the  breakpoints disappear in the Breakpoints, Disassembly, and editor views.</p>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="pgm_bp_setting.htm">Setting Breakpoints</a></li>
-    <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-    <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-</ul>
-  <h5>Related references</h5>
-  <ul>
-    <li><a href="../../reference/perspective_debug.htm">Debug Perspective </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>Removing Breakpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Removing Breakpoints</h2>
+<p>You can remove one or more breakpoints set for a debug session using the <a href="../../reference/view_breakpoints.htm">Breakpoints</a>, <a href="../../reference/view_disassembly.htm">Disassembly</a>, or  editor views.</p>
+<div class="step">
+  <h4>Removing a Breakpoint</h4>
+  <ol>
+    <li>To remove a breakpoint in the Breakpoints view:
+      <ul>
+        <li>Right-click the breakpoint, click Remove </li>
+      </ul>
+    </li>
+    <ul>
+      <p>OR</p>
+          <li>Click the Remove Selected Breakpoints (<img src="../../images/icons/breakpoints_remove_one_icon.png" align="absmiddle" />) button</li>
+    </ul>
+    <li>To remove a breakpoint in an editor  or  Disassembly views:</li>
+      <ul>
+        <li>Double-click the breakpoint dot in the marker bar</li>
+          <p>
+            OR          </p>
+            <li>Select the source line with the breakpoint, click Run &gt; Toggle Line Breakpoint</li>
+            <p>OR </p>
+            <li>Right-click the breakpoint dot in the marker bar and select Toggle Breakpoint</li>
+    </ul>
+<p>The breakpoint disappears in the Breakpoints view.</p>
+  </ol>
+
+  <h4>Removing all Breakpoints</h4>
+  <ol>
+    <li>To remove all breakpoints in the Breakpoints view:
+      <ul>
+        <li>Right-click a breakpoint, click Remove All</li>
+      </ul>
+    </li>
+    <ul>
+      <p>OR</p>
+          <li>Click the Remove All Breakpoints (<img src="../../images/icons/breakpoints_remove_all_icon.png" width="21" height="19" align="absmiddle" />)  button</li>
+    </ul>
+    <li>To remove all breakpoint in an editor  or  Disassembly views:
+      <ul>
+        <li>Click the Run &gt; Remove all Breakpoints menu item</li>
+      </ul>
+    </li>
+    <p>All the  breakpoints disappear in the Breakpoints, Disassembly, and editor views.</p>
+  </ol>
+</div>
+<h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="pgm_bp_setting.htm">Setting Breakpoints</a></li>
+    <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+    <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+</ul>
+  <h5>Related references</h5>
+  <ul>
+    <li><a href="../../reference/perspective_debug.htm">Debug Perspective </a></li>
+</ul>
+
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_conditional.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_conditional.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,57 +1,57 @@
-<!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>Setting Conditional Breakpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting Conditional Breakpoints or Watchpoints </h2>
-<p>You create a conditional (temporary) breakpoint or watchpoint in the<b> Properties for C/C++ breakpoint </b>dialog. Right-click a breakpoint or watchpoint in the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view, then select <b>Properties</b> from the context menu. A conditional breakpoint or watchpoint has an associated conditional expression.  The debugger evaluates the expression to determine whether to halt program execution at that breakpoint.</p>
-<p>A conditional breakpoint or watchpoint behaves in two different ways:</p>
-<ul>
-  <li>If the expression evaluates to <span class="code">true</span> (a non-zero value), the debugger halts program execution.</li>
-  <li>If the expression evaluates to <span class="code">false</span> (a zero value), program execution continues without stopping.</li>
-</ul>
-<p align="center"><img src="images/wnd_breakpoint_properties.png" width="581" height="540" /></p>
-<p class="figure"><span class="figure">Figure 1 </span><b>Properties for C/C++ - breakpoint</b> window </p>
-<div class="step">
-  <h4>To set a conditional breakpoint</h4>
-  <ol>
-    <li>Find the breakpoint or watchpoint in the Breakpoints view
-      <ul>
-        <li>If the breakpoint is  already set, then continue</li>
-        <li>If the breakpoint is not set, set it in the source code now </li>
-      </ul>
-    </li>
-    <li>Right-click the breakpoint and select Properties on the  context menu </li>
-    <p>The <b>Properties for C/C++ - breakpoint</b> dialog appears (Figure 1). The Common panel is shown by default. </p>
-    <li>Enter an condition in the Condition text box</li>
-    <p>When entering a condition use the format: <span class="code">Variable &lt;operator&gt; value</span>. For example, <span class="code">iCount == 5</span>. </p>
-     <li>Enter an ignore count value in the Ignore count text box (optional) </li>
-     <p>The Ignore count specifies how many times the breakpoint or watchpoint hits the condition before execution stops. The default setting is zero, which means  the first time the breakpoint is hit, execution halts. For example, to stop at the breakpoint on the second time it is hit, enter an Ignore count of 1. </p>
-   <li>Click OK </li>
-    <p>During subsequent debugging sessions, the debugger evaluates the expression to determine whether to halt program execution at the conditional breakpoint.</p>
-  </ol>
-</div>
-<p>For more information on marker bar icons, see <b>C/C++ Development User Guide &gt; Concepts &gt; Debug &gt; Breakpoints</b>.</p>
-<h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="pgm_bp_setting.htm">Setting Breakpoints</a></li>
-    <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-    <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
-  </ul>
-  <h5>Related references </h5>
-  <ul>
-    <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li></ul>
-
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!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>Setting Conditional Breakpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setting Conditional Breakpoints or Watchpoints </h2>
+<p>You create a conditional (temporary) breakpoint or watchpoint in the<b> Properties for C/C++ breakpoint </b>dialog. Right-click a breakpoint or watchpoint in the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view, then select <b>Properties</b> from the context menu. A conditional breakpoint or watchpoint has an associated conditional expression.  The debugger evaluates the expression to determine whether to halt program execution at that breakpoint.</p>
+<p>A conditional breakpoint or watchpoint behaves in two different ways:</p>
+<ul>
+  <li>If the expression evaluates to <span class="code">true</span> (a non-zero value), the debugger halts program execution.</li>
+  <li>If the expression evaluates to <span class="code">false</span> (a zero value), program execution continues without stopping.</li>
+</ul>
+<p align="center"><img src="images/wnd_breakpoint_properties.png" width="581" height="540" /></p>
+<p class="figure"><span class="figure">Figure 1 </span><b>Properties for C/C++ - breakpoint</b> window </p>
+<div class="step">
+  <h4>To set a conditional breakpoint</h4>
+  <ol>
+    <li>Find the breakpoint or watchpoint in the Breakpoints view
+      <ul>
+        <li>If the breakpoint is  already set, then continue</li>
+        <li>If the breakpoint is not set, set it in the source code now </li>
+      </ul>
+    </li>
+    <li>Right-click the breakpoint and select Properties on the  context menu </li>
+    <p>The <b>Properties for C/C++ - breakpoint</b> dialog appears (Figure 1). The Common panel is shown by default. </p>
+    <li>Enter an condition in the Condition text box</li>
+    <p>When entering a condition use the format: <span class="code">Variable &lt;operator&gt; value</span>. For example, <span class="code">iCount == 5</span>. </p>
+     <li>Enter an ignore count value in the Ignore count text box (optional) </li>
+     <p>The Ignore count specifies how many times the breakpoint or watchpoint hits the condition before execution stops. The default setting is zero, which means  the first time the breakpoint is hit, execution halts. For example, to stop at the breakpoint on the second time it is hit, enter an Ignore count of 1. </p>
+   <li>Click OK </li>
+    <p>During subsequent debugging sessions, the debugger evaluates the expression to determine whether to halt program execution at the conditional breakpoint.</p>
+  </ol>
+</div>
+<p>For more information on marker bar icons, see <b>C/C++ Development User Guide &gt; Concepts &gt; Debug &gt; Breakpoints</b>.</p>
+<h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="pgm_bp_setting.htm">Setting Breakpoints</a></li>
+    <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+    <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
+  </ul>
+  <h5>Related references </h5>
+  <ul>
+    <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li></ul>
+
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_disable.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_disable.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,48 +1,48 @@
-<!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>Disabling Breakpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Disabling Breakpoints</h2>
-<p>Disable a breakpoint to prevent it from affecting program execution. The disabled breakpoint remains at the source-code line at which you set it, so that you can enable it later. Disabling the breakpoint is easier than clearing it and re-creating it from scratch.</p>
-<p>Figure 1 shows some source code and the selected line shows the breakpoint icon that appears in the marker bar when a breakpoint is disabled.</p>
-<p align="center"><img src="images/breakpoints_marker_bar_disabled.png" width="587" height="234" /></p>
-<p class="figure">Figure 1 - Disabling breakpoints</p>
-<div class="step">
-  <h4>Disabling a Breakpoint</h4>
-  <ul>
-    <li>In the Breakpoints view, uncheck  the checkbox next to the breakpoint</li>
-  </ul>
-  <blockquote>
-    <p>or</p>
-  </blockquote>
-  <ul>
-    <li>In an editor or Disassembly view, right-click the breakpoint in the marker bar and select Disable Breakpoint </li>
-  </ul>
-  <ul><p>The enabled breakpoint dot (<img src="../../images/icons/breakpoints_enabled_icon.png" width="15" height="12" />) changes to a disabled breakpoint dot (<img src="../../images/icons/breakpoints_disabled_icon.png" width="15" height="12" />). The disabled breakpoint dot indicates that the breakpoint does not halt program execution.</p>
-    </ul>
-</div>
-<p>For more information on breakpoints, see <b>C/C++ Development User Guide &gt; Concepts &gt; Debug &gt; Breakpoints</b>.</p>
-  <h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="pgm_bp_setting.htm">Setting Breakpoints</a></li>
-    <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-    <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
-  </ul>
-  <h5>Related references </h5>
-  <ul>
-    <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
-  </ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!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>Disabling Breakpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Disabling Breakpoints</h2>
+<p>Disable a breakpoint to prevent it from affecting program execution. The disabled breakpoint remains at the source-code line at which you set it, so that you can enable it later. Disabling the breakpoint is easier than clearing it and re-creating it from scratch.</p>
+<p>Figure 1 shows some source code and the selected line shows the breakpoint icon that appears in the marker bar when a breakpoint is disabled.</p>
+<p align="center"><img src="images/breakpoints_marker_bar_disabled.png" width="587" height="234" /></p>
+<p class="figure">Figure 1 - Disabling breakpoints</p>
+<div class="step">
+  <h4>Disabling a Breakpoint</h4>
+  <ul>
+    <li>In the Breakpoints view, uncheck  the checkbox next to the breakpoint</li>
+  </ul>
+  <blockquote>
+    <p>or</p>
+  </blockquote>
+  <ul>
+    <li>In an editor or Disassembly view, right-click the breakpoint in the marker bar and select Disable Breakpoint </li>
+  </ul>
+  <ul><p>The enabled breakpoint dot (<img src="../../images/icons/breakpoints_enabled_icon.png" width="15" height="12" />) changes to a disabled breakpoint dot (<img src="../../images/icons/breakpoints_disabled_icon.png" width="15" height="12" />). The disabled breakpoint dot indicates that the breakpoint does not halt program execution.</p>
+    </ul>
+</div>
+<p>For more information on breakpoints, see <b>C/C++ Development User Guide &gt; Concepts &gt; Debug &gt; Breakpoints</b>.</p>
+  <h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="pgm_bp_setting.htm">Setting Breakpoints</a></li>
+    <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+    <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
+  </ul>
+  <h5>Related references </h5>
+  <ul>
+    <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
+  </ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_enable.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_enable.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,49 +1,49 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Enabling Breakpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Enabling Breakpoints</h2>
-<p>Enable a breakpoint to have it halt program execution at the specific line in the source file. You can set a breakpoint using  the <a href="../../reference/view_breakpoints.htm">Breakpoints</a>, <a href="../../reference/view_disassembly.htm">Disassembly</a>, or  editor views. An enabled breakpoint must still be <a href="../../concepts/breakpoints.htm">resolved</a> during a debug session before it can halt program execution. Enabling a breakpoint that you previously disabled is easier than clearing it and re-creating it from scratch. </p>
-Figure 1 shows some source code and the selected line shows the breakpoint icon that appears in the marker bar when a breakpoint is enabled.
-<p align="center"><img src="images/breakpoints_marker_bar.png" width="582" height="230" alt="" /></p>
-<p class="figure">Figure 1 - Enabling breakpoint</p>
-<div class="step">
-  <h4>Enabling a Breakpoint</h4>
-  <ul>
-    <li>In the Breakpoints view, place a check in the checkbox next to the breakpoint</li>
-  </ul>
-  <blockquote>
-    <p>or</p>
-  </blockquote>
-  <ul>
-    <li>In an editor view, right-click the breakpoint in the marker bar and select Enable Breakpoint </li>
-  </ul>
-  <blockquote>
-    <p>If the source line has a breakpoint, the disabled breakpoint dot (<img src="images/breakpoints_disabled_icon.png" width="12" height="11" alt="" />) changes to an enabled breakpoint dot (<img src="images/breakpoints_enabled_icon.png" width="9" height="10" alt="" />). The enabled breakpoint  indicates that the breakpoint, if resolved, will halt program execution.</p>
-  </blockquote>
-</div>
-<p>For more information on breakpoints, see <b>C/C++ Development User Guide &gt; Concepts &gt; Debug &gt; Breakpoints</b>.</p>
-  <h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="pgm_bp_setting.htm">Setting Breakpoints</a></li>
-    <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-    <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
-  </ul>
-  <h5>Related references </h5>
-  <ul>
-    <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
-  </ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!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>Enabling Breakpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Enabling Breakpoints</h2>
+<p>Enable a breakpoint to have it halt program execution at the specific line in the source file. You can set a breakpoint using  the <a href="../../reference/view_breakpoints.htm">Breakpoints</a>, <a href="../../reference/view_disassembly.htm">Disassembly</a>, or  editor views. An enabled breakpoint must still be <a href="../../concepts/breakpoints.htm">resolved</a> during a debug session before it can halt program execution. Enabling a breakpoint that you previously disabled is easier than clearing it and re-creating it from scratch. </p>
+Figure 1 shows some source code and the selected line shows the breakpoint icon that appears in the marker bar when a breakpoint is enabled.
+<p align="center"><img src="images/breakpoints_marker_bar.png" width="582" height="230" alt="" /></p>
+<p class="figure">Figure 1 - Enabling breakpoint</p>
+<div class="step">
+  <h4>Enabling a Breakpoint</h4>
+  <ul>
+    <li>In the Breakpoints view, place a check in the checkbox next to the breakpoint</li>
+  </ul>
+  <blockquote>
+    <p>or</p>
+  </blockquote>
+  <ul>
+    <li>In an editor view, right-click the breakpoint in the marker bar and select Enable Breakpoint </li>
+  </ul>
+  <blockquote>
+    <p>If the source line has a breakpoint, the disabled breakpoint dot (<img src="images/breakpoints_disabled_icon.png" width="12" height="11" alt="" />) changes to an enabled breakpoint dot (<img src="images/breakpoints_enabled_icon.png" width="9" height="10" alt="" />). The enabled breakpoint  indicates that the breakpoint, if resolved, will halt program execution.</p>
+  </blockquote>
+</div>
+<p>For more information on breakpoints, see <b>C/C++ Development User Guide &gt; Concepts &gt; Debug &gt; Breakpoints</b>.</p>
+  <h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="pgm_bp_setting.htm">Setting Breakpoints</a></li>
+    <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+    <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
+  </ul>
+  <h5>Related references </h5>
+  <ul>
+    <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
+  </ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_exporting.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_exporting.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,74 +1,74 @@
-<!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>Exporting Breakpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Exporting Breakpoints</h2>
-<p>Use the <b>Export Breakpoints</b> command to export selected breakpoints to a breakpoints file with a .bkpt extension. All breakpoints set in the source files of all  projects in your current workspace will be listed in the Export Breakpoints window.</p>
-<p>The  <b>Export Breakpoints</b> wizard shown in Figure 1 helps you to export breakpoints from your project's source files.</p>
-<p align="center"><img src="images/wnd_export_breakpoint.png" width="442" height="483" /></p>
-<p class="figure">Figure 1 - Export Breakpoints window </p>
-<table cellspacing="0" cellpadding="5" summary="Import breakpoints page" border="1">
-  <tbody>
-    <tr>
-      <th>Option</th>
-      <th>Description</th>
-      <th>Default</th>
-    </tr>
-    <tr>
-      <td valign="top" align="left"><b>Breakpoint List</b></td>
-      <td valign="top" align="left">Select the breakpoints that you wish to export, and deselect those that you do not. </td>
-      <td valign="top" align="left"><p>not selected </p>
-      </td>
-    </tr>
-    <tr>
-      <td valign="top"><b>To file </b></td>
-      <td valign="top">The file to export the breakpoints to, you can also click <b>Browse...</b> to search for a location to export. </td>
-      <td valign="top"><p><b>There can be two possible defaults:</b></p>
-          <p>If you have never exported breakpoints before it will be blank</p>
-          <p>If you have exported breakpoints before the last file name you exported to will be automatically inserted. </p></td>
-    </tr>
-    <tr>
-      <td valign="top"><b>Overwrite existing file without warning</b></td>
-      <td valign="top"><dl>
-          <dt><b> </b>When selected, if the file you wish to export to already exists, it will be overwritten automatically by the wizard. </dt>
-          </dl></td>
-      <td valign="top">not selected </td>
-    </tr>
-  </tbody>
-</table>
-<div class="step">
-  <h4>Exporting  Breakpoints</h4>
-  <ul>
-    <li>Select File &gt; Export... then select Breakpoints from the General group </li>
-  </ul>
-  <blockquote>
-    <p>or</p>
-  </blockquote>
-  <ul>
-    <li>Right-click in the Breakpoints view and select Export Breakpoints... </li>
-  </ul>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-  <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-  <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!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>Exporting Breakpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Exporting Breakpoints</h2>
+<p>Use the <b>Export Breakpoints</b> command to export selected breakpoints to a breakpoints file with a .bkpt extension. All breakpoints set in the source files of all  projects in your current workspace will be listed in the Export Breakpoints window.</p>
+<p>The  <b>Export Breakpoints</b> wizard shown in Figure 1 helps you to export breakpoints from your project's source files.</p>
+<p align="center"><img src="images/wnd_export_breakpoint.png" width="442" height="483" /></p>
+<p class="figure">Figure 1 - Export Breakpoints window </p>
+<table cellspacing="0" cellpadding="5" summary="Import breakpoints page" border="1">
+  <tbody>
+    <tr>
+      <th>Option</th>
+      <th>Description</th>
+      <th>Default</th>
+    </tr>
+    <tr>
+      <td valign="top" align="left"><b>Breakpoint List</b></td>
+      <td valign="top" align="left">Select the breakpoints that you wish to export, and deselect those that you do not. </td>
+      <td valign="top" align="left"><p>not selected </p>
+      </td>
+    </tr>
+    <tr>
+      <td valign="top"><b>To file </b></td>
+      <td valign="top">The file to export the breakpoints to, you can also click <b>Browse...</b> to search for a location to export. </td>
+      <td valign="top"><p><b>There can be two possible defaults:</b></p>
+          <p>If you have never exported breakpoints before it will be blank</p>
+          <p>If you have exported breakpoints before the last file name you exported to will be automatically inserted. </p></td>
+    </tr>
+    <tr>
+      <td valign="top"><b>Overwrite existing file without warning</b></td>
+      <td valign="top"><dl>
+          <dt><b> </b>When selected, if the file you wish to export to already exists, it will be overwritten automatically by the wizard. </dt>
+          </dl></td>
+      <td valign="top">not selected </td>
+    </tr>
+  </tbody>
+</table>
+<div class="step">
+  <h4>Exporting  Breakpoints</h4>
+  <ul>
+    <li>Select File &gt; Export... then select Breakpoints from the General group </li>
+  </ul>
+  <blockquote>
+    <p>or</p>
+  </blockquote>
+  <ul>
+    <li>Right-click in the Breakpoints view and select Export Breakpoints... </li>
+  </ul>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+  <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+  <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
+</ul>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_importing.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_importing.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,72 +1,72 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Importing Breakpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Importing Breakpoints</h2>
-<p>Use the <b>Import Breakpoints</b> command to import breakpoints previously exported and saved to a breakpoints file (.bkpt). The  <b>Import Breakpoints</b> wizard helps you to import breakpoints from a file.</p>
-<p>Figure 1 shows the Import Breakpoints window. </p>
-<p align="center"><img src="images/wnd_import_breakpoint.png" width="470" height="338" /></p>
-<p class="figure">Figure 1 - Importing Breakpoints</p>
-<p>&nbsp;</p>
-<table cellspacing="0" cellpadding="5" summary="Import breakpoints page" border="1">
-  <tbody>
-    <tr>
-      <th>Option</th>
-      <th>Description</th>
-    </tr>
-    <tr>
-      <td valign="top" align="left"><b>From file </b></td>
-      <td valign="top" align="left">Type the name of the file to import from, or click the <b>Browse...</b> button to search for a breakpoints file.</td>
-    </tr>
-    <tr>
-      <td valign="top"><b>Automatically update existing breakpoints</b></td>
-      <td valign="top"><dl>
-          <dt>When selected, any breakpoints that already exist in your workspace will be overwritten by those being imported from the file.</dt>
-          </dl>
-      </td>
-    </tr>
-    <tr>
-      <td valign="top"><b>Automatically create breakpoint working sets</b></td>
-      <td valign="top"><dl>
-          <dt>When selected, if an imported breakpoint indicates it belongs to a working set that does not exist in your workspace, the working set will be created for you and the breakpoint added to it.</dt>
-          </dl>
-      </td>
-    </tr>
-  </tbody>
-</table>
-<div class="step">
-  <h4>Importing  Breakpoints</h4>
-  <ul>
-    <li>Select File &gt; Import... and then select Breakpoints in the General group </li>
-  </ul>
-  <blockquote>
-    <p>or</p>
-  </blockquote>
-  <ul>
-    <li>Right-click in the Breakpoints view and select Import Breakpoints... </li>
-  </ul>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-  <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-  <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Importing Breakpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Importing Breakpoints</h2>
+<p>Use the <b>Import Breakpoints</b> command to import breakpoints previously exported and saved to a breakpoints file (.bkpt). The  <b>Import Breakpoints</b> wizard helps you to import breakpoints from a file.</p>
+<p>Figure 1 shows the Import Breakpoints window. </p>
+<p align="center"><img src="images/wnd_import_breakpoint.png" width="470" height="338" /></p>
+<p class="figure">Figure 1 - Importing Breakpoints</p>
+<p>&nbsp;</p>
+<table cellspacing="0" cellpadding="5" summary="Import breakpoints page" border="1">
+  <tbody>
+    <tr>
+      <th>Option</th>
+      <th>Description</th>
+    </tr>
+    <tr>
+      <td valign="top" align="left"><b>From file </b></td>
+      <td valign="top" align="left">Type the name of the file to import from, or click the <b>Browse...</b> button to search for a breakpoints file.</td>
+    </tr>
+    <tr>
+      <td valign="top"><b>Automatically update existing breakpoints</b></td>
+      <td valign="top"><dl>
+          <dt>When selected, any breakpoints that already exist in your workspace will be overwritten by those being imported from the file.</dt>
+          </dl>
+      </td>
+    </tr>
+    <tr>
+      <td valign="top"><b>Automatically create breakpoint working sets</b></td>
+      <td valign="top"><dl>
+          <dt>When selected, if an imported breakpoint indicates it belongs to a working set that does not exist in your workspace, the working set will be created for you and the breakpoint added to it.</dt>
+          </dl>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<div class="step">
+  <h4>Importing  Breakpoints</h4>
+  <ul>
+    <li>Select File &gt; Import... and then select Breakpoints in the General group </li>
+  </ul>
+  <blockquote>
+    <p>or</p>
+  </blockquote>
+  <ul>
+    <li>Right-click in the Breakpoints view and select Import Breakpoints... </li>
+  </ul>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+  <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+  <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
+</ul>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_setting.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_setting.htm	Fri Apr 16 11:18:22 2010 -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>Setting Breakpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting Breakpoints</h2>
-<p>Use the <b>Set Breakpoint</b> command (<span class="code">Ctrl+Shift+B</span>) to set a breakpoint. A regular breakpoint suspends program execution. The debugger executes the line of source code that contains the regular breakpoint.</p>
-<p class="note"><strong>TIP</strong> If you find that a breakpoint is not being hit, verify that the EXE or DLL is listed in the <a href="../../reference/view_executables.htm">Executables</a> view. </p>
-<p class="note"><strong>TIP</strong> If debugging a server launched by a client, you must attach to the server  process using the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view in order to hit the breakpoints in the server. Alternately, you can launch the server and  client as two independent EXEs using the same COM port and debug them that way. </p>
-<p>Figure 1 shows some source code and the marker bar to the left of the source code. The selected line shows the breakpoint dot that appears in the marker bar when a breakpoint is set.</p>
-<p align="center"><img src="images/breakpoints_marker_bar.png" width="582" height="230" /></p>
-<p class="figure">Figure 1 - Setting Breakpoints in an editor view </p>
-<div class="step">
-  <h4>Setting a Breakpoint in Editor or Disassembly Views</h4>
-  <ul>
-    <li>Double-click the marker bar to the left of the line of code where you want to place a breakpoint </li>
-  </ul>
-  <blockquote>
-    <p>or</p>
-  </blockquote>
-  <ul>
-    <li>Right-click in the marker bar and select Toggle  Breakpoint</li>
-  </ul>
-  <blockquote>
-    <p>or</p>
-  </blockquote>
-  <ul>
-    <li>Click on the line of code and select Run &gt;  Toggle   Breakpoint from the program menu bar </li>
-  </ul>
-  <blockquote>
-    <p>or</p>
-  </blockquote>
-  <ul>
-    <li>While selecting a line, press Ctrl+Shift+B  </li>
-    <p>The active breakpoint dot appears (<img src="images/breakpoints_enabled_icon.png" width="9" height="10" />) in the marker bar. If the breakpoint is  <a href="../../concepts/breakpoints.htm">resolved</a> during the debug session,  the debugger halts program execution at the line with the resolved breakpoint (<img src="../../images/icons/breakpoints_enabled_icon.png" width="15" height="12" />).</p>
-<p class="note"><span class="note"><b>NOTE</b> Setting a breakpoint in a file affects execution of all build targets that include that file.</span></p>
-  </ul>
-</div>
-<p>For more information on breakpoints, see <b>C/C++ Development User Guide &gt; Concepts &gt; Debug &gt; Breakpoints</b>.</p>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-  <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-  <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!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>Setting Breakpoints</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setting Breakpoints</h2>
+<p>Use the <b>Set Breakpoint</b> command (<span class="code">Ctrl+Shift+B</span>) to set a breakpoint. A regular breakpoint suspends program execution. The debugger executes the line of source code that contains the regular breakpoint.</p>
+<p class="note"><strong>TIP</strong> If you find that a breakpoint is not being hit, verify that the EXE or DLL is listed in the <a href="../../reference/view_executables.htm">Executables</a> view. </p>
+<p class="note"><strong>TIP</strong> If debugging a server launched by a client, you must attach to the server  process using the <a href="../../reference/view_symbian_kernel.htm">Symbian OS Data</a> view in order to hit the breakpoints in the server. Alternately, you can launch the server and  client as two independent EXEs using the same COM port and debug them that way. </p>
+<p>Figure 1 shows some source code and the marker bar to the left of the source code. The selected line shows the breakpoint dot that appears in the marker bar when a breakpoint is set.</p>
+<p align="center"><img src="images/breakpoints_marker_bar.png" width="582" height="230" /></p>
+<p class="figure">Figure 1 - Setting Breakpoints in an editor view </p>
+<div class="step">
+  <h4>Setting a Breakpoint in Editor or Disassembly Views</h4>
+  <ul>
+    <li>Double-click the marker bar to the left of the line of code where you want to place a breakpoint </li>
+  </ul>
+  <blockquote>
+    <p>or</p>
+  </blockquote>
+  <ul>
+    <li>Right-click in the marker bar and select Toggle  Breakpoint</li>
+  </ul>
+  <blockquote>
+    <p>or</p>
+  </blockquote>
+  <ul>
+    <li>Click on the line of code and select Run &gt;  Toggle   Breakpoint from the program menu bar </li>
+  </ul>
+  <blockquote>
+    <p>or</p>
+  </blockquote>
+  <ul>
+    <li>While selecting a line, press Ctrl+Shift+B  </li>
+    <p>The active breakpoint dot appears (<img src="images/breakpoints_enabled_icon.png" width="9" height="10" />) in the marker bar. If the breakpoint is  <a href="../../concepts/breakpoints.htm">resolved</a> during the debug session,  the debugger halts program execution at the line with the resolved breakpoint (<img src="../../images/icons/breakpoints_enabled_icon.png" width="15" height="12" />).</p>
+<p class="note"><span class="note"><b>NOTE</b> Setting a breakpoint in a file affects execution of all build targets that include that file.</span></p>
+  </ul>
+</div>
+<p>For more information on breakpoints, see <b>C/C++ Development User Guide &gt; Concepts &gt; Debug &gt; Breakpoints</b>.</p>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+  <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+  <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
+</ul>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_temporary.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_temporary.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,47 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Setting a Temporary Breakpoint</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting a Temporary Breakpoint</h2>
-<p>Use the Temporary Breakpoint command to set temporary breakpoints. Unlike a regular breakpoint that halts execution each time you debug a project, a temporary breakpoint halts execution only once. The debugger removes the temporary breakpoint after halting program execution. </p>
-<div class="step">
-  <h4>To set a temporary breakpoint at a line of source code</h4>
-  <ol>
-    <li>      <a href="pgm_bp_enable.htm">Set a breakpoint</a> on the source line</li>
-    <li>      Right-click breakpoint and select Breakpoint Properties in the context menu</li>
-		<p>The Properties for C/C++ breakpoint window appears (Figure 1).</p>
-		<p align="center"><img src="images/wnd_breakpoint_properties.png" width="581" height="540" /></p>
-		<p class="figure">Figure 1 Properties for C/C++ breakpoint window</p>
-	<li>	  Enter the value &quot;1&quot; into the Ignore count field</li>
-    <li>      Click OK  </li>
-  </ol>
-  <ul>
-    <p>The dash icon changes to an active breakpoint icon. After you debug the project, the debugger halts program execution at the line that has the active breakpoint icon. After execution halts, the active breakpoint icon reverts to a dash icon.
-    </p>
-  </ul>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-  <li><a href="../../concepts/watchpoints.htm">Watchpoints</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-  <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-  <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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>Setting a Temporary Breakpoint</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setting a Temporary Breakpoint</h2>
+<p>Use the Temporary Breakpoint command to set temporary breakpoints. Unlike a regular breakpoint that halts execution each time you debug a project, a temporary breakpoint halts execution only once. The debugger removes the temporary breakpoint after halting program execution. </p>
+<div class="step">
+  <h4>To set a temporary breakpoint at a line of source code</h4>
+  <ol>
+    <li>      <a href="pgm_bp_enable.htm">Set a breakpoint</a> on the source line</li>
+    <li>      Right-click breakpoint and select Breakpoint Properties in the context menu</li>
+		<p>The Properties for C/C++ breakpoint window appears (Figure 1).</p>
+		<p align="center"><img src="images/wnd_breakpoint_properties.png" width="581" height="540" /></p>
+		<p class="figure">Figure 1 Properties for C/C++ breakpoint window</p>
+	<li>	  Enter the value &quot;1&quot; into the Ignore count field</li>
+    <li>      Click OK  </li>
+  </ol>
+  <ul>
+    <p>The dash icon changes to an active breakpoint icon. After you debug the project, the debugger halts program execution at the line that has the active breakpoint icon. After execution halts, the active breakpoint icon reverts to a dash icon.
+    </p>
+  </ul>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
+  <li><a href="../../debugger/watchpoints/watchpoints.htm">Watchpoints</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+  <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+  <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
+</ul>
+<h5>Related references </h5>
+<ul>
+  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_view_props.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/pgm_bp_view_props.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,58 +1,58 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Viewing Breakpoint Properties</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Viewing Breakpoint Properties</h2>
-<p>After you set a breakpoint, you can view and modify its Actions, Common, and Filtering properties. Table 1 explains breakpoint properties for the <b>Common</b> panel.</p>
-<p align="center"><img src="images/wnd_breakpoint_properties.png" width="580" height="540" /></p>
-<p class="figure">Figure 1 - <b>Properties for C/C++ breakpoint</b> window </p>
-<h5>Table 1. Breakpoint properties </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="25%" scope="col">Property</th>
-    <th width="75%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Type</b></td>
-    <td>The type of item, such as Auto Breakpoint.</td>
-  </tr>
-  <tr>
-    <td><b>File</b></td>
-    <td>The path to the file that contains the item.</td>
-  </tr>
-  <tr>
-    <td><b>Line number</b></td>
-    <td>Line number in file breakpoint applies to. </td>
-  </tr>
-  <tr>
-    <td><b>Enabled</b></td>
-    <td>Indicates the current status of the breakpoint. When checkmarked, the breakpoint  stops program execution if its condition is met. When unchecked, the breakpoint is ignored during the debug session. </td>
-  </tr>
-  <tr>
-    <td><b>Condition</b></td>
-    <td>The conditional expression associated with the item. This conditional expression must evaluate to true in order for the item to perform its specified action.</td>
-  </tr>
-  <tr>
-    <td><b>Ignore  count</b></td>
-    <td>Displays the number of times that program execution arrived at the breakpoint before the program stopped.</td>
-  </tr>
-</table>
-<div class="step">
-  <h4>To view properties for a breakpoint</h4>
-  <ol>
-    <li>Right-click the breakpoint  in the Breakpoints view and select Properties... <br />
-	    <p>The <b>Properties for C/C++ breakpoint</b> window appears.</p>
- </li>
-    <li>Click Actions, Common, or Filtering to view specific breakpoint property information </li>
-  </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>Viewing Breakpoint Properties</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Viewing Breakpoint Properties</h2>
+<p>After you set a breakpoint, you can view and modify its Actions, Common, and Filtering properties. Table 1 explains breakpoint properties for the <b>Common</b> panel.</p>
+<p align="center"><img src="images/wnd_breakpoint_properties.png" width="580" height="540" /></p>
+<p class="figure">Figure 1 - <b>Properties for C/C++ breakpoint</b> window </p>
+<h5>Table 1. Breakpoint properties </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="25%" scope="col">Property</th>
+    <th width="75%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Type</b></td>
+    <td>The type of item, such as Auto Breakpoint.</td>
+  </tr>
+  <tr>
+    <td><b>File</b></td>
+    <td>The path to the file that contains the item.</td>
+  </tr>
+  <tr>
+    <td><b>Line number</b></td>
+    <td>Line number in file breakpoint applies to. </td>
+  </tr>
+  <tr>
+    <td><b>Enabled</b></td>
+    <td>Indicates the current status of the breakpoint. When checkmarked, the breakpoint  stops program execution if its condition is met. When unchecked, the breakpoint is ignored during the debug session. </td>
+  </tr>
+  <tr>
+    <td><b>Condition</b></td>
+    <td>The conditional expression associated with the item. This conditional expression must evaluate to true in order for the item to perform its specified action.</td>
+  </tr>
+  <tr>
+    <td><b>Ignore  count</b></td>
+    <td>Displays the number of times that program execution arrived at the breakpoint before the program stopped.</td>
+  </tr>
+</table>
+<div class="step">
+  <h4>To view properties for a breakpoint</h4>
+  <ol>
+    <li>Right-click the breakpoint  in the Breakpoints view and select Properties... <br />
+	    <p>The <b>Properties for C/C++ breakpoint</b> window appears.</p>
+ </li>
+    <li>Click Actions, Common, or Filtering to view specific breakpoint property information </li>
+  </ol>
+</div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/save_breakpoints_view.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/save_breakpoints_view.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,38 +1,38 @@
-<!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>Saving the Breakpoints View</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Saving the Contents of Breakpoints View </h2>
-<p>You can save the contents of the <b>Breakpoints</b> view. This feature is useful for saving sets of breakpoint data, then later re-opening those sets.</p>
-<div class="step">
-  <h4>To save contents of the Breakpoints view</h4>
-  <ul>
-    <li>Click File &gt; Save or File &gt; Save As</li>
-  <p>Clicking File &gt; Save As lets you specify the name and path to save the file that stores the contents.<br />
-</p>
-  </ul>
-</div>
-  <h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-    <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-    <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
-  </ul>
-  <h5>Related references </h5>
-  <ul>
-    <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
-  </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!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>Saving the Breakpoints View</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Saving the Contents of Breakpoints View </h2>
+<p>You can save the contents of the <b>Breakpoints</b> view. This feature is useful for saving sets of breakpoint data, then later re-opening those sets.</p>
+<div class="step">
+  <h4>To save contents of the Breakpoints view</h4>
+  <ul>
+    <li>Click File &gt; Save or File &gt; Save As</li>
+  <p>Clicking File &gt; Save As lets you specify the name and path to save the file that stores the contents.<br />
+</p>
+  </ul>
+</div>
+  <h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+    <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+    <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
+  </ul>
+  <h5>Related references </h5>
+  <ul>
+    <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
+  </ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/show_breakpoints_view.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/breakpoints/show_breakpoints_view.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,36 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Opening the Breakpoints View</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Opening a Breakpoints View </h2>
-<p>Use the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view to show a list of breakpoints currently set in your project.</p>
-<p align="center"><img src="../../reference/images/view_breakpoints.png" width="544" height="264" /></p>
-<p class="figure">Figure 1 - Breakpoints view </p>
-<div class="step">
-  <h4>To open a Breakpoints view </h4>
-  <ul>
-    <li>Click Window &gt; Show View &gt; Breakpoints (Alt+Shift+Q, B) </li>
-	<p>The Breakpoints view opens in the current perspective.</p>
-<p class="note"><b>NOTE</b> Double-click a breakpoint in the Breakpoints view to display its associated source-code line in an editor view.</p>
-  </ul>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-  <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-  <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Opening the Breakpoints View</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Opening a Breakpoints View </h2>
+<p>Use the <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view to show a list of breakpoints currently set in your project.</p>
+<p align="center"><img src="../../reference/images/view_breakpoints.png" width="544" height="264" /></p>
+<p class="figure">Figure 1 - Breakpoints view </p>
+<div class="step">
+  <h4>To open a Breakpoints view </h4>
+  <ul>
+    <li>Click Window &gt; Show View &gt; Breakpoints (Alt+Shift+Q, B) </li>
+	<p>The Breakpoints view opens in the current perspective.</p>
+<p class="note"><b>NOTE</b> Double-click a breakpoint in the Breakpoints view to display its associated source-code line in an editor view.</p>
+  </ul>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+  <li><a href="pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+  <li><a href="pgm_bp_clearing.htm">Removing Breakpoints</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/carbide_tools.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/carbide_tools.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -40,6 +40,6 @@
 <ul>
   <li>Carbide.c++ Plug-in Developer Guide</li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_reformatting_sources.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_reformatting_sources.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,29 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Reformatting a Source File</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-<h2>Reformatting a Source File</h2>
-
-	  
-	 <p>You can reformat a source file to use any of the  preset code styles  in the <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel.  </p>
-	 <div class="step">
-	   <h4>To reformat a source file</h4>
-	   <ol>
-	     <li>Verify the correct code style is set in the <a href="../reference/wnd_pref_code_style.htm">Code Style</a> preference panel </li>
-         <li>Open an editor view with the source file you want to reformat</li>
-	     <li>Right-click and choose <b>Source &gt; Format</b> (<span class="code">CTRL+SHIFT+F</span>)</li>
-	   </ol>
-       <p align="center"><img src="images/menu_reformat_source_file.png" width="444" height="431" /></p>
-       <p align="center" class="figure">Figure 1 -Selecting Source &gt; Format from an editor view </p>
-   </div>
-	 <h5>Related references	 </h5>
-	 <ul>
-       <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm">Code Style preferences</a></li>
-       <li><a href="code_style_workspace.htm">Setting the Workspace Code Style </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>
+<title>Reformatting a Source File</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+<h2>Reformatting a Source File</h2>
+
+	  
+	 <p>You can reformat a source file to use any of the  preset code styles  in the <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel.  </p>
+	 <div class="step">
+	   <h4>To reformat a source file</h4>
+	   <ol>
+	     <li>Verify the correct code style is set in the <a href="../reference/wnd_pref_code_style.htm">Code Style</a> preference panel </li>
+         <li>Open an editor view with the source file you want to reformat</li>
+	     <li>Right-click and choose <b>Source &gt; Format</b> (<span class="code">CTRL+SHIFT+F</span>)</li>
+	   </ol>
+       <p align="center"><img src="images/menu_reformat_source_file.png" width="444" height="431" /></p>
+       <p align="center" class="figure">Figure 1 -Selecting Source &gt; Format from an editor view </p>
+   </div>
+	 <h5>Related references	 </h5>
+	 <ul>
+       <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm">Code Style preferences</a></li>
+       <li><a href="code_style_workspace.htm">Setting the Workspace Code Style </a></li>
+   </ul>
+	 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_workspace.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/code_style_workspace.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,30 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Code Styles preferences</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-<h2>Setting the Workspace Code Style</h2>
-
-	  
-	 <p>You can set the default code style for a workspace using the   <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel. Once set, the specified code style is applied to all new files and projects created in the workspace. To update a source file already in the workspace, see <a href="code_style_reformatting_sources.htm">Reformatting a Source File</a>.</p>
-	 <p align="center"><img src="../reference/images/wnd_pref_code_styles.png" width="627" height="544"></p>
-	 <p align="center" class="figure">Figure 1 -Select a profile from the Select a profile list</p>
-	 <p align="left">You can also create your own profiles based on the one's included with Carbide. Simply click <b>Edit</b> and change the options presented in the <b>Profile &lt;<i>profile_name</i>&gt;</b> window that appears. </p>
-	 <div class="step">
-       <h4>To set the workspace code style</h4>
-	   <ol>
-         <li>Open  the <a href="../reference/wnd_pref_code_style.htm">Code Style</a> preference panel </li>
-	     <li>Choose a profile from the Select a profile dropdown list </li>
-	     <li>Click OK </li>
-       </ol>
-   </div>
-	 <h5>Related references	 </h5>
-	 <ul>
-       <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm">Code Style preferences</a></li>
-       <li><a href="code_style_reformatting_sources.htm">Reformatting a Source File </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>
+<title>Code Styles preferences</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+<h2>Setting the Workspace Code Style</h2>
+
+	  
+	 <p>You can set the default code style for a workspace using the   <img src="../images/command_link.png" alt="" width="16" height="12" border="0" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferences.CodeFormatterPreferencePage)")'> Code Style</a> preference panel. Once set, the specified code style is applied to all new files and projects created in the workspace. To update a source file already in the workspace, see <a href="code_style_reformatting_sources.htm">Reformatting a Source File</a>.</p>
+	 <p align="center"><img src="../reference/images/wnd_pref_code_styles.png" width="627" height="544"></p>
+	 <p align="center" class="figure">Figure 1 -Select a profile from the Select a profile list</p>
+	 <p align="left">You can also create your own profiles based on the one's included with Carbide. Simply click <b>Edit</b> and change the options presented in the <b>Profile &lt;<i>profile_name</i>&gt;</b> window that appears. </p>
+	 <div class="step">
+       <h4>To set the workspace code style</h4>
+	   <ol>
+         <li>Open  the <a href="../reference/wnd_pref_code_style.htm">Code Style</a> preference panel </li>
+	     <li>Choose a profile from the Select a profile dropdown list </li>
+	     <li>Click OK </li>
+       </ol>
+   </div>
+	 <h5>Related references	 </h5>
+	 <ul>
+       <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm">Code Style preferences</a></li>
+       <li><a href="code_style_reformatting_sources.htm">Reformatting a Source File </a></li>
+   </ul>
+	 <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/soft_attach_debug.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -111,7 +111,7 @@
   <li><a href="../../reference/view_registers.htm">Registers</a> view</li>
   <li><a href="../../reference/view_breakpoints.htm">Breakpoint</a> view    </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/view_symbian_kernel_set.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/view_symbian_kernel_set.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -31,7 +31,7 @@
   <li><a href="../../debugger/debug/viewing_debug.htm">Debug View</a></li>
   <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View Window</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -30,7 +30,7 @@
     <li><a href="../../concepts/working_with_debugger.htm">Working with the Debugger </a></li>
     <li><a href="../../debugger/debug/viewing_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>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_disabling.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_disabling.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -22,7 +22,7 @@
 </p>
   </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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_enabling.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_enabling.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -21,7 +21,7 @@
     <li>The disabled eventpoint icon changes to its original eventpoint icon. The enabled eventpoint icon indicates that the eventpoint will perform its specified action.</li>
   </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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_viewing.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/eventpoints_viewing.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -18,7 +18,7 @@
 </li>
   </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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_clear.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_clear.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -24,7 +24,7 @@
     <li>Click Debug &gt; Clear Eventpoint &gt; Clear Log Point.</li>
   </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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_set.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/log_point_set.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -34,7 +34,7 @@
   </ol>
 </div>
 <p>Example use: If you want to display the value of a variable each time some code is executed, set a log point, check the Log Message and Treat as expression boxes and enter the variable name in the edit box, then click OK.</p>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_clear.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_clear.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -28,7 +28,7 @@
   </ol>
 </div>
   <p></p>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_set.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/pause_point_set.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -26,7 +26,7 @@
 </div>
   <p></p>
   <p></p>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_clear.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_clear.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -19,7 +19,7 @@
     <li>Click Debug &gt; Clear Eventpoint &gt; Clear Trace Collection On</li>
   </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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_off.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_off.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -18,7 +18,7 @@
     <li>Click Debug &gt; Set Eventpoint &gt; Set Trace Collection Off</li>
   </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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_on.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/eventpoints/trace_collection_on.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -18,7 +18,7 @@
     <li>Click Debug &gt; Set Eventpoint &gt; Set Trace Collection On</li>
   </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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br />License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/index.html	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/index.html	Fri Apr 16 11:18:22 2010 -0500
@@ -52,7 +52,7 @@
 
 
 
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </div></body>
    </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_adding.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_adding.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,57 +1,57 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Adding a Memory Monitor</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Adding a Memory Monitor </h2>
-<p>You can add one or more memory monitors to the <a href="../../reference/view_memory_wnd.htm">Memory</a> view. A memory monitor  shows the contents of a different address or expression. </p>
-<p class="note"><b>NOTE</b> When using an emulator, the memory addresses are actually based on their location and  formats dependent upon the host machine. </p>
-<div class="step">
-  <h4>To add a Memory Monitor</h4>
-  <ol>
-    <li>Open a new memory monitor  by:
-      <ul>
-        <li>Click the Add Memory Monitor (<img src="../../images/icons/mem_add_monitor_icon.png" width="18" height="18" align="absmiddle" />) icon in the Monitors pane</li>
-        <li>Right-click in the  Monitors pane, then select Add Memory Monitor</li>
-        <li>Right-click a variable in the Variables view, then select View Memory  </li>
-      </ul>
-    </li>
-    <p>The Add Memory Monitor window appears (Figure 1).</p>
-    <p align="center"><img src="../../images/views/wnd_memory_monitor.png" width="296" height="131" /></p>
-    <p class="figure">Figure 1 - Memory Monitor window </p>
-    <li> Enter the address or expression to monitor</li>
-    <p>Type the address or expression that specifies the memory section to monitor. Acceptable formats include:</p>
-    <ul>
-      <li>Address -- *ptr</li>
-      <li>Expression -- (&amp;y)+1024 </li>
-      <li>Functions -- FNname </li>
-      <li>Hexadecimal -- 0x0847d3c </li>
-      <li>Variables -- &amp;VarName</li>
-    </ul>
-    <li>Click OK </li>
-    <p>The monitor appears in the monitor list and the Memory Renderings pane displays the contents of memory locations beginning at the specified address.</p>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/working_with_memory.htm">Working with Memory </a> </li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="view_memory_show.htm">Opening a Memory View</a></li>
-  <li><a href="memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
-  <li><a href="memory_monitor_removing.htm">Removing a Memory Monitor or Rendering</a> </li>
-</ul>
-<h5>Related References </h5>
-<ul>
-  <li><a href="../../reference/view_memory_wnd.htm">Memory 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>Adding a Memory Monitor</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Adding a Memory Monitor </h2>
+<p>You can add one or more memory monitors to the <a href="../../reference/view_memory_wnd.htm">Memory</a> view. A memory monitor  shows the contents of a different address or expression. </p>
+<p class="note"><b>NOTE</b> When using an emulator, the memory addresses are actually based on their location and  formats dependent upon the host machine. </p>
+<div class="step">
+  <h4>To add a Memory Monitor</h4>
+  <ol>
+    <li>Open a new memory monitor  by:
+      <ul>
+        <li>Click the Add Memory Monitor (<img src="../../images/icons/mem_add_monitor_icon.png" width="18" height="18" align="absmiddle" />) icon in the Monitors pane</li>
+        <li>Right-click in the  Monitors pane, then select Add Memory Monitor</li>
+        <li>Right-click a variable in the Variables view, then select View Memory  </li>
+      </ul>
+    </li>
+    <p>The Add Memory Monitor window appears (Figure 1).</p>
+    <p align="center"><img src="../../images/views/wnd_memory_monitor.png" width="296" height="131" /></p>
+    <p class="figure">Figure 1 - Memory Monitor window </p>
+    <li> Enter the address or expression to monitor</li>
+    <p>Type the address or expression that specifies the memory section to monitor. Acceptable formats include:</p>
+    <ul>
+      <li>Address -- *ptr</li>
+      <li>Expression -- (&amp;y)+1024 </li>
+      <li>Functions -- FNname </li>
+      <li>Hexadecimal -- 0x0847d3c </li>
+      <li>Variables -- &amp;VarName</li>
+    </ul>
+    <li>Click OK </li>
+    <p>The monitor appears in the monitor list and the Memory Renderings pane displays the contents of memory locations beginning at the specified address.</p>
+  </ol>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/working_with_memory.htm">Working with Memory </a> </li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="view_memory_show.htm">Opening a Memory View</a></li>
+  <li><a href="memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
+  <li><a href="memory_monitor_removing.htm">Removing a Memory Monitor or Rendering</a> </li>
+</ul>
+<h5>Related References </h5>
+<ul>
+  <li><a href="../../reference/view_memory_wnd.htm">Memory View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_removing.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_monitor_removing.htm	Fri Apr 16 11:18:22 2010 -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>Removing a Memory Monitor or Rendering</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style1 {color: #FF0000}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Removing a Memory Monitor or Rendering </h2>
-<p>Remove a memory monitor or rendering when you have finished working with it. </p>
-<div class="step">
-  <div class="step">
-    <h4>To remove a Memory Monitor</h4>
-    <ul>
-      <li>Right-click the memory monitor and select Remove Memory Monitor</li>
-    </ul>
-    <blockquote>
-      <p>OR</p>
-    </blockquote>
-    <ul>
-      <li>Select the memory monitor to remove, click the Remove Rendering Monitor (<img src="../../images/icons/mem_remove_monitor_icon.png" width="19" height="19" align="middle" alt="" />) button 
-      <p>The Memory Monitor item is removed.</p></li>
-    </ul>
-  </div>
-    <div class="step">
-      <h4>To remove a Memory Rendering </h4>
-      <ol>
-        <li>Select the memory rendering to remove</li>
-        <li>Click the Remove Memory Rendering (<img src="../../images/icons/mem_remove_monitor_icon.png" width="19" height="19" align="middle" alt="" />) button </li>
-      </ol>
-        <p>The Memory Rendering pane is removed.</p>
-    </div>
-</div>
-  <h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/working_with_memory.htm">Working with Memory </a> </li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="view_memory_show.htm">Opening a Memory View</a></li>
-    <li><a href="memory_monitor_adding.htm">Adding a Memory Monitor</a></li>
-    <li><a href="memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
-  </ul>
-  <h5>Related References </h5>
-  <ul>
-    <li><a href="../../reference/view_memory_wnd.htm">Memory 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>Removing a Memory Monitor or Rendering</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style1 {color: #FF0000}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Removing a Memory Monitor or Rendering </h2>
+<p>Remove a memory monitor or rendering when you have finished working with it. </p>
+<div class="step">
+  <div class="step">
+    <h4>To remove a Memory Monitor</h4>
+    <ul>
+      <li>Right-click the memory monitor and select Remove Memory Monitor</li>
+    </ul>
+    <blockquote>
+      <p>OR</p>
+    </blockquote>
+    <ul>
+      <li>Select the memory monitor to remove, click the Remove Rendering Monitor (<img src="../../images/icons/mem_remove_monitor_icon.png" width="19" height="19" align="middle" alt="" />) button 
+      <p>The Memory Monitor item is removed.</p></li>
+    </ul>
+  </div>
+    <div class="step">
+      <h4>To remove a Memory Rendering </h4>
+      <ol>
+        <li>Select the memory rendering to remove</li>
+        <li>Click the Remove Memory Rendering (<img src="../../images/icons/mem_remove_monitor_icon.png" width="19" height="19" align="middle" alt="" />) button </li>
+      </ol>
+        <p>The Memory Rendering pane is removed.</p>
+    </div>
+</div>
+  <h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/working_with_memory.htm">Working with Memory </a> </li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="view_memory_show.htm">Opening a Memory View</a></li>
+    <li><a href="memory_monitor_adding.htm">Adding a Memory Monitor</a></li>
+    <li><a href="memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
+  </ul>
+  <h5>Related References </h5>
+  <ul>
+    <li><a href="../../reference/view_memory_wnd.htm">Memory View</a>
+</li>
+</ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_rendering_adding.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/memory_rendering_adding.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,50 +1,50 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Adding a Memory Monitor</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Adding a  Memory Rendering </h2>
-<p>Add a memory rendering pane to display the memory monitor item in different formats. The formats available include:</p>
-<ul>
-  <li>Traditional</li>
-  <li>Hex</li>
-  <li>ASCII</li>
-  <li>Signed Integer</li>
-  <li>Unsigned Integer </li>
-</ul>
-<p>Use the <b>Add New</b> button to choose a different memory monitor item. </p>
-<div class="step">
-  <h4>To add a Memory Rendering </h4>
-  <ol>
-    <li>Right-click the Memory Renderings pane and select Add  Rendering or click the Add  Rendering(s) (<img src="../../images/icons/mem_add_monitor_icon.png" width="18" height="18" align="absmiddle" />) button</li>
-    <p>The <b>Add Memory Rendering</b> dialog appears (Figure 1).</p>
-    <p align="center"><img src="../../images/views/wnd_memory_rendering.png" width="259" height="340" /></p>
-    <p class="figure">Figure 1 - Add Memory Rendering dialog </p>
-    <li> Select the type of memory rendering to display in the memory monitor</li>
-    <li>Click OK </li>
-    <p>The  Memory Renderings pane displays a new tab of the memory monitor item using the specified format.</p>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/working_with_memory.htm">Working with Memory </a> </li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="view_memory_show.htm">Opening a Memory View</a></li>
-  <li><a href="memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
-  <li><a href="memory_monitor_removing.htm">Removing a Memory Monitor or Rendering</a> </li>
-</ul>
-<h5>Related References </h5>
-<ul>
-  <li><a href="../../reference/view_memory_wnd.htm">Memory 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>Adding a Memory Monitor</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Adding a  Memory Rendering </h2>
+<p>Add a memory rendering pane to display the memory monitor item in different formats. The formats available include:</p>
+<ul>
+  <li>Traditional</li>
+  <li>Hex</li>
+  <li>ASCII</li>
+  <li>Signed Integer</li>
+  <li>Unsigned Integer </li>
+</ul>
+<p>Use the <b>Add New</b> button to choose a different memory monitor item. </p>
+<div class="step">
+  <h4>To add a Memory Rendering </h4>
+  <ol>
+    <li>Right-click the Memory Renderings pane and select Add  Rendering or click the Add  Rendering(s) (<img src="../../images/icons/mem_add_monitor_icon.png" width="18" height="18" align="absmiddle" />) button</li>
+    <p>The <b>Add Memory Rendering</b> dialog appears (Figure 1).</p>
+    <p align="center"><img src="../../images/views/wnd_memory_rendering.png" width="259" height="340" /></p>
+    <p class="figure">Figure 1 - Add Memory Rendering dialog </p>
+    <li> Select the type of memory rendering to display in the memory monitor</li>
+    <li>Click OK </li>
+    <p>The  Memory Renderings pane displays a new tab of the memory monitor item using the specified format.</p>
+  </ol>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/working_with_memory.htm">Working with Memory </a> </li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="view_memory_show.htm">Opening a Memory View</a></li>
+  <li><a href="memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
+  <li><a href="memory_monitor_removing.htm">Removing a Memory Monitor or Rendering</a> </li>
+</ul>
+<h5>Related References </h5>
+<ul>
+  <li><a href="../../reference/view_memory_wnd.htm">Memory View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/view_memory_show.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/memory/view_memory_show.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,38 +1,38 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Opening the Memory View</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Opening a Memory View </h2>
-<p>Use the <b>Memory</b> view to examine a portion of memory starting at a specific address on the host machine.</p>
-<p class="note"><b>NOTE</b> When using an emulator, the memory addresses are actually based on their location and formats dependent upon the host machine.</p>
-<div class="step">
-  <h4>To open a Memory view </h4>
-  <ul>
-    <li>Click Window &gt; Show View &gt; Memory</li>
-    <p>The Memory view appears.</p>
-  </ul>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/working_with_memory.htm">Working with Memory </a> </li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="memory_monitor_adding.htm">Adding a Memory Monitor</a></li>
-  <li><a href="memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
-  <li><a href="memory_monitor_removing.htm">Removing a Memory Monitor or Rendering</a> </li>
-</ul>
-<h5>Related References </h5>
-<ul>
-  <li><a href="../../reference/view_memory_wnd.htm">Memory 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>Opening the Memory View</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Opening a Memory View </h2>
+<p>Use the <b>Memory</b> view to examine a portion of memory starting at a specific address on the host machine.</p>
+<p class="note"><b>NOTE</b> When using an emulator, the memory addresses are actually based on their location and formats dependent upon the host machine.</p>
+<div class="step">
+  <h4>To open a Memory view </h4>
+  <ul>
+    <li>Click Window &gt; Show View &gt; Memory</li>
+    <p>The Memory view appears.</p>
+  </ul>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/working_with_memory.htm">Working with Memory </a> </li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="memory_monitor_adding.htm">Adding a Memory Monitor</a></li>
+  <li><a href="memory_rendering_adding.htm">Adding A Memory Rendering</a></li>
+  <li><a href="memory_monitor_removing.htm">Removing a Memory Monitor or Rendering</a> </li>
+</ul>
+<h5>Related References </h5>
+<ul>
+  <li><a href="../../reference/view_memory_wnd.htm">Memory View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -40,7 +40,7 @@
   <li><a href="../../reference/wnd_debug_configuration.htm">Debug Window </a></li>
   <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View</a> </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/opening_system_browser.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/opening_system_browser.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Opening the System Browser View</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Opening the System Browser View</h2>
-<p>Use the System Views or System menu command to view and manipulate active processes on a selected machine. If multiple machines are available, select each machine from the System Views submenu to display multiple System Browser windows. If you choose a machine that is already open, the existing window will be brought to the front.</p>
-<p class="note"><b>NOTE</b> The System Browser view appears on platforms that support it.</p>
-Table 1 explains how to open the System Browser <span class="note">view</span>.
-<h5>Table 1 Opening the System Browser <span class="note">view</span></h5>
-<table width="78%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="47%" scope="col">Menu Bar Layout</th>
-    <th width="53%" scope="col">Do this&hellip;</th>
-  </tr>
-  <tr>
-    <td>Views</td>
-    <td>Select View &gt; System</td>
-  </tr>
-  <tr>
-    <td>Macintosh (also applies to Linux/Solaris)</td>
-    <td>Select View &gt; System Views</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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Opening the System Browser View</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Opening the System Browser View</h2>
+<p>Use the System Views or System menu command to view and manipulate active processes on a selected machine. If multiple machines are available, select each machine from the System Views submenu to display multiple System Browser windows. If you choose a machine that is already open, the existing window will be brought to the front.</p>
+<p class="note"><b>NOTE</b> The System Browser view appears on platforms that support it.</p>
+Table 1 explains how to open the System Browser <span class="note">view</span>.
+<h5>Table 1 Opening the System Browser <span class="note">view</span></h5>
+<table width="78%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="47%" scope="col">Menu Bar Layout</th>
+    <th width="53%" scope="col">Do this&hellip;</th>
+  </tr>
+  <tr>
+    <td>Views</td>
+    <td>Select View &gt; System</td>
+  </tr>
+  <tr>
+    <td>Macintosh (also applies to Linux/Solaris)</td>
+    <td>Select View &gt; System Views</td>
+  </tr>
+</table>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -40,7 +40,7 @@
   <li><a href="../AddingClasses.html">Adding Classes</a></li>
   <li><a href="../../reference/NewClassWizard.html">New C++ Classs Wizard</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_cmd_line.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_cmd_line.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,48 +1,48 @@
-<!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>Setting Environment for x86 Compiler</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style2 {
-	font-weight: bold;
-	font-style: italic;
-}
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting Environment for x86 Compiler</h2>
-<p>You can build  files and projects using the Carbide.c++ command-line tools. </p>
-<p>The command-line tools are located in the <span class="code">plugins\x86Build</span> folder and include:</p>
-<ul>
-  <li><span class="code">\env_switch</span> - contains the <span class="code">env_update.exe</span> program which installs the environment variables used by the command-line tools. You must  run  the <span class="code">env_update.exe</span> program before any of the command-line tools can operate. It is not required to run if building from Carbide. </li>
-  <li><span class="code">\Symbian_Support</span> - contains the libraries, headers, and other support files necessary to use the command-line toosl</li>
-  <li><span class="code">\Symbian_Tools</span> - contains the  command-line tools compile (<span class="code">mwccsym2.exe</span>), assembler (<span class="code">mwc++filt.exe</span>), and linker (<span class="code">mwldsym2.exe</span>) project files</li>
-</ul>
-<div class="step">
-  <h4>Running a Command-Line Tool</h4>
-  <ol>
-    <li>Locate and launch env_update.exe to install the environment variables required by the command-line tools</li>
-    <p>Follow the onscreen instructions to install the correct environment variables. </p>
-    <li>In the Command Prompt window, enter the tool name and options to invoke the command-line tool</li>
-  </ol>
-</div>
-<h5>Concepts</h5>
-  <ul>
-    <li><a href="../../concepts/Projects.html">Projects</a></li>
-</ul>
-  <h5>Tasks</h5>
-  <ul>
-    <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
-    <li><a href="prj_debug_config.htm">Creating a Launch Configuration</a></li>
-    <li><a href="../start/carbide_debugging.htm">Debugging a Symbian OS Program</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>Setting Environment for x86 Compiler</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style2 {
+	font-weight: bold;
+	font-style: italic;
+}
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setting Environment for x86 Compiler</h2>
+<p>You can build  files and projects using the Carbide.c++ command-line tools. </p>
+<p>The command-line tools are located in the <span class="code">plugins\x86Build</span> folder and include:</p>
+<ul>
+  <li><span class="code">\env_switch</span> - contains the <span class="code">env_update.exe</span> program which installs the environment variables used by the command-line tools. You must  run  the <span class="code">env_update.exe</span> program before any of the command-line tools can operate. It is not required to run if building from Carbide. </li>
+  <li><span class="code">\Symbian_Support</span> - contains the libraries, headers, and other support files necessary to use the command-line toosl</li>
+  <li><span class="code">\Symbian_Tools</span> - contains the  command-line tools compile (<span class="code">mwccsym2.exe</span>), assembler (<span class="code">mwc++filt.exe</span>), and linker (<span class="code">mwldsym2.exe</span>) project files</li>
+</ul>
+<div class="step">
+  <h4>Running a Command-Line Tool</h4>
+  <ol>
+    <li>Locate and launch env_update.exe to install the environment variables required by the command-line tools</li>
+    <p>Follow the onscreen instructions to install the correct environment variables. </p>
+    <li>In the Command Prompt window, enter the tool name and options to invoke the command-line tool</li>
+  </ol>
+</div>
+<h5>Concepts</h5>
+  <ul>
+    <li><a href="../../concepts/Projects.html">Projects</a></li>
+</ul>
+  <h5>Tasks</h5>
+  <ul>
+    <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
+    <li><a href="prj_debug_config.htm">Creating a Launch Configuration</a></li>
+    <li><a href="../start/carbide_debugging.htm">Debugging a Symbian OS Program</a> </li>
+  </ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_multi_projects.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_multi_projects.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,38 +1,38 @@
-<!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>Building Multiple Projects</title>
-  <link rel="StyleSheet" href="../../../book.css" type="text/css" />
-</head>
-<body bgcolor="#ffffff">
-<h2>Importing Projects With Inter-Dependencies</h2>
-If you are building a project that had external project dependencies,
-such as an import library from a DLL you must make sure the projects
-are built in the correct order to avoid missing dependencies.<br />
-<br />
-The best way to do this is to import projects with a <span class="code">bld.inf</span> file. For
-example, if you are building an executable that relies on a static
-DLL's import library you need to build the project that generates
-the import library first.&nbsp; If a project contains a <span class="code">bld.inf</span> file
-that contains all the required project MMP files you should import via
-the INF file. Building projects after importing with INF files will
-insure that other project dependencies get built properly. <br />
-<h5>Concepts</h5>
-<ul>
-  <li><a href="../../concepts/Projects.html">Projects</a></li>
-</ul>
-<h5>Tasks</h5>
-<ul>
-  <li><a href="../CreatingNewProjects.html">Creating
-Projects</a></li>
-  <li><a href="prj_import_exe.htm">Importing Symbian Executables </a> </li>
-</ul>
-<div class="step"></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>
+<!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>Building Multiple Projects</title>
+  <link rel="StyleSheet" href="../../../book.css" type="text/css" />
+</head>
+<body bgcolor="#ffffff">
+<h2>Importing Projects With Inter-Dependencies</h2>
+If you are building a project that had external project dependencies,
+such as an import library from a DLL you must make sure the projects
+are built in the correct order to avoid missing dependencies.<br />
+<br />
+The best way to do this is to import projects with a <span class="code">bld.inf</span> file. For
+example, if you are building an executable that relies on a static
+DLL's import library you need to build the project that generates
+the import library first.&nbsp; If a project contains a <span class="code">bld.inf</span> file
+that contains all the required project MMP files you should import via
+the INF file. Building projects after importing with INF files will
+insure that other project dependencies get built properly. <br />
+<h5>Concepts</h5>
+<ul>
+  <li><a href="../../concepts/Projects.html">Projects</a></li>
+</ul>
+<h5>Tasks</h5>
+<ul>
+  <li><a href="../CreatingNewProjects.html">Creating
+Projects</a></li>
+  <li><a href="prj_import_exe.htm">Importing Symbian Executables </a> </li>
+</ul>
+<div class="step"></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,32 +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>Building Projects</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Cleaning Projects</h2>
-<p>In the Project Explorer, C/C++ Projects, or Symbian Project Navigator views you can select a project, right-click and select <b>Clean Project</b> (CTRL+SHIFT+-) to remove the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
-<p>If you select a project and select the menu option <b>Project &gt; Clean...</b> a <b>Clean</b> dialog will appear (Figure 1). You can clean all projects or select individual projects to clean. This method of cleaning projects  performs the same operations as the <b>Clean Project</b> context menu option. If the <b>Start a build immediately</b> option is selected, then the selected project(s) are rebuilt after the clean operation.</p>
-<p align="center"><img src="images/clean.png" width="443" height="285" /></p>
-<p class="figure">Figure 1 - Clean Project Dialog</p>
-<p>By default, performing a<b> Clean Project</b> complies with the global  <b>Clean level</b> settings in the <a href="../../reference/wnd_build_prefs.htm">Build</a> preference panel and inherited by the project on creation. You can also assign project specific clean settings in the <span class="note"><a href="../../reference/build_properties/pane_project_settings.htm">Carbide Project Settings</a></span> panel in the <b>Properties for &lt;<i>project</i>&gt;</b> dialog. </p>
-<h5>Concepts</h5>
-  <ul>
-    <li><a href="../../concepts/Projects.html">Projects</a></li>
-</ul>
-  <h5>Tasks</h5>
-  <ul>
-    <li><a href="../../reference/menus/compile_source.htm">Compile Source</a></li>
-    <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
-    <li><a href="../../reference/menus/build_symbian_comp.htm">Build Symbian Component</a></li>
-    <li><a href="../../reference/menus/clean_symbian_comp.htm">Clean Symbian Component</a></li>
-    <li><a href="../../reference/menus/build_pkg_file.htm">Build Package (.pkg) File</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>Building Projects</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Cleaning Projects</h2>
+<p>In the Project Explorer, C/C++ Projects, or Symbian Project Navigator views you can select a project, right-click and select <b>Clean Project</b> (CTRL+SHIFT+-) to remove the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
+<p>If you select a project and select the menu option <b>Project &gt; Clean...</b> a <b>Clean</b> dialog will appear (Figure 1). You can clean all projects or select individual projects to clean. This method of cleaning projects  performs the same operations as the <b>Clean Project</b> context menu option. If the <b>Start a build immediately</b> option is selected, then the selected project(s) are rebuilt after the clean operation.</p>
+<p align="center"><img src="images/clean.png" width="443" height="285" /></p>
+<p class="figure">Figure 1 - Clean Project Dialog</p>
+<p>By default, performing a<b> Clean Project</b> complies with the global  <b>Clean level</b> settings in the <a href="../../reference/wnd_build_prefs.htm">Build</a> preference panel and inherited by the project on creation. You can also assign project specific clean settings in the <span class="note"><a href="../../reference/build_properties/pane_project_settings.htm">Carbide Project Settings</a></span> panel in the <b>Properties for &lt;<i>project</i>&gt;</b> dialog. </p>
+<h5>Concepts</h5>
+  <ul>
+    <li><a href="../../concepts/Projects.html">Projects</a></li>
+</ul>
+  <h5>Tasks</h5>
+  <ul>
+    <li><a href="../../reference/menus/compile_source.htm">Compile Source</a></li>
+    <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
+    <li><a href="../../reference/menus/build_symbian_comp.htm">Build Symbian Component</a></li>
+    <li><a href="../../reference/menus/clean_symbian_comp.htm">Clean Symbian Component</a></li>
+    <li><a href="../../reference/menus/build_pkg_file.htm">Build Package (.pkg) File</a></li>
+  </ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_dlls.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,32 +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>Importing Executables for Debugging</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Debugging DLLs</h2>
-<p>A binary that you want to debug must be built with symbolic information (a .sym file). You can debug a DLL just as you would any other executable with full support of the Carbide debugger. Basically, the following situations can occur: </p>
-<ul>
-  <li>If the DLL appears in the <a href="../../reference/view_executables.htm">Executables</a> view it can be debugged. Just <a href="../breakpoints/pgm_bp_setting.htm">set</a> breakpoints inside the DLL sources before you start the debug session. The next time  the  project is debugged, the DLL is loaded and made  available for debugging.</li>
-</ul>
-<blockquote>
-  <p class="note"><b class="note">NOTE</b> Breakpoints inside a DLL will not be <a href="../../concepts/breakpoints.htm">resolved</a> until the DLL is loaded into memory by the calling binary. </p>
-</blockquote>
-<ul>
-  <li>If the DLL is not built by the project you can import the DLL by  clicking the<b> Import an executable file</b> icon (<img src="../../images/icons/btn_import_executables.png" width="18" height="15" align="absmiddle">) in the <a href="../../reference/view_executables.htm">Executables</a> view. Then, set your  breakpoints and start the  debug session.</li>
-</ul>
-<p> You can use the <a href="../../reference/view_module_wnd.htm">Modules</a> view to determine if a particular DLL or binary is loaded and available for debugging.</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="../../reference/view_executables.htm">Executables</a> view  </li>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a> </li>
-  <li><a href="../../concepts/autotargeting.htm">Auto-targeting Executables</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>Importing Executables for Debugging</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Debugging DLLs</h2>
+<p>A binary that you want to debug must be built with symbolic information (a .sym file). You can debug a DLL just as you would any other executable with full support of the Carbide debugger. Basically, the following situations can occur: </p>
+<ul>
+  <li>If the DLL appears in the <a href="../../reference/view_executables.htm">Executables</a> view it can be debugged. Just <a href="../breakpoints/pgm_bp_setting.htm">set</a> breakpoints inside the DLL sources before you start the debug session. The next time  the  project is debugged, the DLL is loaded and made  available for debugging.</li>
+</ul>
+<blockquote>
+  <p class="note"><b class="note">NOTE</b> Breakpoints inside a DLL will not be <a href="../../concepts/breakpoints.htm">resolved</a> until the DLL is loaded into memory by the calling binary. </p>
+</blockquote>
+<ul>
+  <li>If the DLL is not built by the project you can import the DLL by  clicking the<b> Import an executable file</b> icon (<img src="../../images/icons/btn_import_executables.png" width="18" height="15" align="absmiddle">) in the <a href="../../reference/view_executables.htm">Executables</a> view. Then, set your  breakpoints and start the  debug session.</li>
+</ul>
+<p> You can use the <a href="../../reference/view_module_wnd.htm">Modules</a> view to determine if a particular DLL or binary is loaded and available for debugging.</p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="../../reference/view_executables.htm">Executables</a> view  </li>
+  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a> </li>
+  <li><a href="../../concepts/autotargeting.htm">Auto-targeting Executables</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_multiple_projects.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_multiple_projects.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -25,7 +25,7 @@
   <li><a href="prj_import_exe.htm">Importing Executables for Debugging</a></li>
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_freeze_def_file.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_freeze_def_file.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,32 +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>Freezing DLL Projects</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Freezing DLL Projects</h2>
-<p>Use the <b>Project &gt; Freeze Exports</b> menu command to freeze a entire project, normally a DLL, to ensure backward compatibility of a new release. The result is a .def file that can be imported into other projects. You cannot freeze a single file of the project, only the entire project. Also, once a project is frozen, only new exports can be added. </p>
-<p class="note">  <b>NOTE</b> A .def file must be included in the project target to export a project. The IDE will not create one if it is missing.</p>
-<div class="step">
-  <h4>Freezing an Active Project </h4>
-  <ol>
-    <li>Select the Project &gt; Freeze Exports menu item or Right-click and select Freeze Exports from the context menu </li>
-    <p>The appropriate <b>abld</b> command is called in the background and a .def file is generated that can be imported into other projects. </p>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/Projects.html">Projects</a></li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="../ImportingProjects.html">Importing Projects</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>Freezing DLL Projects</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Freezing DLL Projects</h2>
+<p>Use the <b>Project &gt; Freeze Exports</b> menu command to freeze a entire project, normally a DLL, to ensure backward compatibility of a new release. The result is a .def file that can be imported into other projects. You cannot freeze a single file of the project, only the entire project. Also, once a project is frozen, only new exports can be added. </p>
+<p class="note">  <b>NOTE</b> A .def file must be included in the project target to export a project. The IDE will not create one if it is missing.</p>
+<div class="step">
+  <h4>Freezing an Active Project </h4>
+  <ol>
+    <li>Select the Project &gt; Freeze Exports menu item or Right-click and select Freeze Exports from the context menu </li>
+    <p>The appropriate <b>abld</b> command is called in the background and a .def file is generated that can be imported into other projects. </p>
+  </ol>
+</div>
+<h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/Projects.html">Projects</a></li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="../ImportingProjects.html">Importing Projects</a></li>
+  </ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_import_exe.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,56 +1,56 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Importing a Symbian Executable</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Importing a Symbian Executable</h2>
-<p>Use the <b>File &gt; Import &gt; Symbian OS Executable</b> feature to import an executable into the <a href="../../reference/view_executables.htm">Executables</a> view and debug it. This is useful when the binary is not part of any project in the workspace. An example of this may be a library that is called from an mmp file.  The binary must be built with the same build configuration as the current build configuration that is being used (compiler must be the same). </p>
-<p class="note"><b>NOTE</b> You also need the symbolics (.sym) file for debugging  ARM build configurations.</p>
-<p class="note"><b>NOTE</b> Binaries built by the project can be debugged by selecting executables to debug in the Executable tab of the launch configuration Debug window.</p>
-<div class="step">
-  <h4>To import a Symbian Executable </h4>
-  <ol>
-    <li>Select the File &gt; Import... menu item</li>
-   <p>The Import  window appears (Figure 1). </p>
-   <p align="center"><img src="images/wnd_import_executable_01.png" width="403" height="469" /></p>
-   <p class="figure">Figure 1 - Import window</p>
-   <li>Expand Symbian OS and select Symbian OS Executable in the list, then click Next</li>
-   <p>The Import Executable window appears (Figure 2). </p>
-    <li>Enter the executable name in the Select Executable field or click Browse to locate the executable </li>
-    <p>Use the <b>Select executable</b> field to choose a single executable or <b>Search directory</b> field to select one or more Symbian executables to import from the specified directory.</p>
-    <p align="center"><img src="images/wnd_import_executable_02.png" width="473" height="491" /></p>
-   <p class="figure">Figure 2 - Import Executable window</p>
-    <li>Click Finish</li>
-    <p>The IDE imports the Symbian executable and displays it in the Executables view  (figure 3).</p>
-    <p align="center"><img src="images/wnd_import_executable_06.png" width="677" height="164" /></p>
-    <p class="figure">Figure 3 - Executables view showing executable and source files </p>
-    <p>The new project is listed under the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view, as shown in Figure 4.</p>
-    <p align="center"><img src="images/wnd_import_executable_05.png" width="252" height="206" /></p>
-    <p class="figure">Figure 4 - New executable listed</p>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/Projects.html">Projects</a></li>
-    <li><a href="../../concepts/Modify.html">Project Resources</a> </li>
-  </ul>
-  <h5>Related tasks</h5>
-  <ul><li><a href="../ImportingProjects.html">Importing Projects</a></li>
-    <li><a href="../ImportingProjects.html">Importing BLD.INF Files</a></li>
-    <li><a href="prj_debug_rom.htm">Debugging in ROM</a></li>
-  </ul>
-  <h5>Related references </h5>
-  <ul>
-    <li><a href="../../reference/ProjectDirectories.html">Project Directories</a></li>
-    <li><a href="../../reference/view_executables.htm">Executables view</a> </li>
-</ul>
-
-<div id="footer">Copyright &copy; 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>Importing a Symbian Executable</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Importing a Symbian Executable</h2>
+<p>Use the <b>File &gt; Import &gt; Symbian OS Executable</b> feature to import an executable into the <a href="../../reference/view_executables.htm">Executables</a> view and debug it. This is useful when the binary is not part of any project in the workspace. An example of this may be a library that is called from an mmp file.  The binary must be built with the same build configuration as the current build configuration that is being used (compiler must be the same). </p>
+<p class="note"><b>NOTE</b> You also need the symbolics (.sym) file for debugging  ARM build configurations.</p>
+<p class="note"><b>NOTE</b> Binaries built by the project can be debugged by selecting executables to debug in the Executable tab of the launch configuration Debug window.</p>
+<div class="step">
+  <h4>To import a Symbian Executable </h4>
+  <ol>
+    <li>Select the File &gt; Import... menu item</li>
+   <p>The Import  window appears (Figure 1). </p>
+   <p align="center"><img src="images/wnd_import_executable_01.png" width="403" height="469" /></p>
+   <p class="figure">Figure 1 - Import window</p>
+   <li>Expand Symbian OS and select Symbian OS Executable in the list, then click Next</li>
+   <p>The Import Executable window appears (Figure 2). </p>
+    <li>Enter the executable name in the Select Executable field or click Browse to locate the executable </li>
+    <p>Use the <b>Select executable</b> field to choose a single executable or <b>Search directory</b> field to select one or more Symbian executables to import from the specified directory.</p>
+    <p align="center"><img src="images/wnd_import_executable_02.png" width="473" height="491" /></p>
+   <p class="figure">Figure 2 - Import Executable window</p>
+    <li>Click Finish</li>
+    <p>The IDE imports the Symbian executable and displays it in the Executables view  (figure 3).</p>
+    <p align="center"><img src="images/wnd_import_executable_06.png" width="677" height="164" /></p>
+    <p class="figure">Figure 3 - Executables view showing executable and source files </p>
+    <p>The new project is listed under the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view, as shown in Figure 4.</p>
+    <p align="center"><img src="images/wnd_import_executable_05.png" width="252" height="206" /></p>
+    <p class="figure">Figure 4 - New executable listed</p>
+  </ol>
+</div>
+<h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/Projects.html">Projects</a></li>
+    <li><a href="../../concepts/Modify.html">Project Resources</a> </li>
+  </ul>
+  <h5>Related tasks</h5>
+  <ul><li><a href="../ImportingProjects.html">Importing Projects</a></li>
+    <li><a href="../ImportingProjects.html">Importing BLD.INF Files</a></li>
+    <li><a href="prj_debug_rom.htm">Debugging in ROM</a></li>
+  </ul>
+  <h5>Related references </h5>
+  <ul>
+    <li><a href="../../reference/ProjectDirectories.html">Project Directories</a></li>
+    <li><a href="../../reference/view_executables.htm">Executables view</a> </li>
+</ul>
+
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_new_build_config.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,40 +1,40 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Adding/Removing Build Configurations</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Adding/Removing Build Configurations</h2>
-<p>Use the <b>Properties for &lt;<em>project_name</em>&gt;</b> window to manage the active or build configurations associated with a project. In the <b>Active Configuration</b> group you can select which build configuration is current active as well as choose which build configurations appear in the Build Configurations sub-menu as choices. </p>
-<div class="step">
-  <h4>Adding/Removing a Build Configuration </h4>
-  <ol>
-    <li>Open Carbide Build Configuration panel in the project's Properties window
-      <p>Select the <b>Project &gt; Properties</b> menu item or right-click the project name in the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view, then select <b>Properties</b>. The project <b>Properties for <em>&lt;project_name&gt;</em></b> window appears. Then select Carbide Build Configurations. </p>    
-      <p align="center"><img src="images/panel_active_config.png" width="695" height="291" alt=""/></p>
-      <p class="figure">Figure 1 - Active Configuration group in project Properties window </p></li>
-    <li>Click Manage... in the Active Configuration group (Figure 1)
-      <p>The <b>Add/Remove Carbide Build Configuration </b> window appears (Figure 2). Use the <b>Add/Remove Carbide Build Configuration</b> window to manage the build configurations that appear on the Build Configurations sub-menu for the current project. You can also  click the <b>Manage configurations for the current project</b> icon (<img src="images/icon_manage_project_configs.png" width="16" height="16" align="absmiddle">) on the toolbar to open this dialog. </p>
-    </li>
-    <li>
-      <p align="center"><img src="images/add_build_config_manage_wnd.png" width="650" height="500" alt="" /></p>
-      <p class="figure">Figure 2 - Window for managing build configurations</p>
-    </li>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/build_configurations.htm">Active  Configuration</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="prj_set_build_tgt.htm">Setting an Active  Configuration </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Adding/Removing Build Configurations</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Adding/Removing Build Configurations</h2>
+<p>Use the <b>Properties for &lt;<em>project_name</em>&gt;</b> window to manage the active or build configurations associated with a project. In the <b>Active Configuration</b> group you can select which build configuration is current active as well as choose which build configurations appear in the Build Configurations sub-menu as choices. </p>
+<div class="step">
+  <h4>Adding/Removing a Build Configuration </h4>
+  <ol>
+    <li>Open Carbide Build Configuration panel in the project's Properties window
+      <p>Select the <b>Project &gt; Properties</b> menu item or right-click the project name in the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> view, then select <b>Properties</b>. The project <b>Properties for <em>&lt;project_name&gt;</em></b> window appears. Then select Carbide Build Configurations. </p>    
+      <p align="center"><img src="images/panel_active_config.png" width="695" height="291" alt=""/></p>
+      <p class="figure">Figure 1 - Active Configuration group in project Properties window </p></li>
+    <li>Click Manage... in the Active Configuration group (Figure 1)
+      <p>The <b>Add/Remove Carbide Build Configuration </b> window appears (Figure 2). Use the <b>Add/Remove Carbide Build Configuration</b> window to manage the build configurations that appear on the Build Configurations sub-menu for the current project. You can also  click the <b>Manage configurations for the current project</b> icon (<img src="images/icon_manage_project_configs.png" width="16" height="16" align="absmiddle">) on the toolbar to open this dialog. </p>
+    </li>
+    <li>
+      <p align="center"><img src="images/add_build_config_manage_wnd.png" width="650" height="500" alt="" /></p>
+      <p class="figure">Figure 2 - Window for managing build configurations</p>
+    </li>
+  </ol>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/build_configurations.htm">Active  Configuration</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="prj_set_build_tgt.htm">Setting an Active  Configuration </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_preprocess.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_preprocess.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,24 +1,24 @@
-<!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>Preprocessing Files </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Preprocessing Files </h2>
-<p>In the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> or <a href="../../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views you can preprocess source files (.c, .cpp, .cia), header files (.h), and resource files (.rss) by right-clicking the source file and then selecting the <b>Preprocess</b> command. Use the <a href="../../reference/wnd_preprocess_prefs.htm">Preprocess</a> preference panel to specify the preprocessor settings. </p>
-<p>When preprocessing resource files that use more than one language, the <b>Select Language</b> dialog appears asking you to select the language to preprocess. </p>
-<p align="center"><img src="images/menu_preprocessing.png" width="409" height="471"></p>
-<p class="figure">Figure 1 - Selecting a source file to preprocess </p>
-<h5>Other references </h5>
-  <ul>
-<li><a href="../../concepts/Projects.html">Projects</a></li>
-<li><a href="../../reference/wnd_preprocess_prefs.htm">Preprocess Preferences </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>Preprocessing Files </title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Preprocessing Files </h2>
+<p>In the <a href="../../reference/view_cpp_projects.htm">Project Explorer</a> or <a href="../../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views you can preprocess source files (.c, .cpp, .cia), header files (.h), and resource files (.rss) by right-clicking the source file and then selecting the <b>Preprocess</b> command. Use the <a href="../../reference/wnd_preprocess_prefs.htm">Preprocess</a> preference panel to specify the preprocessor settings. </p>
+<p>When preprocessing resource files that use more than one language, the <b>Select Language</b> dialog appears asking you to select the language to preprocess. </p>
+<p align="center"><img src="images/menu_preprocessing.png" width="409" height="471"></p>
+<p class="figure">Figure 1 - Selecting a source file to preprocess </p>
+<h5>Other references </h5>
+  <ul>
+<li><a href="../../concepts/Projects.html">Projects</a></li>
+<li><a href="../../reference/wnd_preprocess_prefs.htm">Preprocess Preferences </a></li>
+  </ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,64 +1,64 @@
-<!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>Setting an Active Configuration</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting an Active Configuration</h2>
-<p>If you have more than one build configuration in a project, use the <b>Manage configurations </b> icon on the toolbar or the <b>Build  Configuration</b> menu item to select the build target used to create executables. The active build target is indicated by a check mark.</p>
-<div class="step">
-  <h4>Setting the Active  Configuration </h4>
-  <ul>
-    <li>From the
-      toolbar
-        <ol>
-          <li>Select the project in the Project Explorer or C/C++ Projects view </li>
-          <li>In the toolbar click  Manage  configurations for the current project control (<img src="../../images/icons/toolbar_manage_configs.png" width="29" height="16" align="absmiddle">) &gt;      <i>configuration_name</i></li>
-        </ol>
-        <ul>
-          <div align="center"><img src="../../images/icons/toolbar_manage_configs_menu.png" width="271" height="121"></div>
-          <blockquote class="figure"><p align="center" class="figure">Figure 2 - Build Configuration menu</p>
-          </blockquote>
-        </ul>
-    </li>
-    <li>From the Project menu    
-      <ul>
-        <li>Click Project &gt; Build  Configurations &gt; Set Active &gt; <i>configuration_name</i></li>
-      </ul>
-    </li>
-    <blockquote>
-      <p align="center" class="figure"><img src="images/menu_build_config_select_tgt_01.png" width="734" height="240" /><br />
-      Figure 2 - Build Configuration menu</p>
-    </blockquote>
-    <li>From the project's context menu 
-      <ul>
-        <li>Right-click the project name, click  Build Configurations &gt; Set Active &gt; <i>configuration_name</i></li>
-      </ul>
-    </li>
-    <li>From the Properties for &lt;<em>project_name</em>&gt; window
-      <ol>
-        <li>Right-click the project name, select  Properties </li>
-        <li>Select Carbide.c++ &gt; <a href="../../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> panel </li>
-        <li>Select the active build configuration from the Active Configuration dropdown list</li>
-        <li>Click Apply </li>
-      </ol>
-    </li>
-  </ul>
-  <p>The IDE uses the chosen build configuration as its build target. </p>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/build_configurations.htm">Active  Configuration</a></li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="prj_new_build_config.htm">Adding/Removing 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>Setting an Active Configuration</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Setting an Active Configuration</h2>
+<p>If you have more than one build configuration in a project, use the <b>Manage configurations </b> icon on the toolbar or the <b>Build  Configuration</b> menu item to select the build target used to create executables. The active build target is indicated by a check mark.</p>
+<div class="step">
+  <h4>Setting the Active  Configuration </h4>
+  <ul>
+    <li>From the
+      toolbar
+        <ol>
+          <li>Select the project in the Project Explorer or C/C++ Projects view </li>
+          <li>In the toolbar click  Manage  configurations for the current project control (<img src="../../images/icons/toolbar_manage_configs.png" width="29" height="16" align="absmiddle">) &gt;      <i>configuration_name</i></li>
+        </ol>
+        <ul>
+          <div align="center"><img src="../../images/icons/toolbar_manage_configs_menu.png" width="271" height="121"></div>
+          <blockquote class="figure"><p align="center" class="figure">Figure 2 - Build Configuration menu</p>
+          </blockquote>
+        </ul>
+    </li>
+    <li>From the Project menu    
+      <ul>
+        <li>Click Project &gt; Build  Configurations &gt; Set Active &gt; <i>configuration_name</i></li>
+      </ul>
+    </li>
+    <blockquote>
+      <p align="center" class="figure"><img src="images/menu_build_config_select_tgt_01.png" width="734" height="240" /><br />
+      Figure 2 - Build Configuration menu</p>
+    </blockquote>
+    <li>From the project's context menu 
+      <ul>
+        <li>Right-click the project name, click  Build Configurations &gt; Set Active &gt; <i>configuration_name</i></li>
+      </ul>
+    </li>
+    <li>From the Properties for &lt;<em>project_name</em>&gt; window
+      <ol>
+        <li>Right-click the project name, select  Properties </li>
+        <li>Select Carbide.c++ &gt; <a href="../../reference/build_properties/pane_build_config.htm">Carbide Build Configurations</a> panel </li>
+        <li>Select the active build configuration from the Active Configuration dropdown list</li>
+        <li>Click Apply </li>
+      </ol>
+    </li>
+  </ul>
+  <p>The IDE uses the chosen build configuration as its build target. </p>
+</div>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../../concepts/build_configurations.htm">Active  Configuration</a></li>
+</ul>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/working_with_sis_pkg_files.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -47,7 +47,7 @@
   <li><a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> pane</li>
   <li><a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_changing.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_changing.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,41 +1,41 @@
-<!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>Changing Register Values</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Changing Register Values</h2>
-<p>  You can change register values in the <a href="../../reference/view_registers.htm">Registers</a> view during program execution in order to examine program behavior.</p>
-<p class="note"><b>NOTE</b> Changing a register value can cause unpredictable behavior in the running program. </p>
-<div class="step">
-  <h4>Changing a Register Value </h4>
-  <ol>
-    <li>Right-click the value  in the Registers view  and select Change Value 
-      <p align="center"><img src="images/set_register_value_menu.png" width="395" height="370" /></p>
-      <p class="figure">Figure 1 - Right-click register value to change</p>
-      <p>The Set Value window appears (Figure 2).</p>
-      <p align="center"><img src="images/set_register_value.png" width="401" height="214" /></p>
-      <p class="figure">Figure 2 - Set Value window</p>
-    </li>
-    <li>
-      <p class="step">Enter a new register value</p>
-    </li>
-    <li>Press OK</li>
-    <p>The register value changes in the Register view</p>
-  </ol>
-</div>
-  <h5>Other references </h5>
-  <ul>
-    <li><a href="../../concepts/registers.htm">Register</a></li>
-    <li><a href="mem_reg_open_wnd.htm">Opening Register View</a></li>
-    <li><a href="mem_reg_viewing.htm">Viewing Register Values </a></li>
-    <li><a href="../../reference/view_registers.htm">Registers 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>Changing Register Values</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Changing Register Values</h2>
+<p>  You can change register values in the <a href="../../reference/view_registers.htm">Registers</a> view during program execution in order to examine program behavior.</p>
+<p class="note"><b>NOTE</b> Changing a register value can cause unpredictable behavior in the running program. </p>
+<div class="step">
+  <h4>Changing a Register Value </h4>
+  <ol>
+    <li>Right-click the value  in the Registers view  and select Change Value 
+      <p align="center"><img src="images/set_register_value_menu.png" width="395" height="370" /></p>
+      <p class="figure">Figure 1 - Right-click register value to change</p>
+      <p>The Set Value window appears (Figure 2).</p>
+      <p align="center"><img src="images/set_register_value.png" width="401" height="214" /></p>
+      <p class="figure">Figure 2 - Set Value window</p>
+    </li>
+    <li>
+      <p class="step">Enter a new register value</p>
+    </li>
+    <li>Press OK</li>
+    <p>The register value changes in the Register view</p>
+  </ol>
+</div>
+  <h5>Other references </h5>
+  <ul>
+    <li><a href="../../concepts/registers.htm">Register</a></li>
+    <li><a href="mem_reg_open_wnd.htm">Opening Register View</a></li>
+    <li><a href="mem_reg_viewing.htm">Viewing Register Values </a></li>
+    <li><a href="../../reference/view_registers.htm">Registers view </a></li>
+</ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_data_views.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_data_views.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,42 +1,42 @@
-<!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>Changing Register Data Views</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Changing Register Data Views</h2>
-<p>  You can change the register data in the <a href="../../reference/view_registers.htm">Registers</a> view to see register contents in a different format. For example, you can change the view of a register from binary to hexadecimal format.</p>
-<div class="step">
-  <h4>To change register data views</h4>
-  <ol>
-    <li>Open a Registers view </li>
-    <li>Expand the hierarchical list to view the names and corresponding values of the register</li>
-    <li>Select the register value that you want to view in a different format</li>
-    <p>The value highlights.</p>
-    <li>Select Data &gt; View as format, where format is the data format in which you want to view the register value. The register value changes format</li>
-    <p>Available formats depend on the selected register value.</p>
-    <li>Select Data &gt; View as Default to restore the original data format</li>
-  </ol>
-</div>
-  <h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/registers.htm">Registers</a></li>
-</ul>
-  <h5>Related tasks</h5>
-  <ul>
-    <li><a href="mem_reg_open_wnd.htm">Opening Register View</a></li>
-    <li><a href="mem_reg_viewing.htm">Viewing Register Values </a></li>
-    <li><a href="mem_reg_changing.htm">Changing Register Values</a></li>
-  </ul>
-  <h5>Related references </h5>
-  <ul>
-    <li><a href="mem_reg_viewing.htm">Registers 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>Changing Register Data Views</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Changing Register Data Views</h2>
+<p>  You can change the register data in the <a href="../../reference/view_registers.htm">Registers</a> view to see register contents in a different format. For example, you can change the view of a register from binary to hexadecimal format.</p>
+<div class="step">
+  <h4>To change register data views</h4>
+  <ol>
+    <li>Open a Registers view </li>
+    <li>Expand the hierarchical list to view the names and corresponding values of the register</li>
+    <li>Select the register value that you want to view in a different format</li>
+    <p>The value highlights.</p>
+    <li>Select Data &gt; View as format, where format is the data format in which you want to view the register value. The register value changes format</li>
+    <p>Available formats depend on the selected register value.</p>
+    <li>Select Data &gt; View as Default to restore the original data format</li>
+  </ol>
+</div>
+  <h5>Related concepts</h5>
+  <ul>
+    <li><a href="../../concepts/registers.htm">Registers</a></li>
+</ul>
+  <h5>Related tasks</h5>
+  <ul>
+    <li><a href="mem_reg_open_wnd.htm">Opening Register View</a></li>
+    <li><a href="mem_reg_viewing.htm">Viewing Register Values </a></li>
+    <li><a href="mem_reg_changing.htm">Changing Register Values</a></li>
+  </ul>
+  <h5>Related references </h5>
+  <ul>
+    <li><a href="mem_reg_viewing.htm">Registers View </a></li>
+  </ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_open_wnd.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_open_wnd.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,33 +1,33 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Opening a Registers View</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Opening a Registers View </h2>
-<p>  Open the <a href="../../reference/view_registers.htm">Registers</a> view to <a href="mem_reg_viewing.htm">inspect</a> and <a href="mem_reg_changing.htm">modify</a> various register contents.</p>
-<p class="note"><b>NOTE</b> When using an emulator, the registers shown are those of the x86 processor on the host machine, not that of the target device.</p>
-<div class="step">
-  <h4>To open a Registers view </h4>
-  <ul>
-    <li><b>Click Window &gt; Show View &gt; Registers </b></li>
-  <p> Registers view appears in the current perspective.</p>
-  <p align="center"><img src="../../concepts/images/ARM_registers.PNG" width="648" height="276" /></p>
-  <p class="figure">Figure 1 - Registers view</p>
-  </ul>
-</div>
-  <h5>Other references </h5>
-  <ul>
-    <li><a href="../../concepts/registers.htm">Register</a></li>
-    <li><a href="../../reference/view_registers.htm">Registers view </a></li>
-    <li><a href="mem_reg_viewing.htm">Viewing Register Values </a></li>
-    <li><a href="mem_reg_changing.htm">Changing Register Values</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>Opening a Registers View</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Opening a Registers View </h2>
+<p>  Open the <a href="../../reference/view_registers.htm">Registers</a> view to <a href="mem_reg_viewing.htm">inspect</a> and <a href="mem_reg_changing.htm">modify</a> various register contents.</p>
+<p class="note"><b>NOTE</b> When using an emulator, the registers shown are those of the x86 processor on the host machine, not that of the target device.</p>
+<div class="step">
+  <h4>To open a Registers view </h4>
+  <ul>
+    <li><b>Click Window &gt; Show View &gt; Registers </b></li>
+  <p> Registers view appears in the current perspective.</p>
+  <p align="center"><img src="../../concepts/images/ARM_registers.PNG" width="648" height="276" /></p>
+  <p class="figure">Figure 1 - Registers view</p>
+  </ul>
+</div>
+  <h5>Other references </h5>
+  <ul>
+    <li><a href="../../concepts/registers.htm">Register</a></li>
+    <li><a href="../../reference/view_registers.htm">Registers view </a></li>
+    <li><a href="mem_reg_viewing.htm">Viewing Register Values </a></li>
+    <li><a href="mem_reg_changing.htm">Changing Register Values</a></li>
+</ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_viewing.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/registers/mem_reg_viewing.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -28,7 +28,7 @@
     <li><a href="mem_reg_changing.htm">Changing Register Values</a></li>
     <li><a href="../../reference/view_registers.htm">Registers 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>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -67,7 +67,7 @@
 <ul>
   <li><a href="../../reference/SDKPreferences.html">SDK Preferences Panel</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add_custkits.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_add_custkits.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -36,7 +36,7 @@
   
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_platform_filter.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -103,7 +103,7 @@
   <li><a href="../WorkingwithSDKs.html">Working with SDKs</a></li>
   <li><a href="../../reference/SDKPreferences.html">SDK Preferences Panel </a> </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_search.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -30,7 +30,7 @@
   <li><a href="sdk_view_properties.htm">View SDK Properties</a> </li>
   <li><a href="../../reference/SDKPreferences.html">SDK Preferences Panel</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/sdks/sdk_view_properties.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -31,7 +31,7 @@
   <li><a href="sdk_search.htm">Searching SDKs</a></li>
   <li><a href="../../reference/SDKPreferences.html">SDK Preferences Panel </a> </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_deploying.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_deploying.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,47 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Deploying Programs</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Deploying Programs to Devices</h2>
-<p>Once you have completed the program and tested it with the emulator, it&#8217;s possible to create a <a href="../projects/prj_new_build_config.htm">new</a> build configuration for your device, <a href="../projects/prj_build.htm">build</a> it, then create a <span class="code">.sis</span> file and deploy it to a device.</p>
-<p>To upload a valid <span class="code">.sis</span> file to the target device you need software that communicates with the target device from your PC. Every Symbian phone ships with this connectivity software, which we will refer to generically as Symbian Connect. The actual name for the software is vendor dependent, so refer to your phone&rsquo;s documentation for the name.</p>
-<p>For example, most phones from Nokia that use  Symbian OS  come with <a href="http://europe.nokia.com/nokia/0,,72014,00.html">Nokia PC Suite</a>, which allows you to synchronize and transfer data between your compatible phone and a compatible PC via a compatible data cable or a wireless connection. </p>
-<p> Essentially, the Symbian Connect program provides a method of connecting a PC to the target device via USB, IrDA, Bluetooth, or other serial connection. Once you make a connection, you can upload your <span class="code">.sis</span> file to the target device and install the program. </p>
-<p class="note"><b>NOTE</b> A simple guide is provided to show the basic steps necessary to upload a .sis file to a target device. The actual steps required by the specific Symbian Connect program that ships with the SDK you are using may differ, so always refer to that phone &rsquo;s documentation for details.</p>
-<div class="step">
-  <h4>Deploying .sis Files</h4>
-  <ol>
-    <li>Launch the phone&rsquo;s Symbian Connect program</li>
-    <li>Select the method of connection</li>
-    <p>In this step you select the form of the serial connection to use, USB, Irda, Bluetooth, etc.</p>
-    <li>Select the .sis file to upload</li>
-    <p class="note"><b>NOTE</b> Double-clicking the .sis file should launch the phone's Symbian Connect software.</p>
-    <li>Upload the  .sis file using the Symbian Connect software </li>
-    <li>Install the program on the target device</li>
-  <p>To make the program available on the target device, you must install the program
-    stored in the.sis file. Try double-clicking the .sis file on the phone to install it. If that doesn't work try selecting Install from the phone's menu,
-    selecting the program name, then clicking Install.</p>
-  </ol>
-</div>
-    <p>Congratulations, you&rsquo;ve now successfully uploaded a .sis file  to your
-target device.</p>
-<h5>Concepts</h5>
-<ul>
-    <li><a href="../../concepts/Projects.html">Projects</a> </li>
-</ul>
-  <h5>Tasks</h5>
-  <ul>
-    <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
-    <li><a href="../projects/prj_build.htm">Building Projects</a></li>
-    <li><a href="../projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
-  </ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!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>Deploying Programs</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Deploying Programs to Devices</h2>
+<p>Once you have completed the program and tested it with the emulator, it&#8217;s possible to create a <a href="../projects/prj_new_build_config.htm">new</a> build configuration for your device, <a href="../projects/prj_build.htm">build</a> it, then create a <span class="code">.sis</span> file and deploy it to a device.</p>
+<p>To upload a valid <span class="code">.sis</span> file to the target device you need software that communicates with the target device from your PC. Every Symbian phone ships with this connectivity software, which we will refer to generically as Symbian Connect. The actual name for the software is vendor dependent, so refer to your phone&rsquo;s documentation for the name.</p>
+<p>For example, most phones from Nokia that use  Symbian OS  come with <a href="http://europe.nokia.com/nokia/0,,72014,00.html">Nokia PC Suite</a>, which allows you to synchronize and transfer data between your compatible phone and a compatible PC via a compatible data cable or a wireless connection. </p>
+<p> Essentially, the Symbian Connect program provides a method of connecting a PC to the target device via USB, IrDA, Bluetooth, or other serial connection. Once you make a connection, you can upload your <span class="code">.sis</span> file to the target device and install the program. </p>
+<p class="note"><b>NOTE</b> A simple guide is provided to show the basic steps necessary to upload a .sis file to a target device. The actual steps required by the specific Symbian Connect program that ships with the SDK you are using may differ, so always refer to that phone &rsquo;s documentation for details.</p>
+<div class="step">
+  <h4>Deploying .sis Files</h4>
+  <ol>
+    <li>Launch the phone&rsquo;s Symbian Connect program</li>
+    <li>Select the method of connection</li>
+    <p>In this step you select the form of the serial connection to use, USB, Irda, Bluetooth, etc.</p>
+    <li>Select the .sis file to upload</li>
+    <p class="note"><b>NOTE</b> Double-clicking the .sis file should launch the phone's Symbian Connect software.</p>
+    <li>Upload the  .sis file using the Symbian Connect software </li>
+    <li>Install the program on the target device</li>
+  <p>To make the program available on the target device, you must install the program
+    stored in the.sis file. Try double-clicking the .sis file on the phone to install it. If that doesn't work try selecting Install from the phone's menu,
+    selecting the program name, then clicking Install.</p>
+  </ol>
+</div>
+    <p>Congratulations, you&rsquo;ve now successfully uploaded a .sis file  to your
+target device.</p>
+<h5>Concepts</h5>
+<ul>
+    <li><a href="../../concepts/Projects.html">Projects</a> </li>
+</ul>
+  <h5>Tasks</h5>
+  <ul>
+    <li><a href="../CreatingNewProjects.html">Creating Projects</a></li>
+    <li><a href="../projects/prj_build.htm">Building Projects</a></li>
+    <li><a href="../projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+  </ul>
+  <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,24 +1,24 @@
-<!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>Application Emulator Debug Example using Templates</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Application  Emulator Debug Example using Templates</h2>
-<p>This example shows how to create, build, and debug a program for the emulator called HelloCarbide using Carbide project templates. Once debugged, you can create a new build compiled to run on a target device. If the Carbide.c++ edition you are using supports on-device debugging, then Carbide.c++ deploys the program to the target device automatically. The steps include:</p>
-<ul>
-  <li><a href="../CreatingNewProjects.html">Creating</a> a project using Carbide project templates </li>
-  <li>Building an <a href="../projects/prj_build.htm">executable</a> of the project sources </li>
-  <li>Defining a <a href="../projects/prj_debug_config.htm">run/debug</a> <a href="../../projects/launch/launch_configs_overview.htm">launch configuration</a> to provide additional information to the debugger </li>
-  <li>Using a <a href="carbide_debugging.htm">debugger</a> to interactively control the program in the emulator </li>
-</ul>
-<p>Follow the steps to successfully create the HelloCarbide program and debug it on the S60 Emulator. </p>
-<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
-<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>Application Emulator Debug Example using Templates</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Application  Emulator Debug Example using Templates</h2>
+<p>This example shows how to create, build, and debug a program for the emulator called HelloCarbide using Carbide project templates. Once debugged, you can create a new build compiled to run on a target device. If the Carbide.c++ edition you are using supports on-device debugging, then Carbide.c++ deploys the program to the target device automatically. The steps include:</p>
+<ul>
+  <li><a href="../CreatingNewProjects.html">Creating</a> a project using Carbide project templates </li>
+  <li>Building an <a href="../projects/prj_build.htm">executable</a> of the project sources </li>
+  <li>Defining a <a href="../projects/prj_debug_config.htm">run/debug</a> <a href="../../projects/launch/launch_configs_overview.htm">launch configuration</a> to provide additional information to the debugger </li>
+  <li>Using a <a href="carbide_debugging.htm">debugger</a> to interactively control the program in the emulator </li>
+</ul>
+<p>Follow the steps to successfully create the HelloCarbide program and debug it on the S60 Emulator. </p>
+<p class="note"><b>NOTE</b> There must be at least one recognized SDK installed before you can create a project. See the <a href="../../reference/SDKPreferences.html">SDK Preferences panel</a> to determine if the installed SDKs are recognized by Carbide.c++ IDE. If the SDK you have installed is not recognized, you may still be able to <a href="../AddinganSDK.html">add</a> it to the Discovered Symbian OS SDK list.</p>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_example_trk.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -66,7 +66,7 @@
   <li><a href="../trk/trk_troubleshooting.htm">On-device Debugging Troubleshooting</a></li>
   <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS 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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_help.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_help.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -25,7 +25,7 @@
 <ul>
   <li> <a href="file:///fturovic/Documents/workspace-2.x.x/carbidecpp/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview.htm">Carbide.c++ Overview</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -17,7 +17,7 @@
   <li><a href="carbide_help.htm">Carbide Help</a></li>
   <li><a href="carbide_updating.htm">Updating Carbide</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_overview_trk.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -1,45 +1,45 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Run Mode Overview</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Run Mode Overview </h2>
-<p>This example shows how to create and build an application and debug it on a device using the Application TRK on-device debug agent. Click this link to the <img src="../../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=com.nokia.carbide.cpp.doc.user.trk_appTRK_Using)")'>HelloCarbide</a> cheatsheet that provides links to detailed steps. The majority of steps are identical to the ones used to create a program and debug in an emulator, with some minor variations.</p>
-<p>See the <a href="carbide_example_trk.htm">Run Mode Debug Example</a> for a walkthrough of the following steps which include:</p>
-<ol>
-  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/SDKPreferences.html">SDK preferences</a> panel.</li>
-  <li>Create a project by <a href="../ImportingProjects.html">importing</a> a Bld.inf  </li>
-  <li>Verify that all the symbolics for the binaries are visible in the <a href="../../reference/view_executables.htm">Executables</a> view</li>
-  <li><a href="../projects/prj_creating_sis_file.htm">Manage</a> the project's PKG file, being sure to:
-    <ul>
-      <li><a href="../projects/working_with_sis_pkg_files.htm">Create</a> a PKG file for the application (if using Application TRK)</li>
-      <li><a href="../../reference/build_properties/pane_build_config_sis.htm">Include</a> the PKG file as part of the project in the SIS Builder pane of your project Properties </li>
-      <li><a href="../../reference/build_properties/wnd_sis_properties.htm">Specify</a> application keys (if not a self-signing application) in the SIS Properties dialog </li>
-    </ul>
-  </li>
-  <li><a href="../projects/prj_build.htm">Build</a> the project using a target for on-device build configuration (GCCE or ARM) </li>
-  <li>Start the TRK on-device debug agent on the device</li>
-  <li><a href="../projects/prj_debug_config.htm">Create</a> a Symbian OS Application TRK <a href="../trk/trk_carbide_setup.htm">launch configuration</a> to provide additional information to the debugger</li>
-  <li>Launch the <a href="carbide_debugging.htm">debugger</a> to interactively control the program on the  device</li>
-</ol>
-<p class="note"><b>NOTE</b> Carbide will install the SISX file on the device prior to launching the debugger.</p>
-<p>At this point you can open sources files from the <b>Executables</b> view or project view in order to set breakpoints.</p>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../processes/attach_debugger_to_process.htm">Attaching to a Symbian OS Process </a></li>
-</ul>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../trk/trk_troubleshooting.htm">On-device Debugging Troubleshooting</a></li>
-  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS 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>Run Mode Overview</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Run Mode Overview </h2>
+<p>This example shows how to create and build an application and debug it on a device using the Application TRK on-device debug agent. Click this link to the <img src="../../images/command_link.png" width="16" height="12" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=com.nokia.carbide.cpp.doc.user.trk_appTRK_Using)")'>HelloCarbide</a> cheatsheet that provides links to detailed steps. The majority of steps are identical to the ones used to create a program and debug in an emulator, with some minor variations.</p>
+<p>See the <a href="carbide_example_trk.htm">Run Mode Debug Example</a> for a walkthrough of the following steps which include:</p>
+<ol>
+  <li>Verify that your SDK or customer kit is recognized in the <a href="../../reference/SDKPreferences.html">SDK preferences</a> panel.</li>
+  <li>Create a project by <a href="../ImportingProjects.html">importing</a> a Bld.inf  </li>
+  <li>Verify that all the symbolics for the binaries are visible in the <a href="../../reference/view_executables.htm">Executables</a> view</li>
+  <li><a href="../projects/prj_creating_sis_file.htm">Manage</a> the project's PKG file, being sure to:
+    <ul>
+      <li><a href="../projects/working_with_sis_pkg_files.htm">Create</a> a PKG file for the application (if using Application TRK)</li>
+      <li><a href="../../reference/build_properties/pane_build_config_sis.htm">Include</a> the PKG file as part of the project in the SIS Builder pane of your project Properties </li>
+      <li><a href="../../reference/build_properties/wnd_sis_properties.htm">Specify</a> application keys (if not a self-signing application) in the SIS Properties dialog </li>
+    </ul>
+  </li>
+  <li><a href="../projects/prj_build.htm">Build</a> the project using a target for on-device build configuration (GCCE or ARM) </li>
+  <li>Start the TRK on-device debug agent on the device</li>
+  <li><a href="../projects/prj_debug_config.htm">Create</a> a Symbian OS Application TRK <a href="../trk/trk_carbide_setup.htm">launch configuration</a> to provide additional information to the debugger</li>
+  <li>Launch the <a href="carbide_debugging.htm">debugger</a> to interactively control the program on the  device</li>
+</ol>
+<p class="note"><b>NOTE</b> Carbide will install the SISX file on the device prior to launching the debugger.</p>
+<p>At this point you can open sources files from the <b>Executables</b> view or project view in order to set breakpoints.</p>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../processes/attach_debugger_to_process.htm">Attaching to a Symbian OS Process </a></li>
+</ul>
+<h5>Related references</h5>
+<ul>
+  <li><a href="../trk/trk_troubleshooting.htm">On-device Debugging Troubleshooting</a></li>
+  <li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_updating.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -50,7 +50,7 @@
 <ul>
   <li> <a href="carbide_overview.htm">Carbide.c++ Overview</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_carbide_setup.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -47,6 +47,6 @@
   <li><a href="../../projects/launch/page_main.htm">Debug Window (On-device Debugging) Overview</a></li>
   <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_bluetooth.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -47,7 +47,7 @@
   <li><a href="trk_connection_bluetooth.htm">Connecting via Bluetooth</a></li>
   <li><a href="trk_connection_usb.htm">Connecting via USB </a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_install_usb.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -49,7 +49,7 @@
   <li><a href="trk_connection_bluetooth.htm">Connecting via Bluetooth</a></li>
   <li><a href="trk_connection_usb.htm">Connecting via USB </a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_troubleshooting.htm	Fri Apr 16 11:18:22 2010 -0500
@@ -119,7 +119,7 @@
   <li>In the Carbide tools, <a href="../projects/prj_debug_config.htm">open</a> the launch configuration associated with the target device. In the Connections tab make sure you specify the same COM port number as in the device manager. For Bluetooth, if two ports are listed in the device manager, then you need to try to both, to see which one works. For USB, don't select the COM port assigned to the serial port. Always select the COM port assigned to the virtual COM port ID for the phone that is specified in the Device Manager. </li>
   <li>Make sure the settings in these two dialogs are the same and that the launch configuration settings refer to the right COM port. You shouldn't have to touch the other settings, but they're Data Bits: 8; Parity: None; Stop Bits: 1; Flow Control: None. </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Fri Apr 16 11:18:22 2010 -0500
@@ -410,4 +410,30 @@
     	return contexts; 
     }
     
+    /**
+	 * If a variant is defined and it changes the output directory, return the directory name.
+	 * For example, armv5_udeb.phone1 would return '.phone1'. If not variant that changes the release tree, then null
+	 * NOTE: This method deals with variant text applied to the end of a build alias, specifically testing for
+	 * variant text defined in the SBSv2 Build Configuration tab.
+	 * @return null if not a variant or the value to append to the platform release tree directory
+	 * @see com.nokia.carbide.cdt.internal.builder.ui#SBSv2BuildConfigTab
+	 */
+	public static String getVariantOutputDirModifier(String variantText) {
+		
+		String[] ignoredVariants =  { "generic", "tracecompiler", "trace", "test", "savespace", 
+				"bfc", "smp", "rvct2_2", "rvct4_0", "rvct3_1", "gcce4_3_2", "remove_freeze" };
+		
+		String newOutputDir = null;
+		if (variantText != null && variantText.length() > 1){
+			String[] variantTok = variantText.split("\\.");
+			if (variantTok.length > 1){
+				for (String ignore : ignoredVariants){
+					if (variantTok[1].toLowerCase().equals(ignore))
+						return null;
+				}
+				newOutputDir = "." + variantTok[1];
+			}
+		}
+		return newOutputDir;
+	}
 }
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SymbianBuildContext.java	Fri Apr 16 11:18:22 2010 -0500
@@ -626,12 +626,4 @@
 	public String getSBSv2Alias() {  
 		return sbsv2Alias;
 	} 
-	
-	public void setSBSv2Alias(String sbsv2Alias) { 
-		this.sbsv2Alias = sbsv2Alias; 
-	}
-	
-	public void setDisplayString(String newDisplayName) { 
-		this.displayString = newDisplayName; 
-	}
 }
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java	Fri Apr 16 11:16:33 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/sdk/core/ISymbianBuildContext.java	Fri Apr 16 11:18:22 2010 -0500
@@ -151,7 +151,4 @@
 	 */
 	public String getSBSv2Alias();
 	
-	public void setSBSv2Alias(String newAlias);
-	
-	public void setDisplayString(String newDisplayName);
 }
--- a/core/com.nokia.carbide.cpp/plugin_customization.ini	Fri Apr 16 11:16:33 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,269 +0,0 @@
-# WARNING: A VERSION OF THIS FILE FOR S60 DEVELOPMENT EXISTS UNDER internal\core\com.nokia.carbide.cpp\plugin_customization.ini
-# IF YOU MAKE CHANGES HERE, THINK ABOUT IF YOU NEED TO MAKE CHANGES THERE TOO (LIKELY YOU WILL)
-
-# plugin_customization.ini 
-# sets default values for plug-in-specific preferences
-# keys are qualified by plug-in id
-# e.g., com.example.acmeplugin/myproperty=myvalue
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in plugin_customization.properties
-# This file does not need to be translated.
-
-# Property "org.eclipse.ui/defaultPerspectiveId" controls the 
-# perspective that the workbench opens initially
-org.eclipse.ui/defaultPerspectiveId=com.nokia.carbide.cpp.CarbideCppPerspective
-
-org.eclipse.ui/KEY_CONFIGURATION_ID=com.nokia.carbide.cpp.carbidedefault
-
-# new-style tabs by default
-org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
-
-# put the perspective switcher on the top right
-org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight
-
-# show progress on startup
-org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true
-
-org.eclipse.debug.ui/org.eclipse.debug.ui.switch_to_perspective=always
-
-#from org.eclipse.core.resource.ResourcesPlugin
-org.eclipse.core.resources/description.autobuilding=false
-org.eclipse.core.resources/refresh.enabled=true
-
-# set the default perspective to crash debugger for crash debugger launch
-org.eclipse.debug.ui/org.eclipse.debug.ui.PREF_LAUNCH_PERSPECTIVES=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<launchPerspectives>\r\n<launchPerspective configurationType\="com.nokia.cdt.debug.crashdebugger.crashDebugLaunch" mode\="run" perspective\="com.nokia.cdt.debug.crashdebugger.CrashDebuggerPerspective"/>\r\n</launchPerspectives>\r\n
-
-# Carbide Help system customizations
-# reset order of Carbide manuals as they should appear in help system
-# replaces the org.eclipse.help/baseTOCS setting
-org.eclipse.help/HELP_DATA = /com.nokia.carbide.cpp/html/helpDATA.xml
-
-
-# reset base page of help system to our own
-org.eclipse.help.base/help_home = /com.nokia.carbide.cpp/html/help_home.html
-# org.eclipse.help.base/help_home = http://domino.americas.nokia.com/tp/austin/idesolutions.nsf/document/DA02M6JNMTL
-
-# enable editor folding but don't fold anything by default
-org.eclipse.cdt.ui/editor_folding_enabled=true
-org.eclipse.cdt.ui/editor_folding_default_structures=false
-org.eclipse.cdt.ui/editor_folding_default_functions=false
-org.eclipse.cdt.ui/editor_folding_default_methods=false
-org.eclipse.cdt.ui/editor_folding_default_macros=false
-org.eclipse.cdt.ui/editor_folding_default_headers=false
-
-# default class/structs/unions/typedef syntax color (see bug #3527 and #2920)
-org.eclipse.cdt.ui/semanticHighlighting.class.color=16,105,239
-org.eclipse.cdt.ui/semanticHighlighting.typedef.color=16,105,239
-
-# enable macro reference highlighting like it was in Carbide 1.3.0 (see bug #7776)
-org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.enabled=true
-org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.bold=true
-org.eclipse.cdt.ui/semanticHighlighting.macroSubstitution.color=127,0,85
-
-# In CDT 5.0 this setting is enabled by default, so we have to disable
-# it here.  We want it disabled so indexer problem markers are not created.
-# We do want some visual indication of indexer issues though so we enable
-# syntax coloring for indexer problems.  See bug #3314 for more details.
-org.eclipse.cdt.ui/handleTemporaryProblems=false
-org.eclipse.cdt.ui/semanticHighlighting.problem.enabled=true
-org.eclipse.cdt.ui/semanticHighlighting.problem.color=100,100,100
-
-# this is a copy of whitesmiths code style with tab length changed from 8 to 4 (bug #3368)
-org.eclipse.cdt.ui/formatter_profile=Symbian OS
-org.eclipse.cdt.ui/org.eclipse.cdt.ui.formatterprofiles=<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r\n\
-<profiles version="1">\r\n\
-<profile kind="CodeFormatterProfile" name="Symbian OS" version="1">\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.lineSplit" value="80"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer" value="48"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.tabulation.size" value="4"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_enumerator_list" value="48"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_declarator_list" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_empty_lines" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_method_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_block" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_type_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.continuation_indentation" value="2"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_expression_list" value="0"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_binary_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_conditional_expression" value="80"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_compact_if" value="0"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_binary_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration" value="80"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_statements_compare_to_body" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_statements_compare_to_block" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.tabulation.char" value="mixed"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_block_in_case" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.compact_else_if" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_switch" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indentation.size" value="4"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_array_initializer" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments" value="do not insert"/>\r\n\
-</profile>\r\n\
-<profile kind="CodeFormatterProfile" name="S60" version="1">\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.lineSplit" value="78"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer" value="48"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.tabulation.size" value="4"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_enumerator_list" value="48"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_declarator_list" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_empty_lines" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_method_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_block" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_type_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.continuation_indentation" value="2"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_expression_list" value="0"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_binary_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_conditional_expression" value="78"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_compact_if" value="0"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_binary_operator" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration" value="80"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_statements_compare_to_body" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_statements_compare_to_block" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.tabulation.char" value="space"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_block_in_case" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.compact_else_if" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_switch" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indentation.size" value="4"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_array_initializer" value="next_line_shifted"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments" value="do not insert"/>\r\n\
-</profile>\r\n\
-<profile kind="CodeFormatterProfile" name="Qt" version="1">\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration" value="next_line"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_statements_compare_to_block" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.lineSplit" value="100"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_empty_lines" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_block" value="end_of_line"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indentation.size" value="4"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.continuation_indentation" value="1"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_switch" value="end_of_line"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>\r\n<setting id="org.eclipse.cdt.core.formatter.compact_else_if" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.tabulation.size" value="4"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_conditional_expression" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header" value="false"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.indent_statements_compare_to_body" value="true"/>\r\n<setting id="org.eclipse.cdt.core.formatter.tabulation.char" value="space"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>\r\n<setting id="org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>\r\n\
-</profile>\r\n\
-</profiles>\r\n
-
-# apply code formatting to C/C++ templates
-org.eclipse.cdt.ui/org.eclipse.cdt.ui.text.templates.format=true
-
-# yuck.  the line above sets values for a new formatter profile.  this itself is an org.eclipse.cdt.ui pref.  but the values
-# themselves, e.g. insert_space_before_closing_paren_in_if, are org.eclipse.cdt.core prefs.  they are not loaded by CDT at all
-# until you open and ok on the code style pref page (see bug #3580).  so the only way i can figure out how to fix
-# this bug is to set the org.eclipse.cdt.core settings here.  note, these values must match the ones from the line above!!!
-# there is probably a much cleaner fix in CDT somewhere but I couldn't figure it out.
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.lineSplit=80
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier=true
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer=48
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.tabulation.size=4
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.alignment_for_enumerator_list=48
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.alignment_for_declarator_list=16
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indent_empty_lines=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.brace_position_for_method_declaration=next_line_shifted
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.brace_position_for_block=next_line_shifted
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.brace_position_for_type_declaration=next_line_shifted
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.continuation_indentation=2
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.alignment_for_expression_list=0
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.alignment_for_compact_if=0
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=80
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indent_statements_compare_to_body=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indent_statements_compare_to_block=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.tabulation.char=mixed
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.brace_position_for_block_in_case=next_line_shifted
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.compact_else_if=true
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.brace_position_for_switch=next_line_shifted
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.indentation.size=4
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration=next_line_shifted
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.brace_position_for_array_initializer=next_line_shifted
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket=do not insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters=insert
-org.eclipse.cdt.core/org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments=do not insert
-
-
-# save before build on by default
-org.eclipse.ui.ide/SAVE_ALL_BEFORE_BUILD=true
-
-# refresh workspace on startup - see bug #4083
-org.eclipse.ui.ide/REFRESH_WORKSPACE_ON_STARTUP=true
-
-# indexer files to parse up front (comma separated list)
-org.eclipse.cdt.core/indexer/filesToParseUpFront=e32base.h
-
-# universal intro definitions
-org.eclipse.ui.intro.universal/INTRO_ROOT_PAGES = overview, whatsnew, tutorials, webresources, migrate
-org.eclipse.ui.intro.universal/INTRO_DATA = product:introDATA.xml
-org.eclipse.ui.intro/INTRO_THEME = com.nokia.carbide.cpp.carbide
-
-# can be used for preprocess so we need to make it big!
-org.eclipse.cdt.ui/buildConsoleLines=500000
-
-# turn off showing source files from binaries, maybe not be needed in CDT 5.0
-org.eclipse.cdt.core/org.eclipse.cdt.core.showSourceFilesInBinaries=false
-
-# turn off showing source roots at top level of projects
-org.eclipse.cdt.core/org.eclipse.cdt.core.showSourceRootsAtTopLevelOfProject=false
-
-# map C sources and headers to C++
-org.eclipse.cdt.core/org.eclipse.cdt.core.workspaceLanguageMappings=<?xml version\="1.0" encoding\="UTF-8"?><workspace-mappings><content-type-mapping content-type\="org.eclipse.cdt.core.cHeader" language\="org.eclipse.cdt.core.g++"/><content-type-mapping content-type\="org.eclipse.cdt.core.cSource" language\="org.eclipse.cdt.core.g++"/></workspace-mappings>
-
-# fix bug #7537
-org.eclipse.cdt.ui/removeTrailingWhitespace=false
-
-# disable certain SBSv2 configurations by default
-com.nokia.carbide.cpp.sdk.core/sbsv2FilteredConfigs=tools2_deb;tools2_rel;gccxml_udeb;gccxml_urel;tools_deb;tools_rel
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/main.cpp	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/main.cpp	Fri Apr 16 11:18:22 2010 -0500
@@ -1,32 +1,11 @@
-/****************************************************************************
-**
-** Trolltech hereby grants a license to use the Qt/Eclipse Integration
-** plug-in (the software contained herein), in binary form, solely for the
-** purpose of creating code to be used with Trolltech's Qt software.
-**
-** Qt Designer is licensed under the terms of the GNU General Public
-** License versions 2.0 and 3.0 ("GPL License"). Trolltech offers users the
-** right to use certain no GPL licensed software under the terms of its GPL
-** Exception version 1.2 (http://trolltech.com/products/qt/gplexception).
-**
-** THIS SOFTWARE IS PROVIDED BY TROLLTECH AND ITS CONTRIBUTORS (IF ANY) "AS
-** IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-** TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-** PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** Since we now have the GPL exception I think that the "special exception
-** is no longer needed. The license text proposed above (other than the
-** special exception portion of it) is the BSD license and we have added
-** the BSD license as a permissible license under the exception.
-**
-****************************************************************************/
+/*
+============================================================================
+ Name		: $(baseName).cpp
+ Author	  : $(author)
+ Copyright   : $(copyright)
+ Description : Main Console Application
+============================================================================
+*/
 
 #include <QtCore>
 #include <QCoreApplication>
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.properties	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.properties	Fri Apr 16 11:18:22 2010 -0500
@@ -11,3 +11,7 @@
 Release UIDs are provided by Symbian.
 basics.label=Basic Settings
 basics.desc=Basic properties of a project
+basics.author.label=Author:
+basics.author.desc=Name of the author
+basics.copyright.label=Copyright notice:
+basics.copyright.desc=Your copyright notice
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.xml	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/template.xml	Fri Apr 16 11:18:22 2010 -0500
@@ -13,9 +13,24 @@
 				label="%uid3.label"
 				min="0xe0000000"
 				max="0xefffffff"
-				mandatory="true">
+				mandatory="true"
+				persist="true">
 				<description>%uid3.desc</description>
 		</uidField>
+		<textField 
+				id="author"
+				label="%basics.author.label"
+				persist="true">
+				<description>%basics.author.desc</description>
+		</textField>
+		<textField 
+				id="copyright"
+				label="%basics.copyright.label"
+				multiline="true"
+				default="Your copyright notice"
+				persist="true">
+				<description>%basics.copyright.desc</description>
+		</textField>
 	</wizardPage>
 
 	<process class="com.nokia.carbide.cpp.project.core.processes.NewProject"
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.cpp	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.cpp	Fri Apr 16 11:18:22 2010 -0500
@@ -1,32 +1,11 @@
-/****************************************************************************
-**
-** Trolltech hereby grants a license to use the Qt/Eclipse Integration
-** plug-in (the software contained herein), in binary form, solely for the
-** purpose of creating code to be used with Trolltech's Qt software.
-**
-** Qt Designer is licensed under the terms of the GNU General Public
-** License versions 2.0 and 3.0 ("GPL License"). Trolltech offers users the
-** right to use certain no GPL licensed software under the terms of its GPL
-** Exception version 1.2 (http://trolltech.com/products/qt/gplexception).
-**
-** THIS SOFTWARE IS PROVIDED BY TROLLTECH AND ITS CONTRIBUTORS (IF ANY) "AS
-** IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-** TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-** PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** Since we now have the GPL exception I think that the "special exception
-** is no longer needed. The license text proposed above (other than the
-** special exception portion of it) is the BSD license and we have added
-** the BSD license as a permissible license under the exception.
-**
-****************************************************************************/
+/*
+============================================================================
+ Name		: $(baseName).cpp
+ Author	  : $(author)
+ Copyright   : $(copyright)
+ Description : Class Implementation
+============================================================================
+*/
 
 #include "$(className).h"
 
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.h	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.h	Fri Apr 16 11:18:22 2010 -0500
@@ -1,32 +1,11 @@
-/****************************************************************************
-**
-** Trolltech hereby grants a license to use the Qt/Eclipse Integration
-** plug-in (the software contained herein), in binary form, solely for the
-** purpose of creating code to be used with Trolltech's Qt software.
-**
-** Qt Designer is licensed under the terms of the GNU General Public
-** License versions 2.0 and 3.0 ("GPL License"). Trolltech offers users the
-** right to use certain no GPL licensed software under the terms of its GPL
-** Exception version 1.2 (http://trolltech.com/products/qt/gplexception).
-**
-** THIS SOFTWARE IS PROVIDED BY TROLLTECH AND ITS CONTRIBUTORS (IF ANY) "AS
-** IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-** TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-** PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** Since we now have the GPL exception I think that the "special exception
-** is no longer needed. The license text proposed above (other than the
-** special exception portion of it) is the BSD license and we have added
-** the BSD license as a permissible license under the exception.
-**
-****************************************************************************/
+/*
+============================================================================
+ Name		: $(baseName).cpp
+ Author	  : $(author)
+ Copyright   : $(copyright)
+ Description : Declares Class
+============================================================================
+*/
 
 #ifndef $(className$upper)_H
 #define $(className$upper)_H
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/main.cpp	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/main.cpp	Fri Apr 16 11:18:22 2010 -0500
@@ -1,32 +1,11 @@
-/****************************************************************************
-**
-** Trolltech hereby grants a license to use the Qt/Eclipse Integration
-** plug-in (the software contained herein), in binary form, solely for the
-** purpose of creating code to be used with Trolltech's Qt software.
-**
-** Qt Designer is licensed under the terms of the GNU General Public
-** License versions 2.0 and 3.0 ("GPL License"). Trolltech offers users the
-** right to use certain no GPL licensed software under the terms of its GPL
-** Exception version 1.2 (http://trolltech.com/products/qt/gplexception).
-**
-** THIS SOFTWARE IS PROVIDED BY TROLLTECH AND ITS CONTRIBUTORS (IF ANY) "AS
-** IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-** TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-** PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-** OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-** EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-** PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-** PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-** LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-** NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** Since we now have the GPL exception I think that the "special exception
-** is no longer needed. The license text proposed above (other than the
-** special exception portion of it) is the BSD license and we have added
-** the BSD license as a permissible license under the exception.
-**
-****************************************************************************/
+/*
+============================================================================
+ Name		: $(baseName).cpp
+ Author	  : $(author)
+ Copyright   : $(copyright)
+ Description : Main GUI Application
+============================================================================
+*/
 
 #include "$(className).h"
 
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.properties	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.properties	Fri Apr 16 11:18:22 2010 -0500
@@ -12,3 +12,7 @@
 basics.desc=Basic properties of a project
 className.label=Class Name:
 className.desc=The name of the class to generate
+basics.author.label=Author:
+basics.author.desc=Name of the author
+basics.copyright.label=Copyright notice:
+basics.copyright.desc=Your copyright notice
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Dialog/template.xml	Fri Apr 16 11:18:22 2010 -0500
@@ -20,9 +20,24 @@
 				label="%uid3.label"
 				min="0xe0000000"
 				max="0xefffffff"
-				mandatory="true">
+				mandatory="true"
+				persist="true">
 				<description>%uid3.desc</description>
 		</uidField>
+		<textField 
+				id="author"
+				label="%basics.author.label"
+				persist="true">
+				<description>%basics.author.desc</description>
+		</textField>
+		<textField 
+				id="copyright"
+				label="%basics.copyright.label"
+				multiline="true"
+				default="Your copyright notice"
+				persist="true">
+				<description>%basics.copyright.desc</description>
+		</textField>
 	</wizardPage>
 
 	<process class="com.nokia.carbide.templatewizard.processes.CreateTemplateVariable"
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.properties	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.properties	Fri Apr 16 11:18:22 2010 -0500
@@ -12,3 +12,7 @@
 basics.desc=Basic properties of a project
 className.label=Class Name:
 className.desc=The name of the class to generate
+basics.author.label=Author:
+basics.author.desc=Name of the author
+basics.copyright.label=Copyright notice:
+basics.copyright.desc=Your copyright notice
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-MainWindow/template.xml	Fri Apr 16 11:18:22 2010 -0500
@@ -20,9 +20,24 @@
 				label="%uid3.label"
 				min="0xe0000000"
 				max="0xefffffff"
-				mandatory="true">
+				mandatory="true"
+				persist="true">
 				<description>%uid3.desc</description>
 		</uidField>
+		<textField 
+				id="author"
+				label="%basics.author.label"
+				persist="true">
+				<description>%basics.author.desc</description>
+		</textField>
+		<textField 
+				id="copyright"
+				label="%basics.copyright.label"
+				multiline="true"
+				default="Your copyright notice"
+				persist="true">
+				<description>%basics.copyright.desc</description>
+		</textField>
 	</wizardPage>
 
 	<process class="com.nokia.carbide.templatewizard.processes.CreateTemplateVariable"
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.properties	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.properties	Fri Apr 16 11:18:22 2010 -0500
@@ -12,3 +12,7 @@
 basics.desc=Basic properties of a project
 className.label=Class Name:
 className.desc=The name of the class to generate
+basics.author.label=Author:
+basics.author.desc=Name of the author
+basics.copyright.label=Copyright notice:
+basics.copyright.desc=Your copyright notice
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml	Fri Apr 16 11:16:33 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Widget/template.xml	Fri Apr 16 11:18:22 2010 -0500
@@ -20,9 +20,24 @@
 				label="%uid3.label"
 				min="0xe0000000"
 				max="0xefffffff"
-				mandatory="true">
+				mandatory="true"
+				persist="true">
 				<description>%uid3.desc</description>
 		</uidField>
+		<textField 
+				id="author"
+				label="%basics.author.label"
+				persist="true">
+				<description>%basics.author.desc</description>
+		</textField>
+		<textField 
+				id="copyright"
+				label="%basics.copyright.label"
+				multiline="true"
+				default="Your copyright notice"
+				persist="true">
+				<description>%basics.copyright.desc</description>
+		</textField>
 	</wizardPage>
 
 	<process class="com.nokia.carbide.templatewizard.processes.CreateTemplateVariable"