minor edits and updates for 3.0 release
authorfturovic <frank.turovich@nokia.com>
Mon, 21 Jun 2010 14:53:26 -0500
changeset 1507 30441fd93226
parent 1506 9ebb7e505267
child 1508 08aaa57f3eaa
minor edits and updates for 3.0 release
core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/filter_launch_config.png
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html
core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor.html
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_cpp_projects.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/ExportingtoMMP_BLDinf.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/clean.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html	Mon Jun 21 14:53:26 2010 -0500
@@ -37,7 +37,7 @@
 		<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> 
+		  pop-up menus of the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> and <a href="../reference/view_sym_proj_nav.htm">Symbian Project Navigator</a> views.</p> 
 		  <p>
 			 For more information, see <a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>. 
 		  </p> 
@@ -45,7 +45,7 @@
 		<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> 
+		  available on the File menu, and on the pop-up menus of the Project Explorer and Symbian Project Navigator views.</p> 
 		  <p>
 			 For more information, see <a href="../tasks/ImportingProjects.html">Importing Projects from a Bld.Inf File</a>. 
 		  </p> 
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/cmds_starting.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -25,7 +25,7 @@
 </ul>
 <p>To launch a specific launch configuration:</p>
 <ul>
-  <li>Right-click the project's EXE file in the C/C++ Projects view and select <b>Debug As &gt; <em>Project_Name</em></b> from the context menu</li>
+  <li>Right-click the project's EXE file in the Project Explorer view and select <b>Debug As &gt; <em>Project_Name</em></b> from the context menu</li>
 </ul>
 <h4><a name="TERMINATE_DB" id="START_DB2"></a>Terminating a session</h4>
 <p>Use the <b>Terminate</b> command (<img src="../../images/icons/btn_terminate.png" width="17" height="15" align="absmiddle" />) to stop or halt a program based on the type of debugging session underway. Terminate behavior includes: </p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/filter_launch_config.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -9,7 +9,11 @@
 
 <body>
 <h2>Symbian OS Reference Board Launch</h2>
-<p>Use the <b>Debug As</b> dialog to select  the <b>New Launch Configuration Wizard</b> to create a  launch configuration for a development board or reference hardware using a JTAG connection.</p>
+<p>Use the <b>Debug As</b> dialog to select  the <b>New Launch Configuration Wizard</b> to create a  launch configuration for a development board or reference hardware using a JTAG connection. Currently there are two choices of debugger:</p>
+<ul>
+    <li><strong>Symbian OS Phone Launch</strong> &mdash; uses the Eclipse Debugger for C/C++ as the debugger engine which includes snapshots, improved variables view, and other features not available in the Classic debugger.</li>
+    <li><strong>Classic Symbian OS Reference Board Launch</strong> &mdash; uses the classic debugger engine.</li>
+</ul>
 <p align="center"><img src="images/launch_board_01.png" width="350" height="350"></p>
 <p class="figure">Figure 1. Debug As dialog</p>
     <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm	Mon Jun 21 14:53:26 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; 2010 Nokia Corporation and/or its subsidiary(-ies). All 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 Configurations </b> preference panel to  filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs.  </p>
+<p align="center"><img src="images/filter_launch_config.png" width="682" height="587" /></p>
+<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/launch_emulator.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -9,8 +9,12 @@
 
 <body>
 <h2>Symbian OS Emulator Launch</h2>
-<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. </p>
-<p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
+<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. Currently there are two choices of debugger:</p>
+<ul>
+    <li><strong>Symbian OS Phone Launch</strong> &mdash; uses the Eclipse Debugger for C/C++ as the debugger engine which includes snapshots, improved variables view, and other features not available in the Classic debugger.</li>
+    <li><strong>Classic Symbian OS Reference Board Launch</strong> &mdash; uses the classic debugger engine.</li>
+</ul>
+<p align="center"><img src="images/launch_phone_01.png" width="350" height="350" align="center"></p>
 <p class="figure">Figure 1. Debug As dialog</p>
 <div class="step">
   <h4>Creating a Launch Configuration for  Emulators</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -9,7 +9,11 @@
 
 <body>
 <h2>Symbian OS Phone Launch</h2>
-<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. </p>
+<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> that will create a launch configuration for the project. Currently there are two choices of debugger:</p>
+<ul>
+    <li><strong>Symbian OS Phone Launch</strong> &mdash; uses the Eclipse Debugger for C/C++ as the debugger engine which includes snapshots, improved variables view, and other features not available in the Classic debugger.</li>
+    <li><strong>Classic Symbian OS Reference Board Launch</strong> &mdash; uses the classic debugger engine.</li>
+</ul>
 <p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
 <p class="figure">Figure 1. Debug As dialog</p>
 <div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Mon Jun 21 14:53:26 2010 -0500
@@ -1,52 +1,52 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>INF Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>INF Editor - Overview Tab</h2>
-   
-   <p>
-   The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's .INF file. You can view the .inf file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
-<p>
-	  The INF Editor is shown when an INF  file is
-   opened from the <a href="view_cpp_projects.htm">Project Explorer</a> view or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
-   <p align="center"><img src="images/inf_editor_overview.png" width="743" height="533" /></p>
-   <p align="left" class="figure">Figure 1 - INF Editor</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>Components</b></p></td><td class="Cell">
-			 <p>
-				Add components such as MMP and make files to be part of the normal build process.</p>
-			 <ul>
-			   <li>Create New MMP File - creates a new  MMP file at the bottom of the Component list.</li>
-			   <li>Add Existing MMP File - imports a MMP file at the bottom of the Component list.</li>
-			   <li>Add Existing Makefile - adds a make file to the bottom of the Component list. </li>
-			   <li>Edit - Select a component and click Edit to apply the Tidy attribute or specify the Build as ARM option.</li>
-			   <li>Open - Select a component and click Open to open the component in an editor window.</li>
-			   <li>Up - Select a component and click Up to move the component up in the list.</li>
-			   <li>Down - Select a component and click Down to move the component down in the list.</li>
-			   <li>Remove - Select a component and click Remove to remove the component from the build process.</li>
-			 </ul></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Test Components</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Create, import, edit, open, move, or remove MMP and make files that are part of a test build process.</p></td></tr>
-   </table>
-   <h5>Other references</h5>
-	 <ul>
-      <li><a href="INF_Editor_addedit_mmp.html">INF Editor - Add/Edit MMP File</a></li>
-      <li><a href="INF_Editor_addedit_make.html">INF Editor - Add/Edit Make File</a></li>
-      <li><a href="INF_Editor_exports.html">INF Editor - Exports</a></li>
-    </ul>
-  
-   
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head>
+<title>INF Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>INF Editor - Overview Tab</h2>
+   
+   <p>
+   The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's .INF file. You can view the .inf file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
+<p>
+	  The INF Editor is shown when an INF  file is
+   opened from the <a href="view_cpp_projects.htm">Project Explorer</a> view or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
+   <p align="center"><img src="images/inf_editor_overview.png" width="656" height="563" /></p>
+   <p align="left" class="figure">Figure 1 - INF Editor</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>Components</b></p></td><td class="Cell">
+			 <p>
+				Add components such as MMP and make files to be part of the normal build process.</p>
+			 <ul>
+			   <li>Create New MMP File - creates a new  MMP file at the bottom of the Component list.</li>
+			   <li>Add Existing MMP File - imports a MMP file at the bottom of the Component list.</li>
+			   <li>Add Existing Makefile - adds a make file to the bottom of the Component list. </li>
+			   <li>Edit - Select a component and click Edit to apply the Tidy attribute or specify the Build as ARM option.</li>
+			   <li>Open - Select a component and click Open to open the component in an editor window.</li>
+			   <li>Up - Select a component and click Up to move the component up in the list.</li>
+			   <li>Down - Select a component and click Down to move the component down in the list.</li>
+			   <li>Remove - Select a component and click Remove to remove the component from the build process.</li>
+			 </ul></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Test Components</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Create, import, edit, open, move, or remove MMP and make files that are part of a test build process.</p></td></tr>
+   </table>
+   <h5>Other references</h5>
+	 <ul>
+      <li><a href="INF_Editor_addedit_mmp.html">INF Editor - Add/Edit MMP File</a></li>
+      <li><a href="INF_Editor_addedit_make.html">INF Editor - Add/Edit Make File</a></li>
+      <li><a href="INF_Editor_exports.html">INF Editor - Exports</a></li>
+    </ul>
+  
+   
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+</html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor.html	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MMP_Editor.html	Mon Jun 21 14:53:26 2010 -0500
@@ -10,7 +10,7 @@
    The MMP Editor <strong>Overview</strong> tab 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>
+   opened from the <a href="view_cpp_projects.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> 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="675" height="406" /></p>
    <p align="left" class="figure">Figure 1 - MMP Editor Overview tab</p>
    <table cellpadding="2" cellspacing="0"
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_all_targets.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -9,9 +9,14 @@
 </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>Select a project 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:</p>
+<ul>
+    <li>Click <b>Project &gt; Build All Configurations</b> (<span class="code">CTRL+ALT+A</span>) , or</li>
+    <li>Right-click the project name and select <strong>Symbian Build &gt; Build All Configurations</strong></li>
+</ul>
+<p>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>
+<p align="center" class="figure">Figure 1. Build All Configurations  menu </p>
 <h5>Other references</h5>
 <ul>
   <li><a href="menus.htm">Carbide Menus</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_pkg_file.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Build Package (.pkg) File</h2>
-<p>Select a .pkg file in a project&prime;s sis folder in the Project Explorer or C/C++ Projects view and right-click to display the context menu. Select <b>Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The Console view will display the processing output.  The .sis and .sisx files will appear in the sis folder.</p>
+<p>Select a .pkg file in a project&prime;s sis folder in the <a href="../view_cpp_projects.htm">Project Explorer</a> view and right-click to display the context menu. Select <b>Build PKG File</b> to build the package file and create the .sis installation file. This option is also available from an editor view when the file is open. The <span class="code">makesis</span> tool uses the package file and packs all the required resources together into a SIS installation file. The <a href="../view_log.htm">Console</a> view will display the processing output.  The .sis and .sisx files will appear in the sis folder.</p>
 <p align="center"><img src="../images/build_pkg_file.png" width="371" height="420" /></p>
 <p align="center" class="figure">Figure 1. Build PKG File context menu </p>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/clean_symbian_comp.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -9,7 +9,7 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Clean Symbian Component </h2>
-<p>You can select a MMP or MK  file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view and right-click to display the context menu. Select <b>Clean Symbian Component</b> (CTRL+ALT+X) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to see the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
+<p>You can select a MMP or MK  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 right-click to select <b>Symbian Build &gt; Clean Symbian Component</b> (<span class="code">CTRL+ALT+X</span>) to clean the selected MMP project file or makefile. You can also right-click the file in an editor view to see the same option. The cleaning process removes the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
 <p align="center"><img src="../images/clean_symbian_comp.png" width="461" height="347" /></p>
 <p align="center" class="figure">Figure 1. Clean Symbian Component context menu </p>
 <h5>Other references</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/compile_source.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -9,7 +9,7 @@
 </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>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, right-click the file and choose <b> Symbian Build &gt; Compile</b> (<span class="code">CTRL+ALT+C</span>) to compile it. This is also available from within a C/C++ editor view. You can use the shift or control key to select one or more of these file types across the same or different projects. The build progress is displayed in the Console view.</p>
 <p align="center"><img src="../images/menu_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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_cpp_projects.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_cpp_projects.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -8,10 +8,10 @@
 <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>
+<h2>Project Explorer view </h2>
+<p>  The <b>Project Explorer</b> view (Figure 1) display<span><span>s  relevant C/C++ projects located in the current workspace using a tree structure</span></span>. Use this view to manage all the projects located in the current workspace. The view is customizable and takes advantage of working sets. </p>
 <p>The content of a project is dependent upon how it was created in the workspace.</p>
-<p align="center"><img src="images/view_cpp_projects.png" width="273" height="413" /></p>
+<p align="center"><img src="images/view_project_explorer.png" alt="Project Explorer view" width="281" height="424"></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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_log.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Console View </h2>
+<h2>Console view </h2>
 <p>  The <b>Console</b> view display<span><span>s the output of a process and allows you to provide keyboard input to a process</span></span>. There are numerous consoles available, see the Open Console dropdown list for those available to you. Most are enabled from various project panels in Carbide. </p>
 <p align="center"><img src="../images/views/view_console_build.png" width="778" height="203" /></p>
 <p class="figure">Figure 1 - Console view showing build console information</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_sym_proj_nav.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -11,12 +11,12 @@
 <body bgcolor="#FFFFFF">
 <h2>Symbian Project Navigator  view</h2>
 <p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.project.ui.views.SymbianProjectNavigatorView)")'>Symbian Project Navigator</a> view shows all files that belong to the
-current build configuration. This view lists the Symbian projects in your current workspace and their corresponding *.inf file (typically bld.inf). The *.inf file contains the related MMP project files, which are also listed in a tree structure.  You can collapse or expand the list for each MMP to see which sources  belong to each MMP.</p>
+current build configuration. This view lists the Symbian projects in your current workspace and their corresponding *.inf file (typically <span class="code">bld.inf</span>). The *.inf file contains the related MMP project files, which are also listed in a tree structure.  You can collapse or expand the list for each MMP to see which sources  belong to each MMP.</p>
 <p>To open this view select <b>Window &gt; Show View &gt; Symbian Project Navigator</b>, or select <b>Window &gt; Show View &gt; Other ...</b> and expand the Carbide.c++ folder then choose Symbian Project Navigator. </p>
 <p>Figure 1 shows the Symbian Project Navigator view.</p>
-<p align="center"><img src="images/view_sym_proj_nav.png" width="279" height="404" alt=""/></p>
+<p align="center"><img src="images/view_sym_proj_nav.png" width="281" height="340" alt=""/></p>
 <p class="figure">Figure 1 - Symbian Project Navigator view</p>
-<h5>Table 1. Symbian Project Navigator view &mdash;shortcut  menu</h5>
+<h5>Table 1. Symbian Project Navigator view &mdash; shortcut  menu</h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="30%" scope="col">Item</th>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ExportingtoMMP_BLDinf.html	Mon Jun 21 14:52:39 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,271 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>Exporting project(s) to MMP/Bld.inf files in Tasks</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-   </head>
-   <body>
-
-   <div class="step">
-     <h2>Exporting project(s) to MMP/Bld.inf files</h2>
-     <p>
-       The command-line Symbian OS toolchain requires a component description
-       file (<span class="code">Bld.Inf</span>) and one or more project definition files
-       (<span class="code">.mmp</span>) to build a project. The export command allows you to create
-       these files for your projects.       </p>
-     <h4>
-       To export project(s) to a <span class="code">Bld.Inf</span> and/or <span class="code">MMP</span>
-       file:       </h4>
-     <ol> 
-       <li> 
-         Click <span class="code">File &gt; Export...</span> to get a list of the
-         available export wizards: 
-         <p>
-           OR         </p> 
-	     <p>
-	        Click <span class="code">Export</span> from the pop-up menus of the
-	        <span class="code">C/C++ Projects</span> and <span class="code">Navigator</span> views to get a
-		      list of the available export wizards:         </p> 
-	     <div class="Figure">
-		      
-	        <p class="Image"><a name=""><img src="../images/export1.gif" alt="" width="470" height="550"  border="0"></a></p>
-  </div> 
-       </li> 
-	    <li>Select <span class="code">Symbian MMP/Bld.Inf</span> and click
-		    <span class="code">Next</span> to go to the <span class="code">Symbian Projects</span> page: 
-	      <p></p> 
-	      <div class="Figure">
-		      
-	         <p class="Image"><a name=""><img src="../images/export2.gif" alt="" width="470" height="550"  border="0"></a></p>
-  </div> 
-	    </li> 
-	    <li> 
-		    Select the project(s) you intend to export from the list of
-		    <span class="code">Symbian Projects</span>.	    </li> 
-	    <li> 
-		    Click <span class="code">Next</span> to go to the <span class="code">SDKs and Build Configurations Selection</span> page: 
-	      <div class="Figure">
-		      
-	         <p class="Image"><a name=""><img src="../images/export3.gif" alt="" width="470" height="550"  border="0"></a></p>
-  </div> 
-	    </li> 
-	    <li> 
-		    Select at least one build configuration for each project in the
-		    left-hand pane from the list of available SDKs and build configurations in the
-		    right-hand pane. By default, all the build configurations chosen during the
-		    last export are selected. If a project is being exported for the first time, no
-		    build configurations are selected. 
-	      <p>
-	         The build configurations chosen for a project are distinguished using
-		      guard macros in the <span class="code">MMP</span> file. The guard macros are placed around
-		      the <span class="code">MMP</span> file statements containing resources or build setting,
-		      only valid for a subset of the chosen build configurations.	      </p> 
-	      <p>
-	         There are cases where guard macros may not be able to distinguish
-		      between two build configurations. The export wizard shows a conflict when two
-		      such ambiguous build configurations are selected by the user.	      </p> 
-	      <p>
-	         The combination of build configurations which results in a conflict
-		      are as follows:	      </p> 
-  
-		  <ul> 
-		    <li> 
-		      <p>
-		        Any two build configurations that differ only in the build
-		        variant (UDEB/UREL). For example, "UIQ 3.0 Phone (GCCE) Debug" and "UIQ 3.0
-		        Phone (GCCE) Release" configurations will result in a conflict, as they differ
-		        only in the build variant.	           </p> 
-	        </li> 
-		     <li> 
-		        <p>
-		          Any two build configurations, of which one is user-defined based
-			       on the other using the <span class="code">Manage</span> option in the <span class="code">C/C++
-			         Build properties</span> view of the project.		        </p> 
-			    <p>
-			      <i>For more information on managing build configurations,
-			      refer to the CDT user guide.</i>		        </p> 
-		     </li> 
-	      </ul>
-  
-		  <p>
-		    The wizard will change the build settings in the <span class="code">MMP</span>
-		    file based on the chosen build configuration. If more than one build
-		    configuration which require different build settings are chosen, guard macros
-		    are used to determine the build settings. For example, if you want to change
-		    the <span class="code">SECUREID</span> option for all the <code>EKA2 build
-		    configurations, the wizard will append the following lines into the
-		    <span class="code">MMP</span> file:	      </code></p><code> 
-	      <p class="CodeBlock">#if def EKA2<br>&nbsp;&nbsp;SECUREID 0x00301<br>#endif</p> 
-	      <p>
-	         Where <code>EKA2 is the guard macro for all the build
-		      configurations designed for the EKA2 kernel. The above <span class="code">MMP</span> file
-		      statements check whether the <code>EKA2 guard macro is defined, and if
-		      it is, change the <code>SECUREID option accordingly.	      </code></code></code></p> 
-	    </code></li><code><code><code><code> 
-	    <li> 
-		    Click <span class="code">Next</span> to go to the <span class="code">MMP File and Bld.inf
-		      File</span> page: 
-	      <div class="Figure">		    
-	        <div align="center"><a name=""><img src="../images/export4.gif" alt="" width="470" height="550"  border="0"></a></div>
-	      </div> 
-	      <ol type="a">
-	        <li>
-	           Type the <span class="code">MMP</span> file location in the <span class="code">MMP
-		          File</span> field, or click <span class="code">Browse</span> to select the
-	           <span class="code">MMP</span> file for each project listed above. 
-	           <p>
-	             By default, the <span class="code">MMP</span> file is exported to one of the
-		          following locations in the order listed below:	           </p>
-	           <ul>
-	             <li> The location where the project was exported the last time. </li>
-	             <li> The group folder of the exported project, if it exists. </li>
-	             <li> The exported project's root directory. </li>
-              </ul>
-	        </li>
-	        <li>
-	           If you select the <span class="code">Export Bld.inf file</span> option, then
-		        type the <span class="code">Bld.Inf</span> file location in the <span class="code">Bld.inf
-		          File</span> field, or click <span class="code">Browse</span> to select the
-	           <span class="code">Bld.Inf</span> file. 
-	           <p>
-	             If you do not select the <span class="code">Export Bld.inf file</span> option,
-		          then you need not specify the <span class="code">Bld.Inf</span> file location.	           </p>
-	           <p>
-	             By default, the <span class="code">Bld.Inf</span> file is exported to one of the
-		           following locations in the order listed below:	           </p>
-	           <ul>
-	             <li>
-	               The location where the <span class="code">Bld.Inf</span> was created when the
-		             project was last exported to an <span class="code">MMP</span> file. </li>
-	             <li> The <span class="code">MMP</span> file location.</li>
-              </ul>
-	        </li>
-          </ol>
-	    </li> 
-       <li>Click Next to go to the Other Makefiles page where you can specify extra Makefiles to invoke from bld.inf </li> 
-  
-	 <blockquote>
-	   <p align="center"><img src="../images/export4a.gif" width="470" height="550"></p>
-    </blockquote>
-       <li>Click Next to open the Scalable Icon Makefiles page where you can specify the Makefiles used to generate scalable icon files.</li>
-	   <p align="center"><img src="../images/export4b.gif" width="470" height="550"></p>
-        <li>Click <span class="code">Next</span> to go to the <span class="code">PRJ_EXPORTS</span> page, to specify the list of files to be copied from the source directories to
-            the releasables directories while building the project:
-            <div class="Figure">
-              
-              <p class="Image"><a name=""><img src="../images/export5.gif" alt="" width="470" height="550"  border="0"></a></p>
-            </div>
-          <p>
-             <i>Note that this page is displayed only if you have selected
-             the Export Bld.inf file option in the previous page.</i>          </p>
-        </li>
-        <li> 
-            Type the <span class="code">Source</span> and <span class="code">Target</span>
-            locations of the file to be copied, and click <span class="code">Add</span> to append
-            the source-target pair to the <span class="code">PRJ_EXPORTS</span> list. You can use
-            <span class="code">Browse</span> to specify the source file and its target location. If
-            the target location for the file is not specified, it will be copied to
-            <span class="code">epoc32\include</span> directory. 
-          <p>
-             Note that the contents of the <span class="code">PRJ_EXPORTS</span> list is
-              exactly the same as it appears in the <code>PRJ_EXPORTS section of the
-             <span class="code">Bld.Inf</span> file.          </code></p> 
-        </li><code>
-        <li> 
-            If you want to modify or delete any entry from the
-            <span class="code">PRJ_EXPORTS</span> list, select the entry and click
-            <span class="code">Modify</span> or <span class="code">Delete</span>.        </li>
-        <li> 
-            Click <span class="code">Next</span> to go to the <span class="code">MMP Preview</span>
-            page: 
-          <div class="Figure">
-              
-             <p class="Image"><a name=""><img src="../images/export6.gif" alt="" width="470" height="550"  border="0"></a></p>
-      </div> 
-        </li>
-        <li> 
-            Select a project from the list of projects to be exported, to see a
-            preview of the <span class="code">MMP</span> file in the pane below. You can edit the
-            contents if required.        </li>
-        <li> 
-            Click <span class="code">Finish</span> to complete the export process. The
-            wizard will create the managed <span class="code">MMP</span> file and <code class="filename">Bld.inf
-            file in their specified locations.
-          <p>
-             A managed <span class="code">MMP</span> file contains the same content as a
-              standard <span class="code">MMP</span> file would, but the contents are organised into
-              following managed sections using special tags:          </p> 
-      
-		  <ul> 
-		    <li> 
-		      <p>
-		        Binary Build Information	           </p> 
-            </li> 
-             <li> 
-                <p>
-                  Search Path                </p> 
-             </li> 
-             <li> 
-                <p>
-                  Project Content Managed                </p> 
-             </li> 
-             <li> 
-                <p>
-                  Linkage                </p> 
-             </li> 
-             <li> 
-                <p>
-                  Customization                </p> 
-             </li> 
-          </ul>
-      
-		  <p>
-		    You will be notified in case of any errors during the updated
-		    process, which results in not creating the <span class="code">MMP</span> or
-		    <span class="code">Bld.Inf</span> files.</p> 
-        </code></li>
-     </code></code></code></code></code></ol>
-   </div><code><code><code><code><code><code class="filename">
-     <p>
-       The following <span class="code">MMP</span> file generated by the wizard, shows how
-       its content is organised using managed sections:       </p>
-     <h4 class="listing">// HelloCarbide.mmp</h4>
-     <p class="listing">/*&amp; START_BINARY_BUILD &amp;*/<br>
-     // NOTE Content in this section is auto-generated, any changes are overwritten in the next update process.<br>
-     CAPABILITY READUSERDATA<br>
-     TARGET HelloCarbide.exe<br>
-     TARGETTYPE exe<br>
-     UID 0x00000000 0xe4d95f85<br>
-     VENDORID 0x00000000<br>
-     SECUREID 0xE4D95F85<br>
-     /*&amp; END_BINARY_BUILD &amp;*/</p>
-     <p class="listing">/*&amp; START_SEARCH_PATHS &amp;*/<br>
-     // NOTE Content in this section is auto-generated, any changes are overwritten in the next update process.<br>
-     SYSTEMINCLUDE \epoc32\include \epoc32\include\variant \epoc32\include\oem<br>
-     USERINCLUDE ..\inc ..\data<br>
-     /*&amp; END_SEARCH_PATHS &amp;*/</p>
-     <p class="listing">/*&amp; START_PROJECT_CONTENT &amp;*/<br>
-     // NOTE Content in this section is auto-generated, any changes are overwritten in the next update process.<br>
-     SOURCEPATH ..\data<br>
-     START RESOURCE HelloCarbide.rss<br>
-     TARGETPATH resource\apps<br>
-     HEADER<br>
-     END<br>
-     START RESOURCE HelloCarbide_reg.rss<br>
-     TARGETPATH private\10003a3f\apps<br>
-     HEADER<br>
-     END<br>
-     SOURCEPATH ..\src<br>
-     SOURCE Waving.cpp HelloCarbideDocument.cpp HelloCarbideApplication.cpp<br>
-     SOURCE HelloCarbideAppView.cpp HelloCarbideAppUi.cpp HelloCarbide.cpp<br>
-     /*&amp; END_PROJECT_CONTENT &amp;*/</p>
-     <p class="listing">/*&amp; START_LINKAGE_INFORMATION &amp;*/<br>
-     // NOTE Content in this section is auto-generated, any changes are overwritten in the next update process.<br>
-     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; 2010 Nokia Corporation and/or its subsidiary(-ies). All 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>
-   
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html	Mon Jun 21 14:53:26 2010 -0500
@@ -49,58 +49,62 @@
 	 <ol> 
 		<li> 
 	   Click File &gt; Import... to get a list of available import wizards</li> 
-		<li>Select Symbian OS Bld.inf file and click Next to go to the Import Bld.inf page
-		  <div class="Figure">
-    
-		  <p class="Image"><img src="../images/import1.gif" alt="" width="373" height="419"  border="0" /></p>
-	      </div>
+		<li>Select Symbian OS &gt; Symbian OS Bld.inf file and click Next to go to the Import Bld.inf page
+		    <div class="Figure"></div>
 		</li>
-		<li> 
-			 Type the location of the bld.inf file to import, or browse to the file using the Browse button. </li> 
-	
-	      <p class="Image"><img src="images/file_import.png" alt="file import" width="521" height="391"></p>
-	      <p class="note"><strong>NOTE</strong> There will be two builders available in Carbide, one for SBSv1 (current version of Symbian Build System) and  one for SBSv2 (newer version). The Builder option will only be displayed when a SBSv2  installation is detected.</p>
-	      <p class="Image">SBSv2  only works with recent versions of Symbian OS9.5. Both  SBSv1 and SBSv2 are GNU make based build systems.&nbsp; SBSv1 uses Perl to generate make files,  while SBSv2 uses Python. Select the appropriate builder for your project.</p>
-	      When building for  SBSv2, the builder will set EPOCROOT to the absolute path (including drive  letter) to the kit for the active build configuration.&nbsp; It will also add the path to the sbs bin  directory to the start of the PATH variable.&nbsp;  This is derived from the SBS_HOME environment variable.<p class="Image">For SBSv2, all  build configurations (platform/target), including the built-in platforms  (WISNCW, ARMV5), are declared in xml files in the \sbs\lib\config directory.  The Build  Configurations selection page will display only those kits  known to support SBSv2.</p>
-       <li>	    Click Next to select the recognized SDKs and Build Configurations to be created for this project
-  <p>The SDKs and Build Configurations shows a tree of
-			 the SDKs that are available to be used, and for each SDK, the type of build configurations
-			 that are available. You can select a single SDK if you are developing the program
-			 for just one version of a platform, or multiple SDKs if your
-			 program is to be built against multiple platforms or operating system
-		  versions.</p>
-		  <p class="note"><b>NOTE</b> The platforms listed are dependent upon the filter settings in the <a href="sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a>.</p>
-		  <p></p>
-		  <div class="Figure">
-            <p class="Image"><img src="../images/import3.gif" alt="" width="448" height="410"  border="0" /></p>
-	      </div>
-	   </li> 
-	   <li value="5"> Click Next to select the mmp and extension make files
-		  <div class="Figure">
-            <p>One MMP file must be selected in order to continue. If the bld.inf file contains more than three MMP files, just select the MMP files you need to import. If there are three or less MMP files, then all are selected for importing.</p>
-            <p class="Image"><img src="../images/import4.gif" alt="" width="521" height="550"  border="0" /></p>
-         </div>
-	   </li>
-	   <li>Click Next to enter the Project name and root directory</li>
-		<p>When creating a project, project files are created in the root directory. Carbide.c++ creates additional files for each project. They consist of:</p>
-	    <ul>
-	      <li>.project - an xml file that provides a project description </li>
-	      <li>.cproject - an xml file that provides additional project information </li>
-	      <li>.settings folder - contains files that provide build configuration and preference settings </li>
-       </ul>
-       <p>The root directory is a path to the root of your project. All necessary tool components, developer libraries, and information about the SDK are stored in subdirectories under this root. The whole path leading to the SDK root directory must be declared to the Windows system via the Environment Variables settings. The variable name is EPOCROOT and the variable value is the full path where a Symbian OS SDK is installed in the Windows system.</p>
-       <p>The root directory should contain all project related files that you want to work with in Carbide. The default directory is calculated by parsing the bld.inf file and mmp file(s).</p>
-       <p class="Image"><img src="../images/import5.gif" alt="" width="518" height="313"  border="0" /></p>
-       
-	    <li> Click Finish to import the project
-	      <p>
-             The
-			   wizard creates the project in the C/C++ Projects view, where it can be built and edited as normal. If the wizard is unable to read the project files, then the page
-	        describes the error that occurred. If an error occurs, you must fix the project file, and then
-          re-import the bld.inf.</p>
-       </li>
-	 </ol>
+       </ol>
 
+     <blockquote>
+         <p><img src="../reference/images/import_bld_inf_01.png" alt="Select Symbian bld.inf file to import" width="525" height="550"></p>
+     </blockquote>
+     <ol start="3">
+		 <li> 
+			 Type the location of the bld.inf file to import, or browse to the file using the Browse button. </li>
+		  <p class="Image"><img src="../reference/images/import_bld_inf_02.png" alt="Select bld.inf file to import" width="573" height="550"></p>
+		  <p class="note"><strong>NOTE</strong> Depending upon which SDKs are installed, you may see both SBSv1 and SBSv2 builders available. It is recommended that SBSv2 be the primary choice as SBSv1 has been deprecated for future Symbian OS development.</p>
+		  <p class="Image">SBSv2   works with recent versions of Symbian^3 and Symbian ^4 SDKs. Both  SBSv1 and SBSv2 are GNU make based build systems.&nbsp; SBSv1 uses Perl to generate make files,  while SBSv2 uses Python. Select the appropriate builder for your project.</p>
+		  When building for  SBSv2, the builder will set <span class="code">EPOCROOT</span> to the absolute path (including drive  letter) to the kit for the active build configuration.&nbsp; It will also add the path to the sbs bin  directory to the start of the <span class="code">PATH</span> variable.&nbsp;  This is derived from the SBS_HOME environment variable.
+		  <p class="Image">For SBSv2, all  build configurations (platform/target), including the built-in platforms  (WINSCW, ARMV5), are declared in xml files in the <span class="code">\sbs\lib\config</span> directory.  The Build  Configurations selection page  displays only kits  known to support SBSv2.</p>
+		  <li> Click Next to select the recognized SDKs and Build Configurations to be created for this project
+		      <blockquote>
+		          <p>The SDKs and Build Configurations shows a tree of
+		              the SDKs that are available to be used, and for each SDK, the type of build configurations
+		              that are available. You can select a single SDK if you are developing the program
+		              for just one version of a platform, or multiple SDKs if your
+		              program is to be built against multiple platforms or operating system
+		              versions.</p>
+	          </blockquote>
+         </li>
+     </ol>
+     <blockquote>
+         <p class="note"><b>NOTE</b> The platforms listed are dependent upon the filter settings in the <a href="sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a>.</p>
+         <p><img src="../reference/images/import_bld_inf_03.png" alt="Symbian OS SDKs page" width="573" height="550"></p>
+     </blockquote>
+     <ol>
+         <li value="5"> Click Next to select the mmp and extension make files
+             <div class="Figure">
+                 <p>One MMP file must be selected in order to continue. If the bld.inf file contains more than three MMP files, just select the MMP files you need to import. If there are three or less MMP files, then all are selected for importing.</p>
+                 <p class="Image"><img src="../reference/images/import_bld_inf_04.png" alt="" width="573" height="550"  border="0" /></p>
+             </div>
+                 </li>
+         <li>Click Next to enter the Project name and root directory</li>
+         <p>When creating a project, project files are created in the root directory. Carbide.c++ creates additional files for each project. They consist of:</p>
+         <ul>
+             <li>.project - an xml file that provides a project description </li>
+             <li>.cproject - an xml file that provides additional project information </li>
+             <li>.settings folder - contains files that provide build configuration and preference settings </li>
+                     </ul>
+         <p>The root directory is a path to the root of your project. All necessary tool components, developer libraries, and information about the SDK are stored in subdirectories under this root. The whole path leading to the SDK root directory must be declared to the Windows system via the Environment Variables settings. The variable name is <span class="code">EPOCROOT</span> and the variable value is the full path where a Symbian OS SDK is installed in the Windows system.</p>
+         <p>The root directory should contain all project related files that you want to work with in Carbide. The default directory is calculated by parsing the bld.inf file and mmp file(s).</p>
+         <p class="Image"><img src="../reference/images/import_bld_inf_05.png" alt="" width="573" height="550"  border="0" /></p>
+         <li> Click Finish to import the project
+             <p>
+                 The
+                 wizard creates the project in the <a href="../reference/view_cpp_projects.htm">Project Explorer</a> view, where it can be built and edited as normal. If the wizard is unable to read the project files, then the page
+                 describes the error that occurred. If an error occurs, you must fix the project file, and then
+             re-import the bld.inf.</p>
+                     </li>
+     </ol>
    </div>
 	   <h5>Related  concepts</h5>
 
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/debugger/work_debug_act_debug.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -18,7 +18,7 @@
     <p>or</p>
 	<li>Select Run &gt; Debug from the  menu bar </li>
     <p>Both of these methods create a new debug launch configuration if none previously existed in the project or uses the last one launched for debugging. </p>
-    <li>To launch using a specific debug launch configuration, right-click the project's EXE file in the C/C++ Projects view and select Debug As &gt; <em>Project_Name</em> from the C/C++ Projects context menu</li>
+    <li>To launch using a specific debug launch configuration, right-click the project's EXE file in the Project Explorer view and select Debug As &gt; <em>Project_Name</em> from the Project Explorer context menu</li>
   </ul>
   <ul>
     <p>The debugger assumes control of the program execution as the program runs.</p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/clean.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_adding_symbian_class.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -32,7 +32,7 @@
     <li>Enter Author and Copyright information, then click Finish. </li>
     <p>The new defined Symbian-based class titled <span class="code">NewClass</span>, is added to the project and appears in the src folder (Figure 5). </p>
     <p align="center"><img src="images/wiz_add_sos_class_07.png" width="279" height="436" /></p>
-    <p class="figure">Figure 5 -New class appears in C/C++ Projects list inside the project </p>
+    <p class="figure">Figure 5 -New class appears in Project Explorer list inside the project </p>
   </ol>
 </div>
 <h5>Related tasks</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -1,83 +1,83 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; 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"/>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Building Projects and Symbian Components </h2>
-<p>Building projects consists of a new abld-based build system that wraps build functionality around existing SDK build tools that invoke <span class="code">makmake</span> commands (e.g. <span class="code">bldmake bldfiles</span> and <span class="code">abld build</span>).</p>
-<p> The plug-ins provide extra functionality to set up suitable build configurations for Symbian OS C++ projects.  The initial selection of a build configuration is done when you create a project, as described in <a href="../CreatingNewProjects.html">Creating New Projects</a>. You can later <a href="prj_set_build_tgt.htm">change</a> the Active Build Configuration. The Build Configurations also provides a command (<b>Project &gt; <a href="../../reference/menus/build_all_targets.htm">Build All Configurations</a></b>) to build all the selected build configurations in a batch.</p>
-<p> Building Symbian OS C++ projects can involve the use of Symbian OS specific tools, such as the Symbian OS resource compiler. For detailed information on such tools, see the documentation for the SDK that you are using.</p>
-<p>You build  projects to process the source files that comprise a program and
-  generate object code. The compiler flags syntax errors in the source files. Use the  <a href="../../reference/ProjectPreferences.html">Properties for &lt;project_name&gt; </a> window to control how the project is built. The following methods build a project:</p>
-<ul><li><b>Build All Configurations</b>&#8212;builds all build configurations for a project</li>
-  <li><b>Build Working Set</b>&#8212;specify which projects to build in a working set </li>
-  <li><b>Build Project</b>&#8212;(CTRL+B) builds the entire project if it has never been built before or on subsequent builds only those files that have changed since the last build operation</li>
-</ul>
-<p align="center"><img src="images/menu_build_project.png" width="359" height="341" /></p>
-<p class="figure">Figure 1 - Right-click project name to build a project </p>
-<div class="step">
-  <h4>Building a Project</h4>
-  <ul>
-    <li>Right-click the project name in the Project Explorer view and select Build Project (Figure 1) </li>
-  </ul>
-  <ol>
-    <p></p>
-    or
-  </ol>
-  <ul>
-    <li>Select the Project &gt; Build Project menu item </li>
-  </ul>
-  <ul>
-    <p></p>
-    or
-  </ul>
-  <ul>
-    <li>Click the Build icon in the tool bar (Figure 2) to build the current build configuration </li>
-    <p align="center"><img src="images/wnd_build_config_select_tgt.png" width="341" height="128" /></p>
-    <p class="figure">Figure 2 - Build icon </p>
-    <p>or
-    </p>
-  </ul>
-  <ul>
-    <li>Select a build configuration using the Build icon&#8217;s dropdown list in the tool bar (Figure 2)</li>
-  </ul>
-  <ol>
-    <p>Carbide.c++ builds the project. A build dialog  and a task bar appear during a build process. All build output  is shown in the Console view while build errors and warnings appear in the Problems view.</p>
-    <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
-      built. Carbide  always checks that makefiles are up-to-date and
-    dependencies present.</p>
-    <p>Project is also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window &gt; Preferences &gt; General &gt;</b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
-    <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window &gt; Preferences &gt; Run/Debug &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
-  </ol>
-  <p>When performing a build, output is displayed in the Console window. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b>Build Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window &gt; Preferences &gt; C/C++ &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Build Console</a></b> preference panel (figure 2).</p>
-  <p>Not clearing the console is useful when you are performing multiple builds, such as a regular project build, building a project package (.pkg) file, and building a ROM image. For example, if you do not clear the console before each build, then a subsequent build will not overwrite information from a previous build.</p>
-<p align="center"><img src="images/build_console.png" width="562" height="446" /></p>
-<p align="left" class="figure">Figure 4 - Build Console Preference Panel</p>
-<p>&nbsp;</p>
-</div>
-  <h5>Concepts</h5>
-  <ul>
-    <li><a href="../../concepts/Projects.html">Projects</a></li>
-</ul>
-  <h5>Tasks</h5>
-  <ul>
-    <li><a href="prj_clean.htm">Cleaning Projects</a> </li>
-    <li><a href="../../reference/menus/compile_source.htm">Compile Source</a></li>
-    <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>
-    <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>
-    <li><a href="../ImportingProjects.html">Importing BLD.INF 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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; 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"/>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Building Projects and Symbian Components </h2>
+<p>Building projects consists of a new abld-based build system that wraps build functionality around existing SDK build tools that invoke <span class="code">makmake</span> commands (e.g. <span class="code">bldmake bldfiles</span> and <span class="code">abld build</span>).</p>
+<p> The plug-ins provide extra functionality to set up suitable build configurations for Symbian OS C++ projects.  The initial selection of a build configuration is done when you create a project, as described in <a href="../CreatingNewProjects.html">Creating New Projects</a>. You can later <a href="prj_set_build_tgt.htm">change</a> the Active Build Configuration. The Build Configurations also provides a command (<b>Project &gt; <a href="../../reference/menus/build_all_targets.htm">Build All Configurations</a></b>) to build all the selected build configurations in a batch.</p>
+<p> Building Symbian OS C++ projects can involve the use of Symbian OS specific tools, such as the Symbian OS resource compiler. For detailed information on such tools, see the documentation for the SDK that you are using.</p>
+<p>You build  projects to process the source files that comprise a program and
+  generate object code. The compiler flags syntax errors in the source files. Use the  <a href="../../reference/ProjectPreferences.html">Properties for &lt;project_name&gt; </a> window to control how the project is built. The following methods build a project:</p>
+<ul><li><b>Build All Configurations</b>&#8212;builds all build configurations for a project</li>
+  <li><b>Build Working Set</b>&#8212;specify which projects to build in a working set </li>
+  <li><b>Build Project</b>&#8212;(CTRL+B) builds the entire project if it has never been built before or on subsequent builds only those files that have changed since the last build operation</li>
+</ul>
+<p align="center"><img src="images/menu_build_project.png" width="359" height="341" /></p>
+<p class="figure">Figure 1 - Right-click project name to build a project </p>
+<div class="step">
+  <h4>Building a Project</h4>
+  <ul>
+    <li>Right-click the project name in the Project Explorer view and select Build Project (Figure 1) </li>
+  </ul>
+  <ol>
+    <p></p>
+    or
+  </ol>
+  <ul>
+    <li>Select the Project &gt; Build Project menu item </li>
+  </ul>
+  <ul>
+    <p></p>
+    or
+  </ul>
+  <ul>
+    <li>Click the Build icon in the tool bar (Figure 2) to build the current build configuration </li>
+    <p align="center"><img src="images/wnd_build_config_select_tgt.png" width="321" height="69" /></p>
+    <p class="figure">Figure 2 - Build icon </p>
+    <p>or
+    </p>
+  </ul>
+  <ul>
+    <li>Select a build configuration using the Build icon&#8217;s dropdown list in the tool bar (Figure 2)</li>
+  </ul>
+  <ol>
+    <p>Carbide.c++ builds the project. A build dialog  and a task bar appear during a build process. All build output  is shown in the Console view while build errors and warnings appear in the Problems view.</p>
+    <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
+      built. Carbide  always checks that makefiles are up-to-date and
+    dependencies present.</p>
+    <p>Project is also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window &gt; Preferences &gt; General &gt;</b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
+    <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window &gt; Preferences &gt; Run/Debug &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
+  </ol>
+  <p>When performing a build, output is displayed in the Console window. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b>Build Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window &gt; Preferences &gt; C/C++ &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Build Console</a></b> preference panel (figure 2).</p>
+  <p>Not clearing the console is useful when you are performing multiple builds, such as a regular project build, building a project package (.pkg) file, and building a ROM image. For example, if you do not clear the console before each build, then a subsequent build will not overwrite information from a previous build.</p>
+<p align="center"><img src="images/build_console.png" width="532" height="451" /></p>
+<p align="left" class="figure">Figure 4 - Build Console Preference Panel</p>
+<p>&nbsp;</p>
+</div>
+  <h5>Concepts</h5>
+  <ul>
+    <li><a href="../../concepts/Projects.html">Projects</a></li>
+</ul>
+  <h5>Tasks</h5>
+  <ul>
+    <li><a href="prj_clean.htm">Cleaning Projects</a> </li>
+    <li><a href="../../reference/menus/compile_source.htm">Compile Source</a></li>
+    <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>
+    <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>
+    <li><a href="../ImportingProjects.html">Importing BLD.INF 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/tasks/projects/prj_clean.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_clean.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -4,29 +4,53 @@
 <meta http-equiv="Content-Type" content="text/html; 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>
+<title>Cleaning 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>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 select a project, right-click and select <b>Clean Project</b> (<span class="code">CTRL+SHIFT+-</span>) to remove the object and make files, and output files. The files that are removed by this command include all the intermediate files created during compilation and all the executables and import libraries created by the linker.</p>
+<p>If you select a project and select the menu option <b>Project &gt; Clean...</b> the <b>Clean</b> dialog  appears (Figure 1). You can clean all projects or select individual projects to clean within the workspace. This method of cleaning projects  performs the same operations as the <b>Clean Project</b> context menu option. If the <b>Start a build immediately</b> option is selected, then the selected project(s) are rebuilt after the clean operation.</p>
+<p align="center"><img src="images/clean.png" width="500" height="440" /></p>
+<p class="figure">Figure 1 - Clean project options</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>
+<h5>Table 1. Clean dialog &mdash; options</h5>
+  <table width="700" border="0" cellpadding="2" cellspacing="0">
+      <tr valign="top">
+          <th width="30%" class="Cell">Name</th>
+          <th width="70%" class="Cell">Function</th>
+      </tr>
+      <tr valign="top">
+          <td class="Cell"><p> <b>Clean all projects</b></p></td>
+          <td class="Cell"><p>Enable to clean all the projects in the workspace.</p></td>
+      </tr>
+      <tr valign="top">
+          <td class="Cell"><p><b>Clean projects selected below</b></p></td>
+          <td class="Cell"><p>Enable to clean only the selected project(s).</p></td>
+      </tr>
+      <tr valign="top">
+          <td class="Cell"><b>Start a build immediately</b></td>
+          <td class="Cell">Rebuild the selected project(s) immediately after a clean operation.</td>
+      </tr>
+      <tr valign="top">
+          <td class="Cell"><b>Build the entire workspace</b></td>
+          <td class="Cell">Build the entire workspace once the clean operation is complete.</td>
+      </tr>
+      <tr valign="top">
+          <td class="Cell"><strong>Build only the selected projects</strong></td>
+          <td class="Cell">Build only the selected projects once the clean operation is complete.</td>
+      </tr>
+  </table>
+  <h5>Other references</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>
+    <li><a href="../../concepts/Projects.html">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>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <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_creating_sis_file.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -21,7 +21,7 @@
 <ul>
   <li>For non-Platform Security SDKs (pre-OS 9.x), <span class="code">makesis</span> is called</li>
 </ul>
-<p>Depending upon which tool is used, you will  need to complete some entries in the<a href="../../reference/build_properties/pane_build_config_sis.htm"> SIS Builder</a> pane of the Carbide Build Configurations window of the project Properties dialog box. You can access this pane by selecting a project in the C/C++ Projects view and select <b>Project &gt; Properties</b> &gt;  <b>Carbide Build Configurations</b>. Fill in the necessary information to add PKG files to the project for downloading. </p>
+<p>Depending upon which tool is used, you will  need to complete some entries in the<a href="../../reference/build_properties/pane_build_config_sis.htm"> SIS Builder</a> pane of the Carbide Build Configurations window of the project Properties dialog box. You can access this pane by selecting a project in the Project Explorer view and select <b>Project &gt; Properties</b> &gt;  <b>Carbide Build Configurations</b>. Fill in the necessary information to add PKG files to the project for downloading. </p>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="19%" scope="col">Tool</th>
@@ -38,7 +38,7 @@
     <td><b>SIS Properties </b></td>
     <td><div align="center">
       <p align="left">Complete the PKG File, and Signing Options settings in the <a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a> dialog. By default, SIS files are output in the directory of the original SIS file.</p>
-      <p><img src="../../reference/images/wnd_sis_properties.png" width="375" height="452"></p>
+      <p><img src="../../reference/images/wnd_sis_properties.png" width="455" height="452"></p>
       <p class="figure">Figure 2 - SIS Properties dialog </p>
       </div></td>
   </tr>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm	Mon Jun 21 14:52:39 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_set_build_tgt.htm	Mon Jun 21 14:53:26 2010 -0500
@@ -16,7 +16,7 @@
     <li>From the
       toolbar
         <ol>
-          <li>Select the project in the Project Explorer or C/C++ Projects view </li>
+          <li>Select the project in the Project Explorer  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>