minor edits and updates to images
authorfturovic <frank.turovich@nokia.com>
Mon, 21 Jun 2010 16:26:29 -0500
changeset 1510 90c95d26606c
parent 1509 1c77dba7ce70
child 1512 8731dc95fb5a
minor edits and updates to images
core/com.nokia.carbide.cpp.doc.user/html/reference/MBMEditor.html
core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/NewClassWizard.html
core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectNameAndLocation.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html
core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_filesys.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_project.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_macro_settings.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_project_settings.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configuration_filter.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm
core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MBMEditor.html	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MBMEditor.html	Mon Jun 21 16:26:29 2010 -0500
@@ -1,110 +1,110 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>MBM Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <h2>MBM Editor</h2>
-	  
-	 <p>
-		The <b>MBM Editor</b> allows you to specify the bitmaps that
-		should be included in a Symbian OS multi-bitmap (MBM) file. Use of MBM files for general purpose graphics is restricted to using <span class="filename">.bmp</span> files and works for versions 2.x and later releases of the Symbian OS SDKs. For more
-		information, see <a href="../concepts/MBMDefWizard.html">MBM File</a> and <a href="../tasks/Multi-BitmapFile.html">Creating a MBM File</a>.   </p>
-<p>
-		The MBM Editor is shown when an MBM file is
-	 opened for editing:</p>
-     <p class="Image"><img src="../tasks/projects/images/MBM_editor.png" width="900" height="600" /></p>
-    <p class="figure">Figure 1 - MBM Editor</p>
-    <h5>Table 1. MBM Editor &mdash;Items</h5>
-    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
-      <tr>
-        <th width="32%" scope="col">Item</th>
-        <th width="68%" scope="col">Explanation</th>
-      </tr>
-      <tr>
-        <td><b>Target File </b></td>
-        <td><p>Specifies the EPOCROOT relative path for the compiled images. Click the Default button to set the target file based on the SDK and project name. </p></td>
-      </tr>
-      <tr>
-        <td><b>Header File </b></td>
-        <td>Shows the generated header file. Select the Header option in the Header Generation group to create a default .mbg file. The path cannot be edited in this field. </td>
-      </tr>
-      <tr>
-        <td><b>Header Generation</b></td>
-        <td><p>Options include:</p>
-            <ul>
-              <li>No header - If selected, no .mbg header will be generated. </li>
-              <li>Header - If selected, a .mbg header will be generated.</li>
-          </ul></td>
-      </tr>
-      <tr>
-        <td><b>Up</b></td>
-        <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
-      </tr>
-      <tr>
-        <td><b>Down</b></td>
-        <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
-      </tr>
-      <tr>
-        <td><b>Pair Image and Mask </b></td>
-        <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
-      </tr>
-      <tr>
-        <td><b>Split Image and Mask </b></td>
-        <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
-      </tr>
-      <tr>
-        <td><b>Swap Image and Mask </b></td>
-        <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
-      </tr>
-      <tr>
-        <td><b><a href="add_from_project.htm">Add From Project</a> </b></td>
-        <td>Click this button to open an Add Images from Project dialog to reference available images in the project.</td>
-      </tr>
-      <tr>
-        <td><b><a href="add_from_filesys.htm">Add From Filesystem</a></b></td>
-        <td>Click this button to open an Add Images From Filesystem dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
-      </tr>
-      <tr>
-        <td><b>Remove</b></td>
-        <td>Select an image and click Remove to remove image entry from the list. This does not delete file from directory.</td>
-      </tr>
-      <tr>
-        <td><b>Color depth </b></td>
-        <td>Select the bit depth used to encode the image at build time.</td>
-      </tr>
-      <tr>
-        <td><b>Mask depth </b></td>
-        <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
-            <ul>
-              <li>n/a - Do not apply mask depth to images </li>
-              <li>1 - A 1-bit mask treats pixels as &quot;on/off&quot; bits, where black is opaque and white is transparent. </li>
-              <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
-          </ul></td>
-      </tr>
-      <tr>
-        <td><b>Color format </b></td>
-        <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
-      </tr>
-      <tr>
-        <td><b>Set from image </b></td>
-        <td>Click this button to auto-detect the image depth, mask depth, and color/grayscale setting from the image contents.</td>
-      </tr>
-      <tr>
-        <td><b>Preview</b></td>
-        <td>A preview of the image as it will appear at runtime. </td>
-      </tr>
-    </table>
-    <h5>Related  concepts</h5>
-
-   <ul>
-     <li><a href="../concepts/MBMDefWizard.html">MBM File</a></li>
-   </ul>
-   <h5>Related tasks</h5>
-   <ul>
-     <li><a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a></li>
-   </ul>
-   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-   </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>MBM Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <h2>MBM Editor</h2>
+	  
+	 <p>
+		The <b>MBM Editor</b> allows you to specify the bitmaps that
+		should be included in a Symbian OS multi-bitmap (MBM) file. Use of MBM files for general purpose graphics is restricted to using <span class="filename">.bmp</span> files and works for versions 2.x and later releases of the Symbian OS SDKs. For more
+		information, see <a href="../concepts/MBMDefWizard.html">MBM File</a> and <a href="../tasks/Multi-BitmapFile.html">Creating a MBM File</a>.   </p>
+<p>
+		The MBM Editor is shown when an MBM file is
+	 opened for editing:</p>
+     <p align="center" class="Image"><img src="images/wnd_edit_mbm_contents.png" alt="Edit MBM Contents window" width="900" height="600"></p>
+   <p class="figure">Figure 1 - MBM Editor</p>
+    <h5>Table 1. MBM Editor &mdash;Items</h5>
+    <table width="94%"  border="0" cellpadding="2" cellspacing="0">
+      <tr>
+        <th width="32%" scope="col">Item</th>
+        <th width="68%" scope="col">Explanation</th>
+      </tr>
+      <tr>
+        <td><b>Target File </b></td>
+        <td><p>Specifies the EPOCROOT relative path for the compiled images. Click the Default button to set the target file based on the SDK and project name. </p></td>
+      </tr>
+      <tr>
+        <td><b>Header File </b></td>
+        <td>Shows the generated header file. Select the Header option in the Header Generation group to create a default .mbg file. The path cannot be edited in this field. </td>
+      </tr>
+      <tr>
+        <td><b>Header Generation</b></td>
+        <td><p>Options include:</p>
+            <ul>
+              <li>No header - If selected, no .mbg header will be generated. </li>
+              <li>Header - If selected, a .mbg header will be generated.</li>
+          </ul></td>
+      </tr>
+      <tr>
+        <td><b>Up</b></td>
+        <td>Select an image in the list and click Up to move the selection one position up in the list.</td>
+      </tr>
+      <tr>
+        <td><b>Down</b></td>
+        <td><p>Select an image in the list and click Down to move the selection one position down in the list. </p></td>
+      </tr>
+      <tr>
+        <td><b>Pair Image and Mask </b></td>
+        <td>Select two adjacent unpaired BMP image entries in the list and click this button to combine the images together into image/mask pairs.</td>
+      </tr>
+      <tr>
+        <td><b>Split Image and Mask </b></td>
+        <td>Select a paired BMP image in the list and click this button to split the image into image and mask entries. </td>
+      </tr>
+      <tr>
+        <td><b>Swap Image and Mask </b></td>
+        <td>Select a paired BMP image in the list and click this button to swap the image and mask files and format information in paired image entries. </td>
+      </tr>
+      <tr>
+        <td><b><a href="add_from_project.htm">Add From Project</a> </b></td>
+        <td>Click this button to open an Add Images from Project dialog to reference available images in the project.</td>
+      </tr>
+      <tr>
+        <td><b><a href="add_from_filesys.htm">Add From Filesystem</a></b></td>
+        <td>Click this button to open an Add Images From Filesystem dialog to locate and reference existing images in the filesystem or copy images to the project.</td>
+      </tr>
+      <tr>
+        <td><b>Remove</b></td>
+        <td>Select an image and click Remove to remove image entry from the list. This does not delete file from directory.</td>
+      </tr>
+      <tr>
+        <td><b>Color depth </b></td>
+        <td>Select the bit depth used to encode the image at build time.</td>
+      </tr>
+      <tr>
+        <td><b>Mask depth </b></td>
+        <td><p>Select the bit depth used to encode the mask at build time. Options include:</p>
+            <ul>
+              <li>n/a - Do not apply mask depth to images </li>
+              <li>1 - A 1-bit mask treats pixels as &quot;on/off&quot; bits, where black is opaque and white is transparent. </li>
+              <li>8 - An 8-bit mask is treated as alpha values, where black is transparent and white is opaque.</li>
+          </ul></td>
+      </tr>
+      <tr>
+        <td><b>Color format </b></td>
+        <td>Select Color to encode the image(s) as color or select Grayscale to encode the image(s) as grayscale.</td>
+      </tr>
+      <tr>
+        <td><b>Set from image </b></td>
+        <td>Click this button to auto-detect the image depth, mask depth, and color/grayscale setting from the image contents.</td>
+      </tr>
+      <tr>
+        <td><b>Preview</b></td>
+        <td>A preview of the image as it will appear at runtime. </td>
+      </tr>
+    </table>
+    <h5>Related  concepts</h5>
+
+   <ul>
+     <li><a href="../concepts/MBMDefWizard.html">MBM File</a></li>
+   </ul>
+   <h5>Related tasks</h5>
+   <ul>
+     <li><a href="../tasks/Multi-BitmapFile.html">Creating an MBM File</a></li>
+   </ul>
+   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm	Mon Jun 21 16:26:29 2010 -0500
@@ -5,14 +5,12 @@
    <body>
    <h2>References</h2>
 	 <p>The topics include:</p>
-	 <ul>
-	   <li><a href="../concepts/cvs.htm">Concurrent Versions System (CVS)</a></li>
-	   <li><a href="../concepts/contextual_menus.htm">Context Menus</a></li>
+	 <ul><li><a href="../concepts/contextual_menus.htm">Context Menus</a></li>
 	   <li><a href="menus/menus.htm">Menus</a></li>
 	   <li><a href="menus/open_cmd_window.htm">Open Command Window</a></li>
-	   <li><a href="menus/run_leavescan.htm">Run Leavescan</a></li>
 	   <li><a href="menus/s60_ui_designer.htm">S60 UI Designer</a></li>
 	   <li><a href="menus/open_explorer_window.htm">Show in Explorer</a></li>
+	   <li><a href="../concepts/cvs.htm">Software Configuration Management</a></li>
 	   <li><a href="menus/new_symbian_class.htm">Symbian OS Class</a></li>
 	   <li><a href="menus/new_symbian_project.htm">Symbian OS C++ Project</a></li>
    </ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/NewClassWizard.html	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/NewClassWizard.html	Mon Jun 21 16:26:29 2010 -0500
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>New Class Wizard in Reference</title>
+<title>New C++ Class Wizard</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
    <body>
@@ -8,27 +8,27 @@
  
   <a name="ref_newclass_wizard"></a>
    </div><div class="Head1">
-<h2>New Class Wizard</h2>
+<h2>New C++ Class Wizard</h2>
 </div><div class="Bodytext">
 	  
 	 <p>
-		The New Class wizard allows a developer to add a new C++ class to
+		The <strong>New C++ Class</strong> wizard allows a developer to add a new C++ class to
 		existing or new header and source files. This wizard is supplied by the C/C++
 		Development Toolkit (CDT), and is not customised for Symbian OS development.
 		However, as it is not currently described in the C/C++ Development Toolkit User
 		Guide, you may find this extra information about it useful.</p>
-	 <p>See <a href="../tasks/projects/prj_adding_symbian_class.htm">Adding a Symbian OS Class</a> for information on adding Symbian-based classes to a project. </p>
+    <p>See <a href="../tasks/projects/prj_adding_symbian_class.htm">Adding a Symbian OS Class</a> for information on adding Symbian-based classes to a project. </p>
 	 <p>
-	 To invoke the wizard, click File &gt; New &gt; Class from the menu bar. The New Class wizard appears. </p> 
-	 <div class="Figure">
+	 To invoke the wizard, click <strong>File &gt; New &gt; Class </strong>from the menu bar. The <strong>New C++ Class </strong> window appears. </p> 
+    <div class="Figure">
 
-		<p class="Image"><a name=""><img src="../images/newclasswiz.gif" alt="" width="500" height="568"  border="0" /></a></p>
+		<p class="Image"><a name=""><img src="images/wiz_new_class.png" alt="" width="582" height="618"  border="0" /></a></p>
  
 	 
 </div>
-	 <table cellpadding="2" cellspacing="0"
+	 <table width="700" cellpadding="2" cellspacing="0"
 border="0">
-	 <tr valign="top"><th width="145" class="Cell">Name</th><th width="639" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+	 <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>Source Folder</b> 
 			 </p></td><td class="Cell">
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/NewMMP_wizard.html	Mon Jun 21 16:26:29 2010 -0500
@@ -7,7 +7,7 @@
    <h2>Symbian OS MMP File</h2>
    
    <p>
-   Use the <b>Symbian OS MMP File</b> wizard (figure 1) to create a new MMP project file for the currently selected project. Symbian projects are defined by an <code class="code">.mmp</code> file which specifies the essential elements of the project. All details of the project lifecycle are handled by the IDE. There is no editable makefile the user can edit to modify the build behavior of the project.</p>
+   Use the <b>Symbian OS MMP File</b> wizard (figure 1) to create a new MMP project file for the currently selected project. Symbian projects are defined by an <code class="code">.mmp</code> file which specifies the essential project elements of a Symbian OS project. All details of the project lifecycle are handled by the IDE. There is no editable makefile the user can edit to modify the build behavior of the project.</p>
    <div class="step">
      <h4>Creating a New Symbian OS MMP File</h4>
      <ol>
@@ -16,7 +16,7 @@
              <li>Select the File &gt; New &gt; Other... menu item (Figure 1)</li>
            </ul>
            <blockquote>
-             <p align="center"><img src="images/MMP_wizard.png" width="500" height="500" /></p>
+             <p align="center"><img src="images/MMP_wizard.png" width="525" height="500" /></p>
              <p align="left" class="figure">Figure 1 - Select a wizard page in the New window</p>
              <p>OR</p>
            </blockquote>
@@ -25,7 +25,7 @@
            </ul>
          </li>
          <blockquote>
-           <p align="center"><img src="images/MMP_wizard2.png" width="500" height="500" /></p>
+           <p align="center"><img src="images/MMP_wizard2.png" width="525" height="500" /></p>
            <p align="left" class="figure">Figure 2 - MMP File page in the New MMP File window</p>
        </blockquote>
          <li>On the Select the wizard page, select Symbian OS &gt; Symbian OS MMP File, then click Next (Figure 1)</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectDirectories.html	Mon Jun 21 16:26:29 2010 -0500
@@ -1,61 +1,61 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Project Directories in New Project Wizard</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <div class="Head1">
-<h2>Project Directories</h2>
-</div><div class="Bodytext">
-	  
-	 <p>
-		You can specify the name of the project directories, where the project
-		files are to be stored. 
-	 </p> 
-	 <div class="Figure">
-
-		<p align="center" class="Image"><img src="../images/step6.png" width="500" height="567" /></p>
-	   <p class="Image">Figure 1 - Project Directories page </p>
-	 </div><table width="720"
-border="0" cellpadding="2" cellspacing="0">
-	   <tr valign="top"><th width="108" class="Cell">Name</th><th width="493" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Include</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Specifies the name of the include folder, where all the header
-				files for the project are located. 
-			 </p></td></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Source</b> 
-			 </p></td><td class="Cell">
-			 <p>
-				Specifies the name of the source folder, where all the source files
-				for the project are located. 
-			 </p></td></tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>Group</b></td>
-			   <td class="Cell">Specifies the name of the group folder, where all the group files for the project are located. </td>
-    </tr>
-			 <tr valign="top">
-               <td class="Cell"><b>Data</b></td>
-               <td class="Cell">Specifies the name of the data folder, where all the data files for the project are located. </td>
-	   </tr>
-			 <tr valign="top">
-               <td class="Cell"><b>Install</b></td>
-               <td class="Cell">Specifies the name of the Install folder, where all the .sis files for the project are located. </td>
-	   </tr>
-			 <tr valign="top">
-               <td class="Cell"><b>Graphics</b></td>
-               <td class="Cell">Specifies the name of the graphics folder, where all the graphic files for the project are located. </td>
-	   </tr>
-</table>
-</div>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>
-</li></ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-   </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Project Directories in New Project Wizard</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <div class="Head1">
+<h2>Project Directories</h2>
+</div><div class="Bodytext">
+	  
+	 <p>
+		You can specify the name of the project directories, where the project
+		files are to be stored. 
+	 </p> 
+	 <div class="Figure">
+
+		<p align="center" class="Image"><img src="../images/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">
+	   <tr valign="top"><th width="108" class="Cell">Name</th><th width="493" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Include</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Specifies the name of the include folder, where all the header
+				files for the project are located. 
+			 </p></td></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Source</b> 
+			 </p></td><td class="Cell">
+			 <p>
+				Specifies the name of the source folder, where all the source files
+				for the project are located. 
+			 </p></td></tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>Group</b></td>
+			   <td class="Cell">Specifies the name of the group folder, where all the group files for the project are located. </td>
+    </tr>
+			 <tr valign="top">
+               <td class="Cell"><b>Data</b></td>
+               <td class="Cell">Specifies the name of the data folder, where all the data files for the project are located. </td>
+	   </tr>
+			 <tr valign="top">
+               <td class="Cell"><b>Install</b></td>
+               <td class="Cell">Specifies the name of the Install folder, where all the .sis files for the project are located. </td>
+	   </tr>
+			 <tr valign="top">
+               <td class="Cell"><b>Graphics</b></td>
+               <td class="Cell">Specifies the name of the graphics folder, where all the graphic files for the project are located. </td>
+	   </tr>
+</table>
+</div>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/CreatingNewProjects.html">Creating New Projects</a>
+</li></ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectNameAndLocation.html	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectNameAndLocation.html	Mon Jun 21 16:26:29 2010 -0500
@@ -1,44 +1,44 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Name and Location</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-   <div class="Head1">
-<h2>Name and Location</h2>
-</div>
-   <p>
-		You can specify the name of the class and  where the generated source and header 
-		files are to be stored. 
-   </p> 
-
-		<p align="center" class="Image"><img src="images/wiz_name_and_location_page.png" width="607" height="500" /></p>
-   <p align="center" class="figure">Figure 1 - Name and Location page </p>
-	 <h5>Table 1 - Name and Locations page options</h5>
-	 <table width="785"
-border="0" cellpadding="2" cellspacing="0">
-	   <tr valign="top"><th width="219" class="Cell">Name</th><th width="491" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
-			 <p>
-				<b>Class name </b></p></td><td class="Cell">
-			 <p>Class name to create.				</p></td></tr>
-	   <tr valign="top">
-	     <td class="Cell"><b>Use default</b></td>
-	     <td class="Cell">Checkmark to use the suggested default names, or uncheck to customize the names.</td>
-       </tr>
-	   <tr valign="top"><td class="Cell">
-		 <p>
-		 <b>Source</b></p></td><td class="Cell">
-		   <p>Specify directory to store source information. </p></td></tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>Include</b></td>
-			   <td class="Cell">Specify directory to store header information. </td>
-    </tr>
-			 <tr valign="top">
-			   <td class="Cell"><b>Force files to lowercase</b></td>
-			   <td class="Cell">Checkmark to force all filenames to use lowercase letters. Uncheck to use mixed case.</td>
-	   </tr>
-</table>
-   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-   </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Name and Location</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+   <div class="Head1">
+<h2>Name and Location</h2>
+</div>
+   <p>
+		You can specify the name of the class and  where the generated source and header 
+		files are to be stored. 
+   </p> 
+
+		<p align="center" class="Image"><img src="images/wiz_name_and_location_page.png" width="438" height="415" /></p>
+   <p align="center" class="figure">Figure 1 - Name and Location page </p>
+	 <h5>Table 1 - Name and Locations page options</h5>
+	 <table width="785"
+border="0" cellpadding="2" cellspacing="0">
+	   <tr valign="top"><th width="219" class="Cell">Name</th><th width="491" class="Cell">Function</th></tr><tr valign="top"><td class="Cell">
+			 <p>
+				<b>Class name </b></p></td><td class="Cell">
+			 <p>Class name to create.				</p></td></tr>
+	   <tr valign="top">
+	     <td class="Cell"><b>Use default</b></td>
+	     <td class="Cell">Checkmark to use the suggested default names, or uncheck to customize the names.</td>
+       </tr>
+	   <tr valign="top"><td class="Cell">
+		 <p>
+		 <b>Source</b></p></td><td class="Cell">
+		   <p>Specify directory to store source information. </p></td></tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>Include</b></td>
+			   <td class="Cell">Specify directory to store header information. </td>
+    </tr>
+			 <tr valign="top">
+			   <td class="Cell"><b>Force files to lowercase</b></td>
+			   <td class="Cell">Checkmark to force all filenames to use lowercase letters. Uncheck to use mixed case.</td>
+	   </tr>
+</table>
+   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+   </html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html	Mon Jun 21 16:26:29 2010 -0500
@@ -1,27 +1,25 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
 <title>Project and File Properties</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/></head>
    <body>
    <div class="Head1">
 <h2>C/C++ Project and File Properties</h2>
 </div>
 	  
 	 <p>
-		The <b>Properties</b> window allows you to change the general
-	 settings for a project and  individual files.</p> 
+		The<b>Properties for &lt;<i>project_name</i>&gt;</b><strong> </strong>window allows you to change a project's build configurations, macros, and other project settings.</p> 
 	 <p>
-		To change the settings for a project, right-click the project from the	   <b>Project Explorer</b>, <b>C/C++ Project</b>, or <b>Symbian Project Navigator</b> views, and choose <b>Properties</b> from the context menu. The <b>Properties for &lt;<i>project_name</i>&gt;</b> window will then show all the project settings. If
+		To change the settings for a project, right-click the project from the	   <a href="view_cpp_projects.htm">Project Explorer</a> or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> views, and choose <b>Properties</b> from the context menu. The <b>Properties for &lt;<i>project_name</i>&gt;</b> window then show all the project settings. If
 		you alter the settings, then the settings are applied as
 	 defaults for all files in the project. </p>
-	 <p>The Carbide.c++ panels include:</p>
+   <p>The Carbide.c++ panels include:</p>
 <ul>
 	   <li><a href="build_properties/pane_build_config.htm">Build Configurations</a> </li>
        <li><a href="build_properties/pane_macro_settings.htm">Macro Settings</a></li>
   <li><a href="build_properties/pane_project_settings.htm">Project Settings</a></li>
-  <li>other - additional panels may appear here as well. For example,  <b>CodeScanner</b> and <b>UI Designer</b>, to name two.   </li>
+  <li>other - additional panels may appear here as well. For example,  <b>CodeScanner</b>.   </li>
    </ul>
-<p align="center"><img src="images/carbide_build_config.png" width="795" height="692"></p>
+<p align="center"><img src="images/carbide_build_config.png" width="786" height="693"></p>
 <p class="figure">Figure 1. Project for <i>project_name</i> dialog</p>
 <p>
 		To change the settings only for a particular file, right-click the file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_filesys.htm	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_filesys.htm	Mon Jun 21 16:26:29 2010 -0500
@@ -1,55 +1,55 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>MBM/MIF Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-
-<h2>Add Images From Filesystem</h2>
-	  
-	 <p>The <b>Add Images from Filesystem</b> dialog allows you to search for and add images currently available in the filesystem. Select an image and click <b>OK</b> to add the image.</p>
-   <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM, MIF, or AIF editor. </p>
-	 <p align="center" class="Image"><img src="images/add_images_from_filesys.png" width="640" height="700"></p>
-   <p class="figure">Figure 1 - Add Images from Filesystem </p>
-		<h5>Table 1. Add Images&mdash;Items</h5>
-		<table width="94%"  border="0" cellpadding="2" cellspacing="0">
-          <tr>
-            <th width="32%" scope="col">Item</th>
-            <th width="68%" scope="col">Explanation</th>
-          </tr>
-          <tr>
-            <td><b>Directory</b></td>
-            <td><p>Browse to the directory containing images you want to add. </p></td>
-          </tr>
-          <tr>
-            <td><b>Available directory images </b></td>
-            <td>Shows the images found in the directory. Select images to be added. </td>
-          </tr>
-          <tr>
-            <td><b>Detected image pairs </b></td>
-            <td><p>Lists the selected images and detected image pairs.</p>
-            </td>
-          </tr>
-          <tr>
-            <td><b>Copy images into project </b></td>
-            <td>Enable this option to make a copy of selected images in the selected project location. </td>
-          </tr>
-          <tr>
-            <td><b>Overwrite existing </b></td>
-            <td><p>Enable this option to overwrite existing images with the same name. </p></td>
-          </tr>
-          <tr>
-            <td><b>Project location </b></td>
-            <td>Click the Choose... button to display the Select a folder dialog, then select a project folder to store the images.</td>
-          </tr>
-        </table>
-		<h5>Other references</h5>
-		<ul>
-          <li><a href="MBMEditor.html">MBM Editor</a></li>
-   </ul>
-		<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>MBM/MIF Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+
+<h2>Add Images From Filesystem</h2>
+	  
+	 <p>The <b>Add Images from Filesystem</b> dialog allows you to search for and add images currently available in the filesystem. Select an image and click <b>OK</b> to add the image.</p>
+   <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM, MIF, or AIF editor. </p>
+	 <p align="center" class="Image"><img src="images/add_images_from_filesys.png" width="608" height="581"></p>
+   <p class="figure">Figure 1 - Add Images from Filesystem </p>
+		<h5>Table 1. Add Images&mdash;Items</h5>
+		<table width="94%"  border="0" cellpadding="2" cellspacing="0">
+          <tr>
+            <th width="32%" scope="col">Item</th>
+            <th width="68%" scope="col">Explanation</th>
+          </tr>
+          <tr>
+            <td><b>Directory</b></td>
+            <td><p>Browse to the directory containing images you want to add. </p></td>
+          </tr>
+          <tr>
+            <td><b>Available directory images </b></td>
+            <td>Shows the images found in the directory. Select images to be added. </td>
+          </tr>
+          <tr>
+            <td><b>Detected image pairs </b></td>
+            <td><p>Lists the selected images and detected image pairs.</p>
+            </td>
+          </tr>
+          <tr>
+            <td><b>Copy images into project </b></td>
+            <td>Enable this option to make a copy of selected images in the selected project location. </td>
+          </tr>
+          <tr>
+            <td><b>Overwrite existing </b></td>
+            <td><p>Enable this option to overwrite existing images with the same name. </p></td>
+          </tr>
+          <tr>
+            <td><b>Project location </b></td>
+            <td>Click the <strong>Choose...</strong> button to display the <strong>Select a folder</strong> dialog, then select a project folder to store the images.</td>
+          </tr>
+        </table>
+		<h5>Other references</h5>
+		<ul>
+          <li><a href="MBMEditor.html">MBM Editor</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/add_from_project.htm	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/add_from_project.htm	Mon Jun 21 16:26:29 2010 -0500
@@ -1,23 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>MBM/MIF Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-
-<h2>Add Images From Project </h2>
-	  
-	 <p>The <b>Add Images from Project</b> dialog allows you to add images currently available in the project. Select an image and click <b>OK</b> to add the image. </p>
-   <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM, MIF, or AIF editor.</p>
-   <p align="center" class="Image"><img src="images/add_images_from_project.png" width="640" height="567"></p>
-		<p class="figure">Figure 1 - Add Images from Project </p>
-		<h5>Other references</h5>
-		<ul>
-          <li><a href="MBMEditor.html">MBM Editor</a></li>
-   </ul>
-   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>MBM/MIF Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+
+<h2>Add Images From Project </h2>
+	  
+	 <p>The <b>Add Images from Project</b> dialog allows you to add images currently included in the project. Select one or more images and click <b>OK</b> to add the image to the MMP file. </p>
+   <p class="note"><b>NOTE</b> Information displayed under Help group will vary slightly depending upon whether this dialog was called from a MBM, MIF, or AIF editor.</p>
+   <p align="center" class="Image"><img src="images/add_images_from_project.png" width="608" height="581"></p>
+   <p class="figure">Figure 1 - Add Images from Project </p>
+		<h5>Other references</h5>
+		<ul>
+          <li><a href="MBMEditor.html">MBM Editor</a></li>
+   </ul>
+   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+</html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm	Mon Jun 21 16:26:29 2010 -0500
@@ -1,62 +1,62 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<meta name="keywords" content="Active Configuration, SIS Builder, Environment, Arguments, Paths and Symbols, ROM Builder" >
-<title>Carbide Build Configurations </title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide Build Configurations </h2>
-<p>Use the <b>Carbide Build Configurations</b> panel to specify the project's <a href="../../concepts/build_configurations.htm">active build configuration</a> and its related build properties.  </p>
-<p align="center"><img src="../images/carbide_build_config.png" width="795" height="692" /></p>
-<p class="figure">Figure 1 - Carbide Build Configurations panel </p>
-<h5>Table 1 Carbide Build Configuration items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="20%" scope="col">Item</th>
-    <th width="71%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td width="20%"><b>Active Configuration </b></td>
-    <td>The <b>Active Configuration</b> drop down list allows you to <a href="../../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
-  </tr>
-  <tr>
-    <td width="20%"><b>Manage...</b></td>
-    <td>Click the <b>Manage</b>... button to <a href="../../tasks/projects/prj_new_build_config.htm">add</a> a new SDK/Configuration or remove an existing configuration.</td>
-  </tr>
-  <tr>
-    <td><b>SIS Builder </b></td>
-    <td><p>The <a href="pane_build_config_sis.htm">SIS Builder</a> pane is used to specify a .pkg file and .sis file options to create an application .sis file. These settings apply to the currently selected Configuration.</p></td>
-  </tr>
-  <tr>
-    <td><b>SBSv2</b></td>
-    <td>The <a href="pane_build_config_sbsv2.htm">SBSv2</a> pane is used to define which build configuration variant to use.</td>
-  </tr>
-  <tr>
-    <td><b>Environment</b></td>
-    <td><p>The <a href="pane_build_config_env.htm">Environment</a> tab allows you to view the current User and System environment variables that will be used  when any abld command is invoked.</p></td>
-  </tr>
-  <tr>
-    <td><b>Paths and Symbols </b></td>
-    <td>The <a href="pane_build_config_paths.htm">Paths and Symbols</a> tab allows you to see which paths and symbols have been indexed for the project. </td>
-  </tr>
-  <tr>
-    <td><b>ROM Builder </b></td>
-    <td>The <a href="../ROM_build_settings.html">ROM Builder</a> tab  allows you to specify commands and a working directory for building a GUI ROM Image.</td>
-  </tr>
-</table>
-<h5>Other references</h5>
-<ul>
-  <li><a href="pane_build_config.htm">SIS Builder</a></li>
-  <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
-  <li><a href="../../concepts/build_configurations.htm">Active  Configuration</a></li>
-  <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
-  <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a .PKG file</a></li>
-</ul>
-<div id="footer">Copyright &copy; 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" />
+<meta name="keywords" content="Active Configuration, SIS Builder, Environment, Arguments, Paths and Symbols, ROM Builder" >
+<title>Build Configurations</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Build Configurations </h2>
+<p>Use the <b> Build Configurations</b> panel to specify the project's <a href="../../concepts/build_configurations.htm">active build configuration</a> and its related build properties.  </p>
+<p align="center"><img src="../images/carbide_build_config.png" width="786" height="693" /></p>
+<p class="figure">Figure 1 - Carbide Build Configurations panel </p>
+<h5>Table 1  Build Configuration items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="20%" scope="col">Item</th>
+    <th width="71%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td width="20%"><b>Active Configuration </b></td>
+    <td>The <b>Active Configuration</b> drop down list allows you to <a href="../../tasks/projects/prj_set_build_tgt.htm">select</a> a configuration that is currently available for the selected project. The entries in the related sub-panes will change according to the selected configuration. The Configuration name consists of a target name and an SDK identifier in brackets.</td>
+  </tr>
+  <tr>
+    <td width="20%"><b>Manage...</b></td>
+    <td>Click the <b>Manage</b>... button to <a href="../../tasks/projects/prj_new_build_config.htm">add</a> a new SDK/Configuration or remove an existing configuration.</td>
+  </tr>
+  <tr>
+    <td><b>SIS Builder </b></td>
+    <td><p>The <a href="pane_build_config_sis.htm">SIS Builder</a> pane is used to specify a .pkg file and .sis file options to create an application .sis file. These settings apply to the currently selected Configuration.</p></td>
+  </tr>
+  <tr>
+    <td><b>SBSv2</b></td>
+    <td>The <a href="pane_build_config_sbsv2.htm">SBSv2</a> pane is used to define which build configuration variant to use.</td>
+  </tr>
+  <tr>
+    <td><b>Environment</b></td>
+    <td><p>The <a href="pane_build_config_env.htm">Environment</a> tab allows you to view the current User and System environment variables that will be used  when any abld command is invoked.</p></td>
+  </tr>
+  <tr>
+    <td><b>Paths and Symbols </b></td>
+    <td>The <a href="pane_build_config_paths.htm">Paths and Symbols</a> tab allows you to see which paths and symbols have been indexed for the project. </td>
+  </tr>
+  <tr>
+    <td><b>ROM Builder </b></td>
+    <td>The <a href="../ROM_build_settings.html">ROM Builder</a> tab  allows you to specify commands and a working directory for building a GUI ROM Image.</td>
+  </tr>
+</table>
+<h5>Other references</h5>
+<ul>
+  <li><a href="pane_build_config.htm">SIS Builder</a></li>
+  <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
+  <li><a href="../../concepts/build_configurations.htm">Active  Configuration</a></li>
+  <li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
+  <li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a .PKG file</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_macro_settings.htm	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_macro_settings.htm	Mon Jun 21 16:26:29 2010 -0500
@@ -4,19 +4,19 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Macro Settings</title>
+<title>Macro Settings</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Carbide Macro Settings</h2>
-<p>  The <b>Carbide Macro Settings</b> properties page allows you to specify a file containing macros that CDT will use when parsing the source code. </p>
-<p align="center"><img src="../images/carbide_macro_settings.png" width="670" height="488"></p>
+<h2> Macro Settings</h2>
+<p>  The <b> Macro Settings</b> properties page allows you to specify a file containing macros that CDT  uses to parse the source code. </p>
+<p align="center"><img src="../images/carbide_macro_settings.png" width="786" height="476"></p>
 <p class="figure">Figure 1 - Carbide Macros Settings panel </p>
 <h5>Table 1 Carbide <span class="figure">Macros Settings</span> items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+<table width="700"  border="0" cellpadding="2" cellspacing="0">
   <tr>
-    <th width="28%" scope="col">Item</th>
-    <th width="72%" scope="col">Explanation</th>
+    <th width="30%" scope="col">Item</th>
+    <th width="70%" scope="col">Explanation</th>
   </tr>
   <tr>
     <td width="28%"><b>Macro File </b></td>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_project_settings.htm	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_project_settings.htm	Mon Jun 21 16:26:29 2010 -0500
@@ -1,126 +1,133 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide Project Settings</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-<style type="text/css">
-<!--
-.style5 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
--->
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide Project Settings</h2>
-<p>  Use the <b>Carbide Project Settings </b>window to specify whether all components or selected subcomponents listed in a build information file (bld.inf) should be built for the currently selected project. You can also specify whether to perform a <span class="code">clean</span> or <span class="code">reallyclean</span> command on the project before building a project.</p>
-<p align="center"><img src="../images/carbide_proj_settings.png" width="640" height="643" /></p>
-<p class="figure">Figure 1 - Carbide Project Settings</p>
-<h5>Table 1 Carbide Project Settings items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Bld.inf file</b></td>
-    <td>This is the path to the bld.inf file that lists the makefile and mmp components.</td>
-  </tr>
-  <tr>
-    <td><b>Bld.inf</b></td>
-    <td>Select this option to ensure all components are built for the selected project. </td>
-  </tr>
-  <tr>
-    <td><b>Selected Components</b></td>
-    <td><p>Select this option to  specify which components of the bld.inf file to be built, including makefiles. The equivalent call to abld is <span class="code">abld build &lt;subcomponent&gt;</span>. Use the <b>Exclude extension makefiles</b> and <b>Exclude test components</b> options to manage the items that appear in the list. </p>
-      <p>Toggle the state of each component to set its build state to true or not. A checkmark indicates a component is built. Click on a column title to sort the items by that columns contents. </p>
-    </td>
-  </tr>
-  <tr>
-    <td><b>Exclude extension makefiles </b></td>
-    <td>Toggles the presense of extension makefiles in the Selected components list. </td>
-  </tr>
-  <tr>
-    <td><b>Exclude test components </b></td>
-    <td>Toggles the presense of test components in the Selected components list. </td>
-  </tr>
-  <tr>
-    <td><b>Enable project specific settings </b></td>
-    <td>Click to set project specific build settings. By default a project in the workspace uses the global build settings unless this option is enabled. See the <a href="../wnd_build_prefs.htm">Build</a> preference panel for details on these options. </td>
-  </tr>
-  <tr>
-    <td><b>Configure Workspace Settings... </b></td>
-    <td>Opens the <a href="../wnd_build_prefs.htm">Build</a> preference panel. </td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p align="center"><img src="../images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="417" height="243"></p>
-<p align="center" class="figure">Figure 2 - SBSv1 Tab</p>
-<h5 align="left">Table 2 Symbian Build System v1 tab </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><span class="style5">Clean level </span></td>
-    <td><p>Specifies the level of clean to perform on  project files. The levels include:</p>
-      <ul>
-        <li>Level 0  (<span class="code">abld clean</span>) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker</li>
-        <li>Level 1  (<span class="code">abld reallyclean</span>) - performs a <span class="code">clean</span> operation, but also removes all exported files and makefiles</li>
-        <li>Level 2  (<span class="code">abld reallyclean</span>, <span class="code">bldmake clean</span>) - performs  a <span class="code">reallyclean</span> operation and then removes all files created by bldmake</li>
-      </ul></td>
-  </tr>
-  <tr>
-    <td><span class="style5">Manage dependency tracking </span></td>
-    <td>If checked, the Symbian command line build system will not generate dependencies for source and resource files. These will be managed by Carbide. This can reduce build times. </td>
-  </tr>
-  <tr>
-    <td><b>Show a dialog to modify build actions when modified MMPs are detected </b></td>
-    <td><p>If checked, you will be asked what action to take before a build if a MMP file has been modified. </p>
-        <p>If not checked, the default action is taken for all modified mmp files. </p></td>
-  </tr>
-  <tr>
-    <td><b>Default action to take when mmp files are modified </b></td>
-    <td>Select either None, Link only, or Compile and Link.</td>
-  </tr>
-</table>
-<p align="left">&nbsp;</p>
-<p align="center"><img src="../images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="427" height="269"></p>
-<p align="center" class="figure">Figure 3 - SBSv2 Tab</p>
-<h5 align="left">Table 3 Symbian Build System v2 tab (only visible for Projects created with SBSv2 builder) </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="29%" scope="col">Item</th>
-    <th width="57%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Clean level </b></td>
-    <td>Select the level of clean when cleaning a project.
-      <ul>
-        <li><strong>abld clean</strong> erases all files created by a corresponding abld target   command (all intermediate files created during compilation and all executables and import libraries created by the linker)</li>
-        <li><strong>abld reallyclean</strong> does what abld clean does, and also removes files   exported by abld export and makefiles generated by abld makefile, or the abld   test equivalents</li>
-      </ul></td>
-  </tr>
-  <tr>
-    <td><b>Keep going  </b></td>
-    <td><p>This build option tells a particular command to   keep going even if unrelated build steps report errors or files are missing.</p>    </td>
-  </tr>
-  <tr>
-    <td><b>Debug </b></td>
-    <td><p>This option generates symbolic debug information for release or debug builds,   independent of the compiler optimization level.</p>
-      <p>By default, the build system generates symbolic debug information only for   the debug builds. With this option, the generation of symbolic debug information   is extended to release builds to support debugging of release binaries on ARM   ABI compliant platforms.</p></td>
-  </tr>
-  <tr>
-    <td><b>Override default make engine</b> </td>
-    <td>Check this box to enable  an edit box to specify the make engine to use, for example, eMake  from Electric Cloud.</td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<h4>Related tasks</h4>
-<ul><li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Project Settings</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+<style type="text/css">
+<!--
+.style5 {font-family: Verdana, Ariel, Helvetica, sans-serif; font-weight: bold; }
+-->
+</style>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Project Settings</h2>
+<p>  Use the <b>Project Settings </b>window to specify whether all components or selected subcomponents listed in a build information file (bld.inf) should be built for the currently selected project. You can also specify whether to perform a <span class="code">clean</span> or <span class="code">reallyclean</span> command on the project before building a project.</p>
+<p align="center"><img src="../images/carbide_proj_settings.png" width="672" height="679" /></p>
+<p class="figure">Figure 1 -  Project Settings</p>
+<h5>Table 1  Project Settings items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Bld.inf file</b></td>
+    <td>This is the path to the bld.inf file that lists the makefile and mmp components.</td>
+  </tr>
+  <tr>
+    <td><b>Bld.inf</b></td>
+    <td>Select this option to ensure all components are built for the selected project. </td>
+  </tr>
+  <tr>
+    <td><b>Selected Components</b></td>
+    <td><p>Select this option to  specify which components of the bld.inf file to be built, including makefiles. The equivalent call to abld is <span class="code">abld build &lt;subcomponent&gt;</span>. Use the <b>Exclude extension makefiles</b> and <b>Exclude test components</b> options to manage the items that appear in the list. </p>
+      <p>Toggle the state of each component to set its build state to true or not. A checkmark indicates a component is built. Click on a column title to sort the items by that columns contents. </p>
+    </td>
+  </tr>
+  <tr>
+    <td><b>Exclude extension makefiles </b></td>
+    <td>Toggles the presense of extension makefiles in the Selected components list. </td>
+  </tr>
+  <tr>
+    <td><b>Exclude test components </b></td>
+    <td>Toggles the presense of test components in the Selected components list. </td>
+  </tr>
+  <tr>
+    <td><b>Enable project specific settings </b></td>
+    <td>Click to set project specific build settings. By default a project in the workspace uses the global build settings unless this option is enabled. See the <a href="../wnd_build_prefs.htm">Build</a> preference panel for details on these options. </td>
+  </tr>
+  <tr>
+    <td><b>Configure Workspace Settings... </b></td>
+    <td>Opens the <a href="../wnd_build_prefs.htm">Build</a> preference panel. </td>
+  </tr>
+</table>
+<p>&nbsp;</p>
+<p align="center"><img src="../images/carbide_proj_settings_sbsv1.png" alt="sbsv1 tab" width="444" height="143"></p>
+<p align="center" class="figure">Figure 2 - SBSv1 Tab</p>
+<h5 align="left">Table 2 Symbian Build System v1 tab </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><span class="style5">Clean level </span></td>
+    <td><p>Specifies the level of clean to perform on  project files. The levels include:</p>
+      <ul>
+        <li>Level 0  (<span class="code">abld clean</span>) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker</li>
+        <li>Level 1  (<span class="code">abld reallyclean</span>) - performs a <span class="code">clean</span> operation, but also removes all exported files and makefiles</li>
+        <li>Level 2  (<span class="code">abld reallyclean</span>, <span class="code">bldmake clean</span>) - performs  a <span class="code">reallyclean</span> operation and then removes all files created by bldmake</li>
+      </ul></td>
+  </tr>
+  <tr>
+    <td><span class="style5">Manage dependency tracking </span></td>
+    <td>If checked, the Symbian command line build system will not generate dependencies for source and resource files. These will be managed by Carbide. This can reduce build times. </td>
+  </tr>
+  <tr>
+    <td><b>Show a dialog to modify build actions when modified MMPs are detected </b></td>
+    <td><p>If checked, you will be asked what action to take before a build if a MMP file has been modified. </p>
+        <p>If not checked, the default action is taken for all modified mmp files. </p></td>
+  </tr>
+  <tr>
+    <td><b>Default action to take when mmp files are modified </b></td>
+    <td>Select either None, Link only, or Compile and Link.</td>
+  </tr>
+</table>
+<p align="left">&nbsp;</p>
+<p align="center"><img src="../images/carbide_proj_settings_sbsv2.png" alt="sbsv2 tab" width="423" height="176"></p>
+<p align="center" class="figure">Figure 3 - SBSv2 Tab</p>
+<h5 align="left">Table 3 Symbian Build System v2 tab (only visible for Projects created with SBSv2 builder) </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="29%" scope="col">Item</th>
+    <th width="57%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Clean level </b></td>
+    <td>Select the level of clean when cleaning a project.
+      <ul>
+        <li><strong>abld clean</strong> erases all files created by a corresponding abld target   command (all intermediate files created during compilation and all executables and import libraries created by the linker)</li>
+        <li><strong>abld reallyclean</strong> does what abld clean does, and also removes files   exported by abld export and makefiles generated by abld makefile, or the abld   test equivalents</li>
+      </ul></td>
+  </tr>
+  <tr>
+    <td><b>Keep going  </b></td>
+    <td><p>This build option tells a particular command to   keep going even if unrelated build steps report errors or files are missing.</p>    </td>
+  </tr>
+  <tr>
+    <td><b>Debug mode</b></td>
+    <td><p>This option generates symbolic debug information for release or debug builds,   independent of the compiler optimization level.</p>
+      <p>By default, the build system generates symbolic debug information only for   the debug builds. With this option, the generation of symbolic debug information   is extended to release builds to support debugging of release binaries on ARM   ABI compliant platforms.</p></td>
+  </tr>
+  <tr>
+      <td><strong>Additional SBSv2 arguments</strong></td>
+      <td>Enter any additional arguments to pass to <span class="code">sbs.bat</span>.</td>
+  </tr>
+  <tr>
+    <td><strong>Override default make engine </strong></td>
+    <td>Check this box to enable  an edit box to specify the <strong>Make engine</strong> to use, for example, eMake  from Electric Cloud.</td>
+  </tr>
+  <tr>
+      <td><strong>Make engine</strong></td>
+      <td>Enter the name of a different make engine to use when building.</td>
+  </tr>
+</table>
+<h4>Related tasks</h4>
+<ul><li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configuration_filter.htm	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/launch_configuration_filter.htm	Mon Jun 21 16:26:29 2010 -0500
@@ -5,12 +5,13 @@
 <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"/>
+<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>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> window. This allows you to manage which configuration types are shown. By default, all launch configurations are shown. To open click the <strong>Windows &gt; Preferences &gt; Run/Debug &gt; Launching &gt; Launch Configurations</strong> option.</p>
+<p>To hide specific launch configurations, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that should be hidden in the <b>Run</b> and <b>Debug</b> dialogs. As shown in Figure 1, all the configurations  checked and won't appear in the configurations list, including Snapshot Albums. </p>
+<p align="center"><img src="images/pref_launch_config_filter.png" alt="Launch Configurtion Filter preference panel" width="662" height="579"></p>
 <p class="figure">Figure 1 - Launch Configurations preference panel </p>
 <h5>Related references</h5>
 <ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/menus/build_symbian_comp.htm	Mon Jun 21 16:26:29 2010 -0500
@@ -8,7 +8,7 @@
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
 <body bgcolor="#FFFFFF">
 <h2>Build Symbian Component </h2>
-<p>Select a .mmp or .mk  file in the Project Explorer, C/C++ Projects, or Symbian Project Navigator view, then right-click and select<b> Build Symbian Component</b> (CTRL+ALT+P) to build the selected component file or makefile. You can also right-click the file in an editor view and select <b>Build Symbian Componen</b><b>t</b> to also build the file. </p>
+<p>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, then right-click and select<b> Build Symbian Component</b> (<span class="code">CTRL+ALT+P</span>) to build the selected component file or makefile. You can also right-click the file in an editor view and select <b>Build Symbian Component</b> to also build the file. </p>
 <p align="center"><img src="../images/build_symbian_comp.png" width="432" height="357" /></p>
 <p align="center" class="figure">Figure 1. Build Symbian Component menu item </p>
 <p></p>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Jun 21 16:25:36 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Mon Jun 21 16:26:29 2010 -0500
@@ -97,8 +97,8 @@
       <topic label="N-Gage Projects" 								href="html/concepts/ngage_projects.htm" />
     </topic>
     <topic label="C/C++ Project and File Properties"	href="html/reference/ProjectPreferences.html" >
-      <topic label="Carbide Build Configurations"					href="html/reference/build_properties/pane_build_config.htm" >
-        <topic label="SIS Builder" 								href="html/reference/build_properties/pane_build_config_sis.htm" >
+      <topic label="Build Configurations"					href="html/reference/build_properties/pane_build_config.htm" >
+        <topic label="SIS Builder" 							href="html/reference/build_properties/pane_build_config_sis.htm" >
           <topic label="SIS Properties"						href="html/reference/build_properties/wnd_sis_properties.htm" />
         </topic>
         <topic label="SBSv2"									href="html/reference/build_properties/pane_build_config_sbsv2.htm" />
@@ -107,10 +107,10 @@
         <topic label="Paths and Symbols"						href="html/reference/build_properties/pane_build_config_paths.htm" />
         <topic label="ROM Builder"								href="html/reference/ROM_build_settings.html" />
       </topic>
-      <topic label="Carbide Macro Settings"						href="html/reference/build_properties/pane_macro_settings.htm" />
-      <topic label="Carbide Project Settings"						href="html/reference/build_properties/pane_project_settings.htm" />
+      <topic label="Macro Settings"						href="html/reference/build_properties/pane_macro_settings.htm" />
+      <topic label="Project Settings"						href="html/reference/build_properties/pane_project_settings.htm" />
     </topic>
-    <topic label="Building projects"  							href="html/concepts/build_system.htm" >
+    <topic label="Building projects"  						href="html/concepts/build_system.htm" >
       <topic label="Active Build Configuration"				href="html/concepts/build_configurations.htm" />
       <topic label="Setting an Active Configuration"			href="html/tasks/projects/prj_set_build_tgt.htm" />
       <topic label="Adding/Removing Build Configurations"		href="html/tasks/projects/prj_new_build_config.htm" />
@@ -135,7 +135,7 @@
       </topic>
       <topic label="Classes"  								href="html/tasks/ClassesToc.htm" >
         <topic label="Adding Classes" 						href="html/tasks/AddingClasses.html" />
-        <topic label="New Class Wizard" 					href="html/reference/NewClassWizard.html" />
+        <topic label="New C++ Class Wizard" 				href="html/reference/NewClassWizard.html" />
         <topic label="Adding Symbian OS Classes Wizard"		href="html/tasks/projects/prj_adding_symbian_class.htm" />
       </topic>
       <topic label="INF editor"					href="html/reference/INF_Editor.html" >