BUG 11531 - final updates for build config revision
authorfturovic <frank.turovich@nokia.com>
Tue, 31 Aug 2010 10:54:44 -0500
changeset 1929 e42423cc31d4
parent 1928 cfa3a98b5df2
child 1930 d8b5c1e3a21e
BUG 11531 - final updates for build config revision
core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_find_n_add_extentions.xml
core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm
core/com.nokia.carbide.cpp.doc.user/html/images/step1.png
core/com.nokia.carbide.cpp.doc.user/html/images/step2.png
core/com.nokia.carbide.cpp.doc.user/html/images/step4.png
core/com.nokia.carbide.cpp.doc.user/html/images/step5.png
core/com.nokia.carbide.cpp.doc.user/html/images/step6.png
core/com.nokia.carbide.cpp.doc.user/html/images/step7.png
core/com.nokia.carbide.cpp.doc.user/html/reference/BasicSettings.html
core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html
core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_sis_properties.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html
core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_name_location.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step1.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step2.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step4.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step5.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step6.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step7.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/build_console.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/menu_build_project.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/sis_builder_tab.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_find_n_add_extentions.xml	Tue Aug 31 10:28:49 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<cheatsheet
-      title="Find and Add Extensions">
-`	<intro>
-    	<description>
-			You can add functionality to Carbide by installing additional extensions.
-    	</description>
-	</intro>
-  <item
-        skip="true"
-        title="Open the Carbide.c++ Portal view">
-     <description>
-        Use the <b>Carbide.c++ Portal > Customize</b> tab to find, download, and install extensions.
-     </description>
-      <command
-            required="false"
-            serialization="org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.makeFast=com.nokia.carbide.discovery.ui.portalEditor)"/>
-  </item>
-</cheatsheet>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm	Tue Aug 31 10:28:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm	Tue Aug 31 10:54:44 2010 -0500
@@ -21,7 +21,7 @@
   <tr>
     <th width="17%" rowspan="2" valign="middle" scope="col">Target Types </th>
     <th colspan="2" scope="col">Platform Security<br />
-(S60 5.0, Symbian ^3) </th>
+(S60 5.0, Symbian ^3, Symbian ^4) </th>
   </tr>
   <tr>
     <th width="15%" valign="middle" scope="col"><div align="center">RAPTOR, GCCE, ARMV5, ARMV5_ABIV2</div></th>
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step1.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step2.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step4.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step5.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step6.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/step7.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/BasicSettings.html	Tue Aug 31 10:28:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/BasicSettings.html	Tue Aug 31 10:54:44 2010 -0500
@@ -8,7 +8,7 @@
 		You can set some basic properties for the project in this page, like	   Application UID, Author and Copyright
 	 notice for the project. </p>
 	 <p class="note"><b>NOTE</b> Fields appearing in window vary depending upon the type of project being created. </p>
-    <p align="center" class="Image"><img src="../images/step5.png" width="500" height="500" /></p>
+    <p align="center" class="Image"><img src="../tasks/images/new_proj_step5.png" width="500" height="500" /></p>
    <table width="787"
 border="0" cellpadding="2" cellspacing="0">
      <tr valign="top"><th width="206" class="Cell">Name</th>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Tue Aug 31 10:28:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html	Tue Aug 31 10:54:44 2010 -0500
@@ -45,7 +45,7 @@
     </ul>
   
    
-<div id="footer"> <img src="../images/c3_32x32.png" alt="C3 logo" width="32" height="32" border="2" align="left">    Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.<br>
+<div id="footer">     Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.<br>
    License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html	Tue Aug 31 10:28:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html	Tue Aug 31 10:54:44 2010 -0500
@@ -13,7 +13,7 @@
 	 </p> 
 	 <div class="Figure">
 
-		<p align="center" class="Image"><img src="../images/step6.png" width="500" height="500" /></p>
+		<p align="center" class="Image"><img src="../tasks/images/new_proj_step6.png" width="500" height="500" /></p>
 	   <p class="Image">Figure 1 - Project Directories page </p>
 	 </div><table width="720"
 border="0" cellpadding="2" cellspacing="0">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Tue Aug 31 10:28:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Tue Aug 31 10:54:44 2010 -0500
@@ -11,7 +11,7 @@
 <div class="Bodytext">
 <p> You can set the SDKs and Build Configurations in this page. The available SDKs shown are determined by the settings in the <a href="pref_carb_sdk_preference.html">SDK Preferences</a> page. </p>
 <div class="Figure">
-<p align="center" class="Image"><img src="../images/step4.png" width="500" height="500"><br>
+<p align="center" class="Image"><img src="../tasks/images/new_proj_step4.png" width="525" height="503"><br>
 </p>
 </div>
 
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_sis_properties.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Tue Aug 31 10:28:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/CreatingNewProjects.html	Tue Aug 31 10:54:44 2010 -0500
@@ -14,19 +14,19 @@
     <h3>Creating New Symbian OS C++ Projects</h3>
     <ol>
       <li class="step">Select <b>File &gt; New &gt; Symbian OS C++ Project</b> to invoke the <b>New Project</b> wizard.</span></li>
-        <p><img src="../images/step1.png" width="506" height="318" alt="" ></p>
+        <p><img src="images/new_proj_step1.png" width="548" height="120" alt="" ></p>
         <li>The <b class="step">New Symbian OS C++ Project</b> wizard appears. Select a template related to an installed SDK.</li>
       <p>A project template provides the initial source files and project settings appropriate for the chosen project type. A brief description of each template appears below the list. The project type determines the type of program that you are writing.</p>
       <p class="note"><b>NOTE</b> If the selected template requires user input, additional wizard pages will collect data from the user before creating the project.</p>
       <p>Checkmark the <b>Filter templates based on enabled SDKs</b> option to only list  SDKs enabled in the <a href="../reference/pref_carb_sdk_preference.html">Symbian SDKs panel</a>. Uncheck this option to list  SDKs that can be used with Carbide. Click <b>Next</b>.</p>
-      <p align="center"><img src="../images/step2.png" width="500" height="567" alt="" ></p>
+      <p align="center"><img src="images/new_proj_step2.png" width="525" height="503" alt="" ></p>
       <li>Enter a name for your project. </li>
       <p>Checkmark the <b>Use default location</b> option to save the project in the current workspace by default or uncheck it to save to another location. Enter the path in the <b>Location</b> field or click <b>Browse</b> button to locate the directory. Click <b>Next</b>.</p>
-      <p align="center"><span class="Image"><img src="images/new_proj_name_location.png" alt="new project" width="500" height="400"></span><span class="Image"><br>
+      <p align="center"><span class="Image"><img src="images/new_proj_name_location.png" alt="new project" width="525" height="503"></span><span class="Image"><br>
       </span></p>
       <li>Select the <b>SDKs and Build Configurations</b>. </li>
       <p>Checkmark the <b>Filter SDKs based on selected template</b> option to only show  build configurations based on the selected SDK template, or uncheck to show all enabled SDKs and their related build configurations.</p>
-      <p align="center"><img src="../images/step4.png" width="500" height="500" alt="" ></p>
+      <p align="center"><img src="images/new_proj_step4.png" width="525" height="503" alt="" ></p>
       <p class="Image">The Symbian OS SDKs wizard page shows a tree of the SDKs and the type of builds available within that SDK. Select a single SDK
         if the program you are developing is for just one version of a platform,
       or select multiple SDKs to build the program for multiple build platforms or SDK versions.</p>
@@ -34,7 +34,7 @@
         do the build, and whether debug and/or release builds are required. For this example we recommend using the Emulator Debug version as the <a href="../concepts/build_configurations.htm">build configuration</a>. Later, you can <a href="projects/prj_set_build_tgt.htm">switch</a> to another build configuration to create the project for a specific device.</p>
       <p> Click <b>Next</b>.</p>
       <li>Set the project properties in the <b>Basic Settings</b> page. </li>
-      <div align="center"><img src="../images/step5.png" width="500" height="500" alt="" >        </div>
+      <div align="center"><img src="images/new_proj_step5.png" width="525" height="503" alt="" >        </div>
       <blockquote>
         <p align="left" class="note"><b>NOTE</b> The basic properties for a project may change based on the template selected for a particular project type. </p>
         <p align="left" style="font-weight: normal;">Fill in the applicable fields, which
@@ -61,7 +61,7 @@
       <li span style="font-weight: normal;">
         Click <b>Next</b> to move to the <b>Project Directories</b> page.</li>
         <div class="Figure">
-          <p align="center" class="Image"><img src="../images/step6.png" width="500" height="500" alt="" ><br>
+          <p align="center" class="Image"><img src="images/new_proj_step6.png" width="525" height="503" alt="" ><br>
           </p>
           <p class="note" style="font-weight: normal;"> <b>NOTE</b> The project directories depends on the selected template. That is, the directories required to store project data may
       change based on the template used. </p>
@@ -71,7 +71,7 @@
       <p>This generates the necessary files for the project based on the template selected and show them in the <a href="../reference/view_proj_explorer.htm">Project Explorer</a> view.</p>
     </ol>
     <blockquote>
-      <p align="center"><img src="../images/step7.png" width="273" height="301" alt="" > </p>
+      <p align="center"><img src="images/new_proj_step7.png" width="224" height="267" alt="" > </p>
     </blockquote>
   </div>
   <blockquote>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html	Tue Aug 31 10:28:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html	Tue Aug 31 10:54:44 2010 -0500
@@ -34,7 +34,7 @@
 	 </ul>
 
      <h3>Projects for Symbian OS 9.3+ </h3>
-     <p>The latest versions of Symbian OS 9.3+ devkits include extensive use of <span class="code">PRJ_EXTENSIONS</span> and <span class="code">PRJ_TESTEXTENSIONS</span>. These top-level entries are extension makefile templates whose names are later filled in with target names, sources, and options. The intent is to make source editing easier and dependency checking possible during a build. </p>
+     <p>Versions of Symbian OS 9.3+ devkits include extensive use of <span class="code">PRJ_EXTENSIONS</span> and <span class="code">PRJ_TESTEXTENSIONS</span>. These top-level entries are extension makefile templates whose names are later filled in with target names, sources, and options. The intent is to make source editing easier and dependency checking possible during a build. </p>
      <p>Currently if you  import a bld.inf file but are not importing all of the components and one of these extensions are found:</p>
      <ul>
        <li>a warning appears at the top of the wizard page</li>
@@ -62,19 +62,18 @@
 			 Type the location of the bld.inf file to import, or browse to the file using the Browse button. </li>
 		  <p class="Image"><img src="../reference/images/import_bld_inf_02.png" alt="Select bld.inf file to import" width="573" height="550"></p>
 		  <p class="note"><strong>NOTE</strong> Depending upon which SDKs are installed, you may see both SBSv1 and SBSv2 builders available. It is recommended that SBSv2 be the primary choice as SBSv1 has been deprecated for future Symbian OS development.</p>
-		  <p class="Image">SBSv2   works with recent versions of Symbian^3 and Symbian ^4 SDKs. Both  SBSv1 and SBSv2 are GNU make based build systems.&nbsp; SBSv1 uses Perl to generate make files,  while SBSv2 uses Python. Select the appropriate builder for your project.</p>
-		  When building for  SBSv2, the builder will set <span class="code">EPOCROOT</span> to the absolute path (including drive  letter) to the kit for the active build configuration.&nbsp; It will also add the path to the sbs bin  directory to the start of the <span class="code">PATH</span> variable.&nbsp;  This is derived from the SBS_HOME environment variable.
-		  <p class="Image">For SBSv2, all  build configurations (platform/target), including the built-in platforms  (WINSCW, ARMV5), are declared in xml files in the <span class="code">\sbs\lib\config</span> directory.  The Build  Configurations selection page  displays only kits  known to support SBSv2.</p>
+		  <p class="Image">SBSv2   works with recent versions of Symbian^3 and Symbian ^4 SDKs. Both  SBSv1 and SBSv2 are GNU make based build systems. SBSv1 uses Perl to generate make files,  while SBSv2 uses Python. Select the appropriate builder for your project.</p>
+		  <p class="note"><strong>NOTE</strong> Choose SBSv2 whenever possible as SBSv1 is being phased out.</p>
+	     When building for  SBSv2, the builder will set <span class="code">EPOCROOT</span> to the absolute path (including drive  letter) to the kit for the active build configuration.&nbsp; It will also add the path to the sbs bin  directory to the start of the <span class="code">PATH</span> variable.&nbsp;  This is derived from the <span class="code">SBS_HOME</span> environment variable.
+	     <p class="Image">For SBSv2, all  build configurations (platform/target), including the built-in platforms  (WINSCW, ARMV5), are declared in xml files in the <span class="code">\sbs\lib\config</span> directory.  The Build  Configurations selection page  displays only kits  known to support SBSv2.</p>
 		  <li> Click Next to select the recognized SDKs and Build Configurations to be created for this project
-		      <blockquote>
-		          <p>The SDKs and Build Configurations shows a tree of
+		      <p>The SDKs and Build Configurations shows a tree of
 		              the SDKs that are available to be used, and for each SDK, the type of build configurations
 		              that are available. You can select a single SDK if you are developing the program
 		              for just one version of a platform, or multiple SDKs if your
 		              program is to be built against multiple platforms or operating system
 		              versions.</p>
-	          </blockquote>
-         </li>
+	     </li>
      </ol>
      <blockquote>
          <p class="note"><b>NOTE</b> The platforms listed are dependent upon the filter settings in the <a href="sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a>.</p>
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_name_location.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step1.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step2.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step4.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step5.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step6.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/images/new_proj_step7.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/build_console.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/menu_build_project.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/images/sis_builder_tab.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm	Tue Aug 31 10:28:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build.htm	Tue Aug 31 10:54:44 2010 -0500
@@ -10,56 +10,54 @@
 </head>
 <body >
 <h2>Building Projects and Symbian Components </h2>
-<p>Building projects consists of a new abld-based build system that wraps build functionality around existing SDK build tools that invoke <span class="code">makmake</span> commands (e.g. <span class="code">bldmake bldfiles</span> and <span class="code">abld build</span>).</p>
-<p> The plug-ins provide extra functionality to set up suitable build configurations for Symbian OS C++ projects.  The initial selection of a build configuration is done when you create a project, as described in <a href="../CreatingNewProjects.html">Creating New Projects</a>. You can later <a href="prj_set_build_tgt.htm">change</a> the Active Build Configuration. The Build Configurations also provides a command (<b>Project &gt; <a href="../../reference/menus/build_all_targets.htm">Build All Configurations</a></b>) to build all the selected build configurations in a batch.</p>
+<p>Building projects consists of a new sbs-based build system (Raptor) that wraps build functionality around existing SDK build tools which invoke <span class="code">makmake</span> commands (e.g. <span class="code">bldmake bldfiles</span> and <span class="code">sbs build</span>).</p>
+<p> The plug-ins provide extra functionality to set up suitable build configurations for Symbian OS C++ projects.  The initial selection of a build configuration is done when you create a project, as described in <a href="../CreatingNewProjects.html">Creating New Projects</a>. You can later <a href="prj_set_build_tgt.htm">change</a> the Active Build Configuration. A command is available (<b>Project &gt; <a href="../../reference/menus/build_all_targets.htm">Build All Configurations</a></b>) to build all the selected build configurations in a batch.</p>
 <p> Building Symbian OS C++ projects can involve the use of Symbian OS specific tools, such as the Symbian OS resource compiler. For detailed information on such tools, see the documentation for the SDK that you are using.</p>
 <p>You build  projects to process the source files that comprise a program and
-  generate object code. The compiler flags syntax errors in the source files. Use the  <a href="../../reference/ProjectPreferences.html">Properties for &lt;project_name&gt; </a> window to control how the project is built. The following methods build a project:</p>
-<ul><li><b>Build All Configurations</b>&#8212;builds all build configurations for a project</li>
+  generate object code. The compiler flags syntax errors in the source files. Use the  <a href="../../reference/ProjectPreferences.html">Properties for &lt;project_name&gt;</a> dialog to control how the project is built. The following methods build a project:</p>
+<ul>
+    <li><b>Build All Configurations</b> (<span class="code">CTRL+ALT+A</span>) &#8212;builds all build configurations for a project</li>
+  <li><b>Build Project</b> (<span class="code">CTRL+B</span>) &#8212;  builds the entire project if it has never been built before or on subsequent builds only those files that have changed since the last build operation</li>
   <li><b>Build Working Set</b>&#8212;specify which projects to build in a working set </li>
-  <li><b>Build Project</b>&#8212;(CTRL+B) builds the entire project if it has never been built before or on subsequent builds only those files that have changed since the last build operation</li>
 </ul>
-<p align="center"><img src="images/menu_build_project.png" width="359" height="341" /></p>
-<p class="figure">Figure 1 - Right-click project name to build a project </p>
+<p align="center"><img src="images/menu_build_project.png" width="280" height="262" /></p>
+<p class="figure">Figure 1 - Project menu includes all build options</p>
 <div class="step">
   <h4>Building a project</h4>
   <ul>
-    <li>Right-click the project name in the Project Explorer view and select Build Project (Figure 1) </li>
-  </ul>
-  <ol>
-    <p></p>
-    or
-  </ol>
-  <ul>
-    <li>Select the Project &gt; Build Project menu item </li>
-  </ul>
-  <ul>
-    <p></p>
-    or
-  </ul>
-  <ul>
-    <li>Click the Build icon in the tool bar (Figure 2) to build the current build configuration </li>
-    <p align="center"><img src="images/wnd_build_config_select_tgt.png" width="321" height="69" /></p>
-    <p class="figure">Figure 2 - Build icon </p>
-    <p>or
-    </p>
-  </ul>
-  <ul>
-    <li>Select a build configuration using the Build icon&#8217;s dropdown list in the tool bar (Figure 2)</li>
-  </ul>
-  <ol>
-    <p>Carbide.c++ builds the project. A build dialog  and a task bar appear during a build process. All build output  is shown in the Console view while build errors and warnings appear in the Problems view.</p>
-    <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
+    <li>Choose one of the following to build a project:</li>
+        <table width="800" border="0" cellpadding="2" cellspacing="0">
+            <tr valign="top">
+                <th width="30%" class="Cell"><div align="left">From the ...</div></th>
+                    <th width="70%" class="Cell"><div align="left">Do the following...</div></th>
+                </tr>
+            <tr valign="top">
+                <td class="Cell"><b>Menu bar</b></td>
+                    <td class="Cell"> Click the <strong>Project &gt; Build Project</strong> menu option.</td>
+            </tr>
+            <tr valign="top">
+                <td class="Cell"><b>Toolbar</b></td>
+                    <td class="Cell">Click the <b>Build</b> icon (<img src="../../projects/images/icon_build_project.png" alt="Build project icon" width="17" height="17" align="absmiddle">) on the toolbar</td>
+            </tr>
+            <tr valign="top">
+                <td class="Cell"><b>Project</b></td>
+                    <td class="Cell"><ol>
+                            <li>Right-click the project              
+                            <li>Select Build Project</li>
+                    </ol></td>
+            </tr>
+        </table>
+        </ul>
+  <p>Carbide.c++ builds the project. A build dialog  and a task bar appear during a build process. All build output  is shown in the Console view while build errors and warnings appear in the Problems view.</p>
+  <p>Whether a full build or incremental build is requested, Carbide forwards the request to the SDK make system. The SDK make system determines if anything needs to be
       built. Carbide  always checks that makefiles are up-to-date and
-    dependencies present.</p>
-    <p>Project is also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window &gt; Preferences &gt; General &gt;</b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
-    <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window &gt; Preferences &gt; Run/Debug &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
-  </ol>
-  <p>When performing a build, output is displayed in the Console window. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b>Build Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window &gt; Preferences &gt; C/C++ &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Build Console</a></b> preference panel (figure 2).</p>
+      dependencies present.</p>
+  <p>Projects are also built if you make a change to it and then click <b>Debug</b>. It may be useful to automatically save modified resources before a manual build process by enabling the <b>Save automatically before build</b> option in the <b>Window &gt; Preferences &gt; General &gt;</b> <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.Workbench)")'> Workspace</a> preference panel. </p>
+  <p class="note"><b>NOTE</b> If you want to turn off building before launching, uncheck the <b>Build (if required) before launching</b> option in the <b>Window &gt; Preferences &gt; Run/Debug &gt;<img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.debug.ui.LaunchingPreferencePage)")'> Launching</a></b> preference panel.</p>
+  <p>When performing a build, output is displayed in the <a href="../../reference/view_console.htm">Console</a> view. If you do not want to clear the console before each build you need to uncheck the option <b>Always clear console before building</b> in the <b>Build Console</b> panel. This option is enabled by default. You can access this panel by selecting <b>Window &gt; Preferences &gt; C/C++ &gt; Build &gt; <img src="../../images/command_link.png" width="16" height="12"> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces)")'> Build Console</a></b> preference panel (figure 4).</p>
+  <p align="center"><img src="images/build_console.png" alt="Build Console" width="630" height="214" /></p>
+  <p align="left" class="figure">Figure 4 - Build Console preference panel</p>
   <p>Not clearing the console is useful when you are performing multiple builds, such as a regular project build, building a project package (.pkg) file, and building a ROM image. For example, if you do not clear the console before each build, then a subsequent build will not overwrite information from a previous build.</p>
-<p align="center"><img src="images/build_console.png" width="532" height="451" /></p>
-<p align="left" class="figure">Figure 4 - Build Console Preference Panel</p>
-<p>&nbsp;</p>
 </div>
   <h5>Concepts</h5>
   <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Tue Aug 31 10:28:49 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_creating_sis_file.htm	Tue Aug 31 10:54:44 2010 -0500
@@ -21,7 +21,7 @@
 <ul>
   <li>For non-Platform Security SDKs (pre-OS 9.x), <span class="code">makesis</span> is called</li>
 </ul>
-<p>Depending upon which tool is used, you will  need to complete some entries in the<a href="../../reference/build_properties/pane_build_config_sis.htm"> SIS Builder</a> pane of the Carbide Build Configurations panel of the project Properties dialog box. You can access this pane by selecting a project in the Project Explorer view and select <b>Project &gt; Properties</b> &gt;  <b>Carbide Build Configurations</b>. Fill in the necessary information to add PKG files to the project for downloading. </p>
+<p>Depending upon which tool is used, you will  need to complete some entries in the <a href="../../reference/build_properties/pane_build_config_sis.htm">SIS Builder</a> pane of the Carbide Build Configurations panel of the project Properties dialog box. You can access this pane by selecting a project in the <a href="../../reference/view_proj_explorer.htm">Project Explorer</a> view and select <b>Project &gt; Properties</b> <strong>&gt; Carbide.c++ &gt; </strong><b>Carbide Build Configurations</b>. Fill in the necessary information to add PKG files to the project for downloading. </p>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="19%" scope="col">Tool</th>
@@ -31,14 +31,14 @@
     <td><b>SIS Builder </b></td>
     <td><p>Use the <b>Add</b> control to add one or more SIS or PKG files to the project up to the maximum number Carbide supports. Note that the <b>SIS Builder</b> pane operates on a build configuration level. You will need to add files in this pane for every build configuration in the project. </p>
       <p>In addition, any PKG file added here is picked up by the <a href="../../projects/launch/page_installation.htm">Installation</a> tab in Application TRK configurations. However, as only one SIS file can be debugged at a time you must specify which SIS/PKG file to install for debugging purposes. This is handy if you have both a developer SIS file and a certified SIS file that you want to remain in sync during development. Both are always built but you only need to debug one. </p>
-      <p><img src="images/sis_builder_tab.png" width="550" height="221" /></p>
+      <p><img src="images/sis_builder_tab.png" width="573" height="203" /></p>
     <p class="figure">Figure 1 - SIS Builder tab </p></td>
   </tr>
   <tr>
     <td><b>SIS Properties </b></td>
     <td><div align="center">
       <p align="left">Complete the PKG File, and Signing Options settings in the <a href="../../reference/build_properties/wnd_sis_properties.htm">SIS Properties</a> dialog. By default, SIS files are output in the directory of the original SIS file.</p>
-      <p><img src="../../reference/images/wnd_sis_properties.png" width="455" height="452"></p>
+      <p><img src="../../reference/images/wnd_sis_properties.png" width="533" height="463"></p>
       <p class="figure">Figure 2 - SIS Properties dialog </p>
       </div></td>
   </tr>